X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnIfaces.lhs;h=bc6b7bbd22d025cc03f34bbe8302c77b3789957e;hb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;hp=04252d9150e8acac12584d7f0e4807b4df24bf17;hpb=f8d1d20eb4779a42e72b6a06c47d6e0f13075bf4;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnIfaces.lhs b/ghc/compiler/rename/RnIfaces.lhs index 04252d9..bc6b7bb 100644 --- a/ghc/compiler/rename/RnIfaces.lhs +++ b/ghc/compiler/rename/RnIfaces.lhs @@ -1,11 +1,9 @@ % -% (c) The GRASP/AQUA Project, Glasgow University, 1992-1996 +% (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 % \section[RnIfaces]{Cacheing and Renaming of Interfaces} \begin{code} -#include "HsVersions.h" - module RnIfaces ( getInterfaceExports, getImportedInstDecls, @@ -19,58 +17,57 @@ module RnIfaces ( mkSearchPath ) where -IMP_Ubiq() -#if __GLASGOW_HASKELL__ >= 202 -import IO -#endif - +#include "HsVersions.h" -import CmdLineOpts ( opt_TyConPruning ) -import HsSyn ( HsDecl(..), TyDecl(..), ClassDecl(..), HsTyVar, HsExpr, Sig(..), HsType(..), - HsBinds(..), MonoBinds, DefaultDecl, ConDecl(..), ConDetails(..), BangType, IfaceSig(..), - FixityDecl(..), Fixity, Fake, InPat, InstDecl(..), SYN_IE(Version), HsIdInfo, - IE(..), NewOrData(..), hsDeclName +import CmdLineOpts ( opt_PruneTyDecls, opt_PruneInstDecls, + opt_D_show_rn_imports, opt_IgnoreIfacePragmas + ) +import HsSyn ( HsDecl(..), TyDecl(..), ClassDecl(..), InstDecl(..), IfaceSig(..), + HsType(..), ConDecl(..), IE(..), ConDetails(..), Sig(..), + hsDeclName ) -import HsPragmas ( noGenPragmas ) -import RdrHsSyn ( SYN_IE(RdrNameHsDecl), SYN_IE(RdrNameInstDecl), SYN_IE(RdrNameTyDecl), - RdrName, rdrNameOcc +import BasicTypes ( Version, NewOrData(..), IfaceFlavour(..) ) +import RdrHsSyn ( RdrNameHsDecl, RdrNameInstDecl, RdrNameTyDecl, + RdrName(..), rdrNameOcc ) -import RnEnv ( newGlobalName, lookupRn, addImplicitOccsRn, - availName, availNames, addAvailToNameSet, pprAvail +import RnEnv ( newImportedGlobalName, addImplicitOccsRn, + ifaceFlavour, availName, availNames, addAvailToNameSet ) import RnSource ( rnHsSigType ) import RnMonad -import RnHsSyn ( SYN_IE(RenamedHsDecl) ) -import ParseIface ( parseIface ) +import RnHsSyn ( RenamedHsDecl ) +import ParseIface ( parseIface, IfaceStuff(..) ) -import ErrUtils ( SYN_IE(Error), SYN_IE(Warning) ) -import FiniteMap ( FiniteMap, sizeFM, emptyFM, unitFM, delFromFM, +import FiniteMap ( FiniteMap, sizeFM, emptyFM, delFromFM, lookupFM, addToFM, addToFM_C, addListToFM, - fmToList, eltsFM + fmToList ) -import Name ( Name {-instance NamedThing-}, Provenance, OccName(..), - modAndOcc, occNameString, moduleString, pprModule, isLocallyDefined, - NameSet(..), emptyNameSet, unionNameSets, nameSetToList, - minusNameSet, mkNameSet, elemNameSet, nameUnique, - isWiredInName, maybeWiredInTyConName, maybeWiredInIdName, - NamedThing(..) +import Name ( Name {-instance NamedThing-}, OccName(..), + nameModule, moduleString, pprModule, isLocallyDefined, + isWiredInName, maybeWiredInTyConName, + maybeWiredInIdName, nameUnique, NamedThing(..) ) -import Id ( GenId, Id(..), idType, dataConTyCon, isDataCon ) +import NameSet +import Id ( idType, isDataConId_maybe ) +import DataCon ( dataConTyCon, dataConType ) import TyCon ( TyCon, tyConDataCons, isSynTyCon, getSynTyConDefn ) import Type ( namesOfType ) -import TyVar ( GenTyVar ) -import SrcLoc ( mkIfaceSrcLoc, SrcLoc ) -import PrelMods ( gHC__ ) -import PrelInfo ( cCallishTyKeys ) +import Var ( Id ) +import SrcLoc ( mkSrcLoc, SrcLoc ) +import PrelMods ( pREL_GHC ) +import PrelInfo ( cCallishTyKeys, thinAirModules ) import Bag -import Maybes ( MaybeErr(..), expectJust, maybeToBool ) +import Maybes ( MaybeErr(..), maybeToBool ) import ListSetOps ( unionLists ) -import Pretty -import PprStyle ( PprStyle(..) ) +import Outputable import Unique ( Unique ) -import Util ( pprPanic, pprTrace, Ord3(..) ) -import StringBuffer ( StringBuffer, hGetStringBuffer, freeStringBuffer ) +import StringBuffer ( StringBuffer, hGetStringBuffer ) +import FastString ( mkFastString ) import Outputable + +import IO ( isDoesNotExistError ) +import List ( nub ) + \end{code} @@ -82,12 +79,12 @@ import Outputable %********************************************************* \begin{code} -getRnStats :: [RenamedHsDecl] -> RnMG Doc +getRnStats :: [RenamedHsDecl] -> RnMG SDoc getRnStats all_decls = getIfacesRn `thenRn` \ ifaces -> let - Ifaces this_mod mod_vers_map export_envs decls_fm all_names imp_names unslurped_insts deferred_data_decls inst_mods = ifaces - n_mods = sizeFM mod_vers_map + Ifaces this_mod mod_map decls_fm all_names imp_names (unslurped_insts,_) deferred_data_decls inst_mods = ifaces + n_mods = sizeFM mod_map decls_imported = filter is_imported_decl all_decls decls_read = [decl | (name, (_, avail, decl)) <- fmToList decls_fm, @@ -127,12 +124,12 @@ is_imported_decl (ValD _) = False is_imported_decl decl = not (isLocallyDefined (hsDeclName decl)) count_decls decls - = -- pprTrace "count_decls" (ppr PprDebug decls + = -- pprTrace "count_decls" (ppr decls -- -- $$ -- text "=========" -- $$ - -- ppr PprDebug imported_decls + -- ppr imported_decls -- ) $ (class_decls, data_decls, abstract_data_decls, @@ -159,29 +156,32 @@ count_decls decls %********************************************************* \begin{code} -loadInterface :: Doc -> Module -> RnMG Ifaces -loadInterface doc_str load_mod - = getIfacesRn `thenRn` \ ifaces -> - let - Ifaces this_mod mod_vers_map export_envs decls all_names imp_names insts deferred_data_decls inst_mods = ifaces - in +loadInterface :: SDoc -> Module -> IfaceFlavour -> RnMG Ifaces +loadInterface doc_str load_mod as_source + = getIfacesRn `thenRn` \ ifaces -> + let + Ifaces this_mod mod_map decls + all_names imp_names (insts, tycls_names) + deferred_data_decls inst_mods = ifaces + in -- CHECK WHETHER WE HAVE IT ALREADY - if maybeToBool (lookupFM export_envs load_mod) - then - returnRn ifaces -- Already in the cache; don't re-read it - else + case lookupFM mod_map load_mod of { + Just (hif, _, _, _) | hif `as_good_as` as_source + -> -- Already in the cache; don't re-read it + returnRn ifaces ; + other -> -- READ THE MODULE IN - findAndReadIface doc_str load_mod `thenRn` \ read_result -> - case read_result of { + findAndReadIface doc_str load_mod as_source `thenRn` \ read_result -> + case read_result of { -- Check for not found Nothing -> -- Not found, so add an empty export env to the Ifaces map -- so that we don't look again let - new_export_envs = addToFM export_envs load_mod ([],[]) - new_ifaces = Ifaces this_mod mod_vers_map - new_export_envs - decls all_names imp_names insts deferred_data_decls inst_mods + new_mod_map = addToFM mod_map load_mod (HiFile, 0, [],[]) + new_ifaces = Ifaces this_mod new_mod_map + decls all_names imp_names (insts, tycls_names) + deferred_data_decls inst_mods in setIfacesRn new_ifaces `thenRn_` failWithRn new_ifaces (noIfaceErr load_mod) ; @@ -190,57 +190,84 @@ loadInterface doc_str load_mod Just (ParsedIface _ mod_vers usages exports rd_inst_mods fixs rd_decls rd_insts) -> -- LOAD IT INTO Ifaces - mapRn loadExport exports `thenRn` \ avails_s -> - foldlRn (loadDecl load_mod) decls rd_decls `thenRn` \ new_decls -> - foldlRn (loadInstDecl load_mod) insts rd_insts `thenRn` \ new_insts -> + -- NB: *first* we do loadDecl, so that the provenance of all the locally-defined + --- names is done correctly (notably, whether this is an .hi file or .hi-boot file). + -- If we do loadExport first the wrong info gets into the cache (unless we + -- explicitly tag each export which seems a bit of a bore) + foldlRn (loadDecl load_mod as_source) decls rd_decls `thenRn` \ new_decls -> + mapRn loadExport exports `thenRn` \ avails_s -> + foldlRn (loadInstDecl load_mod) insts rd_insts `thenRn` \ new_insts -> let - export_env = (concat avails_s, fixs) + mod_details = (as_source, mod_vers, concat avails_s, fixs) -- Exclude this module from the "special-inst" modules new_inst_mods = inst_mods `unionLists` (filter (/= this_mod) rd_inst_mods) new_ifaces = Ifaces this_mod - (addToFM mod_vers_map load_mod mod_vers) - (addToFM export_envs load_mod export_env) + (addToFM mod_map load_mod mod_details) new_decls all_names imp_names - new_insts + (new_insts, tycls_names) deferred_data_decls new_inst_mods in setIfacesRn new_ifaces `thenRn_` returnRn new_ifaces - } + }} + +as_good_as HiFile any = True +as_good_as any HiBootFile = True +as_good_as _ _ = False + loadExport :: ExportItem -> RnMG [AvailInfo] -loadExport (mod, entities) +loadExport (mod, hif, entities) = mapRn load_entity entities where - new_name occ = newGlobalName mod occ - --- The communcation between this little code fragment and the "entity" rule --- in ParseIface.y is a bit gruesome. The idea is that things which are --- destined to be AvailTCs show up as (occ, [non-empty-list]), whereas --- things destined to be Avails show up as (occ, []) + new_name occ = newImportedGlobalName mod occ hif - load_entity (occ, occs) + load_entity (Avail occ) + = new_name occ `thenRn` \ name -> + returnRn (Avail name) + load_entity (AvailTC occ occs) = new_name occ `thenRn` \ name -> - if null occs then - returnRn (Avail name) - else - mapRn new_name occs `thenRn` \ names -> - returnRn (AvailTC name names) + mapRn new_name occs `thenRn` \ names -> + returnRn (AvailTC name names) -loadDecl :: Module -> DeclsMap +loadDecl :: Module + -> IfaceFlavour + -> DeclsMap -> (Version, RdrNameHsDecl) -> RnMG DeclsMap -loadDecl mod decls_map (version, decl) +loadDecl mod as_source decls_map (version, decl) = getDeclBinders new_implicit_name decl `thenRn` \ avail -> returnRn (addListToFM decls_map - [(name,(version,avail,decl)) | name <- availNames avail] + [(name,(version,avail,decl')) | name <- availNames avail] ) where - new_implicit_name rdr_name loc = newGlobalName mod (rdrNameOcc rdr_name) + {- + If a signature decl is being loaded and we're ignoring interface pragmas, + toss away unfolding information. + + Also, if the signature is loaded from a module we're importing from source, + we do the same. This is to avoid situations when compiling a pair of mutually + recursive modules, peering at unfolding info in the interface file of the other, + e.g., you compile A, it looks at B's interface file and may as a result change + it's interface file. Hence, B is recompiled, maybe changing it's interface file, + which will the ufolding info used in A to become invalid. Simple way out is to + just ignore unfolding info. + -} + decl' = + case decl of + SigD (IfaceSig name tp ls loc) | from_hi_boot || opt_IgnoreIfacePragmas -> + SigD (IfaceSig name tp [] loc) + _ -> decl + + new_implicit_name rdr_name loc = newImportedGlobalName mod (rdrNameOcc rdr_name) as_source + + from_hi_boot = case as_source of + HiBootFile -> True + other -> False loadInstDecl :: Module -> Bag IfaceInst @@ -260,15 +287,16 @@ loadInstDecl mod_name insts decl@(InstDecl inst_ty binds uprags dfun_name src_lo let munged_inst_ty = case inst_ty of HsForAllTy tvs cxt ty -> HsForAllTy tvs [] ty - HsPreForAllTy cxt ty -> HsPreForAllTy [] ty other -> inst_ty in -- We find the gates by renaming the instance type with in a -- and returning the occurrence pool. - initRnMS emptyRnEnv mod_name InterfaceMode ( - findOccurrencesRn (rnHsSigType (\sty -> text "an instance decl") munged_inst_ty) + initRnMS emptyRnEnv mod_name vanillaInterfaceMode ( + findOccurrencesRn (rnHsSigType (text "an instance decl") munged_inst_ty) ) `thenRn` \ gate_names -> returnRn (((mod_name, decl), gate_names) `consBag` insts) + +vanillaInterfaceMode = InterfaceMode Compulsory (\_ -> False) \end{code} @@ -281,11 +309,13 @@ loadInstDecl mod_name insts decl@(InstDecl inst_ty binds uprags dfun_name src_lo \begin{code} checkUpToDate :: Module -> RnMG Bool -- True <=> no need to recompile checkUpToDate mod_name - = findAndReadIface doc_str mod_name `thenRn` \ read_result -> + = findAndReadIface doc_str mod_name HiFile `thenRn` \ read_result -> + + -- CHECK WHETHER WE HAVE IT ALREADY case read_result of Nothing -> -- Old interface file not found, so we'd better bail out traceRn (sep [ptext SLIT("Didnt find old iface"), - pprModule PprDebug mod_name]) `thenRn_` + pprModule mod_name]) `thenRn_` returnRn False Just (ParsedIface _ _ usages _ _ _ _ _) @@ -293,50 +323,63 @@ checkUpToDate mod_name checkModUsage usages where -- Only look in current directory, with suffix .hi - doc_str = sep [ptext SLIT("Need usage info from"), pprModule PprDebug mod_name] + doc_str = sep [ptext SLIT("need usage info from"), pprModule mod_name] checkModUsage [] = returnRn True -- Yes! Everything is up to date! -checkModUsage ((mod, old_mod_vers, old_local_vers) : rest) - = loadInterface doc_str mod `thenRn` \ ifaces -> +checkModUsage ((mod, hif, old_mod_vers, whats_imported) : rest) + = loadInterface doc_str mod hif `thenRn` \ ifaces -> let - Ifaces _ mod_vers _ decls _ _ _ _ _ = ifaces - maybe_new_mod_vers = lookupFM mod_vers mod - Just new_mod_vers = maybe_new_mod_vers + Ifaces _ mod_map decls _ _ _ _ _ = ifaces + maybe_new_mod_vers = lookupFM mod_map mod + Just (_, new_mod_vers, _, _) = maybe_new_mod_vers in -- If we can't find a version number for the old module then -- bail out saying things aren't up to date if not (maybeToBool maybe_new_mod_vers) then + traceRn (sep [ptext SLIT("Can't find version number for module"), pprModule mod]) `thenRn_` returnRn False else -- If the module version hasn't changed, just move on if new_mod_vers == old_mod_vers then - traceRn (sep [ptext SLIT("Module version unchanged:"), pprModule PprDebug mod]) `thenRn_` + traceRn (sep [ptext SLIT("Module version unchanged:"), pprModule mod]) `thenRn_` checkModUsage rest else - traceRn (sep [ptext SLIT("Module version has changed:"), pprModule PprDebug mod]) `thenRn_` + traceRn (sep [ptext SLIT("Module version has changed:"), pprModule mod]) `thenRn_` + + -- Module version changed, so check entities inside + + -- If the usage info wants to say "I imported everything from this module" + -- it does so by making whats_imported equal to Everything + -- In that case, we must recompile + case whats_imported of { + Everything -> traceRn (ptext SLIT("...and I needed the whole module")) `thenRn_` + returnRn False; -- Bale out - -- New module version, so check entities inside + Specifically old_local_vers -> + + -- Non-empty usage list, so check item by item checkEntityUsage mod decls old_local_vers `thenRn` \ up_to_date -> if up_to_date then traceRn (ptext SLIT("...but the bits I use haven't.")) `thenRn_` checkModUsage rest -- This one's ok, so check the rest else returnRn False -- This one failed, so just bail out now + } where - doc_str = sep [ptext SLIT("need version info for"), pprModule PprDebug mod] + doc_str = sep [ptext SLIT("need version info for"), pprModule mod] checkEntityUsage mod decls [] = returnRn True -- Yes! All up to date! checkEntityUsage mod decls ((occ_name,old_vers) : rest) - = newGlobalName mod occ_name `thenRn` \ name -> + = newImportedGlobalName mod occ_name HiFile `thenRn` \ name -> case lookupFM decls name of Nothing -> -- We used it before, but it ain't there now - traceRn (sep [ptext SLIT("...and this no longer exported:"), ppr PprDebug name]) `thenRn_` + putDocRn (sep [ptext SLIT("No longer exported:"), ppr name]) `thenRn_` returnRn False Just (new_vers,_,_) -- It's there, but is it up to date? @@ -346,7 +389,7 @@ checkEntityUsage mod decls ((occ_name,old_vers) : rest) | otherwise -- Out of date, so bale out - -> traceRn (sep [ptext SLIT("...and this is out of date:"), ppr PprDebug name]) `thenRn_` + -> putDocRn (sep [ptext SLIT("Out of date:"), ppr name]) `thenRn_` returnRn False \end{code} @@ -358,57 +401,59 @@ checkEntityUsage mod decls ((occ_name,old_vers) : rest) %********************************************************* \begin{code} -importDecl :: Name -> Necessity -> RnMG (Maybe RdrNameHsDecl) +importDecl :: Occurrence -> RnSMode -> RnMG (Maybe RdrNameHsDecl) -- Returns Nothing for a wired-in or already-slurped decl -importDecl name necessity +importDecl (name, loc) mode = checkSlurped name `thenRn` \ already_slurped -> if already_slurped then - -- traceRn (sep [text "Already slurped:", ppr PprDebug name]) `thenRn_` +-- traceRn (sep [text "Already slurped:", ppr name]) `thenRn_` returnRn Nothing -- Already dealt with else if isWiredInName name then - getWiredInDecl name + getWiredInDecl name mode else getIfacesRn `thenRn` \ ifaces -> let - Ifaces this_mod _ _ _ _ _ _ _ _ = ifaces - (mod,_) = modAndOcc name + Ifaces this_mod _ _ _ _ _ _ _ = ifaces + mod = nameModule name in if mod == this_mod then -- Don't bring in decls from - pprTrace "importDecl wierdness:" (ppr PprDebug name) $ + addWarnRn (importDeclWarn mod name loc) `thenRn_` +-- pprTrace "importDecl wierdness:" (ppr name) $ returnRn Nothing -- the renamed module's own interface file -- else - getNonWiredInDecl name necessity + getNonWiredInDecl name loc mode \end{code} \begin{code} -getNonWiredInDecl :: Name -> Necessity -> RnMG (Maybe RdrNameHsDecl) -getNonWiredInDecl needed_name necessity - = traceRn doc_str `thenRn_` - loadInterface doc_str mod `thenRn` \ (Ifaces _ _ _ decls _ _ _ _ _) -> +getNonWiredInDecl :: Name -> SrcLoc -> RnSMode -> RnMG (Maybe RdrNameHsDecl) +getNonWiredInDecl needed_name loc mode + = traceRn doc_str `thenRn_` + loadInterface doc_str mod (ifaceFlavour needed_name) `thenRn` \ (Ifaces _ _ decls _ _ _ _ _) -> case lookupFM decls needed_name of -- Special case for data/newtype type declarations Just (version, avail, TyD ty_decl) | is_data_or_newtype ty_decl -> getNonWiredDataDecl needed_name version avail ty_decl `thenRn` \ (avail', maybe_decl) -> - recordSlurp (Just version) avail' `thenRn_` + recordSlurp (Just version) necessity avail' `thenRn_` returnRn maybe_decl Just (version,avail,decl) - -> recordSlurp (Just version) avail `thenRn_` + -> recordSlurp (Just version) necessity avail `thenRn_` returnRn (Just decl) Nothing -> -- Can happen legitimately for "Optional" occurrences case necessity of { - Optional -> addWarnRn (getDeclWarn needed_name); - other -> addErrRn (getDeclErr needed_name) + Optional -> addWarnRn (getDeclWarn needed_name loc); + other -> addErrRn (getDeclErr needed_name loc) } `thenRn_` returnRn Nothing where - doc_str = sep [ptext SLIT("Need decl for"), ppr PprDebug needed_name] - (mod,_) = modAndOcc needed_name + necessity = modeToNecessity mode + doc_str = sep [ptext SLIT("need decl for"), ppr needed_name, ptext SLIT("needed at"), ppr loc] + mod = nameModule needed_name is_data_or_newtype (TyData _ _ _ _ _ _ _ _) = True is_data_or_newtype other = False @@ -434,9 +479,10 @@ All this is necessary so that we know all types that are "in play", so that we know just what instances to bring into scope. \begin{code} -getWiredInDecl name - = get_wired `thenRn` \ avail -> - recordSlurp Nothing avail `thenRn_` +getWiredInDecl name mode + = initRnMS emptyRnEnv mod_name new_mode + get_wired `thenRn` \ avail -> + recordSlurp Nothing necessity avail `thenRn_` -- Force in the home module in case it has instance decls for -- the thing we are interested in. @@ -459,40 +505,48 @@ getWiredInDecl name let main_name = availName avail main_is_tc = case avail of { AvailTC _ _ -> True; Avail _ -> False } - (mod,_) = modAndOcc main_name - doc_str = sep [ptext SLIT("Need home module for wired in thing"), ppr PprDebug name] + mod = nameModule main_name + doc_str = sep [ptext SLIT("need home module for wired in thing"), ppr name] in - (if not main_is_tc || mod == gHC__ then + (if not main_is_tc || mod == pREL_GHC then returnRn () else - loadInterface doc_str mod `thenRn_` + loadInterface doc_str mod (ifaceFlavour main_name) `thenRn_` returnRn () - ) `thenRn_` + ) `thenRn_` returnRn Nothing -- No declaration to process further where + necessity = modeToNecessity mode + new_mode = case mode of + InterfaceMode _ _ -> mode + SourceMode -> vanillaInterfaceMode get_wired | is_tycon -- ... a type constructor = get_wired_tycon the_tycon - | (isDataCon the_id) -- ... a wired-in data constructor - = get_wired_tycon (dataConTyCon the_id) + | maybeToBool maybe_data_con -- ... a wired-in data constructor + = get_wired_tycon (dataConTyCon data_con) | otherwise -- ... a wired-in non data-constructor = get_wired_id the_id + mod_name = nameModule name maybe_wired_in_tycon = maybeWiredInTyConName name is_tycon = maybeToBool maybe_wired_in_tycon maybe_wired_in_id = maybeWiredInIdName name Just the_tycon = maybe_wired_in_tycon Just the_id = maybe_wired_in_id + maybe_data_con = isDataConId_maybe the_id + Just data_con = maybe_data_con get_wired_id id - = addImplicitOccsRn (nameSetToList id_mentioned) `thenRn_` + = addImplicitOccsRn id_mentions `thenRn_` returnRn (Avail (getName id)) where - id_mentioned = namesOfType (idType id) + id_mentions = nameSetToList (namesOfType ty) + ty = idType id get_wired_tycon tycon | isSynTyCon tycon @@ -510,7 +564,7 @@ get_wired_tycon tycon where tycon_name = getName tycon data_cons = tyConDataCons tycon - mentioned = foldr (unionNameSets . namesOfType . idType) emptyNameSet data_cons + mentioned = foldr (unionNameSets . namesOfType . dataConType) emptyNameSet data_cons \end{code} @@ -522,19 +576,19 @@ get_wired_tycon tycon %********************************************************* \begin{code} -getInterfaceExports :: Module -> RnMG (Avails, [(OccName,Fixity)]) -getInterfaceExports mod - = loadInterface doc_str mod `thenRn` \ (Ifaces _ _ export_envs _ _ _ _ _ _) -> - case lookupFM export_envs mod of +getInterfaceExports :: Module -> IfaceFlavour -> RnMG (Avails, [(OccName,Fixity)]) +getInterfaceExports mod as_source + = loadInterface doc_str mod as_source `thenRn` \ (Ifaces _ mod_map _ _ _ _ _ _) -> + case lookupFM mod_map mod of Nothing -> -- Not there; it must be that the interface file wasn't found; -- the error will have been reported already. -- (Actually loadInterface should put the empty export env in there -- anyway, but this does no harm.) returnRn ([],[]) - Just stuff -> returnRn stuff + Just (_, _, avails, fixities) -> returnRn (avails, fixities) where - doc_str = sep [pprModule PprDebug mod, ptext SLIT("is directly imported")] + doc_str = sep [pprModule mod, ptext SLIT("is directly imported")] \end{code} @@ -565,15 +619,24 @@ getNonWiredDataDecl needed_name avail@(AvailTC tycon_name _) ty_decl@(TyData new_or_data context tycon tyvars condecls derivings pragmas src_loc) | needed_name == tycon_name - && opt_TyConPruning - && not (nameUnique needed_name `elem` cCallishTyKeys) -- Hack! Don't prune these tycons whose constructors - -- the desugarer must be able to see when desugaring - -- a CCall. Ugh! + && opt_PruneTyDecls + -- don't prune newtypes, as the code generator may + -- want to peer inside a newtype type constructor + -- (ClosureInfo.fun_result_ty is the culprit.) + && not (new_or_data == NewType) + && not (nameUnique needed_name `elem` cCallishTyKeys) + -- Hack! Don't prune these tycons whose constructors + -- the desugarer must be able to see when desugaring + -- a CCall. Ugh! + = -- Need the type constructor; so put it in the deferred set for now getIfacesRn `thenRn` \ ifaces -> let - Ifaces this_mod mod_vers_map export_envs decls_fm slurped_names imp_names unslurped_insts deferred_data_decls inst_mods = ifaces - new_ifaces = Ifaces this_mod mod_vers_map export_envs decls_fm slurped_names imp_names unslurped_insts new_deferred_data_decls inst_mods + Ifaces this_mod mod_map decls_fm slurped_names imp_names + unslurped_insts deferred_data_decls inst_mods = ifaces + + new_ifaces = Ifaces this_mod mod_map decls_fm slurped_names imp_names + unslurped_insts new_deferred_data_decls inst_mods no_constr_ty_decl = TyData new_or_data [] tycon tyvars [] derivings pragmas src_loc new_deferred_data_decls = addToFM deferred_data_decls tycon_name no_constr_ty_decl @@ -590,8 +653,11 @@ getNonWiredDataDecl needed_name = -- Need a data constructor, so delete the data decl from the deferred set if it's there getIfacesRn `thenRn` \ ifaces -> let - Ifaces this_mod mod_vers_map export_envs decls_fm slurped_names imp_names unslurped_insts deferred_data_decls inst_mods = ifaces - new_ifaces = Ifaces this_mod mod_vers_map export_envs decls_fm slurped_names imp_names unslurped_insts new_deferred_data_decls inst_mods + Ifaces this_mod mod_map decls_fm slurped_names imp_names + unslurped_insts deferred_data_decls inst_mods = ifaces + + new_ifaces = Ifaces this_mod mod_map decls_fm slurped_names imp_names + unslurped_insts new_deferred_data_decls inst_mods new_deferred_data_decls = delFromFM deferred_data_decls tycon_name in @@ -602,11 +668,11 @@ getNonWiredDataDecl needed_name \begin{code} getDeferredDataDecls :: RnMG [(Name, RdrNameTyDecl)] getDeferredDataDecls - = getIfacesRn `thenRn` \ (Ifaces _ _ _ _ _ _ _ deferred_data_decls _) -> + = getIfacesRn `thenRn` \ (Ifaces _ _ _ _ _ _ deferred_data_decls _) -> let deferred_list = fmToList deferred_data_decls trace_msg = hang (text "Slurping abstract data/newtype decls for: ") - 4 (ppr PprDebug (map fst deferred_list)) + 4 (ppr (map fst deferred_list)) in traceRn trace_msg `thenRn_` returnRn deferred_list @@ -631,7 +697,7 @@ getImportedInstDecls -- removing them from the bag kept in Ifaces getIfacesRn `thenRn` \ ifaces -> let - Ifaces this_mod mod_vers export_envs decls slurped_names imp_names insts deferred_data_decls inst_mods = ifaces + Ifaces this_mod mod_map decls slurped_names imp_names (insts, tycls_names) deferred_data_decls inst_mods = ifaces -- An instance decl is ungated if all its gates have been slurped select_ungated :: IfaceInst -- A gated inst decl @@ -647,27 +713,29 @@ getImportedInstDecls | otherwise = (ungated_decls, (decl, remaining_gates) : gated_decls) where - remaining_gates = filter (not . (`elemNameSet` slurped_names)) gates + remaining_gates = filter (not . (`elemNameSet` tycls_names)) gates (un_gated_insts, still_gated_insts) = foldrBag select_ungated ([], []) insts - new_ifaces = Ifaces this_mod mod_vers export_envs decls slurped_names imp_names - (listToBag still_gated_insts) + new_ifaces = Ifaces this_mod mod_map decls slurped_names imp_names + ((listToBag still_gated_insts), tycls_names) + -- NB: don't throw away tycls_names; we may comre across more instance decls deferred_data_decls inst_mods in + traceRn (sep [text "getInstDecls:", fsep (map ppr (nameSetToList tycls_names))]) `thenRn_` setIfacesRn new_ifaces `thenRn_` returnRn un_gated_insts where - load_it mod = loadInterface (doc_str mod) mod - doc_str mod = sep [pprModule PprDebug mod, ptext SLIT("is a special-instance module")] + load_it mod = loadInterface (doc_str mod) mod HiFile + doc_str mod = sep [pprModule mod, ptext SLIT("is a special-instance module")] getSpecialInstModules :: RnMG [Module] getSpecialInstModules = getIfacesRn `thenRn` \ ifaces -> let - Ifaces _ _ _ _ _ _ _ _ inst_mods = ifaces + Ifaces _ _ _ _ _ _ _ inst_mods = ifaces in returnRn inst_mods \end{code} @@ -724,64 +792,82 @@ getImportVersions :: Module -- Name of this module getImportVersions this_mod exports = getIfacesRn `thenRn` \ ifaces -> let - Ifaces _ mod_versions_map _ _ _ imp_names _ _ _ = ifaces - mod_version mod = expectJust "import_versions" (lookupFM mod_versions_map mod) + Ifaces _ mod_map _ _ imp_names _ _ _ = ifaces -- mv_map groups together all the things imported from a particular module. - mv_map, mv_map_mod :: FiniteMap Module [LocalVersion Name] + mv_map, mv_map_mod :: FiniteMap Module (WhatsImported Name) mv_map_mod = foldl add_mod emptyFM export_mods -- mv_map_mod records all the modules that have a "module M" - -- in this module's export list + -- in this module's export list with an "Everything" mv_map = foldl add_mv mv_map_mod imp_names -- mv_map adds the version numbers of things exported individually - in - returnRn [ (mod, mod_version mod, local_versions) - | (mod, local_versions) <- fmToList mv_map - ] + mk_version_info (mod, local_versions) + = case lookupFM mod_map mod of + Just (hif, version, _, _) -> (mod, hif, version, local_versions) + in + returnRn (map mk_version_info (fmToList mv_map)) where export_mods = case exports of Nothing -> [] Just es -> [mod | IEModuleContents mod <- es, mod /= this_mod] add_mv mv_map v@(name, version) - = addToFM_C (\ ls _ -> (v:ls)) mv_map mod [v] + = addToFM_C add_item mv_map mod (Specifically [v]) where - (mod,_) = modAndOcc name + mod = nameModule name + + add_item Everything _ = Everything + add_item (Specifically xs) _ = Specifically (v:xs) - add_mod mv_map mod = addToFM mv_map mod [] + add_mod mv_map mod = addToFM mv_map mod Everything \end{code} \begin{code} checkSlurped name - = getIfacesRn `thenRn` \ (Ifaces _ _ _ _ slurped_names _ _ _ _) -> + = getIfacesRn `thenRn` \ (Ifaces _ _ _ slurped_names _ _ _ _) -> returnRn (name `elemNameSet` slurped_names) getSlurpedNames :: RnMG NameSet getSlurpedNames = getIfacesRn `thenRn` \ ifaces -> let - Ifaces _ _ _ _ slurped_names _ _ _ _ = ifaces + Ifaces _ _ _ slurped_names _ _ _ _ = ifaces in returnRn slurped_names -recordSlurp maybe_version avail - = -- traceRn (sep [text "Record slurp:", pprAvail PprDebug avail]) `thenRn_` +recordSlurp maybe_version necessity avail + = {- traceRn (hsep [text "Record slurp:", pprAvail avail, + -- NB PprForDebug prints export flag, which is too + -- strict; it's a knot-tied thing in RnNames + case necessity of {Compulsory -> text "comp"; Optional -> text "opt" } ]) `thenRn_` + -} getIfacesRn `thenRn` \ ifaces -> let - Ifaces this_mod mod_vers export_envs decls slurped_names imp_names insts deferred_data_decls inst_mods = ifaces + Ifaces this_mod mod_map decls slurped_names imp_names + (insts, tycls_names) deferred_data_decls inst_mods = ifaces + new_slurped_names = addAvailToNameSet slurped_names avail new_imp_names = case maybe_version of - Just version -> (availName avail, version) : imp_names + Just version -> (availName avail, version) : imp_names Nothing -> imp_names - new_ifaces = Ifaces this_mod mod_vers export_envs decls + -- Add to the names that will let in instance declarations; + -- but only (a) if it's a type/class + -- (b) if it's compulsory (unless the test flag opt_PruneInstDecls is off) + new_tycls_names = case avail of + AvailTC tc _ | not opt_PruneInstDecls || + case necessity of {Optional -> False; Compulsory -> True } + -> tycls_names `addOneToNameSet` tc + otherwise -> tycls_names + + new_ifaces = Ifaces this_mod mod_map decls new_slurped_names new_imp_names - insts + (insts, new_tycls_names) deferred_data_decls inst_mods in @@ -803,40 +889,48 @@ It doesn't deal with source-code specific things: ValD, DefD. They are handled by the sourc-code specific stuff in RnNames. \begin{code} -getDeclBinders :: (RdrName -> SrcLoc -> RnMG Name) -- New-name function +getDeclBinders :: (RdrName -> SrcLoc -> RnMG Name) -- New-name function -> RdrNameHsDecl -> RnMG AvailInfo getDeclBinders new_name (TyD (TyData _ _ tycon _ condecls _ _ src_loc)) = new_name tycon src_loc `thenRn` \ tycon_name -> getConFieldNames new_name condecls `thenRn` \ sub_names -> - returnRn (AvailTC tycon_name (tycon_name : sub_names)) + returnRn (AvailTC tycon_name (tycon_name : nub sub_names)) + -- The "nub" is because getConFieldNames can legitimately return duplicates, + -- when a record declaration has the same field in multiple constructors getDeclBinders new_name (TyD (TySynonym tycon _ _ src_loc)) = new_name tycon src_loc `thenRn` \ tycon_name -> returnRn (AvailTC tycon_name [tycon_name]) -getDeclBinders new_name (ClD (ClassDecl _ cname _ sigs _ _ src_loc)) +getDeclBinders new_name (ClD (ClassDecl _ cname _ sigs _ _ tname dname src_loc)) = new_name cname src_loc `thenRn` \ class_name -> + new_name dname src_loc `thenRn` \ datacon_name -> + new_name tname src_loc `thenRn` \ tycon_name -> + + -- Record the names for the class ops mapRn (getClassOpNames new_name) sigs `thenRn` \ sub_names -> - returnRn (AvailTC class_name (class_name : sub_names)) + + returnRn (AvailTC class_name (class_name : datacon_name : tycon_name : sub_names)) getDeclBinders new_name (SigD (IfaceSig var ty prags src_loc)) = new_name var src_loc `thenRn` \ var_name -> returnRn (Avail var_name) +getDeclBinders new_name (ForD _) = returnRn NotAvailable getDeclBinders new_name (DefD _) = returnRn NotAvailable getDeclBinders new_name (InstD _) = returnRn NotAvailable ---------------- -getConFieldNames new_name (ConDecl con _ (RecCon fielddecls) src_loc : rest) +getConFieldNames new_name (ConDecl con _ _ (RecCon fielddecls) src_loc : rest) = mapRn (\n -> new_name n src_loc) (con:fields) `thenRn` \ cfs -> getConFieldNames new_name rest `thenRn` \ ns -> returnRn (cfs ++ ns) where fields = concat (map fst fielddecls) -getConFieldNames new_name (ConDecl con _ _ src_loc : rest) +getConFieldNames new_name (ConDecl con _ _ _ src_loc : rest) = new_name con src_loc `thenRn` \ n -> getConFieldNames new_name rest `thenRn` \ ns -> returnRn (n:ns) @@ -854,67 +948,79 @@ getClassOpNames new_name (ClassOpSig op _ _ src_loc) = new_name op src_loc %********************************************************* \begin{code} -findAndReadIface :: Doc -> Module -> RnMG (Maybe ParsedIface) +findAndReadIface :: SDoc -> Module + -> IfaceFlavour + -> RnMG (Maybe ParsedIface) -- Nothing <=> file not found, or unreadable, or illegible -- Just x <=> successfully found and parsed -findAndReadIface doc_str filename +findAndReadIface doc_str mod_name as_source = traceRn trace_msg `thenRn_` - getSearchPathRn `thenRn` \ dirs -> - try dirs dirs + -- we keep two maps for interface files, + -- one for 'normal' ones, the other for .hi-boot files, + -- hence the need to signal which kind we're interested. + getModuleHiMap as_source `thenRn` \ himap -> + case (lookupFM himap (moduleString mod_name)) of + -- Found the file + Just fpath -> readIface fpath + -- Hack alert! When compiling PrelBase we have to load the + -- decls for packCString# and friends; they are 'thin-air' Ids + -- (see PrelInfo.lhs). So if we don't find the HiFile we quietly + -- look for a .hi-boot file instead, and use that + Nothing | thinAirLoop mod_name as_source + -> findAndReadIface doc_str mod_name HiBootFile + | otherwise + -> traceRn (ptext SLIT("...failed")) `thenRn_` + returnRn Nothing where - trace_msg = hang (hcat [ptext SLIT("Reading interface for "), - ptext filename, semi]) - 4 (hcat [ptext SLIT("reason: "), doc_str]) - - try all_dirs [] = traceRn (ptext SLIT("...failed")) `thenRn_` - returnRn Nothing - - try all_dirs ((dir,hisuf):dirs) - = readIface file_path `thenRn` \ read_result -> - case read_result of - Nothing -> try all_dirs dirs - Just iface -> traceRn (ptext SLIT("...done")) `thenRn_` - returnRn (Just iface) - where - file_path = dir ++ "/" ++ moduleString filename ++ hisuf + thinAirLoop mod_name HiFile = mod_name `elem` thinAirModules + thinAirLoop mod_name hif = False + + trace_msg = sep [hsep [ptext SLIT("Reading"), + case as_source of { HiBootFile -> ptext SLIT("[boot]"); other -> empty}, + ptext SLIT("interface for"), + ptext mod_name <> semi], + nest 4 (ptext SLIT("reason:") <+> doc_str)] \end{code} -@readIface@ trys just one file. +@readIface@ tries just the one file. \begin{code} readIface :: String -> RnMG (Maybe ParsedIface) -- Nothing <=> file not found, or unreadable, or illegible -- Just x <=> successfully found and parsed readIface file_path - = ioToRnMG (hGetStringBuffer file_path) `thenRn` \ read_result -> ---OLD: = ioToRnMG (readFile file_path) `thenRn` \ read_result -> + = ioToRnMG (hGetStringBuffer file_path) `thenRn` \ read_result -> case read_result of - Right contents -> case parseIface contents of - Failed err -> --ioToRnMG (freeStringBuffer contents) `thenRn` \ _ -> - failWithRn Nothing err - Succeeded iface -> --ioToRnMG (freeStringBuffer contents) `thenRn` \ _ -> - returnRn (Just iface) + Right contents -> + case parseIface contents (mkSrcLoc (mkFastString file_path) 1) of + Failed err -> failWithRn Nothing err + Succeeded (PIface iface) -> + if opt_D_show_rn_imports then + putDocRn (hcat[ptext SLIT("Read "), text file_path]) `thenRn_` + returnRn (Just iface) + else + returnRn (Just iface) -#if __GLASGOW_HASKELL__ >= 202 Left err -> if isDoesNotExistError err then returnRn Nothing else failWithRn Nothing (cannaeReadFile file_path err) -#else /* 2.01 and 0.2x */ - Left (NoSuchThing _) -> returnRn Nothing - - Left err -> failWithRn Nothing - (cannaeReadFile file_path err) -#endif - \end{code} -mkSearchPath takes a string consisting of a colon-separated list of directories and corresponding -suffixes, and turns it into a list of (directory, suffix) pairs. For example: +%********************************************************* +%* * +\subsection{Utils} +%* * +%********************************************************* + +@mkSearchPath@ takes a string consisting of a colon-separated list +of directories and corresponding suffixes, and turns it into a list +of (directory, suffix) pairs. For example: \begin{verbatim} - mkSearchPath "foo%.hi:.%.p_hi:baz%.mc_hi" = [("foo",".hi"),( ".", ".p_hi"), ("baz",".mc_hi")] + mkSearchPath "foo%.hi:.%.p_hi:baz%.mc_hi" + = [("foo",".hi"),( ".", ".p_hi"), ("baz",".mc_hi")] \begin{verbatim} \begin{code} @@ -933,22 +1039,36 @@ mkSearchPath (Just s) \end{code} %********************************************************* -%* * +%* * \subsection{Errors} -%* * +%* * %********************************************************* \begin{code} -noIfaceErr filename sty - = hcat [ptext SLIT("Could not find valid interface file "), quotes (pprModule sty filename)] --- , text " in"]) 4 (vcat (map text dirs)) - -cannaeReadFile file err sty - = hcat [ptext SLIT("Failed in reading file: "), text file, ptext SLIT("; error="), text (show err)] - -getDeclErr name sty - = sep [ptext SLIT("Failed to find interface decl for"), ppr sty name] +noIfaceErr filename + = hcat [ptext SLIT("Could not find valid interface file "), + quotes (pprModule filename)] + +cannaeReadFile file err + = hcat [ptext SLIT("Failed in reading file: "), + text file, + ptext SLIT("; error="), + text (show err)] + +getDeclErr name loc + = sep [ptext SLIT("Failed to find interface decl for"), + quotes (ppr name), ptext SLIT("needed at"), ppr loc] + +getDeclWarn name loc + = sep [ptext SLIT("Failed to find (optional) interface decl for"), + quotes (ppr name), ptext SLIT("desired at"), ppr loc] + +importDeclWarn mod name loc + = sep [ptext SLIT("Compiler tried to import decl from interface file with same name as module."), + ptext SLIT("(possible cause: module name clashes with interface file already in scope.)") + ] $$ + hsep [ptext SLIT("Interface:"), quotes (pprModule mod), comma, ptext SLIT("name:"), quotes (ppr name), + comma, ptext SLIT("desired at:"), ppr loc + ] -getDeclWarn name sty - = sep [ptext SLIT("Warning: failed to find (optional) interface decl for"), ppr sty name] \end{code}