projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Outputable.cparen
[ghc-hetmet.git]
/
compiler
/
utils
/
UniqFM.lhs
diff --git
a/compiler/utils/UniqFM.lhs
b/compiler/utils/UniqFM.lhs
index
2a02dc7
..
bb5b33e
100644
(file)
--- a/
compiler/utils/UniqFM.lhs
+++ b/
compiler/utils/UniqFM.lhs
@@
-1,7
+1,9
@@
-%ilter
+%
+% (c) The University of Glasgow 2006
% (c) The AQUA Project, Glasgow University, 1994-1998
%
% (c) The AQUA Project, Glasgow University, 1994-1998
%
-\section[UniqFM]{Specialised finite maps, for things with @Uniques@}
+
+UniqFM: Specialised finite maps, for things with @Uniques@
Based on @FiniteMaps@ (as you would expect).
Based on @FiniteMaps@ (as you would expect).
@@
-52,7
+54,7
@@
import Maybes ( maybeToBool )
import FastTypes
import Outputable
import FastTypes
import Outputable
-import GLAEXTS -- Lots of Int# operations
+import GHC.Exts -- Lots of Int# operations
\end{code}
%************************************************************************
\end{code}
%************************************************************************
@@
-825,18
+827,8
@@
shiftR_ :: FastInt -> FastInt -> FastInt
#if __GLASGOW_HASKELL__
{-# INLINE shiftL_ #-}
{-# INLINE shiftR_ #-}
#if __GLASGOW_HASKELL__
{-# INLINE shiftL_ #-}
{-# INLINE shiftR_ #-}
-#if __GLASGOW_HASKELL__ >= 503
shiftL_ n p = word2Int#((int2Word# n) `uncheckedShiftL#` p)
shiftL_ n p = word2Int#((int2Word# n) `uncheckedShiftL#` p)
-#else
-shiftL_ n p = word2Int#((int2Word# n) `shiftL#` p)
-#endif
-shiftR_ n p = word2Int#((int2Word# n) `shiftr` p)
- where
-#if __GLASGOW_HASKELL__ >= 503
- shiftr x y = uncheckedShiftRL# x y
-#else
- shiftr x y = shiftRL# x y
-#endif
+shiftR_ n p = word2Int#((int2Word# n) `uncheckedShiftRL#` p)
#else /* not GHC */
shiftL_ n p = n * (2 ^ p)
#else /* not GHC */
shiftL_ n p = n * (2 ^ p)