projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Link with hpc even if GhcWithInterpreter is not set
[ghc-hetmet.git]
/
compiler
/
basicTypes
/
UniqSupply.lhs
diff --git
a/compiler/basicTypes/UniqSupply.lhs
b/compiler/basicTypes/UniqSupply.lhs
index
7937043
..
8dcf595
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"
@@
-56,6
+56,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,27
+64,24
@@
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#
= unsafeInterleaveIO (
-- 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 ->
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#
)
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)
splitUniqSupply (MkSplitUniqSupply _ s1 s2) = (s1, s2)
+listSplitUniqSupply (MkSplitUniqSupply _ s1 s2) = s1 : listSplitUniqSupply s2
\end{code}
\begin{code}
\end{code}
\begin{code}