X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Control%2FMonad%2FST.hs;h=8ebb750e3a96f3d1a79695cb9e9166530a299c64;hb=205722095450a487f2d5a7133d0802f2cc2ee856;hp=7341cefd9fe160433f0e31b48ba35e0e3b8193eb;hpb=9812e0a321ec0ed8f9e53eb2febfb14c79564200;p=ghc-base.git

diff --git a/Control/Monad/ST.hs b/Control/Monad/ST.hs
index 7341cef..8ebb750 100644
--- a/Control/Monad/ST.hs
+++ b/Control/Monad/ST.hs
@@ -10,56 +10,59 @@
 --
 -- 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/.
 --
 -----------------------------------------------------------------------------
 
 module Control.Monad.ST
   (
-	-- * The 'ST' Monad
-	ST,		-- abstract, instance of Functor, Monad, Typeable.
-	runST,		-- :: (forall s. ST s a) -> a
-	fixST,		-- :: (a -> ST s a) -> ST s a
+        -- * The 'ST' Monad
+        ST,             -- abstract, instance of Functor, Monad, Typeable.
+        runST,          -- :: (forall s. ST s a) -> a
+        fixST,          -- :: (a -> ST s a) -> ST s a
 
-	-- * Unsafe operations
-	unsafeInterleaveST,  	-- :: ST s a -> ST s a
-	unsafeIOToST,		-- :: IO a -> ST s a
+        -- * Converting 'ST' to 'IO'
+        RealWorld,              -- abstract
+        stToIO,                 -- :: ST RealWorld a -> IO a
 
-	-- * Converting 'ST' to 'IO'
-	RealWorld,		-- abstract
-	stToIO			-- :: ST RealWorld a -> IO a
+        -- * Unsafe operations
+        unsafeInterleaveST,     -- :: ST s a -> ST s a
+        unsafeIOToST,           -- :: IO a -> ST s a
+        unsafeSTToIO            -- :: ST s a -> IO a
       ) where
 
-import Prelude
-
+#if defined(__GLASGOW_HASKELL__)
+import Control.Monad.Fix ()
+#else
 import Control.Monad.Fix
-import Data.Dynamic
+#endif
 
-#ifdef __HUGS__
+#include "Typeable.h"
+
+#if defined(__GLASGOW_HASKELL__)
+import GHC.ST           ( ST, runST, fixST, unsafeInterleaveST )
+import GHC.Base         ( RealWorld )
+import GHC.IO           ( stToIO, unsafeIOToST, unsafeSTToIO )
+#elif defined(__HUGS__)
+import Data.Typeable
 import Hugs.ST
+import qualified Hugs.LazyST as LazyST
 #endif
 
-#ifdef __GLASGOW_HASKELL__
-import GHC.ST
-import GHC.Base		( unsafeCoerce#, RealWorld )
-import GHC.IOBase 	( IO(..), stToIO )
+#if defined(__HUGS__)
+INSTANCE_TYPEABLE2(ST,sTTc,"ST")
+INSTANCE_TYPEABLE0(RealWorld,realWorldTc,"RealWorld")
 
--- 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
+fixST :: (a -> ST s a) -> ST s a
+fixST f = LazyST.lazyToStrictST (LazyST.fixST (LazyST.strictToLazyST . f))
+
+unsafeInterleaveST :: ST s a -> ST s a
+unsafeInterleaveST =
+    LazyST.lazyToStrictST . LazyST.unsafeInterleaveST . LazyST.strictToLazyST
 #endif
 
+#if !defined(__GLASGOW_HASKELL__)
 instance MonadFix (ST s) where
-	mfix = fixST
-
--- ---------------------------------------------------------------------------
--- Typeable instance
-
-sTTc :: TyCon
-sTTc = mkTyCon "ST"
+        mfix = fixST
+#endif
 
-instance (Typeable a, Typeable b) => Typeable (ST a b) where
-  typeOf st = mkAppTy sTTc [typeOf ((undefined :: ST a b -> a) st),
-			    typeOf ((undefined :: ST a b -> b) st)]