X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FbasicTypes%2FUniqSupply.lhs;h=41ad5c0f60dadb5846cfe77716e77673443ab0e6;hb=c5b03909e7c630a874f6f1abf76d28baf4b19d55;hp=b1de3f3d0bb9f67e140b8cfeced6f10659b0cdc2;hpb=8f9f8828209736659b3529924cfbc2c67900fcb6;p=ghc-hetmet.git

diff --git a/ghc/compiler/basicTypes/UniqSupply.lhs b/ghc/compiler/basicTypes/UniqSupply.lhs
index b1de3f3..41ad5c0 100644
--- a/ghc/compiler/basicTypes/UniqSupply.lhs
+++ b/ghc/compiler/basicTypes/UniqSupply.lhs
@@ -24,12 +24,9 @@ module UniqSupply (
 #include "HsVersions.h"
 
 import Unique
-import GlaExts
 
-#if __GLASGOW_HASKELL__ < 301
-import IOBase		( IO(..), IOResult(..) )
-#else
-#endif
+import GLAEXTS
+import UNSAFE_IO	( unsafeInterleaveIO )
 
 w2i x = word2Int# x
 i2w x = int2Word# x
@@ -43,12 +40,6 @@ i2w_s x = (x :: Int#)
 %*									*
 %************************************************************************
 
-%************************************************************************
-%*									*
-\subsubsection[UniqSupply-type]{@UniqSupply@ type and operations}
-%*									*
-%************************************************************************
-
 A value of type @UniqSupply@ is unique, and it can
 supply {\em one} distinct @Unique@.  Also, from the supply, one can
 also manufacture an arbitrary number of further @UniqueSupplies@,
@@ -88,17 +79,19 @@ mkSplitUniqSupply (C# c#)
 		return (MkSplitUniqSupply uniq s1 s2)
 	    )
 
-	mk_unique = _ccall_ genSymZh		>>= \ (W# u#) ->
+	mk_unique = genSymZh		>>= \ (W# u#) ->
 		    return (I# (w2i (mask# `or#` u#)))
     in
     mk_supply#
 
+foreign import ccall unsafe "genSymZh" genSymZh :: IO Word
+
 splitUniqSupply (MkSplitUniqSupply _ s1 s2) = (s1, s2)
 \end{code}
 
 \begin{code}
-uniqFromSupply  (MkSplitUniqSupply (I# n) _ _)  = mkUniqueGrimily n
-uniqsFromSupply (MkSplitUniqSupply (I# n) _ s2) = mkUniqueGrimily n : uniqsFromSupply s2
+uniqFromSupply  (MkSplitUniqSupply n _ _)  = mkUniqueGrimily n
+uniqsFromSupply (MkSplitUniqSupply n _ s2) = mkUniqueGrimily n : uniqsFromSupply s2
 \end{code}
 
 %************************************************************************