X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FUniqSupply.lhs;h=c228eeb5708740740059a5850a1d3383c8d5f2d2;hb=0a599d220f1332cbe03decc54fc4e51628d0502a;hp=7937043dd6d1b9ee0ccf6f1cd6ab592162fe9c28;hpb=49c98d143c382a1341e1046f5ca00819a25691ba;p=ghc-hetmet.git

diff --git a/compiler/basicTypes/UniqSupply.lhs b/compiler/basicTypes/UniqSupply.lhs
index 7937043..c228eeb 100644
--- a/compiler/basicTypes/UniqSupply.lhs
+++ b/compiler/basicTypes/UniqSupply.lhs
@@ -4,6 +4,13 @@
 %
 
 \begin{code}
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 module UniqSupply (
 
 	UniqSupply,		-- Abstractly
@@ -18,7 +25,7 @@ module UniqSupply (
 	lazyThenUs, lazyMapUs,
 
 	mkSplitUniqSupply,
-	splitUniqSupply
+	splitUniqSupply, listSplitUniqSupply
   ) where
 
 #include "HsVersions.h"
@@ -28,6 +35,13 @@ import Unique
 import GHC.Exts
 import System.IO.Unsafe	( unsafeInterleaveIO )
 
+#if __GLASGOW_HASKELL__ >= 607
+import GHC.IOBase (unsafeDupableInterleaveIO)
+#else
+unsafeDupableInterleaveIO :: IO a -> IO a
+unsafeDupableInterleaveIO = unsafeInterleaveIO
+#endif
+
 w2i x = word2Int# x
 i2w x = int2Word# x
 i2w_s x = (x :: Int#)
@@ -56,6 +70,7 @@ data UniqSupply
 mkSplitUniqSupply :: Char -> IO UniqSupply
 
 splitUniqSupply :: UniqSupply -> (UniqSupply, UniqSupply)
+listSplitUniqSupply :: UniqSupply -> [UniqSupply]   -- Infinite
 uniqFromSupply  :: UniqSupply -> Unique
 uniqsFromSupply :: UniqSupply -> [Unique]	-- Infinite
 \end{code}
@@ -63,27 +78,24 @@ uniqsFromSupply :: UniqSupply -> [Unique]	-- Infinite
 \begin{code}
 mkSplitUniqSupply (C# c#)
   = let
-#if __GLASGOW_HASKELL__ >= 503
 	mask# = (i2w (ord# c#)) `uncheckedShiftL#` (i2w_s 24#)
-#else
-	mask# = (i2w (ord# c#)) `shiftL#` (i2w_s 24#)
-#endif
 	-- here comes THE MAGIC:
 
 	-- This is one of the most hammered bits in the whole compiler
 	mk_supply#
-	  = unsafeInterleaveIO (
-		genSymZh    >>= \ (W# u#) ->
+	  = unsafeDupableInterleaveIO (
+		genSymZh    >>= \ (I# u#) ->
 		mk_supply#  >>= \ s1 ->
 		mk_supply#  >>= \ s2 ->
-		return (MkSplitUniqSupply (w2i (mask# `or#` u#)) s1 s2)
+		return (MkSplitUniqSupply (w2i (mask# `or#` (i2w u#))) s1 s2)
 	    )
     in
     mk_supply#
 
-foreign import ccall unsafe "genSymZh" genSymZh :: IO Word
+foreign import ccall unsafe "genSymZh" genSymZh :: IO Int
 
 splitUniqSupply (MkSplitUniqSupply _ s1 s2) = (s1, s2)
+listSplitUniqSupply  (MkSplitUniqSupply _ s1 s2) = s1 : listSplitUniqSupply s2
 \end{code}
 
 \begin{code}