projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
:stepover ---> :steplocal, :stepmodule
[ghc-hetmet.git]
/
compiler
/
basicTypes
/
UniqSupply.lhs
diff --git
a/compiler/basicTypes/UniqSupply.lhs
b/compiler/basicTypes/UniqSupply.lhs
index
710fc03
..
8e3ac96
100644
(file)
--- a/
compiler/basicTypes/UniqSupply.lhs
+++ b/
compiler/basicTypes/UniqSupply.lhs
@@
-18,7
+18,7
@@
module UniqSupply (
lazyThenUs, lazyMapUs,
mkSplitUniqSupply,
lazyThenUs, lazyMapUs,
mkSplitUniqSupply,
- splitUniqSupply
+ splitUniqSupply, listSplitUniqSupply
) where
#include "HsVersions.h"
) where
#include "HsVersions.h"
@@
-28,6
+28,13
@@
import Unique
import GHC.Exts
import System.IO.Unsafe ( unsafeInterleaveIO )
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#)
w2i x = word2Int# x
i2w x = int2Word# x
i2w_s x = (x :: Int#)
@@
-56,6
+63,7
@@
data UniqSupply
mkSplitUniqSupply :: Char -> IO UniqSupply
splitUniqSupply :: UniqSupply -> (UniqSupply, UniqSupply)
mkSplitUniqSupply :: Char -> IO UniqSupply
splitUniqSupply :: UniqSupply -> (UniqSupply, UniqSupply)
+listSplitUniqSupply :: UniqSupply -> [UniqSupply] -- Infinite
uniqFromSupply :: UniqSupply -> Unique
uniqsFromSupply :: UniqSupply -> [Unique] -- Infinite
\end{code}
uniqFromSupply :: UniqSupply -> Unique
uniqsFromSupply :: UniqSupply -> [Unique] -- Infinite
\end{code}
@@
-63,16
+71,12
@@
uniqsFromSupply :: UniqSupply -> [Unique] -- Infinite
\begin{code}
mkSplitUniqSupply (C# c#)
= let
\begin{code}
mkSplitUniqSupply (C# c#)
= let
-#if __GLASGOW_HASKELL__ >= 503
mask# = (i2w (ord# c#)) `uncheckedShiftL#` (i2w_s 24#)
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#
-- here comes THE MAGIC:
-- This is one of the most hammered bits in the whole compiler
mk_supply#
- = unsafeInterleaveIO (
+ = unsafeDupableInterleaveIO (
genSymZh >>= \ (I# u#) ->
mk_supply# >>= \ s1 ->
mk_supply# >>= \ s2 ->
genSymZh >>= \ (I# u#) ->
mk_supply# >>= \ s1 ->
mk_supply# >>= \ s2 ->
@@
-84,6
+88,7
@@
mkSplitUniqSupply (C# c#)
foreign import ccall unsafe "genSymZh" genSymZh :: IO Int
splitUniqSupply (MkSplitUniqSupply _ s1 s2) = (s1, s2)
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}
\end{code}
\begin{code}