X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnMonad.lhs;h=6b2fa195c0161b2b9fe2b509c43c9b3958a56065;hb=9a9c18a5c8a3875cdd8f29972e21d6a0f8257451;hp=6e81a9d771ec6edb41eedc753bcfa6a51a96f6a8;hpb=435b542fea3ccda11376b0422a5ee564ddeba5c7;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnMonad.lhs b/ghc/compiler/rename/RnMonad.lhs index 6e81a9d..6b2fa19 100644 --- a/ghc/compiler/rename/RnMonad.lhs +++ b/ghc/compiler/rename/RnMonad.lhs @@ -35,30 +35,39 @@ import IOExts ( IORef, newIORef, readIORef, writeIORef, unsafePerformIO ) import HsSyn import RdrHsSyn import RnHsSyn ( RenamedFixitySig ) +import HscTypes ( AvailEnv, lookupType, + OrigNameEnv(..), OrigNameNameEnv, OrigNameIParamEnv, + WhetherHasOrphans, ImportVersion, + PersistentRenamerState(..), IsBootInterface, Avails, + DeclsMap, IfaceInsts, IfaceRules, + HomeSymbolTable, TyThing, + PersistentCompilerState(..), GlobalRdrEnv, + HomeIfaceTable, PackageIfaceTable, + RdrAvailInfo ) import BasicTypes ( Version, defaultFixity ) import ErrUtils ( addShortErrLocLine, addShortWarnLocLine, - pprBagOfErrors, ErrMsg, WarnMsg, Message + pprBagOfErrors, Message, Messages, errorsFound, + printErrorsAndWarnings ) import RdrName ( RdrName, dummyRdrVarName, rdrNameModule, rdrNameOcc, RdrNameEnv, emptyRdrEnv, extendRdrEnv, - lookupRdrEnv, addListToRdrEnv, rdrEnvToList, rdrEnvElts + addListToRdrEnv, rdrEnvToList, rdrEnvElts ) -import Name ( Name, OccName, NamedThing(..), getSrcLoc, - isLocallyDefinedName, nameModule, nameOccName, - decode, mkLocalName, mkUnboundName, mkKnownKeyGlobal, - NameEnv, lookupNameEnv, emptyNameEnv, unitNameEnv, extendNameEnvList +import Name ( Name, OccName, NamedThing(..), + nameOccName, + decode, mkLocalName, mkKnownKeyGlobal ) -import Module ( Module, ModuleName, WhereFrom, moduleName ) +import Name ( NameEnv, lookupNameEnv, emptyNameEnv, unitNameEnv, extendNameEnvList ) +import Module ( Module, ModuleName, ModuleSet, emptyModuleSet ) import NameSet -import CmdLineOpts ( DynFlags, dopt_D_dump_rn_trace ) -import PrelInfo ( wiredInNames, knownKeyRdrNames ) -import SrcLoc ( SrcLoc, mkGeneratedSrcLoc ) +import CmdLineOpts ( DynFlags, DynFlag(..), dopt ) +import SrcLoc ( SrcLoc, generatedSrcLoc, noSrcLoc ) import Unique ( Unique ) -import FiniteMap ( FiniteMap, emptyFM, listToFM, plusFM ) -import Bag ( Bag, mapBag, emptyBag, isEmptyBag, snocBag ) +import FiniteMap ( FiniteMap, emptyFM ) +import Bag ( Bag, emptyBag, isEmptyBag, snocBag ) import UniqSupply import Outputable -import CmFind ( Finder ) +import PrelNames ( mkUnboundName ) infixr 9 `thenRn`, `thenRn_` \end{code} @@ -75,14 +84,25 @@ ioToRnM :: IO r -> RnM d (Either IOError r) ioToRnM io rn_down g_down = (io >>= \ ok -> return (Right ok)) `catch` (\ err -> return (Left err)) + +ioToRnM_no_fail :: IO r -> RnM d r +ioToRnM_no_fail io rn_down g_down + = (io >>= \ ok -> return ok) + `catch` + (\ err -> panic "ioToRnM_no_fail: the I/O operation failed!") traceRn :: SDoc -> RnM d () traceRn msg - = doptsRn dopt_D_dump_rn_trace `thenRn` \b -> + = doptRn Opt_D_dump_rn_trace `thenRn` \b -> + if b then putDocRn msg else returnRn () + +traceHiDiffsRn :: SDoc -> RnM d () +traceHiDiffsRn msg + = doptRn Opt_D_dump_hi_diffs `thenRn` \b -> if b then putDocRn msg else returnRn () putDocRn :: SDoc -> RnM d () -putDocRn msg = ioToRnM (printErrs msg) `thenRn_` +putDocRn msg = ioToRnM (printDump msg) `thenRn_` returnRn () \end{code} @@ -105,17 +125,24 @@ type RnMG r = RnM () r -- Getting global names etc -- Common part data RnDown = RnDown { - rn_mod :: Module, -- This module - rn_loc :: SrcLoc, -- Current locn + rn_mod :: Module, -- This module + rn_loc :: SrcLoc, -- Current locn - rn_finder :: Finder, rn_dflags :: DynFlags, - rn_gst :: GlobalSymbolTable, -- Both home modules and packages, - -- at the moment we started compiling - -- this module - rn_errs :: IORef (Bag WarnMsg, Bag ErrMsg), - rn_ns :: IORef (UniqSupply, OrigNameEnv), + rn_hit :: HomeIfaceTable, + rn_done :: Name -> Maybe TyThing, -- Tells what things (both in the + -- home package and other packages) + -- were already available (i.e. in + -- the relevant SymbolTable) before + -- compiling this module + -- The Name passed to rn_done is guaranteed to be a Global, + -- so it has a Module, so it can be looked up + + rn_errs :: IORef Messages, + + -- The second and third components are a flattened-out OrigNameEnv + rn_ns :: IORef (UniqSupply, OrigNameNameEnv, OrigNameIParamEnv), rn_ifaces :: IORef Ifaces } @@ -123,7 +150,7 @@ data RnDown data SDown = SDown { rn_mode :: RnMode, - rn_genv :: GlobalRdrEnv, -- Global envt + rn_genv :: GlobalRdrEnv, -- Top level environment rn_lenv :: LocalRdrEnv, -- Local name envt -- Does *not* include global name envt; may shadow it @@ -133,10 +160,11 @@ data SDown = SDown { -- We still need the unsullied global name env so that -- we can look up record field names - rn_fixenv :: FixityEnv -- Local fixities + rn_fixenv :: LocalFixityEnv -- Local fixities (for non-top-level + -- declarations) -- The global fixities are held in the - -- rn_ifaces field. Why? See the comments - -- with RnIfaces.lookupFixity + -- HIT or PIT. Why? See the comments + -- with RnIfaces.lookupLocalFixity } data RnMode = SourceMode -- Renaming source code @@ -149,19 +177,14 @@ data RnMode = SourceMode -- Renaming source code \begin{code} -------------------------------- -type GlobalRdrEnv = RdrNameEnv [Name] -- The list is because there may be name clashes - -- These only get reported on lookup, - -- not on construction -type LocalRdrEnv = RdrNameEnv Name - --------------------------------- -type FixityEnv = NameEnv RenamedFixitySig +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 -- fixity declaration -lookupFixity :: FixityEnv -> Name -> Fixity -lookupFixity env name +lookupLocalFixity :: LocalFixityEnv -> Name -> Fixity +lookupLocalFixity env name = case lookupNameEnv env name of Just (FixitySig _ fix _) -> fix Nothing -> defaultFixity @@ -181,42 +204,11 @@ type ExportAvails = (FiniteMap ModuleName Avails, %=================================================== \begin{code} -type ExportItem = (ModuleName, [RdrAvailInfo]) - -type ImportVersion name = (ModuleName, WhetherHasOrphans, IsBootInterface, WhatsImported name) - -type ModVersionInfo = (Version, -- Version of the whole module - Version, -- Version number for all fixity decls together - Version) -- ...ditto all rules together - -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 - -data WhatsImported name = NothingAtAll -- The module is below us in the - -- hierarchy, but we import nothing - - | Everything Version -- The module version - - | Specifically Version -- Module version - Version -- Fixity version - Version -- Rules version - [(name,Version)] -- List guaranteed non-empty - deriving( Eq ) - -- 'Specifically' doesn't let you say "I imported f but none of the fixities in - -- the module". If you use anything in the module you get its fixity and rule version - -- So if the fixities or rules change, you'll recompile, even if you don't use either. - -- 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 - - -- 'Everything' means there was a "module M" in - -- this module's export list, so we just have to go by M's version, - -- not the list of (name,version) pairs +type ExportItem = (ModuleName, [RdrAvailInfo]) +type IfaceDeprecs = Maybe (Either DeprecTxt [(RdrName,DeprecTxt)]) + -- Nothing => NoDeprecs + -- Just (Left t) => DeprecAll + -- Just (Right p) => DeprecSome data ParsedIface = ParsedIface { @@ -224,18 +216,13 @@ data ParsedIface pi_vers :: Version, -- Module version number pi_orphan :: WhetherHasOrphans, -- Whether this module has orphans pi_usages :: [ImportVersion OccName], -- Usages - pi_exports :: [ExportItem], -- Exports + pi_exports :: (Version, [ExportItem]), -- Exports + pi_decls :: [(Version, RdrNameTyClDecl)], -- Local definitions + pi_fixity :: [RdrNameFixitySig], -- Local fixity declarations, pi_insts :: [RdrNameInstDecl], -- Local instance declarations - pi_decls :: [(Version, RdrNameHsDecl)], -- Local definitions - pi_fixity :: (Version, [RdrNameFixitySig]), -- Local fixity declarations, with their version pi_rules :: (Version, [RdrNameRuleDecl]), -- Rules, with their version - pi_deprecs :: [RdrNameDeprecation] -- Deprecations + pi_deprecs :: IfaceDeprecs -- Deprecations } - - -type RdrNamePragma = () -- Fudge for now -------------------- - \end{code} %************************************************************************ @@ -246,74 +233,63 @@ type RdrNamePragma = () -- Fudge for now \begin{code} data Ifaces = Ifaces { - - -- PERSISTENT FIELDS - iImpModInfo :: ImportedModuleInfo, - -- Modules this one depends on: that is, the union - -- of the modules its *direct* imports depend on. - -- NB: The direct imports have .hi files that enumerate *all* the - -- dependencies (direct or not) of the imported module. - - iDecls :: DeclsMap, -- A single, global map of Names to decls - -- we can get away with importing them abstractly - - iInsts :: IfaceInsts, + -- PERSISTENT FIELDS + iPIT :: PackageIfaceTable, + -- The ModuleIFaces for modules in other packages + -- whose interfaces we have opened + -- The declarations in these interface files are held in + -- iDecls, iInsts, iRules (below), not in the mi_decls fields + -- of the iPIT. What _is_ in the iPIT is: + -- * The Module + -- * Version info + -- * Its exports + -- * Fixities + -- * Deprecations + -- The iPIT field is initialised from the compiler's persistent + -- package symbol table, and the renamer incrementally adds + -- to it. + + iDecls :: DeclsMap, + -- A single, global map of Names to unslurped decls + + iInsts :: IfaceInsts, -- The as-yet un-slurped instance decls; this bag is depleted when we -- slurp an instance decl so that we don't slurp the same one twice. -- Each is 'gated' by the names that must be available before -- this instance decl is needed. - iRules :: IfaceRules, + iRules :: IfaceRules, -- Similar to instance decls, only for rules - -- SEMI-EPHEMERAL FIELDS - -- iFixes and iDeprecs are accumulated here while one module - -- is compiled, but are transferred to the package symbol table - -- at the end. We don't add them to the table as we encounter them - -- because doing so would require us to have a mutable symbol table - -- which is yukky. - - iFixes :: FixityEnv, -- A single, global map of Names to fixities - -- See comments with RnIfaces.lookupFixity - iDeprecs :: DeprecationEnv, - - -- EPHEMERAL FIELDS - -- These fields persist during the compilation of a single module only + -- 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, + 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. - iVSlurp :: [(Name,Version)] - -- All the (a) non-wired-in (b) "big" (c) non-locally-defined + iVSlurp :: (ModuleSet, NameSet) + -- The Names are all the (a) non-wired-in + -- (b) "big" + -- (c) non-locally-defined + -- (d) home-package -- 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. - } - -type ImportedModuleInfo - = FiniteMap ModuleName (WhetherHasOrphans, IsBootInterface, - Maybe (Module, Version, Version, Version, WhereFrom, Avails)) - -- The three Versions are module version, fixity version, rules version - - -- Suppose the domain element is module 'A' - -- - -- The first Bool is True if A contains - -- 'orphan' rules or instance decls - - -- The second Bool is true if the interface file actually - -- read was an .hi-boot file - - -- Nothing => A's interface not yet read, but this module has - -- imported a module, B, that itself depends on A - -- - -- Just xx => A's interface has been read. The Module in - -- the Just has the correct Dll flag - - -- This set is used to decide whether to look for - -- A.hi or A.hi-boot when importing A.f. - -- Basically, we look for A.hi if A is in the map, and A.hi-boot - -- otherwise + -- 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,57 +300,74 @@ type ImportedModuleInfo %************************************************************************ \begin{code} -initRn :: DynFlags -> Finder -> GlobalSymbolTable - -> PersistentRenamerState - -> Module -> SrcLoc - -initRn dflags finder gst prs mod loc do_rn - = do uniqs <- mkSplitUniqSupply 'r' - names_var <- newIORef (uniqs, prsOrig pcs) - errs_var <- newIORef (emptyBag,emptyBag) - iface_var <- newIORef (initIfaces prs) - let rn_down = RnDown { rn_mod = mod, - rn_loc = loc, - - rn_finder = finder, - rn_dflags = dflags, - rn_gst = gst, - - rn_ns = names_var, - rn_errs = errs_var, - rn_ifaces = iface_var, - } - - -- do the business - res <- do_rn rn_down () - - -- grab errors and return - (warns, errs) <- readIORef errs_var - - return (res, errs, warns) - - -initIfaces :: PersistentRenamerState -> Ifaces -initIfaces prs - = Ifaces { iDecls = prsDecls prs, - iInsts = prsInsts prs, - iRules = prsRules rules, - - iFixes = emptyNameEnv, - iDeprecs = emptyNameEnv, - - iImpModInfo = emptyFM, - iDeferred = emptyNameSet, - 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, - -- and we don't want thereby to try to suck it in! - iVSlurp = [] - } - - -initRnMS :: GlobalRdrEnv -> FixityEnv -> RnMode -> RnMS r -> RnM d r +runRn dflags hit hst pcs mod do_rn + = do { (pcs, msgs, r) <- initRn dflags hit hst pcs mod do_rn ; + printErrorsAndWarnings alwaysQualify msgs ; + return (pcs, errorsFound msgs, r) + } + +initRn :: DynFlags + -> HomeIfaceTable -> HomeSymbolTable + -> PersistentCompilerState + -> Module + -> RnMG t + -> IO (PersistentCompilerState, Messages, t) + +initRn dflags hit hst pcs mod do_rn + = do + let prs = pcs_PRS pcs + let pte = pcs_PTE pcs + let ifaces = Ifaces { iPIT = pcs_PIT pcs, + iDecls = prsDecls prs, + iInsts = prsInsts prs, + iRules = prsRules prs, + + iImpModInfo = emptyFM, + 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, + -- and we don't want thereby to try to suck it in! + iVSlurp = (emptyModuleSet, emptyNameSet) + } + let uniqs = prsNS prs + + names_var <- newIORef (uniqs, origNames (prsOrig prs), + origIParam (prsOrig prs)) + errs_var <- newIORef (emptyBag,emptyBag) + iface_var <- newIORef ifaces + let rn_down = RnDown { rn_mod = mod, + rn_loc = noSrcLoc, + + rn_dflags = dflags, + rn_hit = hit, + rn_done = lookupType hst pte, + + rn_ns = names_var, + rn_errs = errs_var, + rn_ifaces = iface_var, + } + + -- do the business + res <- do_rn rn_down () + + -- Grab state and record it + (warns, errs) <- readIORef errs_var + new_ifaces <- readIORef iface_var + (new_NS, new_origN, new_origIP) <- readIORef names_var + let new_orig = Orig { origNames = new_origN, origIParam = new_origIP } + let new_prs = prs { prsOrig = new_orig, + prsDecls = iDecls new_ifaces, + prsInsts = iInsts new_ifaces, + prsRules = iRules new_ifaces, + prsNS = new_NS } + let new_pcs = pcs { pcs_PIT = iPIT new_ifaces, + pcs_PRS = new_prs } + + return (new_pcs, (warns, errs), res) + initRnMS rn_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, rn_fixenv = fixity_env, rn_mode = mode } @@ -385,7 +378,6 @@ initIfaceRnMS :: Module -> RnMS r -> RnM d r initIfaceRnMS mod thing_inside = initRnMS emptyRdrEnv emptyNameEnv InterfaceMode $ setModuleRn mod thing_inside - \end{code} @renameSourceCode@ is used to rename stuff ``out-of-line''; @@ -409,14 +401,17 @@ renameSourceCode dflags mod prs m -- only do any I/O if we need to read in a fixity declaration; -- and that doesn't happen in pragmas etc - newIORef name_supply >>= \ names_var -> - newIORef (emptyBag,emptyBag) >>= \ errs_var -> + mkSplitUniqSupply 'r' >>= \ new_us -> + newIORef (new_us, origNames (prsOrig prs), + origIParam (prsOrig prs)) >>= \ names_var -> + newIORef (emptyBag,emptyBag) >>= \ errs_var -> let rn_down = RnDown { rn_dflags = dflags, - rn_loc = mkGeneratedSrcLoc, rn_ns = names_var, + rn_loc = generatedSrcLoc, rn_ns = names_var, rn_errs = errs_var, rn_mod = mod, - rn_ifaces = panic "rnameSourceCode: rn_ifaces" -- Not required + rn_done = bogus "rn_done", rn_hit = bogus "rn_hit", + rn_ifaces = bogus "rn_ifaces" } s_down = SDown { rn_mode = InterfaceMode, -- So that we can refer to PrelBase.True etc @@ -441,6 +436,8 @@ renameSourceCode dflags mod prs m where display errs = pprBagOfErrors errs +bogus s = panic ("rnameSourceCode: " ++ s) -- Used for unused record fields + {-# INLINE thenRn #-} {-# INLINE thenRn_ #-} {-# INLINE returnRn #-} @@ -454,7 +451,8 @@ mapRn :: (a -> RnM d b) -> [a] -> RnM d [b] mapRn_ :: (a -> RnM d b) -> [a] -> RnM d () mapMaybeRn :: (a -> RnM d (Maybe b)) -> [a] -> RnM d [b] flatMapRn :: (a -> RnM d [b]) -> [a] -> RnM d [b] -sequenceRn :: [RnM d a] -> RnM d [a] +sequenceRn :: [RnM d a] -> RnM d [a] +sequenceRn_ :: [RnM d a] -> RnM d () foldlRn :: (b -> a -> RnM d b) -> b -> [a] -> RnM d b mapAndUnzipRn :: (a -> RnM d (b,c)) -> [a] -> RnM d ([b],[c]) fixRn :: (a -> RnM d a) -> RnM d a @@ -470,9 +468,12 @@ andRn combiner m1 m2 gdown ldown sequenceRn [] = returnRn [] sequenceRn (m:ms) = m `thenRn` \ r -> - sequenceRn ms `thenRn` \ rs -> + sequenceRn ms `thenRn` \ rs -> returnRn (r:rs) +sequenceRn_ [] = returnRn () +sequenceRn_ (m:ms) = m `thenRn_` sequenceRn_ ms + mapRn f [] = returnRn [] mapRn f (x:xs) = f x `thenRn` \ r -> @@ -562,14 +563,18 @@ checkErrsRn (RnDown {rn_errs = errs_var}) l_down = readIORef errs_var >>= \ (warns,errs) -> return (isEmptyBag errs) -doptsRn :: (DynFlags -> Bool) -> RnM d Bool -doptsRn dopt (RnDown { rn_dflags = dflags}) l_down - = return (dopt dflags) +doptRn :: DynFlag -> RnM d Bool +doptRn dflag (RnDown { rn_dflags = dflags}) l_down + = return (dopt dflag dflags) + +getDOptsRn :: RnM d DynFlags +getDOptsRn (RnDown { rn_dflags = dflags}) l_down + = return dflags \end{code} %================ -\subsubsection{ Source location} +\subsubsection{Source location} %===================== \begin{code} @@ -583,15 +588,27 @@ getSrcLocRn down l_down \end{code} %================ -\subsubsection{ Name supply} +\subsubsection{The finder and home symbol table} %===================== \begin{code} -getNameSupplyRn :: RnM d NameSupply +getHomeIfaceTableRn :: RnM d HomeIfaceTable +getHomeIfaceTableRn down l_down = return (rn_hit down) + +getTypeEnvRn :: RnM d (Name -> Maybe TyThing) +getTypeEnvRn down l_down = return (rn_done down) +\end{code} + +%================ +\subsubsection{Name supply} +%===================== + +\begin{code} +getNameSupplyRn :: RnM d (UniqSupply, OrigNameNameEnv, OrigNameIParamEnv) getNameSupplyRn rn_down l_down = readIORef (rn_ns rn_down) -setNameSupplyRn :: NameSupply -> RnM d () +setNameSupplyRn :: (UniqSupply, OrigNameNameEnv, OrigNameIParamEnv) -> RnM d () setNameSupplyRn names' (RnDown {rn_ns = names_var}) l_down = writeIORef names_var names' @@ -631,10 +648,6 @@ setModuleRn new_mod enclosed_thing rn_down l_down %===================== \begin{code} -getNameEnvs :: RnMS (GlobalRdrEnv, LocalRdrEnv) -getNameEnvs rn_down (SDown {rn_genv = global_env, rn_lenv = local_env}) - = return (global_env, local_env) - getLocalNameEnv :: RnMS LocalRdrEnv getLocalNameEnv rn_down (SDown {rn_lenv = local_env}) = return local_env @@ -647,7 +660,7 @@ setLocalNameEnv :: LocalRdrEnv -> RnMS a -> RnMS a setLocalNameEnv local_env' m rn_down l_down = m rn_down (l_down {rn_lenv = local_env'}) -getFixityEnv :: RnMS FixityEnv +getFixityEnv :: RnMS LocalFixityEnv getFixityEnv rn_down (SDown {rn_fixenv = fixity_env}) = return fixity_env