[project @ 2003-11-06 17:09:50 by simonpj]

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

diff --git a/ghc/compiler/basicTypes/UniqSupply.lhs b/ghc/compiler/basicTypes/UniqSupply.lhs
index 218df9e..6992751 100644 (file)
--- 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@,
@@ -72,8 +63,11 @@ 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
@@ -85,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 "genSymZh" unsafe 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}
 
 %************************************************************************