X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Data%2FIORef.hs;h=7a6ec7d4cb32ecbd1b935ab8272116c8e81ced25;hb=7d469fba03085e1538f7b33227a3b69fc68d037f;hp=af8ebda4ca8bbe2be2055619829e058fd3124b22;hpb=bfdd52de414c485c3173b4c899d4a58b67dc725c;p=ghc-base.git

diff --git a/Data/IORef.hs b/Data/IORef.hs
index af8ebda..7a6ec7d 100644
--- a/Data/IORef.hs
+++ b/Data/IORef.hs
@@ -27,7 +27,7 @@ module Data.IORef
 #endif
 	) where
 
-import Prelude
+import Prelude	-- Explicit dependency helps 'make depend' do the right thing
 
 #ifdef __HUGS__
 import Hugs.IORef
@@ -48,13 +48,10 @@ import NHC.IOExtras
     , newIORef
     , readIORef
     , writeIORef
+    , excludeFinalisers
     )
 #endif
 
-#ifndef __NHC__
-import Data.Dynamic
-#endif
-
 #if defined(__GLASGOW_HASKELL__) && !defined(__PARALLEL_HASKELL__)
 -- |Make a 'Weak' pointer to an 'IORef'
 mkWeakIORef :: IORef a -> IO () -> IO (Weak (IORef a))
@@ -75,7 +72,7 @@ modifyIORef ref f = writeIORef ref . f =<< readIORef ref
 --
 -- Extending the atomicity to multiple 'IORef's is problematic, so it
 -- is recommended that if you need to do anything more complicated
--- then using 'MVar' instead is a good idea.
+-- then using 'Control.Concurrent.MVar.MVar' instead is a good idea.
 --
 atomicModifyIORef :: IORef a -> (a -> (a,b)) -> IO b
 #if defined(__GLASGOW_HASKELL__)
@@ -86,4 +83,11 @@ atomicModifyIORef = plainModifyIORef	-- Hugs has no preemption
   where plainModifyIORef r f = do
 		a <- readIORef r
 		case f a of (a',b) -> writeIORef r a' >> return b
+#elif defined(__NHC__)
+atomicModifyIORef r f =
+  excludeFinalisers $ do
+    a <- readIORef r
+    let (a',b) = f a
+    writeIORef r a'
+    return b
 #endif