Fix Trace #1494

[ghc-hetmet.git] / compiler / basicTypes / UniqSupply.lhs

diff --git a/compiler/basicTypes/UniqSupply.lhs b/compiler/basicTypes/UniqSupply.lhs
index 05b565f..8dcf595 100644 (file)
--- 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 (
@@ -18,15 +18,15 @@ module UniqSupply (
        lazyThenUs, lazyMapUs,
 
        mkSplitUniqSupply,
-       splitUniqSupply
+       splitUniqSupply, listSplitUniqSupply
   ) where
 
 #include "HsVersions.h"
 
 import Unique
 
-import GLAEXTS
-import UNSAFE_IO       ( unsafeInterleaveIO )
+import GHC.Exts
+import System.IO.Unsafe        ( unsafeInterleaveIO )
 
 w2i x = word2Int# x
 i2w x = int2Word# x
@@ -56,6 +56,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 +64,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#) ->
+               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}