[project @ 1996-07-19 18:36:04 by partain]

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

diff --git a/ghc/compiler/rename/RnMonad.lhs b/ghc/compiler/rename/RnMonad.lhs
index e6b7c93..22cb653 100644 (file)
--- a/ghc/compiler/rename/RnMonad.lhs
+++ b/ghc/compiler/rename/RnMonad.lhs
@@ -51,17 +51,17 @@ import CmdLineOpts  ( opt_WarnNameShadowing )
 import ErrUtils                ( addErrLoc, addShortErrLocLine, addShortWarnLocLine,
                          SYN_IE(Error), SYN_IE(Warning)
                        )
-import FiniteMap       ( FiniteMap, emptyFM, lookupFM, addToFM, fmToList{-ToDo:rm-} )
+import FiniteMap       ( FiniteMap, emptyFM, lookupFM, addToFM{-, fmToList ToDo:rm-} )
 import Maybes          ( assocMaybe )
 import Name            ( SYN_IE(Module), RdrName(..), isQual,
                          OrigName(..), Name, mkLocalName, mkImplicitName,
                          getOccName, pprNonSym
                        )
-import PrelInfo                ( builtinNameInfo, SYN_IE(BuiltinNames), SYN_IE(BuiltinKeys) )
+import PrelInfo                ( builtinNameMaps, builtinKeysMap, SYN_IE(BuiltinNames), SYN_IE(BuiltinKeys) )
 import PrelMods                ( pRELUDE )
-import PprStyle{-ToDo:rm-}
-import Outputable{-ToDo:rm-}
-import Pretty--ToDo:rm         ( SYN_IE(Pretty), PrettyRep )
+--import PprStyle{-ToDo:rm-}
+--import Outputable{-ToDo:rm-}
+import Pretty
 import SrcLoc          ( SrcLoc, mkUnknownSrcLoc )
 import UniqFM          ( UniqFM, emptyUFM )
 import UniqSet         ( SYN_IE(UniqSet), mkUniqSet, minusUniqSet )
@@ -127,8 +127,7 @@ initRn source mod env us do_rn
            mode = if source then
                       RnSource occ_var
                   else
-                      case builtinNameInfo of { (wiredin_fm, key_fm, _) ->
-                      RnIface wiredin_fm key_fm imp_var }
+                      RnIface builtinNameMaps builtinKeysMap imp_var
 
            rn_down = RnDown () mod mkUnknownSrcLoc mode env us_var errs_var
        in