X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnMonad.lhs;h=5a215abfe930af7614a0d7ec6d9e2c1748a84d95;hb=0ef29fb878dd6517d2716afb056bcf2536c2562e;hp=10adbaccb0893370833d761059f1535e5e906915;hpb=9adbdb312507dcc7d5777e36376535918549103b;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnMonad.lhs b/ghc/compiler/rename/RnMonad.lhs index 10adbac..5a215ab 100644 --- a/ghc/compiler/rename/RnMonad.lhs +++ b/ghc/compiler/rename/RnMonad.lhs @@ -31,39 +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 ) +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 ErrUtils ( addShortErrLocLine, addShortWarnLocLine, - pprBagOfErrors, ErrMsg, WarnMsg, Message + Message, Messages, errorsFound, warningsFound, + 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, 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 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 ) +import Bag ( Bag, emptyBag, isEmptyBag, snocBag ) import UniqSupply import Outputable -import CmFind ( Finder ) import PrelNames ( mkUnboundName ) -import HscTypes ( GlobalSymbolTable, OrigNameEnv, AvailEnv, - WhetherHasOrphans, ImportVersion, ExportItem, - PersistentRenamerState(..), IsBootInterface, Avails, - DeclsMap, IfaceInsts, IfaceRules, DeprecationEnv ) infixr 9 `thenRn`, `thenRn_` \end{code} @@ -80,14 +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 - = 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 (printErrs alwaysQualify msg) `thenRn_` returnRn () \end{code} @@ -110,15 +126,22 @@ 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_hst :: HomeSymbolTable, - 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, + rn_ns :: IORef NameSupply, rn_ifaces :: IORef Ifaces } @@ -126,7 +149,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 @@ -136,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 :: LocalFixityEnv -- 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 + -- 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} %=================================================== @@ -158,7 +186,10 @@ type LocalFixityEnv = NameEnv RenamedFixitySig -- can report line-number info when there is a duplicate -- fixity declaration -lookupLocalFixity :: FixityEnv -> Name -> Fixity +emptyLocalFixityEnv :: LocalFixityEnv +emptyLocalFixityEnv = emptyNameEnv + +lookupLocalFixity :: LocalFixityEnv -> Name -> Fixity lookupLocalFixity env name = case lookupNameEnv env name of Just (FixitySig _ fix _) -> fix @@ -179,6 +210,11 @@ type ExportAvails = (FiniteMap ModuleName Avails, %=================================================== \begin{code} +type ExportItem = (ModuleName, [RdrAvailInfo]) +type IfaceDeprecs = Maybe (Either DeprecTxt [(RdrName,DeprecTxt)]) + -- Nothing => NoDeprecs + -- Just (Left t) => DeprecAll + -- Just (Right p) => DeprecSome data ParsedIface = ParsedIface { @@ -186,12 +222,12 @@ 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} @@ -204,21 +240,26 @@ data ParsedIface \begin{code} data Ifaces = Ifaces { -- PERSISTENT FIELDS - iPST :: PackageSymbolTable, - -- The ModuleDetails for modules in other packages + iPIT :: PackageIfaceTable, + -- The ModuleIFaces for modules in other packages -- whose interfaces we have opened - -- The contents of those interface files may be mostly - -- in the iDecls, iInsts, iRules (below), but what *will* - -- be in the PackageSymbolTable is: + -- 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 - -- This field is initialised from the compiler's persistent + -- 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 @@ -233,25 +274,25 @@ data Ifaces = Ifaces { -- EPHEMERAL FIELDS -- These fields persist during the compilation of a single module only - 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. - 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. + -- + -- 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, IsLoaded) -type IsLoaded = True \end{code} @@ -262,25 +303,44 @@ type IsLoaded = True %************************************************************************ \begin{code} -initRn :: DynFlags -> Finder -> HomeSymbolTable +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 -> SrcLoc + -> Module -> RnMG t - -> IO (t, PersistentCompilerState, (Bag WarnMsg, Bag ErrMsg)) + -> IO (PersistentCompilerState, Messages, t) -initRn dflags finder hst pcs mod loc do_rn +initRn dflags hit hst pcs mod do_rn = do - let prs = pcsPRS pcs - uniqs <- mkSplitUniqSupply 'r' - names_var <- newIORef (uniqs, prsOrig prs) + 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 (initIfaces pcs) + iface_var <- newIORef ifaces let rn_down = RnDown { rn_mod = mod, - rn_loc = loc, + rn_loc = noSrcLoc, - rn_finder = finder, rn_dflags = dflags, - rn_hst = hst, + rn_hit = hit, + rn_done = lookupType hst pte, rn_ns = names_var, rn_errs = errs_var, @@ -291,38 +351,25 @@ initRn dflags finder hst pcs mod loc do_rn 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, - prsDecls = iDecls new_ifaces, - prsInsts = iInsts new_ifaces, - prsRules = iRules new_ifaces } - let new_pcs = pcs { pcsPST = iPST new_ifaces, - pcsPRS = new_prs } + (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 (res, new_pcs, (warns, errs)) - + return (new_pcs, (warns, errs), res) -initIfaces :: PersistentCompilerState -> Ifaces -initIfaces (PCS { pcsPST = pst, psrPRS = prs }) - = Ifaces { iPST = pst, - iDecls = prsDecls prs, - iInsts = prsInsts prs, - iRules = prsRules prs, +initRnMS :: GlobalRdrEnv -> LocalFixityEnv -> RnMode + -> RnMS a -> RnM d a - 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 = [] - } - - -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 } @@ -331,12 +378,11 @@ 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 $ + = 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. @@ -345,50 +391,55 @@ 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 :: DynFlags - -> Module - -> PersistentRenamerState - -> RnMS r - -> r - -renameSourceCode dflags mod prs 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 - mkSplitUniqSupply 'r' >>= \ new_us -> - newIORef (new_us, prsOrig prs) >>= \ names_var -> - newIORef (emptyBag,emptyBag) >>= \ errs_var -> - let - rn_down = RnDown { rn_dflags = dflags, - rn_loc = mkGeneratedSrcLoc, rn_ns = names_var, - rn_errs = errs_var, - rn_mod = mod, - 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 } + + ; result <- thing_inside rn_down s_down + ; messages <- readIORef errs_var - (if not (isEmptyBag errs) then - pprTrace "Urk! renameSourceCode found errors" (display errs) + ; 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_ #-} @@ -403,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 @@ -419,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 -> @@ -511,14 +566,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} @@ -536,11 +595,11 @@ getSrcLocRn down l_down %===================== \begin{code} -getFinderRn :: RnM d Finder -getFinderRn down l_down = return (rn_finder down) +getHomeIfaceTableRn :: RnM d HomeIfaceTable +getHomeIfaceTableRn down l_down = return (rn_hit down) -getHomeSymbolTableRn :: RnM d HomeSymbolTable -getHomeSymbolTableRn down l_down = return (rn_hst down) +getTypeEnvRn :: RnM d (Name -> Maybe TyThing) +getTypeEnvRn down l_down = return (rn_done down) \end{code} %================ @@ -548,21 +607,21 @@ getHomeSymbolTableRn down l_down = return (rn_hst down) %===================== \begin{code} -getNameSupplyRn :: RnM d (UniqSupply, OrigNameEnv) +getNameSupplyRn :: RnM d NameSupply getNameSupplyRn rn_down l_down = readIORef (rn_ns rn_down) -setNameSupplyRn :: (UniqSupply, OrigNameEnv) -> RnM d () +setNameSupplyRn :: NameSupply -> RnM d () setNameSupplyRn names' (RnDown {rn_ns = names_var}) l_down = writeIORef names_var names' getUniqRn :: RnM d Unique getUniqRn (RnDown {rn_ns = names_var}) l_down - = readIORef names_var >>= \ (us, {-cache,-} ipcache) -> + = readIORef names_var >>= \ ns -> let - (us1,us') = splitUniqSupply us + (us1,us') = splitUniqSupply (nsUniqs ns) in - writeIORef names_var (us', {-cache,-} ipcache) >> + writeIORef names_var (ns {nsUniqs = us'}) >> return (uniqFromSupply us1) \end{code}