X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FUniqSupply.lhs;h=424dbe25423fa07514e6eac6602899315281e24c;hb=317fc69d18eda68fd65f5ba634feafbe4a3923da;hp=05b565fe2e423d538fd730241261d35485edcaf2;hpb=0d7c6cea4af4ac1137f40b8e35348744e80a23b9;p=ghc-hetmet.git

diff --git a/compiler/basicTypes/UniqSupply.lhs b/compiler/basicTypes/UniqSupply.lhs
index 05b565f..424dbe2 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
@@ -63,25 +63,21 @@ 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)
 \end{code}