X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FUniqSupply.lhs;h=7937043dd6d1b9ee0ccf6f1cd6ab592162fe9c28;hb=7da21648f84f4d7257c20f9cc0982462130d6832;hp=b9a31efcaf25cd383a050e9a4818e726d9259ea6;hpb=39a2bccc3221f195892609c5c1e2fee81676b63d;p=ghc-hetmet.git

diff --git a/compiler/basicTypes/UniqSupply.lhs b/compiler/basicTypes/UniqSupply.lhs
index b9a31ef..7937043 100644
--- a/compiler/basicTypes/UniqSupply.lhs
+++ b/compiler/basicTypes/UniqSupply.lhs
@@ -1,7 +1,7 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
-\section[UniqSupply]{The @UniqueSupply@ data type and a (monadic) supply thereof}
 
 \begin{code}
 module UniqSupply (
@@ -25,8 +25,8 @@ module UniqSupply (
 
 import Unique
 
-import GLAEXTS
-import UNSAFE_IO	( unsafeInterleaveIO )
+import GHC.Exts
+import System.IO.Unsafe	( unsafeInterleaveIO )
 
 w2i x = word2Int# x
 i2w x = int2Word# x
@@ -98,14 +98,19 @@ uniqsFromSupply (MkSplitUniqSupply n _ s2) = mkUniqueGrimily (I# n) : uniqsFromS
 %************************************************************************
 
 \begin{code}
-type UniqSM result = UniqSupply -> (result, UniqSupply)
+newtype UniqSM result = USM { unUSM :: UniqSupply -> (result, UniqSupply) }
+
+instance Monad UniqSM where
+  return = returnUs
+  (>>=) = thenUs
+  (>>)  = thenUs_
 
 -- the initUs function also returns the final UniqSupply; initUs_ drops it
 initUs :: UniqSupply -> UniqSM a -> (a,UniqSupply)
-initUs init_us m = case m init_us of { (r,us) -> (r,us) }
+initUs init_us m = case unUSM m init_us of { (r,us) -> (r,us) }
 
 initUs_ :: UniqSupply -> UniqSM a -> a
-initUs_ init_us m = case m init_us of { (r,us) -> r }
+initUs_ init_us m = case unUSM m init_us of { (r,us) -> r }
 
 {-# INLINE thenUs #-}
 {-# INLINE lazyThenUs #-}
@@ -116,38 +121,38 @@ initUs_ init_us m = case m init_us of { (r,us) -> r }
 @thenUs@ is where we split the @UniqSupply@.
 \begin{code}
 fixUs :: (a -> UniqSM a) -> UniqSM a
-fixUs m us
-  = (r,us')  where  (r,us') = m r us
+fixUs m = USM (\us -> let (r,us') = unUSM (m r) us in (r,us'))
 
 thenUs :: UniqSM a -> (a -> UniqSM b) -> UniqSM b
-thenUs expr cont us
-  = case (expr us) of { (result, us') -> cont result us' }
+thenUs (USM expr) cont
+  = USM (\us -> case (expr us) of 
+		   (result, us') -> unUSM (cont result) us')
 
 lazyThenUs :: UniqSM a -> (a -> UniqSM b) -> UniqSM b
-lazyThenUs expr cont us
-  = let (result, us') = expr us in cont result us'
+lazyThenUs (USM expr) cont
+  = USM (\us -> let (result, us') = expr us in unUSM (cont result) us')
 
 thenUs_ :: UniqSM a -> UniqSM b -> UniqSM b
-thenUs_ expr cont us
-  = case (expr us) of { (_, us') -> cont us' }
+thenUs_ (USM expr) (USM cont)
+  = USM (\us -> case (expr us) of { (_, us') -> cont us' })
 
 
 returnUs :: a -> UniqSM a
-returnUs result us = (result, us)
+returnUs result = USM (\us -> (result, us))
 
 withUs :: (UniqSupply -> (a, UniqSupply)) -> UniqSM a
-withUs f us = f us	-- Ha ha!
+withUs f = USM (\us -> f us)	-- Ha ha!
 		
 getUs :: UniqSM UniqSupply
-getUs us = splitUniqSupply us
+getUs = USM (\us -> splitUniqSupply us)
 
 getUniqueUs :: UniqSM Unique
-getUniqueUs us = case splitUniqSupply us of
-		   (us1,us2) -> (uniqFromSupply us1, us2)
+getUniqueUs = USM (\us -> case splitUniqSupply us of
+			   (us1,us2) -> (uniqFromSupply us1, us2))
 
 getUniquesUs :: UniqSM [Unique]
-getUniquesUs us = case splitUniqSupply us of
-		      (us1,us2) -> (uniqsFromSupply us1, us2)
+getUniquesUs = USM (\us -> case splitUniqSupply us of
+			      (us1,us2) -> (uniqsFromSupply us1, us2))
 \end{code}
 
 \begin{code}