X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMkIface.lhs;h=b4178dbfe0cee609a695a2b183065195f62bba43;hb=8f0c89cbbbad60c4f05356fcb9053b7ed0c18075;hp=4317be4f5b0248e1ae25a73771ab78493fd6c937;hpb=1dafd8c2d6e1d1d556a944032d9ccad7206a6dc1;p=ghc-hetmet.git diff --git a/ghc/compiler/main/MkIface.lhs b/ghc/compiler/main/MkIface.lhs index 4317be4..b4178db 100644 --- a/ghc/compiler/main/MkIface.lhs +++ b/ghc/compiler/main/MkIface.lhs @@ -26,10 +26,10 @@ import TcRnTypes ( ImportAvails(..) ) import RnHsSyn ( RenamedInstDecl, RenamedTyClDecl ) import HscTypes ( VersionInfo(..), ModIface(..), HomeModInfo(..), ModGuts(..), ModGuts, - GhciMode(..), HscEnv(..), + GhciMode(..), HscEnv(..), Dependencies(..), FixityEnv, lookupFixity, collectFixities, IfaceDecls, mkIfaceDecls, dcl_tycl, dcl_rules, dcl_insts, - TyThing(..), DFunId, Dependencies, + TyThing(..), DFunId, Avails, AvailInfo, GenAvailInfo(..), availName, ExternalPackageState(..), ParsedIface(..), Usage(..), @@ -476,7 +476,7 @@ mkUsageInfo :: HscEnv -> ExternalPackageState mkUsageInfo hsc_env eps (ImportAvails { imp_mods = dir_imp_mods, - dep_mods = dep_mods }) + imp_dep_mods = dep_mods }) used_names = -- seq the list of Usages returned: occasionally these -- don't get evaluated for a while and we can end up hanging on to @@ -484,7 +484,7 @@ mkUsageInfo hsc_env eps usages `seqList` usages where usages = catMaybes [ mkUsage mod_name - | (mod_name,_,_) <- moduleEnvElts dep_mods] + | (mod_name,_) <- moduleEnvElts dep_mods] hpt = hsc_HPT hsc_env pit = eps_PIT eps @@ -781,16 +781,15 @@ pprUsage getOcc usage pprDeps :: Dependencies -> SDoc -pprDeps (mods, pkgs) +pprDeps (Deps { dep_mods = mods, dep_pkgs = pkgs, dep_orphs = orphs}) = vcat [ptext SLIT("module dependencies:") <+> fsep (map ppr_mod mods), - ptext SLIT("package dependencies:") <+> fsep (map ppr pkgs)] + ptext SLIT("package dependencies:") <+> fsep (map ppr pkgs), + ptext SLIT("orphans:") <+> fsep (map ppr orphs) + ] where - ppr_mod (mod_name, orph, boot) - = ppr mod_name <+> ppr_orphan orph <+> ppr_boot boot + ppr_mod (mod_name, boot) = ppr mod_name <+> ppr_boot boot - ppr_orphan True = char '!' - ppr_orphan False = empty - ppr_boot True = char '@' + ppr_boot True = text "[boot]" ppr_boot False = empty \end{code}