projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for multi-line deprecated pragmas; trac #3303
[ghc-hetmet.git]
/
compiler
/
basicTypes
/
Unique.lhs
diff --git
a/compiler/basicTypes/Unique.lhs
b/compiler/basicTypes/Unique.lhs
index
381503d
..
aecd372
100644
(file)
--- a/
compiler/basicTypes/Unique.lhs
+++ b/
compiler/basicTypes/Unique.lhs
@@
-61,7
+61,6
@@
import FastTypes
import FastString
import Outputable
import StaticFlags
import FastString
import Outputable
import StaticFlags
-import Util
#if defined(__GLASGOW_HASKELL__)
--just for implementing a fast [0,61) -> Char function
#if defined(__GLASGOW_HASKELL__)
--just for implementing a fast [0,61) -> Char function
@@
-135,8
+134,8
@@
newTagUnique u c = mkUnique c i where (_,i) = unpkUnique u
mkUnique c i
= MkUnique (tag `bitOrFastInt` bits)
where
mkUnique c i
= MkUnique (tag `bitOrFastInt` bits)
where
- tag = fastOrd (cUnbox c) `shiftLFastInt` _ILIT(24)
- bits = iUnbox i `bitAndFastInt` _ILIT(16777215){-``0x00ffffff''-}
+ !tag = fastOrd (cUnbox c) `shiftLFastInt` _ILIT(24)
+ !bits = iUnbox i `bitAndFastInt` _ILIT(16777215){-``0x00ffffff''-}
unpkUnique (MkUnique u)
= let
unpkUnique (MkUnique u)
= let
@@
-212,7
+211,7
@@
We do sometimes make strings with @Uniques@ in them:
\begin{code}
pprUnique :: Unique -> SDoc
pprUnique uniq
\begin{code}
pprUnique :: Unique -> SDoc
pprUnique uniq
- | debugIsOn && opt_SuppressUniques
+ | opt_SuppressUniques
= empty -- Used exclusively to suppress uniques so you
| otherwise -- can compare output easily
= case unpkUnique uniq of
= empty -- Used exclusively to suppress uniques so you
| otherwise -- can compare output easily
= case unpkUnique uniq of
@@
-267,7
+266,7
@@
iToBase62 n_
#if defined(__GLASGOW_HASKELL__)
--then FastInt == Int#
chooseChar62 n = C# (indexCharOffAddr# chars62 n)
#if defined(__GLASGOW_HASKELL__)
--then FastInt == Int#
chooseChar62 n = C# (indexCharOffAddr# chars62 n)
- chars62 = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"#
+ !chars62 = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"#
#else
--Haskell98 arrays are portable
chooseChar62 n = (!) chars62 n
#else
--Haskell98 arrays are portable
chooseChar62 n = (!) chars62 n