X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Data%2FIORef.hs;h=7a6ec7d4cb32ecbd1b935ab8272116c8e81ced25;hb=a01ece51085a2a8571c9bda7803b8ea5021c2a85;hp=55cb52f7765188be5f1652e949b50b2b8b476565;hpb=e6470c8b7272a1a06dedf734dc351df265f5328f;p=haskell-directory.git

diff --git a/Data/IORef.hs b/Data/IORef.hs
index 55cb52f..7a6ec7d 100644
--- a/Data/IORef.hs
+++ b/Data/IORef.hs
@@ -20,14 +20,14 @@ module Data.IORef
         readIORef,	      -- :: IORef a -> IO a
         writeIORef,	      -- :: IORef a -> a -> IO ()
 	modifyIORef,	      -- :: IORef a -> (a -> a) -> IO ()
-	atomicModifyIORef,    -- :: IORef a -> (a -> (a,b)) -> IO ()
+	atomicModifyIORef,    -- :: IORef a -> (a -> (a,b)) -> IO b
 
 #if !defined(__PARALLEL_HASKELL__) && defined(__GLASGOW_HASKELL__)
 	mkWeakIORef,          -- :: IORef a -> IO () -> IO (Weak (IORef a))
 #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))
@@ -66,6 +63,7 @@ mkWeakIORef r@(IORef (STRef r#)) f = IO $ \s ->
 modifyIORef :: IORef a -> (a -> a) -> IO ()
 modifyIORef ref f = writeIORef ref . f =<< readIORef ref
 
+
 -- |Atomically modifies the contents of an 'IORef'.
 --
 -- This function is useful for using 'IORef' in a safe way in a multithreaded
@@ -74,12 +72,22 @@ 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__)
 atomicModifyIORef (IORef (STRef r#)) f = IO $ \s -> atomicModifyMutVar# r# f s
 
-#ifndef __NHC__
-#include "Dynamic.h"
-INSTANCE_TYPEABLE1(IORef,ioRefTc,"IORef")
+#elif defined(__HUGS__)
+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