X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMkIface.lhs;h=a77ce516bedd746d88191ffbd788dccb33cfaf6f;hb=ec46629d18a135196fb3ff82794587043d839a27;hp=c837f4cbbbf14d95798828be962c3ad7bcf16e14;hpb=156d91339295539a2b3461efc1ac8c83f29d83f0;p=ghc-hetmet.git diff --git a/ghc/compiler/main/MkIface.lhs b/ghc/compiler/main/MkIface.lhs index c837f4c..a77ce51 100644 --- a/ghc/compiler/main/MkIface.lhs +++ b/ghc/compiler/main/MkIface.lhs @@ -15,50 +15,46 @@ import HsSyn import HsCore ( HsIdInfo(..), UfExpr(..), toUfExpr, toUfBndr ) import HsTypes ( toHsTyVars ) import BasicTypes ( Fixity(..), NewOrData(..), - Version, initialVersion, bumpVersion, isLoopBreaker + Version, initialVersion, bumpVersion, ) import RnMonad import RnHsSyn ( RenamedInstDecl, RenamedTyClDecl ) import TcHsSyn ( TypecheckedRuleDecl ) -import HscTypes ( VersionInfo(..), IfaceDecls(..), ModIface(..), ModDetails(..), - TyThing(..), DFunId, TypeEnv, isTyClThing, Avails, +import HscTypes ( VersionInfo(..), ModIface(..), ModDetails(..), + IfaceDecls, mkIfaceDecls, dcl_tycl, dcl_rules, dcl_insts, + TyThing(..), DFunId, TypeEnv, Avails, WhatsImported(..), GenAvailInfo(..), - ImportVersion, AvailInfo, Deprecations(..), - ModuleLocation(..) + ImportVersion, AvailInfo, Deprecations(..), + extendTypeEnvList ) import CmdLineOpts -import Id ( Id, idType, idInfo, omitIfaceSigForId, isUserExportedId, hasNoBinding, - idSpecialisation, idName, setIdInfo +import Id ( idType, idInfo, isImplicitId, isDictFunId, + idSpecialisation, isLocalId, idName, hasNoBinding ) import Var ( isId ) import VarSet -import DataCon ( StrictnessMark(..), dataConSig, dataConFieldLabels, dataConStrictMarks ) +import DataCon ( StrictnessMark(..), dataConId, dataConSig, dataConFieldLabels, dataConStrictMarks ) import IdInfo -- Lots -import CoreSyn ( CoreExpr, CoreBind, Bind(..), CoreRule(..), IdCoreRule, - isBuiltinRule, rulesRules, rulesRhsFreeVars, emptyCoreRules, - bindersOfBinds - ) -import CoreFVs ( exprSomeFreeVars, ruleSomeLhsFreeVars, ruleSomeFreeVars ) -import CoreUnfold ( okToUnfoldInHiFile, mkTopUnfolding, neverUnfold, unfoldingTemplate, noUnfolding ) -import Name ( isLocallyDefined, getName, - Name, NamedThing(..), - plusNameEnv, lookupNameEnv, emptyNameEnv, mkNameEnv, - extendNameEnv, lookupNameEnv_NF, nameEnvElts +import CoreSyn ( CoreBind, CoreRule(..), IdCoreRule, + isBuiltinRule, rulesRules, + bindersOf, bindersOfBinds ) +import CoreFVs ( ruleSomeLhsFreeVars ) +import CoreUnfold ( neverUnfold, unfoldingTemplate ) +import Name ( getName, nameModule, Name, NamedThing(..) ) +import Name -- Env import OccName ( pprOccName ) -import TyCon ( TyCon, getSynTyConDefn, isSynTyCon, isNewTyCon, isAlgTyCon, - tyConTheta, tyConTyVars, tyConDataCons, tyConFamilySize +import TyCon ( TyCon, getSynTyConDefn, isSynTyCon, isNewTyCon, isAlgTyCon, tyConGenIds, + tyConTheta, tyConTyVars, tyConDataCons, tyConFamilySize, isClassTyCon ) -import Class ( classExtraBigSig, DefMeth(..) ) +import Class ( classExtraBigSig, classTyCon, DefMeth(..) ) import FieldLabel ( fieldLabelType ) import Type ( splitSigmaTy, tidyTopType, deNoteType ) import SrcLoc ( noSrcLoc ) import Outputable -import Module ( ModuleName, moduleName ) -import Finder ( findModule ) +import Module ( ModuleName ) -import List ( partition ) import IO ( IOMode(..), openFile, hClose ) \end{code} @@ -70,102 +66,142 @@ import IO ( IOMode(..), openFile, hClose ) %************************************************************************ \begin{code} -mkModDetails :: TypeEnv -> [DFunId] -- From typechecker - -> [CoreBind] -> [Id] -- Final bindings, plus the top-level Ids from the - -- code generator; they have authoritative arity info - -> [IdCoreRule] -- Tidy orphan rules +mkModDetails :: TypeEnv -- From typechecker + -> [CoreBind] -- Final bindings + -- they have authoritative arity info + -> [IdCoreRule] -- Tidy orphan rules -> ModDetails -mkModDetails type_env dfun_ids tidy_binds stg_ids orphan_rules +mkModDetails type_env tidy_binds orphan_rules = ModDetails { md_types = new_type_env, md_rules = rule_dcls, - md_insts = dfun_ids } + md_insts = filter isDictFunId final_ids } where -- The competed type environment is gotten from -- a) keeping the types and classes - -- b) removing all Ids, and Ids with correct IdInfo + -- b) removing all Ids, + -- c) adding Ids with correct IdInfo, including unfoldings, -- gotten from the bindings - new_type_env = mkNameEnv [(getName tycl, tycl) | tycl <- orig_type_env, isTyClThing tycl] - `plusNameEnv` - mkNameEnv [(idName id, AnId id) | id <- final_ids] + -- From (c) we keep only those Ids with Global names; + -- the CoreTidy pass makes sure these are all and only + -- the externally-accessible ones + -- This truncates the type environment to include only the + -- exported Ids and things needed from them, which saves space + -- + -- However, we do keep things like constructors, which should not appear + -- in interface files, because they are needed by importing modules when + -- using the compilation manager + new_type_env = extendTypeEnvList (filterNameEnv keep_it type_env) + (map AnId final_ids) - orig_type_env = nameEnvElts type_env + -- We keep constructor workers, because they won't appear + -- in the bindings from which final_ids are derived! + keep_it (AnId id) = hasNoBinding id + keep_it other = True - final_ids = bindsToIds (mkVarSet dfun_ids `unionVarSet` orphan_rule_ids) - (mkVarSet stg_ids) - tidy_binds + final_ids = [id | bind <- tidy_binds + , id <- bindersOf bind + , isGlobalName (idName id)] -- The complete rules are gotten by combining -- a) the orphan rules -- b) rules embedded in the top-level Ids rule_dcls | opt_OmitInterfacePragmas = [] - | otherwise = getRules orphan_rules tidy_binds (mkVarSet final_ids) - - orphan_rule_ids = unionVarSets [ ruleSomeFreeVars interestingId rule - | (_, rule) <- orphan_rules] - + | otherwise = getRules orphan_rules tidy_binds (mkVarSet final_ids) -- This version is used when we are re-linking a module -- so we've only run the type checker on its previous interface -mkModDetailsFromIface :: TypeEnv -> [DFunId] -- From typechecker +mkModDetailsFromIface :: TypeEnv -> [TypecheckedRuleDecl] -> ModDetails -mkModDetailsFromIface type_env dfun_ids rules +mkModDetailsFromIface type_env rules = ModDetails { md_types = type_env, md_rules = rule_dcls, md_insts = dfun_ids } where + dfun_ids = [dfun_id | AnId dfun_id <- nameEnvElts type_env, isDictFunId dfun_id] rule_dcls = [(id,rule) | IfaceRuleOut id rule <- rules] -- All the rules from an interface are of the IfaceRuleOut form +\end{code} + +\begin{code} +getRules :: [IdCoreRule] -- Orphan rules + -> [CoreBind] -- Bindings, with rules in the top-level Ids + -> IdSet -- Ids that are exported, so we need their rules + -> [IdCoreRule] +getRules orphan_rules binds emitted + = orphan_rules ++ local_rules + where + local_rules = [ (fn, rule) + | fn <- bindersOfBinds binds, + fn `elemVarSet` emitted, + rule <- rulesRules (idSpecialisation fn), + not (isBuiltinRule rule), + -- We can't print builtin rules in interface files + -- Since they are built in, an importing module + -- will have access to them anyway + + -- Sept 00: I've disabled this test. It doesn't stop many, if any, rules + -- from coming out, and to make it work properly we need to add ???? + -- (put it back in for now) + all (`elemVarSet` emitted) (varSetElems (ruleSomeLhsFreeVars interestingId rule)) + -- Spit out a rule only if all its lhs free vars are emitted + -- This is a good reason not to do it when we emit the Id itself + ] + +interestingId id = isId id && isLocalId id +\end{code} +%************************************************************************ +%* * +\subsection{Completing an interface} +%* * +%************************************************************************ + +\begin{code} completeIface :: Maybe ModIface -- The old interface, if we have it -> ModIface -- The new one, minus the decls and versions -> ModDetails -- The ModDetails for this module - -> Maybe (ModIface, SDoc) -- The new one, complete with decls and versions + -> (ModIface, Maybe SDoc) -- The new one, complete with decls and versions -- The SDoc is a debug document giving differences -- Nothing => no change -- NB: 'Nothing' means that even the usages havn't changed, so there's no -- need to write a new interface file. But even if the usages have -- changed, the module version may not have. - -- - -- The IO in the type is solely for debug output - -- In particular, dumping a record of what has changed completeIface maybe_old_iface new_iface mod_details = addVersionInfo maybe_old_iface (new_iface { mi_decls = new_decls }) where - new_decls = IfaceDecls { dcl_tycl = ty_cls_dcls, - dcl_insts = inst_dcls, - dcl_rules = rule_dcls } - + new_decls = mkIfaceDecls ty_cls_dcls rule_dcls inst_dcls inst_dcls = map ifaceInstance (md_insts mod_details) - ty_cls_dcls = map ifaceTyCls (nameEnvElts (md_types mod_details)) + ty_cls_dcls = foldNameEnv ifaceTyCls [] (md_types mod_details) rule_dcls = map ifaceRule (md_rules mod_details) \end{code} -%************************************************************************ -%* * -\subsection{Types and classes} -%* * -%************************************************************************ - \begin{code} -ifaceTyCls :: TyThing -> RenamedTyClDecl -ifaceTyCls (AClass clas) - = ClassDecl (toHsContext sc_theta) - (getName clas) - (toHsTyVars clas_tyvars) - (toHsFDs clas_fds) - (map toClassOpSig op_stuff) - EmptyMonoBinds - [] noSrcLoc +ifaceTyCls :: TyThing -> [RenamedTyClDecl] -> [RenamedTyClDecl] +ifaceTyCls (AClass clas) so_far + = cls_decl : so_far where - (clas_tyvars, clas_fds, sc_theta, _, op_stuff) = classExtraBigSig clas - - toClassOpSig (sel_id, def_meth) + cls_decl = ClassDecl { tcdCtxt = toHsContext sc_theta, + tcdName = getName clas, + tcdTyVars = toHsTyVars clas_tyvars, + tcdFDs = toHsFDs clas_fds, + tcdSigs = map toClassOpSig op_stuff, + tcdMeths = Nothing, + tcdSysNames = sys_names, + tcdLoc = noSrcLoc } + + (clas_tyvars, clas_fds, sc_theta, sc_sels, op_stuff) = classExtraBigSig clas + tycon = classTyCon clas + data_con = head (tyConDataCons tycon) + sys_names = mkClassDeclSysNames (getName tycon, getName data_con, + getName (dataConId data_con), map getName sc_sels) + + toClassOpSig (sel_id, def_meth) = ASSERT(sel_tyvars == clas_tyvars) - ClassOpSig (getName sel_id) (Just def_meth') (toHsType op_ty) noSrcLoc + ClassOpSig (getName sel_id) def_meth' (toHsType op_ty) noSrcLoc where (sel_tyvars, _, op_ty) = splitSigmaTy (idType sel_id) def_meth' = case def_meth of @@ -173,27 +209,36 @@ ifaceTyCls (AClass clas) GenDefMeth -> GenDefMeth DefMeth id -> DefMeth (getName id) -ifaceTyCls (ATyCon tycon) - | isSynTyCon tycon - = TySynonym (getName tycon)(toHsTyVars tyvars) (toHsType ty) noSrcLoc - where - (tyvars, ty) = getSynTyConDefn tycon - -ifaceTyCls (ATyCon tycon) - | isAlgTyCon tycon - = TyData new_or_data (toHsContext (tyConTheta tycon)) - (getName tycon) - (toHsTyVars tyvars) - (map ifaceConDecl (tyConDataCons tycon)) - (tyConFamilySize tycon) - Nothing noSrcLoc (panic "gen1") (panic "gen2") +ifaceTyCls (ATyCon tycon) so_far + | isClassTyCon tycon = so_far + | otherwise = ty_decl : so_far where - tyvars = tyConTyVars tycon + ty_decl | isSynTyCon tycon + = TySynonym { tcdName = getName tycon, + tcdTyVars = toHsTyVars tyvars, + tcdSynRhs = toHsType syn_ty, + tcdLoc = noSrcLoc } + + | isAlgTyCon tycon + = TyData { tcdND = new_or_data, + tcdCtxt = toHsContext (tyConTheta tycon), + tcdName = getName tycon, + tcdTyVars = toHsTyVars tyvars, + tcdCons = map ifaceConDecl (tyConDataCons tycon), + tcdNCons = tyConFamilySize tycon, + tcdDerivs = Nothing, + tcdSysNames = map getName (tyConGenIds tycon), + tcdLoc = noSrcLoc } + + | otherwise = pprPanic "ifaceTyCls" (ppr tycon) + + tyvars = tyConTyVars tycon + (_, syn_ty) = getSynTyConDefn tycon new_or_data | isNewTyCon tycon = NewType | otherwise = DataType ifaceConDecl data_con - = ConDecl (getName data_con) (error "ifaceConDecl") + = ConDecl (getName data_con) (getName (dataConId data_con)) (toHsTyVars ex_tyvars) (toHsContext ex_theta) details noSrcLoc @@ -215,11 +260,15 @@ ifaceTyCls (ATyCon tycon) mk_field strict_mark field_label = ([getName field_label], mk_bang_ty strict_mark (fieldLabelType field_label)) -ifaceTyCls (ATyCon tycon) = pprPanic "ifaceTyCls" (ppr tycon) - -ifaceTyCls (AnId id) - = IfaceSig (getName id) (toHsType id_type) hs_idinfo noSrcLoc +ifaceTyCls (AnId id) so_far + | isImplicitId id = so_far + | otherwise = iface_sig : so_far where + iface_sig = IfaceSig { tcdName = getName id, + tcdType = toHsType id_type, + tcdIdInfo = hs_idinfo, + tcdLoc = noSrcLoc } + id_type = idType id id_info = idInfo id @@ -247,27 +296,23 @@ ifaceTyCls (AnId id) NoStrictnessInfo -> [] info -> [HsStrictness info] - ------------ Worker -------------- - wrkr_hsinfo = case workerInfo id_info of + work_info = workerInfo id_info + has_worker = case work_info of { HasWorker _ _ -> True; other -> False } + wrkr_hsinfo = case work_info of HasWorker work_id wrap_arity -> [HsWorker (getName work_id)] NoWorker -> [] ------------ Unfolding -------------- + -- The unfolding is redundant if there is a worker unfold_info = unfoldingInfo id_info inline_prag = inlinePragInfo id_info rhs = unfoldingTemplate unfold_info - unfold_hsinfo | neverUnfold unfold_info = [] - | otherwise = [HsUnfold inline_prag (toUfExpr rhs)] + unfold_hsinfo | neverUnfold unfold_info + || has_worker = [] + | otherwise = [HsUnfold inline_prag (toUfExpr rhs)] \end{code} - -%************************************************************************ -%* * -\subsection{Instances and rules} -%* * -%************************************************************************ - \begin{code} ifaceInstance :: DFunId -> RenamedInstDecl ifaceInstance dfun_id @@ -298,215 +343,6 @@ bogusIfaceRule id %************************************************************************ %* * -\subsection{Compute final Ids} -%* * -%************************************************************************ - -A "final Id" has exactly the IdInfo for going into an interface file, or -exporting to another module. - -\begin{code} -bindsToIds :: IdSet -- These Ids are needed already - -> IdSet -- Ids used at code-gen time; they have better pragma info! - -> [CoreBind] -- In dependency order, later depend on earlier - -> [Id] -- Set of Ids actually spat out, complete with exactly the IdInfo - -- they need for exporting to another module - -bindsToIds needed_ids codegen_ids binds - = go needed_ids (reverse binds) [] - -- Reverse so that later things will - -- provoke earlier ones to be emitted - where - -- The 'needed' set contains the Ids that are needed by earlier - -- interface file emissions. If the Id isn't in this set, and isn't - -- exported, there's no need to emit anything - need_id needed_set id = id `elemVarSet` needed_set || isUserExportedId id - - go needed [] emitted - | not (isEmptyVarSet needed) = pprTrace "ifaceBinds: free vars:" - (sep (map ppr (varSetElems needed))) - emitted - | otherwise = emitted - - go needed (NonRec id rhs : binds) emitted - | need_id needed id - = if omitIfaceSigForId id then - go (needed `delVarSet` id) binds (id:emitted) - else - go ((needed `unionVarSet` extras) `delVarSet` id) - binds - (new_id:emitted) - | otherwise - = go needed binds emitted - where - (new_id, extras) = mkFinalId codegen_ids False id rhs - - -- Recursive groups are a bit more of a pain. We may only need one to - -- start with, but it may call out the next one, and so on. So we - -- have to look for a fixed point. We don't want necessarily them all, - -- because without -O we may only need the first one (if we don't emit - -- its unfolding) - go needed (Rec pairs : binds) emitted - = go needed' binds emitted' - where - (new_emitted, extras) = go_rec needed pairs - needed' = (needed `unionVarSet` extras) `minusVarSet` mkVarSet (map fst pairs) - emitted' = new_emitted ++ emitted - - go_rec :: IdSet -> [(Id,CoreExpr)] -> ([Id], IdSet) - go_rec needed pairs - | null needed_prs = ([], emptyVarSet) - | otherwise = (emitted ++ more_emitted, - extras `unionVarSet` more_extras) - where - (needed_prs,leftover_prs) = partition is_needed pairs - (emitted, extras_s) = unzip [ mkFinalId codegen_ids True id rhs - | (id,rhs) <- needed_prs, not (omitIfaceSigForId id)] - extras = unionVarSets extras_s - (more_emitted, more_extras) = go_rec extras leftover_prs - - is_needed (id,_) = need_id needed id -\end{code} - - - -\begin{code} -mkFinalId :: IdSet -- The Ids with arity info from the code generator - -> Bool -- True <=> recursive, so don't include unfolding - -> Id - -> CoreExpr -- The Id's right hand side - -> (Id, IdSet) -- The emitted id, plus any *extra* needed Ids - -mkFinalId codegen_ids is_rec id rhs - = (id `setIdInfo` new_idinfo, new_needed_ids) - where - core_idinfo = idInfo id - stg_idinfo = case lookupVarSet codegen_ids id of - Just id' -> idInfo id' - Nothing -> pprTrace "ifaceBinds not found:" (ppr id) $ - idInfo id - - new_idinfo | opt_OmitInterfacePragmas - = vanillaIdInfo - | otherwise - = core_idinfo `setArityInfo` arity_info - `setCafInfo` cafInfo stg_idinfo - `setUnfoldingInfo` unfold_info - `setWorkerInfo` worker_info - `setSpecInfo` emptyCoreRules - -- We zap the specialisations because they are - -- passed on separately through the modules IdCoreRules - - ------------ Arity -------------- - arity_info = arityInfo stg_idinfo - stg_arity = arityLowerBound arity_info - - ------------ Worker -------------- - -- We only treat a function as having a worker if - -- the exported arity (which is now the number of visible lambdas) - -- is the same as the arity at the moment of the w/w split - -- If so, we can safely omit the unfolding inside the wrapper, and - -- instead re-generate it from the type/arity/strictness info - -- But if the arity has changed, we just take the simple path and - -- put the unfolding into the interface file, forgetting the fact - -- that it's a wrapper. - -- - -- How can this happen? Sometimes we get - -- f = coerce t (\x y -> $wf x y) - -- at the moment of w/w split; but the eta reducer turns it into - -- f = coerce t $wf - -- which is perfectly fine except that the exposed arity so far as - -- the code generator is concerned (zero) differs from the arity - -- when we did the split (2). - -- - -- All this arises because we use 'arity' to mean "exactly how many - -- top level lambdas are there" in interface files; but during the - -- compilation of this module it means "how many things can I apply - -- this to". - worker_info = case workerInfo core_idinfo of - info@(HasWorker work_id wrap_arity) - | wrap_arity == stg_arity -> info - | otherwise -> pprTrace "ifaceId: arity change:" (ppr id) - NoWorker - NoWorker -> NoWorker - - has_worker = case worker_info of - HasWorker _ _ -> True - other -> False - - HasWorker work_id _ = worker_info - - ------------ Unfolding -------------- - inline_pragma = inlinePragInfo core_idinfo - dont_inline = isNeverInlinePrag inline_pragma - loop_breaker = isLoopBreaker (occInfo core_idinfo) - bottoming_fn = isBottomingStrictness (strictnessInfo core_idinfo) - - unfolding = mkTopUnfolding rhs - rhs_is_small = neverUnfold unfolding - - unfold_info | show_unfold = unfolding - | otherwise = noUnfolding - - show_unfold = not has_worker && -- Not unnecessary - not bottoming_fn && -- Not necessary - not dont_inline && - not loop_breaker && - rhs_is_small && -- Small enough - okToUnfoldInHiFile rhs -- No casms etc - - - ------------ Extra free Ids -------------- - new_needed_ids | opt_OmitInterfacePragmas = emptyVarSet - | otherwise = worker_ids `unionVarSet` - unfold_ids `unionVarSet` - spec_ids - - spec_ids = filterVarSet interestingId (rulesRhsFreeVars (specInfo core_idinfo)) - - worker_ids | has_worker && interestingId work_id = unitVarSet work_id - -- Conceivably, the worker might come from - -- another module - | otherwise = emptyVarSet - - unfold_ids | show_unfold = find_fvs rhs - | otherwise = emptyVarSet - - find_fvs expr = exprSomeFreeVars interestingId expr - -interestingId id = isId id && isLocallyDefined id && not (hasNoBinding id) -\end{code} - - -\begin{code} -getRules :: [IdCoreRule] -- Orphan rules - -> [CoreBind] -- Bindings, with rules in the top-level Ids - -> IdSet -- Ids that are exported, so we need their rules - -> [IdCoreRule] -getRules orphan_rules binds emitted - = orphan_rules ++ local_rules - where - local_rules = [ (fn, rule) - | fn <- bindersOfBinds binds, - fn `elemVarSet` emitted, - rule <- rulesRules (idSpecialisation fn), - not (isBuiltinRule rule), - -- We can't print builtin rules in interface files - -- Since they are built in, an importing module - -- will have access to them anyway - - -- Sept 00: I've disabled this test. It doesn't stop many, if any, rules - -- from coming out, and to make it work properly we need to add ???? - -- (put it back in for now) - all (`elemVarSet` emitted) (varSetElems (ruleSomeLhsFreeVars interestingId rule)) - -- Spit out a rule only if all its lhs free vars are emitted - -- This is a good reason not to do it when we emit the Id itself - ] -\end{code} - - -%************************************************************************ -%* * \subsection{Checking if the new interface is up to date %* * %************************************************************************ @@ -514,7 +350,7 @@ getRules orphan_rules binds emitted \begin{code} addVersionInfo :: Maybe ModIface -- The old interface, read from M.hi -> ModIface -- The new interface decls - -> Maybe (ModIface, SDoc) -- Nothing => no change; no need to write new Iface + -> (ModIface, Maybe SDoc) -- Nothing => no change; no need to write new Iface -- Just mi => Here is the new interface to write -- with correct version numbers @@ -524,19 +360,24 @@ addVersionInfo :: Maybe ModIface -- The old interface, read from M.hi addVersionInfo Nothing new_iface -- No old interface, so definitely write a new one! - = Just (new_iface, text "No old interface available") + = (new_iface, Just (text "No old interface available")) -addVersionInfo (Just old_iface@(ModIface { mi_version = old_version, - mi_decls = old_decls, - mi_fixities = old_fixities })) - new_iface@(ModIface { mi_decls = new_decls, - mi_fixities = new_fixities }) +addVersionInfo (Just old_iface@(ModIface { mi_version = old_version, + mi_decls = old_decls, + mi_fixities = old_fixities, + mi_deprecs = old_deprecs })) + new_iface@(ModIface { mi_decls = new_decls, + mi_fixities = new_fixities, + mi_deprecs = new_deprecs }) | no_output_change && no_usage_change - = Nothing + = (new_iface, Nothing) + -- don't return the old iface because it may not have an + -- mi_globals field set to anything reasonable. | otherwise -- Add updated version numbers - = Just (final_iface, pp_tc_diffs) + = --pprTrace "completeIface" (ppr (dcl_tycl old_decls)) + (final_iface, Just pp_diffs) where final_iface = new_iface { mi_version = new_version } @@ -545,11 +386,12 @@ addVersionInfo (Just old_iface@(ModIface { mi_version = old_version, vers_rules = bumpVersion no_rule_change (vers_rules old_version), vers_decls = tc_vers } - no_output_change = no_tc_change && no_rule_change && no_export_change + no_output_change = no_tc_change && no_rule_change && no_export_change && no_deprec_change no_usage_change = mi_usages old_iface == mi_usages new_iface no_export_change = mi_exports old_iface == mi_exports new_iface -- Kept sorted no_rule_change = dcl_rules old_decls == dcl_rules new_decls -- Ditto + no_deprec_change = old_deprecs == new_deprecs -- Fill in the version number on the new declarations by looking at the old declarations. -- Set the flag if anything changes. @@ -557,8 +399,13 @@ addVersionInfo (Just old_iface@(ModIface { mi_version = old_version, old_vers_decls = vers_decls old_version (no_tc_change, pp_tc_diffs, tc_vers) = diffDecls old_vers_decls old_fixities new_fixities (dcl_tycl old_decls) (dcl_tycl new_decls) - - + pp_diffs = vcat [pp_tc_diffs, + pp_change no_export_change "Export list", + pp_change no_rule_change "Rules", + pp_change no_deprec_change "Deprecations", + pp_change no_usage_change "Usages"] + pp_change True what = empty + pp_change False what = text what <+> ptext SLIT("changed") diffDecls :: NameEnv Version -- Old version map -> NameEnv Fixity -> NameEnv Fixity -- Old and new fixities @@ -576,7 +423,7 @@ diffDecls old_vers old_fixities new_fixities old new same_fixity n = lookupNameEnv old_fixities n == lookupNameEnv new_fixities n diff ok_so_far pp new_vers [] [] = (ok_so_far, pp, new_vers) - diff ok_so_far pp new_vers old [] = (False, pp, new_vers) + diff ok_so_far pp new_vers (od:ods) [] = diff False (pp $$ only_old od) new_vers ods [] diff ok_so_far pp new_vers [] (nd:nds) = diff False (pp $$ only_new nd) new_vers [] nds diff ok_so_far pp new_vers (od:ods) (nd:nds) = case od_name `compare` nd_name of @@ -588,12 +435,12 @@ diffDecls old_vers old_fixities new_fixities old new od_name = tyClDeclName od nd_name = tyClDeclName nd new_vers' = extendNameEnv new_vers nd_name - (bumpVersion True (lookupNameEnv_NF old_vers od_name)) + (bumpVersion False (lookupNameEnv_NF old_vers od_name)) - only_old d = ptext SLIT("Only in old iface:") <+> ppr d - only_new d = ptext SLIT("Only in new iface:") <+> ppr d - changed d nd = ptext SLIT("Changed in iface: ") <+> ((ptext SLIT("Old:") <+> ppr d) $$ - (ptext SLIT("New:") <+> ppr nd)) + only_old d = ptext SLIT("Only in old iface:") <+> ppr d + only_new d = ptext SLIT("Only in new iface:") <+> ppr d + changed od nd = ptext SLIT("Changed in iface: ") <+> ((ptext SLIT("Old:") <+> ppr od) $$ + (ptext SLIT("New:") <+> ppr nd)) \end{code} @@ -605,15 +452,16 @@ diffDecls old_vers old_fixities new_fixities old new %************************************************************************ \begin{code} -writeIface :: FilePath -> Maybe ModIface -> IO () -writeIface hi_path Nothing - = return () - -writeIface hi_path (Just mod_iface) +writeIface :: FilePath -> ModIface -> IO () +writeIface hi_path mod_iface = do { if_hdl <- openFile hi_path WriteMode - ; printForIface if_hdl (pprIface mod_iface) + ; printForIface if_hdl from_this_mod (pprIface mod_iface) ; hClose if_hdl } + where + -- Print names unqualified if they are from this module + from_this_mod n = nameModule n == this_mod + this_mod = mi_module mod_iface pprIface :: ModIface -> SDoc pprIface iface @@ -628,14 +476,13 @@ pprIface iface , vcat (map pprExport (mi_exports iface)) , vcat (map pprUsage (mi_usages iface)) - , pprIfaceDecls (vers_decls version_info) - (mi_fixities iface) - (mi_decls iface) - + , pprFixities (mi_fixities iface) (dcl_tycl decls) + , pprIfaceDecls (vers_decls version_info) decls , pprDeprecs (mi_deprecs iface) ] where version_info = mi_version iface + decls = mi_decls iface exp_vers = vers_exports version_info rule_vers = vers_rules version_info @@ -653,20 +500,17 @@ pprExport :: (ModuleName, Avails) -> SDoc pprExport (mod, items) = hsep [ ptext SLIT("__export "), ppr mod, hsep (map pp_avail items) ] <> semi where - ppr_name :: Name -> SDoc -- Print the occurrence name only - ppr_name n = ppr (nameOccName n) - pp_avail :: AvailInfo -> SDoc - pp_avail (Avail name) = ppr_name name - pp_avail (AvailTC name []) = empty - pp_avail (AvailTC name ns) = hcat [ppr_name name, bang, pp_export ns'] - where - bang | name `elem` ns = empty - | otherwise = char '|' - ns' = filter (/= name) ns + pp_avail (Avail name) = pprOcc name + pp_avail (AvailTC n []) = empty + pp_avail (AvailTC n (n':ns)) | n==n' = pprOcc n <> pp_export ns + | otherwise = pprOcc n <> char '|' <> pp_export (n':ns) pp_export [] = empty - pp_export names = braces (hsep (map ppr_name names)) + pp_export names = braces (hsep (map pprOcc names)) + +pprOcc :: Name -> SDoc -- Print the occurrence name only +pprOcc n = pprOccName (nameOccName n) \end{code} @@ -687,36 +531,34 @@ pprUsage (m, has_orphans, is_boot, whats_imported) pp_versions NothingAtAll = empty pp_versions (Everything v) = dcolon <+> int v pp_versions (Specifically vm ve nvs vr) = dcolon <+> int vm <+> pp_export_version ve <+> int vr - <+> hsep [ ppr n <+> int v | (n,v) <- nvs ] + <+> hsep [ pprOcc n <+> int v | (n,v) <- nvs ] - -- HACK for the moment: print the export-list version even if - -- we don't use it, so that syntax of interface files doesn't change - pp_export_version Nothing = int 1 + pp_export_version Nothing = empty pp_export_version (Just v) = int v \end{code} \begin{code} -pprIfaceDecls version_map fixity_map decls +pprIfaceDecls version_map decls = vcat [ vcat [ppr i <+> semi | i <- dcl_insts decls] , vcat (map ppr_decl (dcl_tycl decls)) , pprRules (dcl_rules decls) ] where - ppr_decl d = (ppr_vers d <+> ppr d <> semi) $$ ppr_fixes d + ppr_decl d = ppr_vers d <+> ppr d <> semi -- Print the version for the decl ppr_vers d = case lookupNameEnv version_map (tyClDeclName d) of Nothing -> empty Just v -> int v - - -- Print fixities relevant to the decl - ppr_fixes d = vcat [ ppr fix <+> ppr n <> semi - | (n,_) <- tyClDeclNames d, - Just fix <- [lookupNameEnv fixity_map n] - ] \end{code} \begin{code} +pprFixities fixity_map decls + = hsep [ ppr fix <+> ppr n + | d <- decls, + (n,_) <- tyClDeclNames d, + Just fix <- [lookupNameEnv fixity_map n]] <> semi + pprRules [] = empty pprRules rules = hsep [ptext SLIT("{-## __R"), vcat (map ppr rules), ptext SLIT("##-}")] @@ -724,10 +566,10 @@ pprDeprecs NoDeprecs = empty pprDeprecs deprecs = ptext SLIT("{-## __D") <+> guts <+> ptext SLIT("##-}") where guts = case deprecs of - DeprecAll txt -> ptext txt + DeprecAll txt -> doubleQuotes (ptext txt) DeprecSome env -> pp_deprecs env pp_deprecs env = vcat (punctuate semi (map pp_deprec (nameEnvElts env))) where - pp_deprec (name, txt) = pprOccName (nameOccName name) <+> ptext txt + pp_deprec (name, txt) = pprOcc name <+> doubleQuotes (ptext txt) \end{code}