Convert more UniqFM's back to LazyUniqFM's

[ghc-hetmet.git] / compiler / rename / RnExpr.lhs

diff --git a/compiler/rename/RnExpr.lhs b/compiler/rename/RnExpr.lhs
index 176fdb4..a73d1a8 100644 (file)
--- a/compiler/rename/RnExpr.lhs
+++ b/compiler/rename/RnExpr.lhs
@@ -50,11 +50,10 @@ import PrelNames    ( thFAKE, hasKey, assertIdKey, assertErrorName,
 
 import Name            ( Name, nameOccName, nameModule, nameIsLocalOrFrom )
 import NameSet
-import UniqFM
+import LazyUniqFM
 import RdrName         ( RdrName, extendLocalRdrEnv, lookupLocalRdrEnv, hideSomeUnquals )
 import LoadIface       ( loadInterfaceForName )
-import UniqFM          ( isNullUFM )
-import UniqSet         ( emptyUniqSet )
+import UniqSet         ( isEmptyUniqSet, emptyUniqSet )
 import List            ( nub )
 import Util            ( isSingleton )
 import ListSetOps      ( removeDups )
@@ -64,9 +63,31 @@ import SrcLoc                ( Located(..), unLoc, getLoc, noLoc )
 import FastString
 
 import List            ( unzip4 )
+import Control.Monad
 \end{code}
 
 
+\begin{code}
+-- XXX
+thenM :: Monad a => a b -> (b -> a c) -> a c
+thenM = (>>=)
+
+thenM_ :: Monad a => a b -> a c -> a c
+thenM_ = (>>)
+
+returnM :: Monad m => a -> m a
+returnM = return
+
+mappM :: (Monad m) => (a -> m b) -> [a] -> m [b]
+mappM = mapM
+
+mappM_ :: (Monad m) => (a -> m b) -> [a] -> m ()
+mappM_ = mapM_
+
+checkM :: Monad m => Bool -> m () -> m ()
+checkM = unless
+\end{code}
+
 %************************************************************************
 %*                                                                     *
 \subsubsection{Expressions}
@@ -90,7 +111,7 @@ rnExprs ls = rnExprs' ls emptyUniqSet
     returnM (expr':exprs', fvExprs)
 
 -- Grubby little function to do "seq" on namesets; replace by proper seq when GHC can do seq
-grubby_seqNameSet ns result | isNullUFM ns = result
+grubby_seqNameSet ns result | isEmptyUniqSet ns = result
                            | otherwise    = result
 \end{code}