X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Prelude.hs;h=840c2ca5b965bc614966e8038e968e86b1067157;hb=297d7e3e4ce4950125fd4b6e3bff9d7f6afbfbc6;hp=1be9b4fed58942c2aa71e1082cc4e47e5ca38f41;hpb=b8ac498face4c8b16c06d30fbc86666b7dc28173;p=ghc-base.git

diff --git a/Prelude.hs b/Prelude.hs
index 1be9b4f..840c2ca 100644
--- a/Prelude.hs
+++ b/Prelude.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -fno-implicit-prelude #-}
+{-# OPTIONS_GHC -fno-implicit-prelude #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Prelude
@@ -111,11 +111,15 @@ module Prelude (
     lines, words, unlines, unwords,
 
     -- * Converting to and from @String@
-    ReadS, ShowS,
-    Read(readsPrec, readList),
+    -- ** Converting to @String@
+    ShowS,
     Show(showsPrec, showList, show),
-    reads, shows, read, lex, 
-    showChar, showString, readParen, showParen,
+    shows,
+    showChar, showString, showParen,
+    -- ** Converting from @String@
+    ReadS,
+    Read(readsPrec, readList),
+    reads, readParen, read, lex, 
     
     -- * Basic Input and output
     IO,
@@ -149,6 +153,8 @@ import Data.Either
 import Data.Maybe
 import Data.Bool
 import Data.Tuple
+import Data.Eq
+import Data.Ord
 #endif
 
 #ifdef __GLASGOW_HASKELL__
@@ -171,11 +177,18 @@ import Hugs.Prelude
 #ifndef __HUGS__
 infixr 0 $!
 
-
 -- -----------------------------------------------------------------------------
 -- Miscellaneous functions
 
+-- | Strict (call-by-value) application, defined in terms of 'seq'.
 ($!)    :: (a -> b) -> a -> b
 f $! x  = x `seq` f x
 #endif
 
+#ifdef __HADDOCK__
+-- | The value of @'seq' a b@ is bottom if @a@ is bottom, and otherwise
+-- equal to @b@.  'seq' is usually introduced to improve performance by
+-- avoiding unneeded laziness.
+seq :: a -> b -> b
+seq _ y = y
+#endif