X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnMonad.lhs;h=5a215abfe930af7614a0d7ec6d9e2c1748a84d95;hb=0ef29fb878dd6517d2716afb056bcf2536c2562e;hp=1159bfe6511bffa8b7cbbc796f0921fb93648e4d;hpb=ff755dd9a0a0ad2f106c323852553ea247f16141;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnMonad.lhs b/ghc/compiler/rename/RnMonad.lhs index 1159bfe..5a215ab 100644 --- a/ghc/compiler/rename/RnMonad.lhs +++ b/ghc/compiler/rename/RnMonad.lhs @@ -31,40 +31,44 @@ import PrelIOBase ( fixIO ) -- Should be in GlaExts import IOBase ( fixIO ) #endif import IOExts ( IORef, newIORef, readIORef, writeIORef, unsafePerformIO ) +import IO ( hPutStr, stderr ) import HsSyn import RdrHsSyn -import RnHsSyn ( RenamedFixitySig, RenamedDeprecation ) +import RnHsSyn ( RenamedFixitySig ) +import HscTypes ( AvailEnv, lookupType, + NameSupply(..), + ImportedModuleInfo, WhetherHasOrphans, ImportVersion, + PersistentRenamerState(..), Avails, + DeclsMap, IfaceInsts, IfaceRules, + HomeSymbolTable, TyThing, + PersistentCompilerState(..), GlobalRdrEnv, + HomeIfaceTable, PackageIfaceTable, + RdrAvailInfo ) import BasicTypes ( Version, defaultFixity ) -import SrcLoc ( noSrcLoc ) import ErrUtils ( addShortErrLocLine, addShortWarnLocLine, - pprBagOfErrors, ErrMsg, WarnMsg, Message + Message, Messages, errorsFound, warningsFound, + printErrorsAndWarnings ) -import RdrName ( RdrName, dummyRdrVarName, rdrNameOcc, +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, - NameEnv, lookupNameEnv, emptyNameEnv, unitNameEnv, extendNameEnv, - addToNameEnv_C, plusNameEnv_C, nameEnvElts, - elemNameEnv, addToNameEnv, addListToNameEnv - ) -import Module ( Module, ModuleName, ModuleHiMap, SearchPath, WhereFrom, - mkModuleHiMaps, moduleName, mkSearchPath +import Name ( Name, OccName, NamedThing(..), + nameOccName, + decode, mkLocalName, mkKnownKeyGlobal ) +import Name ( NameEnv, lookupNameEnv, emptyNameEnv, unitNameEnv, extendNameEnvList ) +import Module ( Module, ModuleName, ModuleSet, emptyModuleSet ) import NameSet -import CmdLineOpts ( opt_D_dump_rn_trace, opt_HiMap ) -import PrelInfo ( builtinNames ) -import SrcLoc ( SrcLoc, mkGeneratedSrcLoc ) -import Unique ( Unique, getUnique, unboundKey ) -import FiniteMap ( FiniteMap, emptyFM, bagToFM, lookupFM, addToFM, addListToFM, - addListToFM_C, addToFM_C, eltsFM, fmToList - ) -import Bag ( Bag, mapBag, emptyBag, isEmptyBag, snocBag ) +import CmdLineOpts ( DynFlags, DynFlag(..), dopt ) +import SrcLoc ( SrcLoc, generatedSrcLoc, noSrcLoc ) +import Unique ( Unique ) +import FiniteMap ( FiniteMap ) +import Bag ( Bag, emptyBag, isEmptyBag, snocBag ) import UniqSupply import Outputable +import PrelNames ( mkUnboundName ) infixr 9 `thenRn`, `thenRn_` \end{code} @@ -81,13 +85,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 | opt_D_dump_rn_trace = putDocRn msg - | otherwise = returnRn () +traceRn msg + = 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 (printErrs alwaysQualify msg) `thenRn_` returnRn () \end{code} @@ -108,24 +124,32 @@ type RnMS r = RnM SDown r -- Renaming source type RnMG r = RnM () r -- Getting global names etc -- Common part -data RnDown = RnDown { - rn_mod :: ModuleName, - rn_loc :: SrcLoc, - rn_ns :: IORef RnNameSupply, - rn_errs :: IORef (Bag WarnMsg, Bag ErrMsg), - rn_ifaces :: IORef Ifaces, - rn_hi_maps :: (SearchPath, -- For error messages - ModuleHiMap, -- for .hi files - ModuleHiMap) -- for .hi-boot files - } +data RnDown + = RnDown { + rn_mod :: Module, -- This module + rn_loc :: SrcLoc, -- Current locn + + rn_dflags :: DynFlags, + + 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, + rn_ns :: IORef NameSupply, + rn_ifaces :: IORef Ifaces + } -- For renaming source code data SDown = SDown { rn_mode :: RnMode, - rn_genv :: GlobalRdrEnv, - -- Global envt; the fixity component gets extended - -- with local fixity decls + rn_genv :: GlobalRdrEnv, -- Top level environment rn_lenv :: LocalRdrEnv, -- Local name envt -- Does *not* include global name envt; may shadow it @@ -135,14 +159,19 @@ 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 - | 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} %=================================================== @@ -151,75 +180,29 @@ 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 +emptyLocalFixityEnv :: LocalFixityEnv +emptyLocalFixityEnv = emptyNameEnv + +lookupLocalFixity :: LocalFixityEnv -> Name -> Fixity +lookupLocalFixity env name = case lookupNameEnv env name of Just (FixitySig _ fix _) -> fix Nothing -> defaultFixity - --------------------------------- -type DeprecationEnv = NameEnv DeprecTxt \end{code} \begin{code} --------------------------------- -type RnNameSupply - = ( UniqSupply - - , FiniteMap String Int - -- This is used as a name supply for dictionary functions - -- From the inst decl we derive a string, usually by glomming together - -- the class and tycon name -- but it doesn't matter exactly how; - -- this map then gives a unique int for each inst decl with that - -- string. (In Haskell 98 there can only be one, - -- but not so in more extended versions; also class CC type T - -- and class C type TT might both give the string CCT - -- - -- We could just use one Int for all the instance decls, but this - -- way the uniques change less when you add an instance decl, - -- hence less recompilation - - , FiniteMap (ModuleName, OccName) Name - -- Ensures that one (module,occname) pair gets one unique - , FiniteMap OccName Name - -- Ensures that one implicit parameter name gets one unique - ) - - --------------------------------- -type Avails = [AvailInfo] - type ExportAvails = (FiniteMap ModuleName Avails, -- Used to figure out "module M" export specifiers -- Includes avails only from *unqualified* imports -- (see 1.4 Report Section 5.1.1) AvailEnv) -- Used to figure out all other export specifiers. - - -data GenAvailInfo name = Avail name -- An ordinary identifier - | AvailTC name -- The name of the type or class - [name] -- The available pieces of type/class. - -- NB: If the type or class is itself - -- to be in scope, it must be in this list. - -- Thus, typically: AvailTC Eq [Eq, ==, /=] - deriving( Eq ) - -- Equality used when deciding if the interface has changed - -type AvailEnv = NameEnv AvailInfo -- Maps a Name to the AvailInfo that contains it -type AvailInfo = GenAvailInfo Name -type RdrAvailInfo = GenAvailInfo OccName \end{code} %=================================================== @@ -227,42 +210,11 @@ type RdrAvailInfo = GenAvailInfo OccName %=================================================== \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 { @@ -270,91 +222,77 @@ 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 } +\end{code} +%************************************************************************ +%* * +\subsection{The renamer state} +%* * +%************************************************************************ -type RdrNamePragma = () -- Fudge for now -------------------- - +\begin{code} data Ifaces = Ifaces { - 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 - - iDeferred :: NameSet, -- data (not newtype) TyCons that have been slurped, - -- but none of their constructors have. - -- If this is still the case right at the end - -- we can get away with importing them abstractly - - iFixes :: FixityEnv, - -- A single, global map of Names to fixities - -- See comments with RnIfaces.lookupFixity - - 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 - -- 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. - - 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. + + 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 + + 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 - iDeprecs :: DeprecationEnv - } - -type IfaceInsts = Bag GatedDecl -type IfaceRules = Bag GatedDecl - -type GatedDecl = (NameSet, (Module, RdrNameHsDecl)) - -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 + -- EPHEMERAL FIELDS + -- These fields persist during the compilation of a single module only + 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. - -- Nothing => A's interface not yet read, but this module has - -- imported a module, B, that itself depends on A + 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. -- - -- 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 - -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. + -- 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. + } \end{code} @@ -365,33 +303,73 @@ type DeclsMap = NameEnv (Version, AvailInfo, Bool, (Module, RdrNameHsDecl)) %************************************************************************ \begin{code} -initRn :: ModuleName -> UniqSupply -> SearchPath -> SrcLoc - -> RnMG r - -> IO (r, Bag ErrMsg, Bag WarnMsg) - -initRn mod us dirs loc do_rn = do - himaps <- mkModuleHiMaps dirs - names_var <- newIORef (us, emptyFM, builtins, emptyFM) - errs_var <- newIORef (emptyBag,emptyBag) - iface_var <- newIORef emptyIfaces - let - rn_down = RnDown { rn_loc = loc, rn_ns = names_var, - rn_errs = errs_var, - rn_hi_maps = himaps, - rn_ifaces = iface_var, - rn_mod = mod } +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 = 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, + -- and we don't want thereby to try to suck it in! + iVSlurp = (emptyModuleSet, emptyNameSet) + } + names_var <- newIORef (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 errors and return - (warns, errs) <- readIORef errs_var - - return (res, errs, warns) + res <- do_rn rn_down () + + -- Grab state and record it + (warns, errs) <- readIORef errs_var + new_ifaces <- readIORef iface_var + new_orig <- readIORef names_var + 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 + -> RnMS a -> RnM d a -initRnMS :: GlobalRdrEnv -> FixityEnv -> RnMode -> RnMS r -> RnM d r 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 } @@ -400,82 +378,68 @@ initRnMS rn_env fixity_env mode thing_inside rn_down g_down initIfaceRnMS :: Module -> RnMS r -> RnM d r initIfaceRnMS mod thing_inside - = initRnMS emptyRdrEnv emptyNameEnv InterfaceMode $ - setModuleRn (moduleName mod) thing_inside - -emptyIfaces :: Ifaces -emptyIfaces = Ifaces { iImpModInfo = emptyFM, - iDecls = emptyNameEnv, - iDeferred = emptyNameSet, - iFixes = emptyNameEnv, - 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 = [], - iInsts = emptyBag, - iRules = emptyBag, - iDeprecs = emptyNameEnv - } - -builtins :: FiniteMap (ModuleName,OccName) Name -builtins = - bagToFM ( - mapBag (\ name -> ((moduleName (nameModule name), nameOccName name), name)) - builtinNames) + = initRnMS emptyRdrEnv emptyLocalFixityEnv InterfaceMode $ + setModuleRn mod thing_inside \end{code} -@renameSourceCode@ is used to rename stuff ``out-of-line''; +@renameDerivedCode@ is used to rename stuff ``out-of-line''; that is, not as part of the main renamer. Sole examples: derived definitions, which are only generated in the type checker. -The @RnNameSupply@ includes a @UniqueSupply@, so if you call it more than +The @NameSupply@ includes a @UniqueSupply@, so if you call it more than once you must either split it, or install a fresh unique supply. \begin{code} -renameSourceCode :: ModuleName - -> RnNameSupply - -> RnMS r - -> r - -renameSourceCode mod_name name_supply m - = unsafePerformIO ( +renameDerivedCode :: DynFlags + -> Module + -> PersistentRenamerState + -> RnMS r + -> r + +renameDerivedCode dflags mod prs thing_inside + = unsafePerformIO $ -- It's not really unsafe! When renaming source code we -- only do any I/O if we need to read in a fixity declaration; -- and that doesn't happen in pragmas etc - mkModuleHiMaps (mkSearchPath opt_HiMap) >>= \ himaps -> - newIORef name_supply >>= \ names_var -> - newIORef (emptyBag,emptyBag) >>= \ errs_var -> - let - rn_down = RnDown { rn_loc = mkGeneratedSrcLoc, rn_ns = names_var, - rn_errs = errs_var, rn_hi_maps = himaps, - rn_mod = mod_name, - rn_ifaces = panic "rnameSourceCode: rn_ifaces" -- Not required - } - s_down = SDown { rn_mode = InterfaceMode, + do { us <- mkSplitUniqSupply 'r' + ; names_var <- newIORef ((prsOrig prs) { nsUniqs = us }) + ; errs_var <- newIORef (emptyBag,emptyBag) + + ; let rn_down = RnDown { rn_dflags = dflags, + rn_loc = generatedSrcLoc, rn_ns = names_var, + rn_errs = errs_var, + rn_mod = mod, + rn_done = bogus "rn_done", + rn_hit = bogus "rn_hit", + rn_ifaces = bogus "rn_ifaces" + } + ; let s_down = SDown { rn_mode = InterfaceMode, -- So that we can refer to PrelBase.True etc - rn_genv = emptyRdrEnv, rn_lenv = emptyRdrEnv, - rn_fixenv = emptyNameEnv } - in - m rn_down s_down >>= \ result -> - - readIORef errs_var >>= \ (warns,errs) -> + rn_genv = emptyRdrEnv, rn_lenv = emptyRdrEnv, + rn_fixenv = emptyLocalFixityEnv } - (if not (isEmptyBag errs) then - pprTrace "Urk! renameSourceCode found errors" (display errs) + ; result <- thing_inside rn_down s_down + ; messages <- readIORef errs_var + + ; if bad messages then + do { hPutStr stderr "Urk! renameDerivedCode found errors or warnings" + ; printErrorsAndWarnings alwaysQualify messages + } + else + return() + + ; return result + } + where #ifdef DEBUG - else if not (isEmptyBag warns) then - pprTrace "Note: renameSourceCode found warnings" (display warns) + bad messages = errorsFound messages || warningsFound messages +#else + bad messages = errorsFound messages #endif - else - id) $ - return result - ) - where - display errs = pprBagOfErrors errs +bogus s = panic ("rnameSourceCode: " ++ s) -- Used for unused record fields {-# INLINE thenRn #-} {-# INLINE thenRn_ #-} @@ -490,7 +454,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 @@ -506,9 +471,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 -> @@ -597,11 +565,19 @@ checkErrsRn :: RnM d Bool -- True <=> no errors so far checkErrsRn (RnDown {rn_errs = errs_var}) l_down = readIORef errs_var >>= \ (warns,errs) -> return (isEmptyBag errs) + +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} @@ -615,38 +591,37 @@ getSrcLocRn down l_down \end{code} %================ -\subsubsection{ Name supply} +\subsubsection{The finder and home symbol table} +%===================== + +\begin{code} +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 RnNameSupply +getNameSupplyRn :: RnM d NameSupply getNameSupplyRn rn_down l_down = readIORef (rn_ns rn_down) -setNameSupplyRn :: RnNameSupply -> RnM d () +setNameSupplyRn :: NameSupply -> RnM d () setNameSupplyRn names' (RnDown {rn_ns = names_var}) l_down = writeIORef names_var names' --- See comments with RnNameSupply above. -newInstUniq :: String -> RnM d Int -newInstUniq key (RnDown {rn_ns = names_var}) l_down - = readIORef names_var >>= \ (us, mapInst, cache, ipcache) -> - let - uniq = case lookupFM mapInst key of - Just x -> x+1 - Nothing -> 0 - mapInst' = addToFM mapInst key uniq - in - writeIORef names_var (us, mapInst', cache, ipcache) >> - return uniq - getUniqRn :: RnM d Unique getUniqRn (RnDown {rn_ns = names_var}) l_down - = readIORef names_var >>= \ (us, mapInst, cache, ipcache) -> + = readIORef names_var >>= \ ns -> let - (us1,us') = splitUniqSupply us + (us1,us') = splitUniqSupply (nsUniqs ns) in - writeIORef names_var (us', mapInst, cache, ipcache) >> + writeIORef names_var (ns {nsUniqs = us'}) >> return (uniqFromSupply us1) \end{code} @@ -655,11 +630,11 @@ getUniqRn (RnDown {rn_ns = names_var}) l_down %===================== \begin{code} -getModuleRn :: RnM d ModuleName -getModuleRn (RnDown {rn_mod = mod_name}) l_down - = return mod_name +getModuleRn :: RnM d Module +getModuleRn (RnDown {rn_mod = mod}) l_down + = return mod -setModuleRn :: ModuleName -> RnM d a -> RnM d a +setModuleRn :: Module -> RnM d a -> RnM d a setModuleRn new_mod enclosed_thing rn_down l_down = enclosed_thing (rn_down {rn_mod = new_mod}) l_down \end{code} @@ -676,19 +651,19 @@ 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 +getGlobalNameEnv :: RnMS GlobalRdrEnv +getGlobalNameEnv rn_down (SDown {rn_genv = global_env}) + = return global_env + 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 @@ -696,7 +671,7 @@ extendFixityEnv :: [(Name, RenamedFixitySig)] -> RnMS a -> RnMS a extendFixityEnv fixes enclosed_scope rn_down l_down@(SDown {rn_fixenv = fixity_env}) = let - new_fixity_env = extendNameEnv fixity_env fixes + new_fixity_env = extendNameEnvList fixity_env fixes in enclosed_scope rn_down (l_down {rn_fixenv = new_fixity_env}) \end{code} @@ -730,9 +705,4 @@ getIfacesRn (RnDown {rn_ifaces = iface_var}) _ setIfacesRn :: Ifaces -> RnM d () setIfacesRn ifaces (RnDown {rn_ifaces = iface_var}) _ = writeIORef iface_var ifaces - -getHiMaps :: RnM d (SearchPath, ModuleHiMap, ModuleHiMap) -getHiMaps (RnDown {rn_hi_maps = himaps}) _ - = return himaps -\end{code} \end{code}