[project @ 2000-11-14 10:46:39 by simonpj]

[ghc-hetmet.git] / ghc / compiler / main / HscTypes.lhs

diff --git a/ghc/compiler/main/HscTypes.lhs b/ghc/compiler/main/HscTypes.lhs
index 498add4..c630078 100644 (file)
--- a/ghc/compiler/main/HscTypes.lhs
+++ b/ghc/compiler/main/HscTypes.lhs
@@ -24,7 +24,7 @@ module HscTypes (
 
        WhetherHasOrphans, ImportVersion, WhatsImported(..),
        PersistentRenamerState(..), IsBootInterface, Avails, DeclsMap,
-       IfaceInsts, IfaceRules, GatedDecl,
+       IfaceInsts, IfaceRules, GatedDecl, IsExported,
        OrigNameEnv(..), OrigNameNameEnv, OrigNameIParamEnv,
        AvailEnv, AvailInfo, GenAvailInfo(..),
        PersistentCompilerState(..),
@@ -34,19 +34,18 @@ module HscTypes (
        InstEnv, ClsInstEnv, DFunId,
        PackageInstEnv, PackageRuleBase,
 
-       GlobalRdrEnv, RdrAvailInfo,
+       GlobalRdrEnv, RdrAvailInfo, pprGlobalRdrEnv,
 
        -- Provenance
-       Provenance(..), ImportReason(..), PrintUnqualified,
+       Provenance(..), ImportReason(..), 
         pprNameProvenance, hasBetterProv
 
     ) where
 
 #include "HsVersions.h"
 
-import RdrName         ( RdrNameEnv, emptyRdrEnv )
-import Name            ( Name, NamedThing, isLocallyDefined, 
-                         getName, nameModule, nameSrcLoc )
+import RdrName         ( RdrNameEnv, emptyRdrEnv, rdrEnvToList )
+import Name            ( Name, NamedThing, getName, nameModule, nameSrcLoc )
 import Name -- Env
 import OccName         ( OccName )
 import Module          ( Module, ModuleName, ModuleEnv,
@@ -222,20 +221,17 @@ emptyIfaceTable = emptyModuleEnv
 Simple lookups in the symbol table.
 
 \begin{code}
-lookupIface :: HomeIfaceTable -> PackageIfaceTable
-           -> Module -> Name           -- The module is to use for locally-defined names
-           -> Maybe ModIface
+lookupIface :: HomeIfaceTable -> PackageIfaceTable -> Name -> Maybe ModIface
 -- We often have two IfaceTables, and want to do a lookup
-lookupIface hit pit this_mod name
-  | isLocallyDefined name = lookupModuleEnv hit this_mod
-  | otherwise            = lookupModuleEnv hit mod `seqMaybe` lookupModuleEnv pit mod
+lookupIface hit pit name
+  = lookupModuleEnv hit mod `seqMaybe` lookupModuleEnv pit mod
   where
     mod = nameModule name
 
-lookupIfaceByModName :: ModuleEnv a -> ModuleEnv a -> ModuleName -> Maybe a
--- We often have two Symbol- or IfaceTables, and want to do a lookup
-lookupIfaceByModName ht pt mod
-  = lookupModuleEnvByName ht mod `seqMaybe` lookupModuleEnvByName pt mod
+lookupIfaceByModName :: HomeIfaceTable -> PackageIfaceTable -> ModuleName -> Maybe ModIface
+-- We often have two IfaceTables, and want to do a lookup
+lookupIfaceByModName hit pit mod
+  = lookupModuleEnvByName hit mod `seqMaybe` lookupModuleEnvByName pit mod
 \end{code}
 
 
@@ -285,8 +281,7 @@ extendTypeEnvList env things
 \begin{code}
 lookupType :: HomeSymbolTable -> PackageTypeEnv -> Name -> Maybe TyThing
 lookupType hst pte name
-  = ASSERT2( not (isLocallyDefined name), ppr name )
-    case lookupModuleEnv hst (nameModule name) of
+  = case lookupModuleEnv hst (nameModule name) of
        Just details -> lookupNameEnv (md_types details) name
        Nothing      -> lookupNameEnv pte name
 \end{code}
@@ -403,6 +398,8 @@ data WhatsImported name  = NothingAtAll                             -- The module is below us in the
        --      we imported the module without saying exactly what we imported
        -- We need to recompile if the module exports changes, because we might
        -- now have a name clash in the importing module.
+
+type IsExported = Name -> Bool         -- True for names that are exported from this module
 \end{code}
 
 
@@ -520,6 +517,12 @@ one for each module, corresponding to that module's top-level scope.
 type GlobalRdrEnv = RdrNameEnv [(Name,Provenance)]     -- The list is because there may be name clashes
                                                        -- These only get reported on lookup,
                                                        -- not on construction
+
+pprGlobalRdrEnv env
+  = vcat (map pp (rdrEnvToList env))
+  where
+    pp (rn, nps) = ppr rn <> colon <+> 
+                  vcat [ppr n <+> pprNameProvenance n p | (n,p) <- nps]
 \end{code}
 
 The "provenance" of something says how it came to be in scope.
@@ -530,7 +533,6 @@ data Provenance
 
   | NonLocalDef                -- Defined non-locally
        ImportReason
-       PrintUnqualified
 
 -- Just used for grouping error messages (in RnEnv.warnUnusedBinds)
 instance Eq Provenance where
@@ -541,10 +543,10 @@ instance Eq ImportReason where
 
 instance Ord Provenance where
    compare LocalDef LocalDef = EQ
-   compare LocalDef (NonLocalDef _ _) = LT
-   compare (NonLocalDef _ _) LocalDef = GT
+   compare LocalDef (NonLocalDef _) = LT
+   compare (NonLocalDef _) LocalDef = GT
 
-   compare (NonLocalDef reason1 _) (NonLocalDef reason2 _) 
+   compare (NonLocalDef reason1) (NonLocalDef reason2) 
       = compare reason1 reason2
 
 instance Ord ImportReason where
@@ -568,11 +570,6 @@ data ImportReason
        -- This info is used when warning of unused names.
 
   | ImplicitImport                     -- Imported implicitly for some other reason
-                       
-
-type PrintUnqualified = Bool   -- True <=> the unqualified name of this thing is
-                               -- in scope in this module, so print it 
-                               -- unqualified in error messages
 \end{code}
 
 \begin{code}
@@ -581,15 +578,14 @@ hasBetterProv :: Provenance -> Provenance -> Bool
 --     a local thing                 over an   imported thing
 --     a user-imported thing         over a    non-user-imported thing
 --     an explicitly-imported thing  over an   implicitly imported thing
-hasBetterProv LocalDef                                     _                              = True
-hasBetterProv (NonLocalDef (UserImport _ _ True) _) _                             = True
-hasBetterProv (NonLocalDef (UserImport _ _ _   ) _) (NonLocalDef ImplicitImport _) = True
-hasBetterProv _                                            _                              = False
+hasBetterProv LocalDef                                   _                            = True
+hasBetterProv (NonLocalDef (UserImport _ _ _   )) (NonLocalDef ImplicitImport) = True
+hasBetterProv _                                          _                            = False
 
 pprNameProvenance :: Name -> Provenance -> SDoc
-pprNameProvenance name LocalDef           = ptext SLIT("defined at") <+> ppr (nameSrcLoc name)
-pprNameProvenance name (NonLocalDef why _) = sep [ppr_reason why, 
-                                             nest 2 (parens (ppr_defn (nameSrcLoc name)))]
+pprNameProvenance name LocalDef         = ptext SLIT("defined at") <+> ppr (nameSrcLoc name)
+pprNameProvenance name (NonLocalDef why) = sep [ppr_reason why, 
+                                               nest 2 (parens (ppr_defn (nameSrcLoc name)))]
 
 ppr_reason ImplicitImport        = ptext SLIT("implicitly imported")
 ppr_reason (UserImport mod loc _) = ptext SLIT("imported from") <+> ppr mod <+> ptext SLIT("at") <+> ppr loc