[commit: nofib] master: Hide Word from Prelude (c9c20d4)
git at git.haskell.org
git at git.haskell.org
Tue Sep 2 15:54:51 UTC 2014
Repository : ssh://git@git.haskell.org/nofib
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/c9c20d477088a8a7d5747f16afdf0652fba6dadf/nofib
>---------------------------------------------------------------
commit c9c20d477088a8a7d5747f16afdf0652fba6dadf
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Tue Sep 2 17:53:52 2014 +0200
Hide Word from Prelude
in benchmarks where Word is used. This fixes fall-out from #9531.
>---------------------------------------------------------------
c9c20d477088a8a7d5747f16afdf0652fba6dadf
fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/LeftToRight.lhs | 1 +
fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/LeftToRightD.lhs | 1 +
fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/Posix.lhs | 1 +
fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/RightToLeft.lhs | 1 +
fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/TwoPasses.lhs | 1 +
real/HMMS/Pronunciations.lhs | 1 +
spectral/eliza/Main.hs | 1 +
spectral/para/Main.lhs | 1 +
8 files changed, 8 insertions(+)
diff --git a/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/LeftToRight.lhs b/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/LeftToRight.lhs
index 2b1c4be..56977a2 100644
--- a/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/LeftToRight.lhs
+++ b/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/LeftToRight.lhs
@@ -26,6 +26,7 @@ an emptiable pattern and the input word is fully consumed.
> import qualified Data.IntMap as IM
> import qualified Data.ByteString.Char8 as S
> import Control.DeepSeq
+> import Prelude hiding (Word)
> import System.IO.Unsafe (unsafePerformIO)
diff --git a/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/LeftToRightD.lhs b/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/LeftToRightD.lhs
index 64a2e30..ba8e220 100644
--- a/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/LeftToRightD.lhs
+++ b/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/LeftToRightD.lhs
@@ -26,6 +26,7 @@ an emptiable pattern and the input word is fully consumed.
> import qualified Data.IntMap as IM
> import qualified Data.ByteString.Char8 as S
> import Control.DeepSeq
+> import Prelude hiding (Word)
> import System.IO.Unsafe (unsafePerformIO)
diff --git a/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/Posix.lhs b/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/Posix.lhs
index efde6bf..f46d237 100644
--- a/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/Posix.lhs
+++ b/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/Posix.lhs
@@ -29,6 +29,7 @@ This algorithm implements the POSIX matching policy proceeds by scanning the inp
> import GHC.Arr
> import qualified Data.IntMap as IM
> import qualified Data.ByteString.Char8 as S
+> import Prelude hiding (Word)
> import Text.Regex.Base(RegexOptions(..),RegexLike(..),MatchArray)
diff --git a/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/RightToLeft.lhs b/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/RightToLeft.lhs
index f2d0921..fafa5f6 100644
--- a/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/RightToLeft.lhs
+++ b/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/RightToLeft.lhs
@@ -26,6 +26,7 @@ is reached (AKA init state of the NFA) and the input word is fully consumed.
> import GHC.Int
> import qualified Data.IntMap as IM
> import qualified Data.ByteString.Char8 as S
+> import Prelude hiding (Word)
> import Text.Regex.Base(RegexOptions(..))
diff --git a/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/TwoPasses.lhs b/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/TwoPasses.lhs
index 0f436d8..fd62f69 100644
--- a/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/TwoPasses.lhs
+++ b/fibon/Hackage/Regex/Text/Regex/PDeriv/ByteString/TwoPasses.lhs
@@ -28,6 +28,7 @@ failures states as long as we cannot find them in the sets.
> import GHC.Int
> import qualified Data.IntMap as IM
> import qualified Data.ByteString.Char8 as S
+> import Prelude hiding (Word)
> import Text.Regex.Base(RegexOptions(..))
diff --git a/real/HMMS/Pronunciations.lhs b/real/HMMS/Pronunciations.lhs
index 1195462..4c0f55a 100644
--- a/real/HMMS/Pronunciations.lhs
+++ b/real/HMMS/Pronunciations.lhs
@@ -25,6 +25,7 @@ described in later chapters in Part~\ref{part:library}.
> import MaybeStateT
> import PlainTextIO
> import StateT
+> import Prelude hiding (Word)
\end{verbatim}
diff --git a/spectral/eliza/Main.hs b/spectral/eliza/Main.hs
index 2158970..e8cbc22 100644
--- a/spectral/eliza/Main.hs
+++ b/spectral/eliza/Main.hs
@@ -8,6 +8,7 @@
-------------------------------------------------------------------------------
import Data.Char -- 1.3
+import Prelude hiding (Word)
main = interact (("\n\
\Hi! I'm Eliza. I am your personal therapy computer.\n\
diff --git a/spectral/para/Main.lhs b/spectral/para/Main.lhs
index 120b9b4..3ae76b0 100644
--- a/spectral/para/Main.lhs
+++ b/spectral/para/Main.lhs
@@ -176,6 +176,7 @@ style.
>import Data.Char
>import System.IO
>import System.Environment
+>import Prelude hiding (Word)
\end{mcode}
\fi
More information about the ghc-commits
mailing list