X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscTypes.lhs;h=09a42c9b969d73270a3a4106db492a2f81bbf584;hb=aa44169c3c01243cdbf38f50f58e80477586552c;hp=183daa59e0bbf265cc867e5e0703ad0c7fd5e3ac;hpb=c5eb828c4d5ec8bb278d0bfef8dd0c0d12e32ffe;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscTypes.lhs b/ghc/compiler/main/HscTypes.lhs index 183daa5..09a42c9 100644 --- a/ghc/compiler/main/HscTypes.lhs +++ b/ghc/compiler/main/HscTypes.lhs @@ -4,69 +4,152 @@ \section[HscTypes]{Types for the per-module compiler} \begin{code} -module HscTypes ( ) -where +module HscTypes ( + Finder, ModuleLocation(..), + + ModDetails(..), ModIface(..), GlobalSymbolTable, + HomeSymbolTable, PackageSymbolTable, + HomeIfaceTable, PackageIfaceTable, + + VersionInfo(..), + + TyThing(..), groupTyThings, + + TypeEnv, extendTypeEnv, lookupTypeEnv, + + lookupFixityEnv, + + WhetherHasOrphans, ImportVersion, WhatsImported(..), + PersistentRenamerState(..), IsBootInterface, Avails, DeclsMap, + IfaceInsts, IfaceRules, DeprecationEnv, GatedDecl, + OrigNameEnv(..), OrigNameNameEnv, OrigNameIParamEnv, + AvailEnv, AvailInfo, GenAvailInfo(..), + PersistentCompilerState(..), + + InstEnv, ClsInstEnv, DFunId, + + GlobalRdrEnv, RdrAvailInfo, + + -- Provenance + Provenance(..), ImportReason(..), PrintUnqualified, + pprNameProvenance, hasBetterProv + + ) where #include "HsVersions.h" -import Name ( Name, NameEnv ) -import Module ( Module, ModuleName ) -import Class ( Class ) +import RdrName ( RdrNameEnv, emptyRdrEnv ) +import Name ( Name, NameEnv, NamedThing, + emptyNameEnv, unitNameEnv, extendNameEnv, plusNameEnv, + lookupNameEnv, emptyNameEnv, getName, nameModule, + nameSrcLoc ) +import NameSet ( NameSet ) import OccName ( OccName ) -import RdrName ( RdrNameEnv ) -import Outputable ( SDoc ) -import UniqFM ( UniqFM ) -import FiniteMap ( FiniteMap ) -import Bag ( Bag ) +import Module ( Module, ModuleName, ModuleEnv, + lookupModuleEnv ) +import VarSet ( TyVarSet ) +import VarEnv ( IdEnv, emptyVarEnv ) import Id ( Id ) -import VarEnv ( IdEnv ) -import BasicTypes ( Version, Fixity ) +import Class ( Class ) import TyCon ( TyCon ) -import ErrUtils ( ErrMsg, WarnMsg ) -import CmLink ( Linkable ) -import RdrHsSyn ( RdrNameInstDecl, RdrNameRuleDecl, RdrNameHsDecl, - RdrNameDeprecation, RdrNameFixitySig ) -import UniqSupply ( UniqSupply ) -import HsDecls ( DeprecTxt ) + +import BasicTypes ( Version, Fixity ) + +import HsSyn ( DeprecTxt ) +import RdrHsSyn ( RdrNameHsDecl ) +import RnHsSyn ( RenamedHsDecl ) + import CoreSyn ( CoreRule ) -import RnMonad ( ImportVersion, ExportItem, WhetherHasOrphans ) -import NameSet ( NameSet ) +import Type ( Type ) +import FiniteMap ( FiniteMap, emptyFM, addToFM, lookupFM, foldFM ) +import Bag ( Bag ) +import UniqFM ( UniqFM ) +import Outputable +import SrcLoc ( SrcLoc, isGoodSrcLoc ) +import Util ( thenCmp ) \end{code} %************************************************************************ %* * +\subsection{The Finder type} +%* * +%************************************************************************ + +\begin{code} +type Finder = ModuleName -> IO (Maybe (Module, ModuleLocation)) + +data ModuleLocation + = ModuleLocation { + hs_file :: FilePath, + hi_file :: FilePath, + obj_file :: FilePath + } +\end{code} + +For a module in another package, the hs_file and obj_file +components of ModuleLocation are undefined. + +The locations specified by a ModuleLocation may or may not +correspond to actual files yet: for example, even if the object +file doesn't exist, the ModuleLocation still contains the path to +where the object file will reside if/when it is created. + + +%************************************************************************ +%* * \subsection{Symbol tables and Module details} %* * %************************************************************************ -A @ModDetails@ summarises everything we know about a compiled module. +A @ModIface@ plus a @ModDetails@ summarises everything we know +about a compiled module. The @ModIface@ is the stuff *before* linking, +and can be written out to an interface file. The @ModDetails@ is after +linking; it is the "linked" form of the mi_decls field. \begin{code} -data ModDetails - = ModDetails { - moduleId :: Module, - moduleExports :: Avails, -- What it exports - moduleEnv :: GlobalRdrEnv, -- Its top level environment +data ModIface + = ModIface { + mi_module :: Module, -- Complete with package info + mi_version :: VersionInfo, -- Module version number + mi_orphan :: WhetherHasOrphans, -- Whether this module has orphans + mi_usages :: [ImportVersion Name], -- Usages + + mi_exports :: Avails, -- What it exports + mi_globals :: GlobalRdrEnv, -- Its top level environment - fixityEnv :: NameEnv Fixity, - deprecEnv :: NameEnv DeprecTxt, - typeEnv :: TypeEnv, + mi_fixities :: NameEnv Fixity, -- Fixities + mi_deprecs :: NameEnv DeprecTxt, -- Deprecations - instEnv :: InstEnv, - ruleEnv :: RuleEnv -- Domain may include Id from other modules + mi_decls :: [RenamedHsDecl] -- types, classes + -- inst decls, rules, iface sigs } -emptyModDetails :: Module -> ModuleDetails -emptyModDetails mod - = ModDetails { moduleId = mod, - moduleExports = [], - moduleEnv = emptyRdrEnv, - fixityEnv = emptyNameEnv, - deprecEnv = emptyNameEnv, - typeEnv = emptyNameEnv, - instEnv = emptyInstEnv, - ruleEnv = emptyRuleEnv +-- typechecker should only look at this, not ModIface +-- Should be able to construct ModDetails from mi_decls in ModIface +data ModDetails + = ModDetails { + -- The next three fields are created by the typechecker + md_types :: TypeEnv, + md_insts :: [DFunId], -- Dfun-ids for the instances in this module + md_rules :: RuleEnv -- Domain may include Ids from other modules + } +\end{code} + +\begin{code} +emptyModDetails :: ModDetails +emptyModDetails + = ModDetails { md_types = emptyTypeEnv, + md_insts = [], + md_rules = emptyRuleEnv + } + +emptyModIface :: Module -> ModIface +emptyModIface mod + = ModIface { mi_module = mod, + mi_exports = [], + mi_globals = emptyRdrEnv, + mi_deprecs = emptyNameEnv, } \end{code} @@ -74,6 +157,11 @@ Symbol tables map modules to ModDetails: \begin{code} type SymbolTable = ModuleEnv ModDetails +type IfaceTable = ModuleEnv ModIface + +type HomeIfaceTable = IfaceTable +type PackageIfaceTable = IfaceTable + type HomeSymbolTable = SymbolTable -- Domain = modules in the home package type PackageSymbolTable = SymbolTable -- Domain = modules in the some other package type GlobalSymbolTable = SymbolTable -- Domain = all modules @@ -82,14 +170,11 @@ type GlobalSymbolTable = SymbolTable -- Domain = all modules Simple lookups in the symbol table. \begin{code} -lookupFixityEnv :: SymbolTable -> Name -> Fixity - -- Returns defaultFixity if there isn't an explicit fixity +lookupFixityEnv :: IfaceTable -> Name -> Maybe Fixity lookupFixityEnv tbl name = case lookupModuleEnv tbl (nameModule name) of - Nothing -> defaultFixity - Just details -> case lookupNameEnv (fixityEnv details) name of - Just fixity -> fixity - Nothing -> defaultFixity + Nothing -> Nothing + Just details -> lookupNameEnv (mi_fixities details) name \end{code} @@ -101,6 +186,7 @@ lookupFixityEnv tbl name \begin{code} type TypeEnv = NameEnv TyThing +emptyTypeEnv = emptyNameEnv data TyThing = AnId Id | ATyCon TyCon @@ -117,7 +203,7 @@ instance NamedThing TyThing where lookupTypeEnv :: SymbolTable -> Name -> Maybe TyThing lookupTypeEnv tbl name = case lookupModuleEnv tbl (nameModule name) of - Just details -> lookupNameEnv (typeEnv details) name + Just details -> lookupNameEnv (md_types details) name Nothing -> Nothing @@ -140,11 +226,13 @@ extendTypeEnv tbl things = foldFM add tbl things where add mod type_env tbl - = extendModuleEnv mod new_details + = panic "extendTypeEnv" --extendModuleEnv mod new_details where - new_details = case lookupModuleEnv tbl mod of - Nothing -> emptyModDetails mod {typeEnv = type_env} - Just details -> details {typeEnv = typeEnv details `plusNameEnv` type_env}) + new_details + = case lookupModuleEnv tbl mod of + Nothing -> emptyModDetails {md_types = type_env} + Just details -> details {md_types = md_types details + `plusNameEnv` type_env} \end{code} @@ -158,16 +246,27 @@ These types are defined here because they are mentioned in ModDetails, but they are mostly elaborated elsewhere \begin{code} -type DeprecationEnv = NameEnv DeprecTxt -- Give reason for deprecation +data VersionInfo + = VersionInfo { + vers_module :: Version, -- Changes when anything changes + vers_exports :: Version, -- Changes when export list changes + vers_rules :: Version, -- Changes when any rule changes + vers_decls :: NameEnv Version + -- Versions for "big" names only (not data constructors, class ops) + -- The version of an Id changes if its fixity changes + -- Ditto data constructors, class operations, except that the version of + -- the parent class/tycon changes + } -type GlobalRdrEnv = RdrNameEnv [Name] -- The list is because there may be name clashes - -- These only get reported on lookup, - -- not on construction +type DeprecationEnv = NameEnv DeprecTxt -- Give reason for deprecation type InstEnv = UniqFM ClsInstEnv -- Maps Class to instances for that class -type ClsInstEnv = [(TyVarSet, [Type], Id)] -- The instances for a particular class +type ClsInstEnv = [(TyVarSet, [Type], DFunId)] -- The instances for a particular class +type DFunId = Id type RuleEnv = IdEnv [CoreRule] + +emptyRuleEnv = emptyVarEnv \end{code} @@ -196,22 +295,40 @@ type AvailEnv = NameEnv AvailInfo -- Maps a Name to the AvailInfo that contain %************************************************************************ \begin{code} --- ModIFace is nearly the same as RnMonad.ParsedIface. --- Right now it's identical :) -data ModIFace - = ModIFace { - mi_mod :: Module, -- Complete with package info - mi_vers :: Version, -- Module version number - mi_orphan :: WhetherHasOrphans, -- Whether this module has orphans - mi_usages :: [ImportVersion OccName], -- Usages - mi_exports :: [ExportItem], -- Exports - mi_insts :: [RdrNameInstDecl], -- Local instance declarations - mi_decls :: [(Version, RdrNameHsDecl)], -- Local definitions - mi_fixity :: (Version, [RdrNameFixitySig]), -- Local fixity declarations, - -- with their version - mi_rules :: (Version, [RdrNameRuleDecl]), -- Rules, with their version - mi_deprecs :: [RdrNameDeprecation] -- Deprecations - } +type WhetherHasOrphans = Bool + -- An "orphan" is + -- * an instance decl in a module other than the defn module for + -- one of the tycons or classes in the instance head + -- * a transformation rule in a module other than the one defining + -- the function in the head of the rule. + +type IsBootInterface = Bool + +type ImportVersion name = (ModuleName, WhetherHasOrphans, IsBootInterface, WhatsImported name) + +data WhatsImported name = NothingAtAll -- The module is below us in the + -- hierarchy, but we import nothing + + | Everything Version -- Used for modules from other packages; + -- we record only the module's version number + + | Specifically + Version -- Module version + (Maybe Version) -- Export-list version, if we depend on it + [(name,Version)] -- List guaranteed non-empty + Version -- Rules version + + deriving( Eq ) + -- 'Specifically' doesn't let you say "I imported f but none of the rules in + -- the module". If you use anything in the module you get its rule version + -- So if the rules change, you'll recompile, even if you don't use them. + -- This is easy to implement, and it's safer: you might not have used the rules last + -- time round, but if someone has added a new rule you might need it this time + + -- The export list field is (Just v) if we depend on the export list: + -- 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. \end{code} @@ -224,13 +341,15 @@ data ModIFace \begin{code} data PersistentCompilerState = PCS { - pcsPST :: PackageSymbolTable, -- Domain = non-home-package modules - -- except that the InstEnv components is empty - pcsInsts :: InstEnv -- The total InstEnv accumulated from all - -- the non-home-package modules - pcsRules :: RuleEnv -- Ditto RuleEnv - - pcsPRS :: PersistentRenamerState + pcs_PIT :: PackageIfaceTable, -- Domain = non-home-package modules + -- the mi_decls component is empty + pcs_PST :: PackageSymbolTable, -- Domain = non-home-package modules + -- except that the InstEnv components is empty + pcs_insts :: InstEnv, -- The total InstEnv accumulated from all + -- the non-home-package modules + pcs_rules :: RuleEnv, -- Ditto RuleEnv + + pcs_PRS :: PersistentRenamerState } \end{code} @@ -241,7 +360,7 @@ It contains: * A name supply, which deals with allocating unique names to (Module,OccName) original names, - * An accumulated InstEnv from all the modules in pcsPST + * An accumulated InstEnv from all the modules in pcs_PST The point is that we don't want to keep recreating it whenever we compile a new module. The InstEnv component of pcPST is empty. (This means we might "see" instances that we shouldn't "really" see; @@ -260,23 +379,39 @@ data PersistentRenamerState prsInsts :: IfaceInsts, prsRules :: IfaceRules } +\end{code} + +The OrigNameEnv makes sure that there is just one Unique assigned for +each original name; i.e. (module-name, occ-name) pair. The Name is +always stored as a Global, and has the SrcLoc of its binding location. +Actually that's not quite right. When we first encounter the original +name, we might not be at its binding site (e.g. we are reading an +interface file); so we give it 'noSrcLoc' then. Later, when we find +its binding site, we fix it up. + +Exactly the same is true of the Module stored in the Name. When we first +encounter the occurrence, we may not know the details of the module, so +we just store junk. Then when we find the binding site, we fix it up. -<<<<<<< HscTypes.lhs -data NameSupply - = NS { nsUniqs :: UniqSupply, - nsNames :: FiniteMap (Module,OccName) Name, -- Ensures that one original name gets one unique - nsIParam :: FiniteMap OccName Name -- Ensures that one implicit parameter name gets one unique -======= +\begin{code} data OrigNameEnv - = Orig { origNames :: FiniteMap (Module,OccName) Name -- Ensures that one original name gets one unique - origIParam :: FiniteMap OccName Name -- Ensures that one implicit parameter name gets one unique ->>>>>>> 1.6 + = Orig { origNames :: OrigNameNameEnv, + -- Ensures that one original name gets one unique + origIParam :: OrigNameIParamEnv + -- Ensures that one implicit parameter name gets one unique } -type DeclsMap = NameEnv (Version, AvailInfo, Bool, (Module, RdrNameHsDecl)) - -- A DeclsMap contains a binding for each Name in the declaration - -- including the constructors of a type decl etc. - -- The Bool is True just for the 'main' Name. +type OrigNameNameEnv = FiniteMap (ModuleName,OccName) Name +type OrigNameIParamEnv = FiniteMap OccName Name +\end{code} + + +A DeclsMap contains a binding for each Name in the declaration +including the constructors of a type decl etc. The Bool is True just +for the 'main' Name. + +\begin{code} +type DeclsMap = NameEnv (AvailInfo, Bool, (Module, RdrNameHsDecl)) type IfaceInsts = Bag GatedDecl type IfaceRules = Bag GatedDecl @@ -287,49 +422,101 @@ type GatedDecl = (NameSet, (Module, RdrNameHsDecl)) %************************************************************************ %* * -\subsection{The result of compiling one module} +\subsection{Provenance and export info} %* * %************************************************************************ +The GlobalRdrEnv gives maps RdrNames to Names. There is a separate +one for each module, corresponding to that module's top-level scope. + \begin{code} -data CompResult - = CompOK ModDetails -- new details (HST additions) - (Maybe (ModIFace, Linkable)) - -- summary and code; Nothing => compilation not reqd - -- (old summary and code are still valid) - PersistentCompilerState -- updated PCS - (Bag WarnMsg) -- warnings - - | CompErrs PersistentCompilerState -- updated PCS - (Bag ErrMsg) -- errors - (Bag WarnMsg) -- warnings - - --- The driver sits between 'compile' and 'hscMain', translating calls --- to the former into calls to the latter, and results from the latter --- into results from the former. It does things like preprocessing --- the .hs file if necessary, and compiling up the .stub_c files to --- generate Linkables. - -data HscResult - = HscOK ModDetails -- new details (HomeSymbolTable additions) - Maybe ModIFace -- new iface (if any compilation was done) - Maybe String -- generated stub_h - Maybe String -- generated stub_c - PersistentCompilerState -- updated PCS - [SDoc] -- warnings - - | HscErrs PersistentCompilerState -- updated PCS - [SDoc] -- errors - [SDoc] -- warnings - - --- These two are only here to avoid recursion between CmCompile and --- CompManager. They really ought to be in the latter. -type ModuleEnv a = UniqFM a -- Domain is Module - -type HomeModMap = FiniteMap ModuleName Module -- domain: home mods only -type HomeInterfaceTable = ModuleEnv ModIFace +type GlobalRdrEnv = RdrNameEnv [(Name,Provenance)] -- The list is because there may be name clashes + -- These only get reported on lookup, + -- not on construction \end{code} +The "provenance" of something says how it came to be in scope. + +\begin{code} +data Provenance + = LocalDef -- Defined locally + + | NonLocalDef -- Defined non-locally + ImportReason + PrintUnqualified + +-- Just used for grouping error messages (in RnEnv.warnUnusedBinds) +instance Eq Provenance where + p1 == p2 = case p1 `compare` p2 of EQ -> True; _ -> False + +instance Eq ImportReason where + p1 == p2 = case p1 `compare` p2 of EQ -> True; _ -> False + +instance Ord Provenance where + compare LocalDef LocalDef = EQ + compare LocalDef (NonLocalDef _ _) = LT + compare (NonLocalDef _ _) LocalDef = GT + + compare (NonLocalDef reason1 _) (NonLocalDef reason2 _) + = compare reason1 reason2 + +instance Ord ImportReason where + compare ImplicitImport ImplicitImport = EQ + compare ImplicitImport (UserImport _ _ _) = LT + compare (UserImport _ _ _) ImplicitImport = GT + compare (UserImport m1 loc1 _) (UserImport m2 loc2 _) + = (m1 `compare` m2) `thenCmp` (loc1 `compare` loc2) + + +{- +Moved here from Name. +pp_prov (LocalDef _ Exported) = char 'x' +pp_prov (LocalDef _ NotExported) = char 'l' +pp_prov (NonLocalDef ImplicitImport _) = char 'j' +pp_prov (NonLocalDef (UserImport _ _ True ) _) = char 'I' -- Imported by name +pp_prov (NonLocalDef (UserImport _ _ False) _) = char 'i' -- Imported by .. +pp_prov SystemProv = char 's' +-} + +data ImportReason + = UserImport Module SrcLoc Bool -- Imported from module M on line L + -- Note the M may well not be the defining module + -- for this thing! + -- The Bool is true iff the thing was named *explicitly* in the import spec, + -- rather than being imported as part of a group; e.g. + -- import B + -- import C( T(..) ) + -- Here, everything imported by B, and the constructors of T + -- are not named explicitly; only T is named explicitly. + -- 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} +hasBetterProv :: Provenance -> Provenance -> Bool +-- Choose +-- 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 + +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)))] + +ppr_reason ImplicitImport = ptext SLIT("implicitly imported") +ppr_reason (UserImport mod loc _) = ptext SLIT("imported from") <+> ppr mod <+> ptext SLIT("at") <+> ppr loc + +ppr_defn loc | isGoodSrcLoc loc = ptext SLIT("at") <+> ppr loc + | otherwise = empty +\end{code}