X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Prelude.hs;h=4c183ae38c9ad44a22a25c4bba5fa9149066cb62;hb=7dbb606d7b57cdad87a0ffbdb6ea4a274ebca7c0;hp=ff3902a1f4502e38000f5d6393e878ea2de8bb8e;hpb=10de2c656f74562b662c22928be85e1b3ccda796;p=ghc-base.git

diff --git a/Prelude.hs b/Prelude.hs
index ff3902a..4c183ae 100644
--- a/Prelude.hs
+++ b/Prelude.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -XNoImplicitPrelude #-}
+{-# LANGUAGE CPP, NoImplicitPrelude, BangPatterns #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Prelude
@@ -146,28 +147,24 @@ module Prelude (
 #ifndef __HUGS__
 import Control.Monad
 import System.IO
-import Text.Read
-import Text.Show
+import System.IO.Error
 import Data.List
 import Data.Either
 import Data.Maybe
-import Data.Bool
 import Data.Tuple
-import Data.Eq
-import Data.Ord
 #endif
 
 #ifdef __GLASGOW_HASKELL__
 import GHC.Base
-import GHC.IOBase
-import GHC.Exception
-import GHC.Read
+-- import GHC.IO
+-- import GHC.IO.Exception
+import Text.Read
 import GHC.Enum
 import GHC.Num
 import GHC.Real
 import GHC.Float
 import GHC.Show
-import GHC.Err   ( error, undefined )
+import GHC.Err   ( undefined )
 #endif
 
 #ifdef __HUGS__
@@ -176,12 +173,16 @@ import Hugs.Prelude
 
 #ifndef __HUGS__
 infixr 0 $!
+#endif
 
 -- -----------------------------------------------------------------------------
 -- Miscellaneous functions
 
 -- | Strict (call-by-value) application, defined in terms of 'seq'.
 ($!)    :: (a -> b) -> a -> b
+#ifdef __GLASGOW_HASKELL__
+f $! x  = let !vx = x in f vx  -- see #2273
+#elif !defined(__HUGS__)
 f $! x  = x `seq` f x
 #endif