X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnMonad.lhs;h=1b3bcfc8ef078590babc7102b04b13e490a3e63d;hb=d2cca44eae15bbbd3b86889448e796bc785dfa52;hp=feb0309864d3fbf357ee8ad592c6e9c5a56e24a4;hpb=18976e614fd90a8d81ced2c3e9cd8e38d72a1f40;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnMonad.lhs b/ghc/compiler/rename/RnMonad.lhs index feb0309..1b3bcfc 100644 --- a/ghc/compiler/rename/RnMonad.lhs +++ b/ghc/compiler/rename/RnMonad.lhs @@ -6,10 +6,13 @@ \begin{code} module RnMonad( module RnMonad, + + module RdrName, -- Re-exports + module Name, -- from these two + Module, FiniteMap, Bag, - Name, RdrNameHsDecl, RdrNameInstDecl, Version, @@ -20,44 +23,53 @@ module RnMonad( #include "HsVersions.h" -import SST -import GlaExts ( RealWorld, stToIO ) -import List ( intersperse ) - +#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 405 +import IOExts ( fixIO ) +#elif defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 302 +import PrelIOBase ( fixIO ) -- Should be in GlaExts +#else +import IOBase ( fixIO ) +#endif +import IOExts ( IORef, newIORef, readIORef, writeIORef, unsafePerformIO ) + import HsSyn import RdrHsSyn import RnHsSyn ( RenamedFixitySig ) -import BasicTypes ( Version ) -import SrcLoc ( noSrcLoc ) +import HscTypes ( Finder, + AvailEnv, lookupTypeEnv, + OrigNameEnv(..), OrigNameNameEnv, OrigNameIParamEnv, + WhetherHasOrphans, ImportVersion, + PersistentRenamerState(..), IsBootInterface, Avails, + DeclsMap, IfaceInsts, IfaceRules, + HomeSymbolTable, PackageSymbolTable, + PersistentCompilerState(..), GlobalRdrEnv, + HomeIfaceTable, PackageIfaceTable, + RdrAvailInfo, ModIface ) +import BasicTypes ( Version, defaultFixity ) import ErrUtils ( addShortErrLocLine, addShortWarnLocLine, pprBagOfErrors, ErrMsg, WarnMsg, Message ) -import Name ( Module, Name, OccName, NamedThing(..), IfaceFlavour, - isLocallyDefinedName, nameModule, nameOccName +import RdrName ( RdrName, dummyRdrVarName, rdrNameModule, rdrNameOcc, + RdrNameEnv, emptyRdrEnv, extendRdrEnv, + lookupRdrEnv, addListToRdrEnv, rdrEnvToList, rdrEnvElts + ) +import Name ( Name, OccName, NamedThing(..), getSrcLoc, + isLocallyDefinedName, nameModule, nameOccName, + decode, mkLocalName, mkKnownKeyGlobal, + NameEnv, lookupNameEnv, emptyNameEnv, unitNameEnv, + extendNameEnvList ) +import Module ( Module, ModuleName, lookupModuleEnvByName ) import NameSet -import RdrName ( RdrName ) -import CmdLineOpts ( opt_D_show_rn_trace, opt_IgnoreIfacePragmas, opt_WarnHiShadows ) -import PrelInfo ( builtinNames ) -import TysWiredIn ( boolTyCon ) -import SrcLoc ( SrcLoc, mkGeneratedSrcLoc ) +import CmdLineOpts ( DynFlags, DynFlag(..), dopt ) +import SrcLoc ( SrcLoc, generatedSrcLoc ) import Unique ( Unique ) -import UniqFM ( UniqFM ) -import FiniteMap ( FiniteMap, emptyFM, bagToFM, lookupFM, addToFM, addListToFM, - addListToFM_C, addToFM_C, eltsFM - ) -import Bag ( Bag, mapBag, emptyBag, isEmptyBag, snocBag ) -import Maybes ( seqMaybe, mapMaybe ) -import UniqSet -import UniqFM +import FiniteMap ( FiniteMap, emptyFM ) +import Bag ( Bag, emptyBag, isEmptyBag, snocBag ) import UniqSupply -import Util import Outputable -import DirUtils ( getDirectoryContents ) -import IO ( hPutStrLn, stderr, isDoesNotExistError ) -import Monad ( foldM ) -import Maybe ( fromMaybe ) -import Constants ( interfaceFileFormatVersion ) +import PrelNames ( mkUnboundName ) +import Maybes ( maybeToBool, seqMaybe, orElse ) infixr 9 `thenRn`, `thenRn_` \end{code} @@ -70,18 +82,18 @@ infixr 9 `thenRn`, `thenRn_` %************************************************************************ \begin{code} -sstToIO :: SST RealWorld r -> IO r -sstToIO sst = stToIO (sstToST sst) - -ioToRnMG :: IO r -> RnMG (Either IOError r) -ioToRnMG io rn_down g_down = ioToSST io +ioToRnM :: IO r -> RnM d (Either IOError r) +ioToRnM io rn_down g_down = (io >>= \ ok -> return (Right ok)) + `catch` + (\ err -> return (Left err)) -traceRn :: SDoc -> RnMG () -traceRn msg | opt_D_show_rn_trace = putDocRn msg - | otherwise = returnRn () +traceRn :: SDoc -> RnM d () +traceRn msg + = doptRn Opt_D_dump_rn_trace `thenRn` \b -> + if b then putDocRn msg else returnRn () -putDocRn :: SDoc -> RnMG () -putDocRn msg = ioToRnMG (printErrs msg) `thenRn_` +putDocRn :: SDoc -> RnM d () +putDocRn msg = ioToRnM (printErrs msg) `thenRn_` returnRn () \end{code} @@ -92,248 +104,173 @@ putDocRn msg = ioToRnMG (printErrs msg) `thenRn_` %* * %************************************************************************ -=================================================== - MONAD TYPES -=================================================== +%=================================================== +\subsubsection{ MONAD TYPES} +%=================================================== \begin{code} -type RnM s d r = RnDown s -> d -> SST s r -type RnMS s r = RnM s (SDown s) r -- Renaming source -type RnMG r = RnM RealWorld GDown r -- Getting global names etc -type SSTRWRef a = SSTRef RealWorld a -- ToDo: there ought to be a standard defn of this +type RnM d r = RnDown -> d -> IO r +type RnMS r = RnM SDown r -- Renaming source +type RnMG r = RnM () r -- Getting global names etc -- Common part -data RnDown s = RnDown { - rn_loc :: SrcLoc, - rn_omit :: Name -> Bool, -- True <=> omit qualifier when printing - rn_ns :: SSTRef s RnNameSupply, - rn_errs :: SSTRef s (Bag WarnMsg, Bag ErrMsg), - rn_occs :: SSTRef s ([Occurrence],[Occurrence]), -- Occurrences: compulsory and optional resp - rn_mod :: Module - } +data RnDown + = RnDown { + rn_mod :: Module, -- This module + rn_loc :: SrcLoc, -- Current locn + + rn_finder :: Finder, + rn_dflags :: DynFlags, -type Occurrence = (Name, SrcLoc) -- The srcloc is the occurrence site + rn_hit :: HomeIfaceTable, + rn_done :: Name -> Bool, -- Tells what things (both in the + -- home package and other packages) + -- were already available (i.e. in + -- the relevant SymbolTable) before + -- compiling this module -data Necessity = Compulsory | Optional -- We *must* find definitions for - -- compulsory occurrences; we *may* find them - -- for optional ones. + rn_errs :: IORef (Bag WarnMsg, Bag ErrMsg), - -- For getting global names -data GDown = GDown { - rn_hi_map :: ModuleHiMap, -- for .hi files - rn_hiboot_map :: ModuleHiMap, -- for .hi-boot files - rn_ifaces :: SSTRWRef Ifaces - } + -- The second and third components are a flattened-out OrigNameEnv + rn_ns :: IORef (UniqSupply, OrigNameNameEnv, OrigNameIParamEnv), + rn_ifaces :: IORef Ifaces + } -- For renaming source code -data SDown s = SDown { +data SDown = SDown { rn_mode :: RnMode, - rn_genv :: RnEnv, -- Global envt; the fixity component gets extended - -- with local fixity decls - rn_lenv :: LocalRdrEnv -- Local name envt - -- Does *not* includes global name envt; may shadow it - -- Includes both ordinary variables and type variables; - -- they are kept distinct because tyvar have a different - -- occurrence contructor (Name.TvOcc) - -- We still need the unsullied global name env so that - -- we can look up record field names + + rn_genv :: GlobalRdrEnv, -- Global envt + + rn_lenv :: LocalRdrEnv, -- Local name envt + -- Does *not* include global name envt; may shadow it + -- Includes both ordinary variables and type variables; + -- they are kept distinct because tyvar have a different + -- occurrence contructor (Name.TvOcc) + -- We still need the unsullied global name env so that + -- we can look up record field names + + rn_fixenv :: LocalFixityEnv -- Local fixities + -- The global fixities are held in the + -- rn_ifaces field. Why? See the comments + -- with RnIfaces.lookupLocalFixity } data RnMode = SourceMode -- Renaming source code | InterfaceMode -- Renaming interface declarations. - Necessity -- The "necessity" - -- flag says free variables *must* be found and slurped - -- or whether they need not be. For value signatures of - -- things that are themselves compulsorily imported - -- we arrange that the type signature is read - -- in compulsory mode, - -- but the pragmas in optional mode. - -type SearchPath = [(String,String)] -- List of (directory,suffix) pairs to search - -- for interface files. - -type ModuleHiMap = FiniteMap String String - -- mapping from module name to the file path of its corresponding - -- interface file. \end{code} -=================================================== - ENVIRONMENTS -=================================================== +%=================================================== +\subsubsection{ ENVIRONMENTS} +%=================================================== \begin{code} -------------------------------- -type RdrNameEnv a = FiniteMap RdrName a -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 - -emptyRdrEnv :: RdrNameEnv a -lookupRdrEnv :: RdrNameEnv a -> RdrName -> Maybe a -addListToRdrEnv :: RdrNameEnv a -> [(RdrName,a)] -> RdrNameEnv a - -emptyRdrEnv = emptyFM -lookupRdrEnv = lookupFM -addListToRdrEnv = addListToFM -rdrEnvElts = eltsFM - --------------------------------- -type NameEnv a = UniqFM a -- Domain is Name - -emptyNameEnv :: NameEnv a -nameEnvElts :: NameEnv a -> [a] -addToNameEnv_C :: (a->a->a) -> NameEnv a -> Name -> a -> NameEnv a -addToNameEnv :: NameEnv a -> Name -> a -> NameEnv a -plusNameEnv :: NameEnv a -> NameEnv a -> NameEnv a -extendNameEnv :: NameEnv a -> [(Name,a)] -> NameEnv a -lookupNameEnv :: NameEnv a -> Name -> Maybe a -delFromNameEnv :: NameEnv a -> Name -> NameEnv a -elemNameEnv :: Name -> NameEnv a -> Bool - -emptyNameEnv = emptyUFM -nameEnvElts = eltsUFM -addToNameEnv_C = addToUFM_C -addToNameEnv = addToUFM -plusNameEnv = plusUFM -extendNameEnv = addListToUFM -lookupNameEnv = lookupUFM -delFromNameEnv = delFromUFM -elemNameEnv = elemUFM - --------------------------------- -type FixityEnv = NameEnv RenamedFixitySig - --------------------------------- -data RnEnv = RnEnv GlobalRdrEnv FixityEnv -emptyRnEnv = RnEnv emptyRdrEnv emptyNameEnv +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 + +lookupLocalFixity :: LocalFixityEnv -> Name -> Fixity +lookupLocalFixity env name + = case lookupNameEnv env name of + Just (FixitySig _ fix _) -> fix + Nothing -> defaultFixity \end{code} \begin{code} --------------------------------- -type RnNameSupply - = ( UniqSupply - - , FiniteMap (OccName, OccName) Int - -- This is used as a name supply for dictionary functions - -- From the inst decl we derive a (class, tycon) pair; - -- this map then gives a unique int for each inst decl with that - -- (class, tycon) pair. (In Haskell 98 there can only be one, - -- but not so in more extended versions.) - -- - -- 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 +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) - , FiniteMap (Module,OccName) Name - -- Ensures that one (module,occname) pair gets one unique - ) - - --------------------------------- -data ExportEnv = ExportEnv Avails Fixities -type Avails = [AvailInfo] -type Fixities = [(Name, Fixity)] - -type ExportAvails = (FiniteMap Module Avails, -- Used to figure out "module M" export specifiers - -- Includes avails only from *unqualified* imports - -- (see 1.4 Report Section 5.1.1) - - NameEnv AvailInfo) -- Used to figure out all other export specifiers. - -- Maps a Name to the AvailInfo that contains it - - -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, ==, /=] -type AvailInfo = GenAvailInfo Name -type RdrAvailInfo = GenAvailInfo OccName + AvailEnv) -- Used to figure out all other export specifiers. \end{code} -=================================================== - INTERFACE FILE STUFF -=================================================== +%=================================================== +\subsubsection{ INTERFACE FILE STUFF} +%=================================================== \begin{code} -type ExportItem = (Module, [RdrAvailInfo]) -type VersionInfo name = [ImportVersion name] - -type ImportVersion name = (Module, Version, WhatsImported name) -data WhatsImported name = Everything - | Specifically [LocalVersion name] -- List guaranteed non-empty - - -- ("M", hif, ver, Everything) means there was a "module M" in - -- this module's export list, so we just have to go by M's version, "ver", - -- not the list of LocalVersions. - - -type LocalVersion name = (name, Version) +type ExportItem = (ModuleName, [RdrAvailInfo]) data ParsedIface - = ParsedIface - Module -- Module name - Version -- Module version number - [ImportVersion OccName] -- Usages - [ExportItem] -- Exports - [Module] -- Special instance modules - [(Version, RdrNameHsDecl)] -- Local definitions - [RdrNameInstDecl] -- Local instance declarations - -type InterfaceDetails = (VersionInfo Name, -- Version information for what this module imports - ExportEnv, -- What this module exports - [Module]) -- Instance modules - -type RdrNamePragma = () -- Fudge for now -------------------- - -data Ifaces = Ifaces { - iMod :: Module, -- Name of the module being compiled - - iModMap :: FiniteMap Module (IfaceFlavour, -- Exports - Version, - Avails), - - iDecls :: DeclsMap, -- A single, global map of Names to decls - - iFixes :: FixityEnv, -- A single, global map of Names to fixities - - 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. - - iDefInsts :: (Bag IfaceInst, NameSet), - -- 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. - -- Together with them is the set of tycons/classes that may allow - -- the instance decls in. - - iDefData :: NameEnv (Module, RdrNameTyClDecl), - -- Deferred data type declarations; each has the following properties - -- * it's a data type decl - -- * its TyCon is needed - -- * the decl may or may not have been slurped, depending on whether any - -- of the constrs are needed. - - iInstMods :: [Module] -- Set of modules with "special" instance declarations - -- Excludes this module - } - + = ParsedIface { + pi_mod :: Module, -- Complete with package info + pi_vers :: Version, -- Module version number + pi_orphan :: WhetherHasOrphans, -- Whether this module has orphans + pi_usages :: [ImportVersion OccName], -- Usages + pi_exports :: (Version, [ExportItem]), -- Exports + pi_insts :: [RdrNameInstDecl], -- Local instance declarations + pi_decls :: [(Version, RdrNameHsDecl)], -- Local definitions + pi_fixity :: [RdrNameFixitySig], -- Local fixity declarations, + pi_rules :: (Version, [RdrNameRuleDecl]), -- Rules, with their version + pi_deprecs :: [RdrNameDeprecation] -- Deprecations + } +\end{code} -type DeclsMap = NameEnv (Version, AvailInfo, RdrNameHsDecl, Bool) - -- 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. +%************************************************************************ +%* * +\subsection{The renamer state} +%* * +%************************************************************************ -type IfaceInst = ((Module, RdrNameInstDecl), -- Instance decl - NameSet) -- "Gate" names. Slurp this instance decl when this - -- set becomes empty. It's depleted whenever we - -- slurp another type or class decl. +\begin{code} +data Ifaces = Ifaces { + -- 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, + -- Similar to instance decls, only for rules + + -- 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] + -- 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. + -- 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 = Bool \end{code} @@ -344,174 +281,137 @@ type IfaceInst = ((Module, RdrNameInstDecl), -- Instance decl %************************************************************************ \begin{code} -initRn :: Module -> UniqSupply -> SearchPath -> SrcLoc - -> RnMG r - -> IO (r, Bag ErrMsg, Bag WarnMsg) - -initRn mod us dirs loc do_rn = do - names_var <- sstToIO (newMutVarSST (us, emptyFM, builtins)) - errs_var <- sstToIO (newMutVarSST (emptyBag,emptyBag)) - iface_var <- sstToIO (newMutVarSST (emptyIfaces mod)) - occs_var <- sstToIO (newMutVarSST initOccs) - (himap, hibmap) <- mkModuleHiMaps dirs - let - rn_down = RnDown { rn_loc = loc, rn_omit = \n -> False, rn_ns = names_var, - rn_errs = errs_var, rn_occs = occs_var, - rn_mod = mod } - g_down = GDown { rn_hi_map = himap, rn_hiboot_map = hibmap, rn_ifaces = iface_var } - +initRn :: DynFlags + -> Finder + -> HomeIfaceTable + -> HomeSymbolTable + -> PersistentCompilerState + -> Module + -> SrcLoc + -> RnMG t + -> IO (t, (Bag WarnMsg, Bag ErrMsg), PersistentCompilerState) + +initRn dflags finder hit hst pcs mod loc do_rn + = do + let prs = pcs_PRS pcs + let pst = pcs_PST pcs + + uniqs <- mkSplitUniqSupply 'r' + names_var <- newIORef (uniqs, origNames (prsOrig prs), + origIParam (prsOrig prs)) + errs_var <- newIORef (emptyBag,emptyBag) + iface_var <- newIORef (initIfaces pcs) + let rn_down = RnDown { rn_mod = mod, + rn_loc = loc, + + rn_finder = finder, + rn_dflags = dflags, + rn_hit = hit, + rn_done = is_done hst pst, + + rn_ns = names_var, + rn_errs = errs_var, + rn_ifaces = iface_var, + } + -- do the business - res <- sstToIO (do_rn rn_down g_down) - - -- grab errors and return - (warns, errs) <- sstToIO (readMutVarSST errs_var) - return (res, errs, warns) - - -initRnMS :: RnEnv -> RnMode -> RnMS RealWorld r -> RnMG r -initRnMS rn_env mode m rn_down g_down + res <- do_rn rn_down () + + -- Grab state and record it + (warns, errs) <- readIORef errs_var + new_ifaces <- readIORef iface_var + (_, 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 } + let new_pcs = pcs { pcs_PIT = iPIT new_ifaces, + pcs_PRS = new_prs } + + return (res, (warns, errs), new_pcs) + +is_done :: HomeSymbolTable -> PackageSymbolTable -> Name -> Bool +-- Returns True iff the name is in either symbol table +is_done hst pst n = maybeToBool (lookupTypeEnv pst n `seqMaybe` lookupTypeEnv hst n) + +lookupIface :: HomeIfaceTable -> PackageIfaceTable -> ModuleName -> ModIface +lookupIface hit pit mod = lookupModuleEnvByName hit mod `orElse` + lookupModuleEnvByName pit mod `orElse` + pprPanic "lookupIface" (ppr mod) + +initIfaces :: PersistentCompilerState -> Ifaces +initIfaces (PCS { pcs_PIT = pit, pcs_PRS = prs }) + = Ifaces { iPIT = pit, + 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 = [] + } + + +initRnMS :: GlobalRdrEnv -> LocalFixityEnv -> RnMode -> RnMS r -> RnM d r +initRnMS rn_env fixity_env mode thing_inside rn_down g_down = let - s_down = SDown { rn_genv = rn_env, rn_lenv = emptyRdrEnv, rn_mode = mode } + s_down = SDown { rn_genv = rn_env, rn_lenv = emptyRdrEnv, + rn_fixenv = fixity_env, rn_mode = mode } in - m rn_down s_down - - -emptyIfaces :: Module -> Ifaces -emptyIfaces mod = Ifaces { iMod = mod, - iModMap = emptyFM, - iDecls = emptyNameEnv, - iFixes = emptyNameEnv, - iSlurp = emptyNameSet, - iVSlurp = [], - iDefInsts = (emptyBag, emptyNameSet), - iDefData = emptyNameEnv, - iInstMods = [] - } - -builtins :: FiniteMap (Module,OccName) Name -builtins = bagToFM $ - mapBag (\ name -> ((nameModule name, nameOccName name), name)) - builtinNames - - -- Initial value for the occurrence pool. -initOccs :: ([Occurrence],[Occurrence]) -- Compulsory and optional respectively -initOccs = ([(getName boolTyCon, noSrcLoc)], []) - -- Booleans occur implicitly a lot, so it's tiresome to keep recording the fact, and - -- rather implausible that not one will be used in the module. - -- We could add some other common types, notably lists, but the general idea is - -- to do as much as possible explicitly. -\end{code} + thing_inside rn_down s_down -\begin{code} -mkModuleHiMaps :: SearchPath -> IO (ModuleHiMap, ModuleHiMap) -mkModuleHiMaps dirs = foldM (getAllFilesMatching dirs) (env,env) dirs - where - env = emptyFM - -getAllFilesMatching :: SearchPath - -> (ModuleHiMap, ModuleHiMap) - -> (FilePath, String) - -> IO (ModuleHiMap, ModuleHiMap) -getAllFilesMatching dirs hims (dir_path, suffix) = ( do - -- fpaths entries do not have dir_path prepended - fpaths <- getDirectoryContents dir_path - return (foldl addModules hims fpaths) - ) -- soft failure - `catch` - (\ err -> do - hPutStrLn stderr - ("Import path element `" ++ dir_path ++ - if (isDoesNotExistError err) then - "' does not exist, ignoring." - else - "' couldn't read, ignoring.") - - return hims - ) - where - xiffus = reverse dotted_suffix - - dotted_suffix = - case suffix of - [] -> [] - ('.':xs) -> suffix - ls -> '.':ls - - hi_boot_version_xiffus = - reverse (show interfaceFileFormatVersion) ++ '-':hi_boot_xiffus - hi_boot_xiffus = "toob-ih." -- .hi-boot reversed. - - addModules his@(hi_env, hib_env) nm = fromMaybe his $ - FMAP (\ (mod_nm,v) -> (addToFM_C addNewOne hi_env mod_nm v, hib_env)) - (go xiffus rev_nm) `seqMaybe` - - FMAP (\ (mod_nm,v) -> (hi_env, addToFM_C overrideNew hib_env mod_nm v)) - (go hi_boot_version_xiffus rev_nm) `seqMaybe` - - FMAP (\ (mod_nm,v) -> (hi_env, addToFM_C addNewOne hib_env mod_nm v)) - (go hi_boot_xiffus rev_nm) - where - rev_nm = reverse nm - - go [] xs = Just (reverse xs, dir_path ++'/':nm) - go _ [] = Nothing - go (x:xs) (y:ys) - | x == y = go xs ys - | otherwise = Nothing - - addNewOne - | opt_WarnHiShadows = conflict - | otherwise = stickWithOld - - stickWithOld old new = old - overrideNew old new = new - - conflict old_path new_path - | old_path /= new_path = - pprTrace "Warning: " (text "Identically named interface files present on import path, " $$ - text (show old_path) <+> text "shadows" $$ - text (show new_path) $$ - text "on the import path: " <+> - text (concat (intersperse ":" (map fst dirs)))) - old_path - | otherwise = old_path -- don't warn about innocous shadowings. +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''; +that is, not as part of the main renamer. +Sole examples: derived definitions, +which are only generated in the type checker. -@renameSourceCode@ is used to rename stuff "out-of-line"; that is, not as part of -the main renamer. Examples: pragmas (which we don't want to rename unless -we actually explore them); and 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 :: Module - -> RnNameSupply - -> RnMS RealWorld r +renameSourceCode :: DynFlags + -> Module + -> PersistentRenamerState + -> RnMS r -> r --- Alas, we can't use the real runST, with the desired signature: --- renameSourceCode :: RnNameSupply -> RnMS s r -> r --- because we can't manufacture "new versions of runST". +renameSourceCode dflags mod prs m + = 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 -renameSourceCode mod_name name_supply m - = runSST ( - newMutVarSST name_supply `thenSST` \ names_var -> - newMutVarSST (emptyBag,emptyBag) `thenSST` \ errs_var -> - newMutVarSST ([],[]) `thenSST` \ occs_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_loc = mkGeneratedSrcLoc, rn_ns = names_var, - rn_errs = errs_var, rn_occs = occs_var, - rn_mod = mod_name } - s_down = SDown { rn_mode = InterfaceMode Compulsory, - rn_genv = emptyRnEnv, rn_lenv = emptyRdrEnv } + 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", rn_finder = bogus "rn_finder" + } + 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 `thenSST` \ result -> + m rn_down s_down >>= \ result -> - readMutVarSST errs_var `thenSST` \ (warns,errs) -> + readIORef errs_var >>= \ (warns,errs) -> (if not (isEmptyBag errs) then pprTrace "Urk! renameSourceCode found errors" (display errs) @@ -522,35 +422,39 @@ renameSourceCode mod_name name_supply m else id) $ - returnSST result + return result ) where display errs = pprBagOfErrors errs +bogus s = panic ("rnameSourceCode: " ++ s) -- Used for unused record fields + {-# INLINE thenRn #-} {-# INLINE thenRn_ #-} {-# INLINE returnRn #-} {-# INLINE andRn #-} -returnRn :: a -> RnM s d a -thenRn :: RnM s d a -> (a -> RnM s d b) -> RnM s d b -thenRn_ :: RnM s d a -> RnM s d b -> RnM s d b -andRn :: (a -> a -> a) -> RnM s d a -> RnM s d a -> RnM s d a -mapRn :: (a -> RnM s d b) -> [a] -> RnM s d [b] -mapMaybeRn :: (a -> RnM s d (Maybe b)) -> [a] -> RnM s d [b] -sequenceRn :: [RnM s d a] -> RnM s d [a] -foldlRn :: (b -> a -> RnM s d b) -> b -> [a] -> RnM s d b -mapAndUnzipRn :: (a -> RnM s d (b,c)) -> [a] -> RnM s d ([b],[c]) -fixRn :: (a -> RnM s d a) -> RnM s d a - -returnRn v gdown ldown = returnSST v -thenRn m k gdown ldown = m gdown ldown `thenSST` \ r -> k r gdown ldown -thenRn_ m k gdown ldown = m gdown ldown `thenSST_` k gdown ldown -fixRn m gdown ldown = fixSST (\r -> m r gdown ldown) +returnRn :: a -> RnM d a +thenRn :: RnM d a -> (a -> RnM d b) -> RnM d b +thenRn_ :: RnM d a -> RnM d b -> RnM d b +andRn :: (a -> a -> a) -> RnM d a -> RnM d a -> RnM d a +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] +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 + +returnRn v gdown ldown = return v +thenRn m k gdown ldown = m gdown ldown >>= \ r -> k r gdown ldown +thenRn_ m k gdown ldown = m gdown ldown >> k gdown ldown +fixRn m gdown ldown = fixIO (\r -> m r gdown ldown) andRn combiner m1 m2 gdown ldown - = m1 gdown ldown `thenSST` \ res1 -> - m2 gdown ldown `thenSST` \ res2 -> - returnSST (combiner res1 res2) + = m1 gdown ldown >>= \ res1 -> + m2 gdown ldown >>= \ res2 -> + return (combiner res1 res2) sequenceRn [] = returnRn [] sequenceRn (m:ms) = m `thenRn` \ r -> @@ -563,6 +467,11 @@ mapRn f (x:xs) mapRn f xs `thenRn` \ rs -> returnRn (r:rs) +mapRn_ f [] = returnRn () +mapRn_ f (x:xs) = + f x `thenRn_` + mapRn_ f xs + foldlRn k z [] = returnRn z foldlRn k z (x:xs) = k z x `thenRn` \ z' -> foldlRn k z' xs @@ -585,6 +494,11 @@ mapMaybeRn f (x:xs) = f x `thenRn` \ maybe_r -> case maybe_r of Nothing -> returnRn rs Just r -> returnRn (r:rs) + +flatMapRn f [] = returnRn [] +flatMapRn f (x:xs) = f x `thenRn` \ r -> + flatMapRn f xs `thenRn` \ rs -> + returnRn (r ++ rs) \end{code} @@ -596,204 +510,122 @@ mapMaybeRn f (x:xs) = f x `thenRn` \ maybe_r -> %************************************************************************ -================ Errors and warnings ===================== +%================ +\subsubsection{ Errors and warnings} +%===================== \begin{code} -failWithRn :: a -> Message -> RnM s d a +failWithRn :: a -> Message -> RnM d a failWithRn res msg (RnDown {rn_errs = errs_var, rn_loc = loc}) l_down - = readMutVarSST errs_var `thenSST` \ (warns,errs) -> - writeMutVarSST errs_var (warns, errs `snocBag` err) `thenSST_` - returnSST res + = readIORef errs_var >>= \ (warns,errs) -> + writeIORef errs_var (warns, errs `snocBag` err) >> + return res where err = addShortErrLocLine loc msg -warnWithRn :: a -> Message -> RnM s d a +warnWithRn :: a -> Message -> RnM d a warnWithRn res msg (RnDown {rn_errs = errs_var, rn_loc = loc}) l_down - = readMutVarSST errs_var `thenSST` \ (warns,errs) -> - writeMutVarSST errs_var (warns `snocBag` warn, errs) `thenSST_` - returnSST res + = readIORef errs_var >>= \ (warns,errs) -> + writeIORef errs_var (warns `snocBag` warn, errs) >> + return res where warn = addShortWarnLocLine loc msg -addErrRn :: Message -> RnM s d () +addErrRn :: Message -> RnM d () addErrRn err = failWithRn () err -checkRn :: Bool -> Message -> RnM s d () -- Check that a condition is true +checkRn :: Bool -> Message -> RnM d () -- Check that a condition is true checkRn False err = addErrRn err checkRn True err = returnRn () -warnCheckRn :: Bool -> Message -> RnM s d () -- Check that a condition is true +warnCheckRn :: Bool -> Message -> RnM d () -- Check that a condition is true warnCheckRn False err = addWarnRn err warnCheckRn True err = returnRn () -addWarnRn :: Message -> RnM s d () +addWarnRn :: Message -> RnM d () addWarnRn warn = warnWithRn () warn -checkErrsRn :: RnM s d Bool -- True <=> no errors so far +checkErrsRn :: RnM d Bool -- True <=> no errors so far checkErrsRn (RnDown {rn_errs = errs_var}) l_down - = readMutVarSST errs_var `thenSST` \ (warns,errs) -> - returnSST (isEmptyBag errs) + = 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} -================ Source location ===================== +%================ +\subsubsection{Source location} +%===================== \begin{code} -pushSrcLocRn :: SrcLoc -> RnM s d a -> RnM s d a +pushSrcLocRn :: SrcLoc -> RnM d a -> RnM d a pushSrcLocRn loc' m down l_down = m (down {rn_loc = loc'}) l_down -getSrcLocRn :: RnM s d SrcLoc +getSrcLocRn :: RnM d SrcLoc getSrcLocRn down l_down - = returnSST (rn_loc down) + = return (rn_loc down) \end{code} -================ Name supply ===================== +%================ +\subsubsection{The finder and home symbol table} +%===================== \begin{code} -getNameSupplyRn :: RnM s d RnNameSupply -getNameSupplyRn rn_down l_down - = readMutVarSST (rn_ns rn_down) - -setNameSupplyRn :: RnNameSupply -> RnM s d () -setNameSupplyRn names' (RnDown {rn_ns = names_var}) l_down - = writeMutVarSST names_var names' - --- See comments with RnNameSupply above. -newInstUniq :: (OccName, OccName) -> RnM s d Int -newInstUniq key (RnDown {rn_ns = names_var}) l_down - = readMutVarSST names_var `thenSST` \ (us, mapInst, cache) -> - let - uniq = case lookupFM mapInst key of - Just x -> x+1 - Nothing -> 0 - mapInst' = addToFM mapInst key uniq - in - writeMutVarSST names_var (us, mapInst', cache) `thenSST_` - returnSST uniq -\end{code} - -================ Occurrences ===================== - -Every time we get an occurrence of a name we put it in one of two lists: - one for "compulsory" occurrences - one for "optional" occurrences - -The significance of "compulsory" is - (a) we *must* find the declaration - (b) in the case of type or class names, the name is part of the - source level program, and we must slurp in any instance decls - involving it. +getFinderRn :: RnM d Finder +getFinderRn down l_down = return (rn_finder down) -We don't need instance decls "optional" names, because the type inference -process will never come across them. Optional names are buried inside -type checked (but not renamed) cross-module unfoldings and such. +getHomeIfaceTableRn :: RnM d HomeIfaceTable +getHomeIfaceTableRn down l_down = return (rn_hit down) -The pair of lists is held in a mutable variable in RnDown. +checkAlreadyAvailable :: Name -> RnM d Bool +checkAlreadyAvailable name down l_down = return (rn_done down name) +\end{code} -The lists are kept separate so that we can process all the compulsory occurrences -before any of the optional ones. Why? Because suppose we processed an optional -"g", and slurped an interface decl of g::T->T. Then we'd rename the type T->T in -optional mode. But if we later need g compulsorily we'll find that it's already -been slurped and will do nothing. We could, I suppose, rename it a second time, -but it seems simpler just to do all the compulsory ones first. +%================ +\subsubsection{Name supply} +%===================== \begin{code} -addOccurrenceName :: Name -> RnMS s Name -- Same name returned as passed -addOccurrenceName name (RnDown {rn_loc = loc, rn_occs = occs_var}) - (SDown {rn_mode = mode}) - | isLocallyDefinedName name || - not_necessary necessity - = returnSST name - - | otherwise - = readMutVarSST occs_var `thenSST` \ (comp_occs, opt_occs) -> - let - new_occ_pair = case necessity of - Optional -> (comp_occs, (name,loc):opt_occs) - Compulsory -> ((name,loc):comp_occs, opt_occs) - in - writeMutVarSST occs_var new_occ_pair `thenSST_` - returnSST name - where - necessity = modeToNecessity mode - - -addOccurrenceNames :: [Name] -> RnMS s () -addOccurrenceNames names (RnDown {rn_loc = loc, rn_occs = occs_var}) - (SDown {rn_mode = mode}) - | not_necessary necessity - = returnSST () +getNameSupplyRn :: RnM d (UniqSupply, OrigNameNameEnv, OrigNameIParamEnv) +getNameSupplyRn rn_down l_down + = readIORef (rn_ns rn_down) - | otherwise - = readMutVarSST occs_var `thenSST` \ (comp_occs, opt_occs) -> - let - new_occ_pair = case necessity of - Optional -> (comp_occs, non_local_occs ++ opt_occs) - Compulsory -> (non_local_occs ++ comp_occs, opt_occs) - in - writeMutVarSST occs_var new_occ_pair - where - non_local_occs = [(name, loc) | name <- names, not (isLocallyDefinedName name)] - necessity = modeToNecessity mode - - -- Never look for optional things if we're - -- ignoring optional input interface information -not_necessary Compulsory = False -not_necessary Optional = opt_IgnoreIfacePragmas - -popOccurrenceName :: RnMode -> RnM s d (Maybe Occurrence) -popOccurrenceName mode (RnDown {rn_occs = occs_var}) l_down - = readMutVarSST occs_var `thenSST` \ occs -> - case (mode, occs) of - -- Find a compulsory occurrence - (InterfaceMode Compulsory, (comp:comps, opts)) - -> writeMutVarSST occs_var (comps, opts) `thenSST_` - returnSST (Just comp) - - -- Find an optional occurrence - -- We shouldn't be looking unless we've done all the compulsories - (InterfaceMode Optional, (comps, opt:opts)) - -> ASSERT2( null comps, ppr comps ) - writeMutVarSST occs_var (comps, opts) `thenSST_` - returnSST (Just opt) - - -- No suitable occurrence - other -> returnSST Nothing - --- discardOccurrencesRn does the enclosed thing with a *fresh* occurrences --- variable, and discards the list of occurrences thus found. It's useful --- when loading instance decls and specialisation signatures, when we want to --- know the names of the things in the types, but we don't want to treat them --- as occurrences. - -discardOccurrencesRn :: RnM s d a -> RnM s d a -discardOccurrencesRn enclosed_thing rn_down l_down - = newMutVarSST ([],[]) `thenSST` \ new_occs_var -> - enclosed_thing (rn_down {rn_occs = new_occs_var}) l_down +setNameSupplyRn :: (UniqSupply, OrigNameNameEnv, OrigNameIParamEnv) -> 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) -> + let + (us1,us') = splitUniqSupply us + in + writeIORef names_var (us', cache, ipcache) >> + return (uniqFromSupply us1) \end{code} - -================ Module ===================== +%================ +\subsubsection{ Module} +%===================== \begin{code} -getModuleRn :: RnM s d Module -getModuleRn (RnDown {rn_mod = mod_name}) l_down - = returnSST mod_name +getModuleRn :: RnM d Module +getModuleRn (RnDown {rn_mod = mod}) l_down + = return mod -setModuleRn :: Module -> RnM s d a -> RnM s 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} -\begin{code} -setOmitQualFn :: (Name -> Bool) -> RnM s d a -> RnM s d a -setOmitQualFn fn m g_down l_down = m (g_down { rn_omit = fn }) l_down - -getOmitQualFn :: RnM s d (Name -> Bool) -getOmitQualFn (RnDown {rn_omit = omit_fn}) l_down - = returnSST omit_fn -\end{code} %************************************************************************ %* * @@ -801,42 +633,46 @@ getOmitQualFn (RnDown {rn_omit = omit_fn}) l_down %* * %************************************************************************ -================ RnEnv ===================== +%================ +\subsubsection{ RnEnv} +%===================== \begin{code} -getNameEnvs :: RnMS s (GlobalRdrEnv, LocalRdrEnv) -getNameEnvs rn_down (SDown {rn_genv = RnEnv global_env fixity_env, rn_lenv = local_env}) - = returnSST (global_env, local_env) - -getLocalNameEnv :: RnMS s LocalRdrEnv +getLocalNameEnv :: RnMS LocalRdrEnv getLocalNameEnv rn_down (SDown {rn_lenv = local_env}) - = returnSST local_env + = return local_env + +getGlobalNameEnv :: RnMS GlobalRdrEnv +getGlobalNameEnv rn_down (SDown {rn_genv = global_env}) + = return global_env -setLocalNameEnv :: LocalRdrEnv -> RnMS s a -> RnMS s a +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 s FixityEnv -getFixityEnv rn_down (SDown {rn_genv = RnEnv name_env fixity_env}) - = returnSST fixity_env +getFixityEnv :: RnMS LocalFixityEnv +getFixityEnv rn_down (SDown {rn_fixenv = fixity_env}) + = return fixity_env -extendFixityEnv :: [(Name, RenamedFixitySig)] -> RnMS s a -> RnMS s a +extendFixityEnv :: [(Name, RenamedFixitySig)] -> RnMS a -> RnMS a extendFixityEnv fixes enclosed_scope - rn_down l_down@(SDown {rn_genv = RnEnv name_env fixity_env}) + 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_genv = RnEnv name_env new_fixity_env}) + enclosed_scope rn_down (l_down {rn_fixenv = new_fixity_env}) \end{code} -================ Mode ===================== +%================ +\subsubsection{ Mode} +%===================== \begin{code} -getModeRn :: RnMS s RnMode +getModeRn :: RnMS RnMode getModeRn rn_down (SDown {rn_mode = mode}) - = returnSST mode + = return mode -setModeRn :: RnMode -> RnMS s a -> RnMS s a +setModeRn :: RnMode -> RnMS a -> RnMS a setModeRn new_mode thing_inside rn_down l_down = thing_inside rn_down (l_down {rn_mode = new_mode}) \end{code} @@ -849,28 +685,11 @@ setModeRn new_mode thing_inside rn_down l_down %************************************************************************ \begin{code} -getIfacesRn :: RnMG Ifaces -getIfacesRn rn_down (GDown {rn_ifaces = iface_var}) - = readMutVarSST iface_var - -setIfacesRn :: Ifaces -> RnMG () -setIfacesRn ifaces rn_down (GDown {rn_ifaces = iface_var}) - = writeMutVarSST iface_var ifaces - -getModuleHiMap :: Bool -> RnMG ModuleHiMap -getModuleHiMap want_hi_boot rn_down (GDown {rn_hi_map = himap, rn_hiboot_map = hibmap}) - | want_hi_boot = returnSST hibmap - | otherwise = returnSST himap - -\end{code} +getIfacesRn :: RnM d Ifaces +getIfacesRn (RnDown {rn_ifaces = iface_var}) _ + = readIORef iface_var -%************************************************************************ -%* * -\subsection{HowInScope} -%* * -%************************************************************************ - -\begin{code} -modeToNecessity SourceMode = Compulsory -modeToNecessity (InterfaceMode necessity) = necessity +setIfacesRn :: Ifaces -> RnM d () +setIfacesRn ifaces (RnDown {rn_ifaces = iface_var}) _ + = writeIORef iface_var ifaces \end{code}