X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnMonad.lhs;h=de320ae9318ee7fa145bda8a3d9d6ed7c03938a3;hb=dd214d28a58f10af4355c887674ea692aff37efe;hp=2a795e54840b58c87c2ca77081b71fa28c57ff9c;hpb=864ce5bdfa24cf352c466d6de8e9f938302d4253;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnMonad.lhs b/ghc/compiler/rename/RnMonad.lhs index 2a795e5..de320ae 100644 --- a/ghc/compiler/rename/RnMonad.lhs +++ b/ghc/compiler/rename/RnMonad.lhs @@ -36,13 +36,13 @@ import IO ( hPutStr, stderr ) import HsSyn import RdrHsSyn import RnHsSyn ( RenamedFixitySig ) -import HscTypes ( AvailEnv, lookupType, +import HscTypes ( AvailEnv, emptyAvailEnv, lookupType, NameSupply(..), ImportedModuleInfo, WhetherHasOrphans, ImportVersion, PersistentRenamerState(..), Avails, DeclsMap, IfaceInsts, IfaceRules, HomeSymbolTable, TyThing, - PersistentCompilerState(..), GlobalRdrEnv, + PersistentCompilerState(..), GlobalRdrEnv, LocalRdrEnv, HomeIfaceTable, PackageIfaceTable, RdrAvailInfo ) import BasicTypes ( Version, defaultFixity ) @@ -58,13 +58,14 @@ import Name ( Name, OccName, NamedThing(..), nameOccName, decode, mkLocalName, mkKnownKeyGlobal ) -import Name ( NameEnv, lookupNameEnv, emptyNameEnv, unitNameEnv, extendNameEnvList ) -import Module ( Module, ModuleName, ModuleSet, emptyModuleSet ) +import NameEnv ( NameEnv, lookupNameEnv, emptyNameEnv, extendNameEnvList ) +import Module ( Module, ModuleName, ModuleSet, emptyModuleSet, PackageName ) import NameSet import CmdLineOpts ( DynFlags, DynFlag(..), dopt ) import SrcLoc ( SrcLoc, generatedSrcLoc, noSrcLoc ) import Unique ( Unique ) import FiniteMap ( FiniteMap ) +import Maybes ( seqMaybe ) import Bag ( Bag, emptyBag, isEmptyBag, snocBag ) import UniqSupply import Outputable @@ -93,14 +94,10 @@ ioToRnM_no_fail io rn_down g_down (\ err -> panic "ioToRnM_no_fail: the I/O operation failed!") traceRn :: SDoc -> RnM d () -traceRn msg - = doptRn Opt_D_dump_rn_trace `thenRn` \b -> - if b then putDocRn msg else returnRn () +traceRn msg = ifOptRn Opt_D_dump_rn_trace (putDocRn msg) traceHiDiffsRn :: SDoc -> RnM d () -traceHiDiffsRn msg - = doptRn Opt_D_dump_hi_diffs `thenRn` \b -> - if b then putDocRn msg else returnRn () +traceHiDiffsRn msg = ifOptRn Opt_D_dump_hi_diffs (putDocRn msg) putDocRn :: SDoc -> RnM d () putDocRn msg = ioToRnM (printErrs alwaysQualify msg) `thenRn_` @@ -151,6 +148,13 @@ data SDown = SDown { rn_genv :: GlobalRdrEnv, -- Top level environment + rn_avails :: AvailEnv, + -- Top level AvailEnv; contains all the things that + -- are nameable in the top-level scope, regardless of + -- *how* they can be named (qualified, unqualified...) + -- It is used only to map a Class to its class ops, and + -- hence to resolve the binders in an instance decl + rn_lenv :: LocalRdrEnv, -- Local name envt -- Does *not* include global name envt; may shadow it -- Includes both ordinary variables and type variables; @@ -166,8 +170,15 @@ data SDown = SDown { -- 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 + +isCmdLineMode CmdLineMode = True +isCmdLineMode _ = False \end{code} %=================================================== @@ -176,7 +187,6 @@ data RnMode = SourceMode -- Renaming source code \begin{code} -------------------------------- -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 @@ -192,14 +202,6 @@ lookupLocalFixity env name Nothing -> defaultFixity \end{code} -\begin{code} -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. -\end{code} %=================================================== \subsubsection{ INTERFACE FILE STUFF} @@ -214,7 +216,8 @@ type IfaceDeprecs = Maybe (Either DeprecTxt [(RdrName,DeprecTxt)]) data ParsedIface = ParsedIface { - pi_mod :: Module, -- Complete with package info + pi_mod :: ModuleName, + pi_pkg :: PackageName, pi_vers :: Version, -- Module version number pi_orphan :: WhetherHasOrphans, -- Whether this module has orphans pi_usages :: [ImportVersion OccName], -- Usages @@ -273,6 +276,12 @@ data Ifaces = Ifaces { 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. + -- + -- It's used for two things: + -- a) To record what we've already slurped, so + -- we can no-op if we try to slurp it again + -- b) As the 'gates' for importing rules. We import a rule + -- if all its LHS free vars have been slurped iVSlurp :: (ModuleSet, NameSet) -- The Names are all the (a) non-wired-in @@ -360,22 +369,24 @@ initRn dflags hit hst pcs mod do_rn return (new_pcs, (warns, errs), res) -initRnMS :: GlobalRdrEnv -> LocalFixityEnv -> RnMode +initRnMS :: GlobalRdrEnv -> AvailEnv -> LocalRdrEnv -> LocalFixityEnv -> RnMode -> RnMS a -> RnM d a -initRnMS rn_env fixity_env mode thing_inside rn_down g_down +initRnMS rn_env avails local_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 } + s_down = SDown { rn_genv = rn_env, rn_avails = avails, + rn_lenv = local_env, rn_fixenv = fixity_env, + rn_mode = mode } in thing_inside rn_down s_down initIfaceRnMS :: Module -> RnMS r -> RnM d r initIfaceRnMS mod thing_inside - = initRnMS emptyRdrEnv emptyLocalFixityEnv InterfaceMode $ - setModuleRn mod thing_inside + = initRnMS emptyRdrEnv emptyAvailEnv emptyRdrEnv + emptyLocalFixityEnv InterfaceMode + (setModuleRn mod thing_inside) \end{code} @renameDerivedCode@ is used to rename stuff ``out-of-line''; @@ -411,8 +422,9 @@ renameDerivedCode dflags mod prs thing_inside rn_hit = bogus "rn_hit", rn_ifaces = bogus "rn_ifaces" } - ; let s_down = SDown { rn_mode = InterfaceMode, + ; let s_down = SDown { rn_mode = InterfaceMode, -- So that we can refer to PrelBase.True etc + rn_avails = emptyAvailEnv, rn_genv = emptyRdrEnv, rn_lenv = emptyRdrEnv, rn_fixenv = emptyLocalFixityEnv } @@ -543,6 +555,21 @@ warnWithRn res msg (RnDown {rn_errs = errs_var, rn_loc = loc}) l_down where warn = addShortWarnLocLine loc msg +tryRn :: RnM d a -> RnM d (Either Messages a) +tryRn try_this down@(RnDown {rn_errs = errs_var}) l_down + = do current_msgs <- readIORef errs_var + writeIORef errs_var (emptyBag,emptyBag) + a <- try_this down l_down + (warns, errs) <- readIORef errs_var + writeIORef errs_var current_msgs + if (isEmptyBag errs) + then return (Right a) + else return (Left (warns,errs)) + +setErrsRn :: Messages -> RnM d () +setErrsRn msgs down@(RnDown {rn_errs = errs_var}) l_down + = do writeIORef errs_var msgs; return () + addErrRn :: Message -> RnM d () addErrRn err = failWithRn () err @@ -566,6 +593,11 @@ doptRn :: DynFlag -> RnM d Bool doptRn dflag (RnDown { rn_dflags = dflags}) l_down = return (dopt dflag dflags) +ifOptRn :: DynFlag -> RnM d a -> RnM d () +ifOptRn dflag thing_inside down@(RnDown { rn_dflags = dflags}) l_down + | dopt dflag dflags = thing_inside down l_down >> return () + | otherwise = return () + getDOptsRn :: RnM d DynFlags getDOptsRn (RnDown { rn_dflags = dflags}) l_down = return dflags @@ -596,6 +628,11 @@ getHomeIfaceTableRn down l_down = return (rn_hit down) getTypeEnvRn :: RnM d (Name -> Maybe TyThing) getTypeEnvRn down l_down = return (rn_done down) + +extendTypeEnvRn :: NameEnv TyThing -> RnM d a -> RnM d a +extendTypeEnvRn env inside down l_down + = inside down{rn_done=new_rn_done} l_down + where new_rn_done = \nm -> lookupNameEnv env nm `seqMaybe` rn_done down nm \end{code} %================ @@ -655,6 +692,10 @@ getGlobalNameEnv :: RnMS GlobalRdrEnv getGlobalNameEnv rn_down (SDown {rn_genv = global_env}) = return global_env +getGlobalAvails :: RnMS AvailEnv +getGlobalAvails rn_down (SDown {rn_avails = avails}) + = return avails + setLocalNameEnv :: LocalRdrEnv -> RnMS a -> RnMS a setLocalNameEnv local_env' m rn_down l_down = m rn_down (l_down {rn_lenv = local_env'})