[project @ 2001-03-08 12:07:38 by simonpj]

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

diff --git a/ghc/compiler/rename/RnMonad.lhs b/ghc/compiler/rename/RnMonad.lhs
index 6a4943d..22badd8 100644 (file)
--- a/ghc/compiler/rename/RnMonad.lhs
+++ b/ghc/compiler/rename/RnMonad.lhs
@@ -38,11 +38,11 @@ import RdrHsSyn
 import RnHsSyn         ( RenamedFixitySig )
 import HscTypes                ( AvailEnv, lookupType,
                          NameSupply(..), 
-                         WhetherHasOrphans, ImportVersion, 
-                         PersistentRenamerState(..), IsBootInterface, Avails,
+                         ImportedModuleInfo, WhetherHasOrphans, ImportVersion, 
+                         PersistentRenamerState(..), Avails,
                          DeclsMap, IfaceInsts, IfaceRules, 
                          HomeSymbolTable, TyThing,
-                         PersistentCompilerState(..), GlobalRdrEnv,
+                         PersistentCompilerState(..), GlobalRdrEnv, LocalRdrEnv,
                          HomeIfaceTable, PackageIfaceTable,
                          RdrAvailInfo )
 import BasicTypes      ( Version, defaultFixity )
@@ -58,13 +58,13 @@ import Name         ( Name, OccName, NamedThing(..),
                          nameOccName,
                          decode, mkLocalName, mkKnownKeyGlobal
                        )
-import Name            ( NameEnv, lookupNameEnv, emptyNameEnv, unitNameEnv, extendNameEnvList )
+import NameEnv         ( NameEnv, lookupNameEnv, emptyNameEnv, unitNameEnv, extendNameEnvList )
 import Module          ( Module, ModuleName, ModuleSet, emptyModuleSet )
 import NameSet         
 import CmdLineOpts     ( DynFlags, DynFlag(..), dopt )
 import SrcLoc          ( SrcLoc, generatedSrcLoc, noSrcLoc )
 import Unique          ( Unique )
-import FiniteMap       ( FiniteMap, emptyFM )
+import FiniteMap       ( FiniteMap )
 import Bag             ( Bag, emptyBag, isEmptyBag, snocBag )
 import UniqSupply
 import Outputable
@@ -166,8 +166,12 @@ data SDown = SDown {
                        -- with RnIfaces.lookupLocalFixity
                }
 
-data RnMode    = SourceMode                    -- Renaming source code
-               | InterfaceMode                 -- Renaming interface declarations.  
+data RnMode    = SourceMode            -- Renaming source code
+               | InterfaceMode         -- Renaming interface declarations.  
+               | CmdLineMode           -- Renaming a command-line expression
+
+isInterfaceMode InterfaceMode = True
+isInterfaceMode _ = False
 \end{code}
 
 %===================================================
@@ -176,7 +180,6 @@ data RnMode = SourceMode                    -- Renaming source code
 
 \begin{code}
 --------------------------------
-type LocalRdrEnv    = RdrNameEnv Name
 type LocalFixityEnv = NameEnv RenamedFixitySig
        -- We keep the whole fixity sig so that we
        -- can report line-number info when there is a duplicate
@@ -251,6 +254,11 @@ data Ifaces = Ifaces {
                -- package symbol table, and the renamer incrementally adds
                -- to it.
 
+       iImpModInfo :: ImportedModuleInfo,
+                       -- Modules that we know something about, because they are mentioned
+                       -- in interface files, BUT which we have not loaded yet.  
+                       -- No module is both in here and in the PIT
+
        iDecls :: DeclsMap,     
                -- A single, global map of Names to unslurped decls
 
@@ -265,11 +273,6 @@ data Ifaces = Ifaces {
 
     -- EPHEMERAL FIELDS
     -- These fields persist during the compilation of a single module only
-       iImpModInfo :: ImportedModuleInfo,
-                       -- Modules that we know something about, because they are mentioned
-                       -- in interface files, BUT which we have not loaded yet.  
-                       -- No module is both in here and in the PIT
-
        iSlurp :: NameSet,
                -- All the names (whether "big" or "small", whether wired-in or not,
                -- whether locally defined or not) that have been slurped in so far.
@@ -282,16 +285,13 @@ data Ifaces = Ifaces {
                -- names that have been slurped in so far, with their versions.
                -- This is used to generate the "usage" information for this module.
                -- Subset of the previous field.
+               --
                -- The module set is the non-home-package modules from which we have
                -- slurped at least one name.
                -- It's worth keeping separately, because there's no very easy 
                -- way to distinguish the "big" names from the "non-big" ones.
                -- But this is a decision we might want to revisit.
     }
-
-type ImportedModuleInfo = FiniteMap ModuleName (WhetherHasOrphans, IsBootInterface)
-       -- Contains info ONLY about modules that have not yet
-       --- been loaded into the iPIT
 \end{code}
 
 
@@ -324,7 +324,7 @@ initRn dflags hit hst pcs mod do_rn
                              iInsts = prsInsts prs,
                              iRules = prsRules prs,
 
-                             iImpModInfo = emptyFM,
+                             iImpModInfo = prsImpMods prs,
                              iSlurp      = unitNameSet (mkUnboundName dummyRdrVarName),
                                -- Pretend that the dummy unbound name has already been
                                -- slurped.  This is what's returned for an out-of-scope name,
@@ -353,30 +353,31 @@ initRn dflags hit hst pcs mod do_rn
        (warns, errs)   <- readIORef errs_var
        new_ifaces      <- readIORef iface_var
        new_orig        <- readIORef names_var
-       let new_prs = prs { prsOrig = new_orig,
-                           prsDecls = iDecls new_ifaces,
-                           prsInsts = iInsts new_ifaces,
-                           prsRules = iRules new_ifaces }
+       let new_prs = prs { prsOrig    = new_orig,
+                           prsImpMods = iImpModInfo new_ifaces,
+                           prsDecls   = iDecls new_ifaces,
+                           prsInsts   = iInsts new_ifaces,
+                           prsRules   = iRules new_ifaces }
        let new_pcs = pcs { pcs_PIT = iPIT new_ifaces, 
                            pcs_PRS = new_prs }
        
        return (new_pcs, (warns, errs), res)
 
-initRnMS :: GlobalRdrEnv -> LocalFixityEnv -> RnMode
+initRnMS :: GlobalRdrEnv -> LocalRdrEnv -> LocalFixityEnv -> RnMode
         -> RnMS a -> RnM d a
 
-initRnMS rn_env fixity_env mode thing_inside rn_down g_down
+initRnMS rn_env local_env fixity_env mode thing_inside rn_down g_down
        -- The fixity_env appears in both the rn_fixenv field
        -- and in the HIT.  See comments with RnHiFiles.lookupFixityRn
   = let
-       s_down = SDown { rn_genv = rn_env, rn_lenv = emptyRdrEnv, 
+       s_down = SDown { rn_genv = rn_env, rn_lenv = local_env, 
                         rn_fixenv = fixity_env, rn_mode = mode }
     in
     thing_inside rn_down s_down
 
 initIfaceRnMS :: Module -> RnMS r -> RnM d r
 initIfaceRnMS mod thing_inside 
-  = initRnMS emptyRdrEnv emptyLocalFixityEnv InterfaceMode $
+  = initRnMS emptyRdrEnv emptyRdrEnv emptyLocalFixityEnv InterfaceMode $
     setModuleRn mod thing_inside
 \end{code}