projects
/
haskell-directory.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2005-01-19 22:33:32 by ralf]
[haskell-directory.git]
/
GHC
/
Conc.lhs
diff --git
a/GHC/Conc.lhs
b/GHC/Conc.lhs
index
02b256a
..
edb9679
100644
(file)
--- a/
GHC/Conc.lhs
+++ b/
GHC/Conc.lhs
@@
-81,6
+81,8
@@
import GHC.Exception ( Exception(..), AsyncException(..) )
import GHC.Pack ( packCString# )
import GHC.Ptr ( Ptr(..), plusPtr, FunPtr(..) )
import GHC.STRef
import GHC.Pack ( packCString# )
import GHC.Ptr ( Ptr(..), plusPtr, FunPtr(..) )
import GHC.STRef
+import Data.Typeable
+#include "Typeable.h"
infixr 0 `par`, `pseq`
\end{code}
infixr 0 `par`, `pseq`
\end{code}
@@
-114,6
+116,9
@@
This misfeature will hopefully be corrected at a later date.
it defines 'ThreadId' as a synonym for ().
-}
it defines 'ThreadId' as a synonym for ().
-}
+INSTANCE_TYPEABLE0(ThreadId,threadIdTc,"ThreadId")
+
+
--forkIO has now been hoisted out into the Concurrent library.
{- | 'killThread' terminates the given thread (GHC only).
--forkIO has now been hoisted out into the Concurrent library.
{- | 'killThread' terminates the given thread (GHC only).
@@
-204,6
+209,8
@@
transactions.
\begin{code}
newtype STM a = STM (State# RealWorld -> (# State# RealWorld, a #))
\begin{code}
newtype STM a = STM (State# RealWorld -> (# State# RealWorld, a #))
+INSTANCE_TYPEABLE1(STM,stmTc,"STM" )
+
unSTM :: STM a -> (State# RealWorld -> (# State# RealWorld, a #))
unSTM (STM a) = a
unSTM :: STM a -> (State# RealWorld -> (# State# RealWorld, a #))
unSTM (STM a) = a
@@
-262,6
+269,8
@@
catchSTM (STM m) k = STM $ \s -> catchSTM# m (\ex -> unSTM (k ex)) s
data TVar a = TVar (TVar# RealWorld a)
data TVar a = TVar (TVar# RealWorld a)
+INSTANCE_TYPEABLE1(TVar,tvarTc,"TVar" )
+
instance Eq (TVar a) where
(TVar tvar1#) == (TVar tvar2#) = sameTVar# tvar1# tvar2#
instance Eq (TVar a) where
(TVar tvar1#) == (TVar tvar2#) = sameTVar# tvar1# tvar2#
@@
-300,6
+309,8
@@
writes.
\begin{code}
--Defined in IOBase to avoid cycle: data MVar a = MVar (SynchVar# RealWorld a)
\begin{code}
--Defined in IOBase to avoid cycle: data MVar a = MVar (SynchVar# RealWorld a)
+INSTANCE_TYPEABLE1(MVar,mvarTc,"MVar" )
+
-- |Create an 'MVar' which is initially empty.
newEmptyMVar :: IO (MVar a)
newEmptyMVar = IO $ \ s# ->
-- |Create an 'MVar' which is initially empty.
newEmptyMVar :: IO (MVar a)
newEmptyMVar = IO $ \ s# ->