projects
/
haskell-directory.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make Control.Exception buildable by nhc98.
[haskell-directory.git]
/
Data
/
IORef.hs
diff --git
a/Data/IORef.hs
b/Data/IORef.hs
index
55cb52f
..
7a6ec7d
100644
(file)
--- 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 ()
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
#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
#ifdef __HUGS__
import Hugs.IORef
@@
-48,13
+48,10
@@
import NHC.IOExtras
, newIORef
, readIORef
, writeIORef
, newIORef
, readIORef
, writeIORef
+ , excludeFinalisers
)
#endif
)
#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))
#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
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
-- |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
--
-- 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
--
atomicModifyIORef :: IORef a -> (a -> (a,b)) -> IO b
+#if defined(__GLASGOW_HASKELL__)
atomicModifyIORef (IORef (STRef r#)) f = IO $ \s -> atomicModifyMutVar# r# f s
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
#endif