X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Data%2FIORef.hs;h=f8857510e45109cbd42efe99189bef553a90562b;hb=2b88e86142ffbf79dad8596082ec301627a5682c;hp=1b4b11029374f999a41941bef109fe6e0009582e;hpb=25ee14a12578b3078f0666861fece70fff6e0819;p=ghc-base.git

diff --git a/Data/IORef.hs b/Data/IORef.hs
index 1b4b110..f885751 100644
--- a/Data/IORef.hs
+++ b/Data/IORef.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -XNoImplicitPrelude #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.IORef
@@ -27,16 +28,16 @@ module Data.IORef
 #endif
         ) where
 
-import Prelude  -- Explicit dependency helps 'make depend' do the right thing
-
 #ifdef __HUGS__
 import Hugs.IORef
 #endif
 
 #ifdef __GLASGOW_HASKELL__
-import GHC.Base         ( mkWeak#, atomicModifyMutVar# )
+import GHC.Base
 import GHC.STRef
-import GHC.IOBase
+-- import GHC.IO
+import GHC.IORef hiding (atomicModifyIORef)
+import qualified GHC.IORef
 #if !defined(__PARALLEL_HASKELL__)
 import GHC.Weak
 #endif
@@ -61,7 +62,7 @@ mkWeakIORef r@(IORef (STRef r#)) f = IO $ \s ->
 
 -- |Mutate the contents of an 'IORef'
 modifyIORef :: IORef a -> (a -> a) -> IO ()
-modifyIORef ref f = writeIORef ref . f =<< readIORef ref
+modifyIORef ref f = readIORef ref >>= writeIORef ref . f
 
 
 -- |Atomically modifies the contents of an 'IORef'.
@@ -76,7 +77,7 @@ modifyIORef ref f = writeIORef ref . f =<< readIORef ref
 --
 atomicModifyIORef :: IORef a -> (a -> (a,b)) -> IO b
 #if defined(__GLASGOW_HASKELL__)
-atomicModifyIORef (IORef (STRef r#)) f = IO $ \s -> atomicModifyMutVar# r# f s
+atomicModifyIORef = GHC.IORef.atomicModifyIORef
 
 #elif defined(__HUGS__)
 atomicModifyIORef = plainModifyIORef    -- Hugs has no preemption