Remove Control.Parallel*, now in package parallel

[haskell-directory.git] / Control / Monad / ST.hs

diff --git a/Control/Monad/ST.hs b/Control/Monad/ST.hs
index 5ea1052..d736eb6 100644 (file)
--- a/Control/Monad/ST.hs
+++ b/Control/Monad/ST.hs
@@ -10,7 +10,7 @@
 --
 -- This library provides support for /strict/ state threads, as
 -- described in the PLDI \'94 paper by John Launchbury and Simon Peyton
--- Jones /Lazy State Threads/.
+-- Jones /Lazy Functional State Threads/.
 --
 -----------------------------------------------------------------------------
 
@@ -27,20 +27,24 @@ module Control.Monad.ST
 
        -- * Unsafe operations
        unsafeInterleaveST,     -- :: ST s a -> ST s a
-       unsafeIOToST            -- :: IO a -> ST s a
+       unsafeIOToST,           -- :: IO a -> ST s a
+       unsafeSTToIO            -- :: ST s a -> IO a
       ) where
 
 import Prelude
 
 import Control.Monad.Fix
-import Data.Typeable
 
 #include "Typeable.h"
 
 #ifdef __HUGS__
+import Data.Typeable
 import Hugs.ST
 import qualified Hugs.LazyST as LazyST
 
+INSTANCE_TYPEABLE2(ST,sTTc,"ST")
+INSTANCE_TYPEABLE0(RealWorld,realWorldTc,"RealWorld")
+
 fixST :: (a -> ST s a) -> ST s a
 fixST f = LazyST.lazyToStrictST (LazyST.fixST (LazyST.strictToLazyST . f))
 
@@ -50,21 +54,11 @@ unsafeInterleaveST =
 #endif
 
 #ifdef __GLASGOW_HASKELL__
-import GHC.ST
-import GHC.Base                ( unsafeCoerce#, RealWorld )
-import GHC.IOBase      ( IO(..), stToIO )
-
--- This relies on IO and ST having the same representation modulo the
--- constraint on the type of the state
---
-unsafeIOToST        :: IO a -> ST s a
-unsafeIOToST (IO io) = ST $ \ s -> (unsafeCoerce# io) s
+import GHC.ST          ( ST, runST, fixST, unsafeInterleaveST )
+import GHC.Base                ( RealWorld )
+import GHC.IOBase      ( stToIO, unsafeIOToST, unsafeSTToIO )
 #endif
 
 instance MonadFix (ST s) where
        mfix = fixST
 
--- ---------------------------------------------------------------------------
--- Typeable instance
-
-INSTANCE_TYPEABLE2(ST,sTTc,"ST")