X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMkIface.lhs;h=549d2afb74db79f762ae5fefd1beab3be97143c7;hb=1553c7788e7f663bfc55813158325d695a21a229;hp=4f24901ce4a2f19493070fd9a19bb4c6a9fa1625;hpb=c4854c781cdf7046fe6ec064c805fa838e31e933;p=ghc-hetmet.git diff --git a/ghc/compiler/main/MkIface.lhs b/ghc/compiler/main/MkIface.lhs index 4f24901..549d2af 100644 --- a/ghc/compiler/main/MkIface.lhs +++ b/ghc/compiler/main/MkIface.lhs @@ -6,8 +6,8 @@ \begin{code} module MkIface ( - mkFinalIface, - pprModDetails, pprIface, pprUsage, + showIface, mkFinalIface, + pprModDetails, pprIface, pprUsage, pprUsages, pprExports, ifaceTyThing, ) where @@ -17,19 +17,21 @@ import HsSyn import HsCore ( HsIdInfo(..), UfExpr(..), toUfExpr, toUfBndr ) import HsTypes ( toHsTyVars ) import TysPrim ( alphaTyVars ) -import BasicTypes ( Fixity(..), NewOrData(..), Activation(..), +import BasicTypes ( NewOrData(..), Activation(..), Version, initialVersion, bumpVersion ) import NewDemand ( isTopSig ) import RnMonad import RnHsSyn ( RenamedInstDecl, RenamedTyClDecl ) import HscTypes ( VersionInfo(..), ModIface(..), ModDetails(..), - ModuleLocation(..), GhciMode(..), + ModuleLocation(..), GhciMode(..), + FixityEnv, lookupFixity, collectFixities, IfaceDecls, mkIfaceDecls, dcl_tycl, dcl_rules, dcl_insts, - TyThing(..), DFunId, Avails, + TyThing(..), DFunId, TypeEnv, + GenAvailInfo, WhatsImported(..), GenAvailInfo(..), ImportVersion, AvailInfo, Deprecations(..), - lookupVersion, + lookupVersion, typeEnvIds ) import CmdLineOpts @@ -38,36 +40,73 @@ import Id ( idType, idInfo, isImplicitId, idCgInfo, ) import DataCon ( dataConId, dataConSig, dataConFieldLabels, dataConStrictMarks ) import IdInfo -- Lots -import CoreSyn ( CoreRule(..) ) +import Var ( Var ) +import CoreSyn ( CoreRule(..), IdCoreRule ) import CoreFVs ( ruleLhsFreeNames ) import CoreUnfold ( neverUnfold, unfoldingTemplate ) import PprCore ( pprIdCoreRule ) -import Name ( getName, nameModule, toRdrName, isGlobalName, +import Name ( getName, nameModule, toRdrName, isExternalName, nameIsLocalOrFrom, Name, NamedThing(..) ) import NameEnv import NameSet import OccName ( pprOccName ) -import TyCon ( TyCon, getSynTyConDefn, isSynTyCon, isNewTyCon, - isAlgTyCon, tyConGenIds, tyConTheta, tyConTyVars, - tyConDataCons, tyConFamilySize, isPrimTyCon, - isClassTyCon, isForeignTyCon, tyConArity - ) +import TyCon import Class ( classExtraBigSig, classTyCon, DefMeth(..) ) import FieldLabel ( fieldLabelType ) import TcType ( tcSplitSigmaTy, tidyTopType, deNoteType, namesOfDFunHead ) import SrcLoc ( noSrcLoc ) import Outputable import Module ( ModuleName ) -import Util ( sortLt ) +import Util ( sortLt, dropList ) +import Binary ( getBinFileWithDict ) +import BinIface ( writeBinIface ) import ErrUtils ( dumpIfSet_dyn ) import Monad ( when ) -import IO ( IOMode(..), openFile, hClose ) +import Maybe ( catMaybes ) +import IO ( IOMode(..), openFile, hClose, putStrLn ) \end{code} %************************************************************************ %* * +\subsection{Print out the contents of a binary interface} +%* * +%************************************************************************ + +\begin{code} +showIface :: FilePath -> IO () +showIface filename = do + parsed_iface <- Binary.getBinFileWithDict filename + let ParsedIface{ + pi_mod=pi_mod, pi_pkg=pi_pkg, pi_vers=pi_vers, + pi_orphan=pi_orphan, pi_usages=pi_usages, + pi_exports=pi_exports, pi_decls=pi_decls, + pi_fixity=pi_fixity, pi_insts=pi_insts, + pi_rules=pi_rules, pi_deprecs=pi_deprecs } = parsed_iface + putStrLn (showSDoc (vcat [ + text "__interface" <+> doubleQuotes (ppr pi_pkg) + <+> ppr pi_mod <+> ppr pi_vers + <+> (if pi_orphan then char '!' else empty) + <+> ptext SLIT("where"), + -- no instance Outputable (WhatsImported): + pprExports id (snd pi_exports), + pprUsages id pi_usages, + hsep (map ppr_fix pi_fixity) <> semi, + vcat (map ppr_inst pi_insts), + vcat (map ppr_decl pi_decls), + ppr pi_rules + -- no instance Outputable (Either): + -- ppr pi_deprecs + ])) + where + ppr_fix (n,f) = ppr f <+> ppr n + ppr_inst i = ppr i <+> semi + ppr_decl (v,d) = int v <+> ppr d <> semi +\end{code} + +%************************************************************************ +%* * \subsection{Completing an interface} %* * %************************************************************************ @@ -87,28 +126,33 @@ mkFinalIface :: GhciMode -- a) completes the interface -- b) writes it out to a file if necessary -mkFinalIface ghci_mode dflags location - maybe_old_iface new_iface new_details +mkFinalIface ghci_mode dflags location maybe_old_iface + new_iface@ModIface{ mi_module=mod } + new_details@ModDetails{ md_insts=insts, + md_rules=rules, + md_types=types } = do { -- Add the new declarations, and the is-orphan flag let iface_w_decls = new_iface { mi_decls = new_decls, mi_orphan = orphan_mod } -- Add version information - ; let (final_iface, maybe_diffs) = addVersionInfo maybe_old_iface iface_w_decls + ; let (final_iface, maybe_diffs) = _scc_ "versioninfo" addVersionInfo maybe_old_iface iface_w_decls -- Write the interface file, if necessary ; when (must_write_hi_file maybe_diffs) - (writeIface hi_file_path final_iface) + (writeBinIface hi_file_path final_iface) +-- (writeIface hi_file_path final_iface) -- Debug printing ; write_diffs dflags final_iface maybe_diffs - ; return final_iface } + ; orphan_mod `seq` + return final_iface } where - must_write_hi_file Nothing = False - must_write_hi_file (Just diffs) = ghci_mode /= Interactive + must_write_hi_file Nothing = False + must_write_hi_file (Just _diffs) = ghci_mode /= Interactive -- We must write a new .hi file if there are some changes -- and we're not in interactive mode -- maybe_diffs = 'Nothing' means that even the usages havn't changed, @@ -117,11 +161,12 @@ mkFinalIface ghci_mode dflags location hi_file_path = ml_hi_file location new_decls = mkIfaceDecls ty_cls_dcls rule_dcls inst_dcls - inst_dcls = map ifaceInstance (md_insts new_details) - ty_cls_dcls = foldNameEnv ifaceTyThing_acc [] (md_types new_details) - rule_dcls = map ifaceRule (md_rules new_details) - orphan_mod = isOrphanModule (mi_module new_iface) new_details + inst_dcls = map ifaceInstance insts + ty_cls_dcls = foldNameEnv ifaceTyThing_acc [] types + rule_dcls = map ifaceRule rules + orphan_mod = isOrphanModule mod new_details +write_diffs :: DynFlags -> ModIface -> Maybe SDoc -> IO () write_diffs dflags new_iface Nothing = do when (dopt Opt_D_dump_hi_diffs dflags) (printDump (text "INTERFACE UNCHANGED")) dumpIfSet_dyn dflags Opt_D_dump_hi "UNCHANGED FINAL INTERFACE" (pprIface new_iface) @@ -132,11 +177,15 @@ write_diffs dflags new_iface (Just sdoc_diffs) \end{code} \begin{code} +isOrphanModule :: Module -> ModDetails -> Bool isOrphanModule this_mod (ModDetails {md_insts = insts, md_rules = rules}) = any orphan_inst insts || any orphan_rule rules where + -- A rule is an orphan if the LHS mentions nothing defined locally orphan_inst dfun_id = no_locals (namesOfDFunHead (idType dfun_id)) + -- A instance is an orphan if its head mentions nothing defined locally orphan_rule rule = no_locals (ruleLhsFreeNames rule) + no_locals names = isEmptyNameSet (filterNameSet (nameIsLocalOrFrom this_mod) names) \end{code} @@ -195,25 +244,24 @@ ifaceTyThing (ATyCon tycon) = ty_decl tcdCtxt = toHsContext (tyConTheta tycon), tcdName = getName tycon, tcdTyVars = toHsTyVars tyvars, - tcdCons = map ifaceConDecl (tyConDataCons tycon), - tcdNCons = tyConFamilySize tycon, + tcdCons = ifaceConDecls (tyConDataConDetails tycon), tcdDerivs = Nothing, tcdSysNames = map getName (tyConGenIds tycon), tcdLoc = noSrcLoc } | isForeignTyCon tycon - = ForeignType { tcdName = getName tycon, - tcdFoType = DNType, -- The only case at present - tcdLoc = noSrcLoc } + = ForeignType { tcdName = getName tycon, + tcdExtName = Nothing, + tcdFoType = DNType, -- The only case at present + tcdLoc = noSrcLoc } - | isPrimTyCon tycon + | isPrimTyCon tycon || isFunTyCon tycon -- needed in GHCi for ':info Int#', for example = TyData { tcdND = DataType, tcdCtxt = [], tcdName = getName tycon, tcdTyVars = toHsTyVars (take (tyConArity tycon) alphaTyVars), - tcdCons = [], - tcdNCons = 0, + tcdCons = Unknown, tcdDerivs = Nothing, tcdSysNames = [], tcdLoc = noSrcLoc } @@ -225,6 +273,10 @@ ifaceTyThing (ATyCon tycon) = ty_decl new_or_data | isNewTyCon tycon = NewType | otherwise = DataType + ifaceConDecls Unknown = Unknown + ifaceConDecls (HasCons n) = HasCons n + ifaceConDecls (DataCons cs) = DataCons (map ifaceConDecl cs) + ifaceConDecl data_con = ConDecl (getName data_con) (getName (dataConId data_con)) (toHsTyVars ex_tyvars) @@ -233,7 +285,7 @@ ifaceTyThing (ATyCon tycon) = ty_decl where (tyvars1, _, ex_tyvars, ex_theta, arg_tys, tycon1) = dataConSig data_con field_labels = dataConFieldLabels data_con - strict_marks = drop (length ex_theta) (dataConStrictMarks data_con) + strict_marks = dropList ex_theta (dataConStrictMarks data_con) -- The 'drop' is because dataConStrictMarks -- includes the existential dictionaries details | null field_labels @@ -256,35 +308,38 @@ ifaceTyThing (AnId id) = iface_sig id_type = idType id id_info = idInfo id cg_info = idCgInfo id - arity_info = cgArity cg_info + arity_info = arityInfo id_info caf_info = cgCafInfo cg_info - hs_idinfo | opt_OmitInterfacePragmas = [] - | otherwise = arity_hsinfo ++ caf_hsinfo ++ - strict_hsinfo ++ wrkr_hsinfo ++ unfold_hsinfo + hs_idinfo | opt_OmitInterfacePragmas + = [] + | otherwise + = catMaybes [arity_hsinfo, caf_hsinfo, + strict_hsinfo, wrkr_hsinfo, + unfold_hsinfo] ------------ Arity -------------- - arity_hsinfo | arity_info == 0 = [] - | otherwise = [HsArity arity_info] + arity_hsinfo | arity_info == 0 = Nothing + | otherwise = Just (HsArity arity_info) ------------ Caf Info -------------- caf_hsinfo = case caf_info of - NoCafRefs -> [HsNoCafRefs] - otherwise -> [] + NoCafRefs -> Just HsNoCafRefs + _other -> Nothing ------------ Strictness -------------- -- No point in explicitly exporting TopSig strict_hsinfo = case newStrictnessInfo id_info of - Just sig | not (isTopSig sig) -> [HsStrictness sig] - other -> [] + Just sig | not (isTopSig sig) -> Just (HsStrictness sig) + _other -> Nothing ------------ Worker -------------- 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) wrap_arity] - NoWorker -> [] + Just (HsWorker (getName work_id) wrap_arity) + NoWorker -> Nothing ------------ Unfolding -------------- -- The unfolding is redundant if there is a worker @@ -292,8 +347,8 @@ ifaceTyThing (AnId id) = iface_sig inline_prag = inlinePragInfo id_info rhs = unfoldingTemplate unfold_info unfold_hsinfo | neverUnfold unfold_info - || has_worker = [] - | otherwise = [HsUnfold inline_prag (toUfExpr rhs)] + || has_worker = Nothing + | otherwise = Just (HsUnfold inline_prag (toUfExpr rhs)) \end{code} \begin{code} @@ -312,6 +367,7 @@ ifaceInstance dfun_id -- and this instance decl wouldn't get imported into a module -- that mentioned T but not Tibble. +ifaceRule :: IdCoreRule -> RuleDecl Name pat ifaceRule (id, BuiltinRule _ _) = pprTrace "toHsRule: builtin" (ppr id) (bogusIfaceRule id) @@ -319,6 +375,7 @@ ifaceRule (id, Rule name act bndrs args rhs) = IfaceRule name act (map toUfBndr bndrs) (getName id) (map toUfExpr args) (toUfExpr rhs) noSrcLoc +bogusIfaceRule :: (NamedThing a) => a -> RuleDecl Name pat bogusIfaceRule id = IfaceRule SLIT("bogus") NeverActive [] (getName id) [] (UfVar (getName id)) noSrcLoc \end{code} @@ -391,7 +448,7 @@ addVersionInfo (Just old_iface@(ModIface { mi_version = old_version, pp_change False what = text what <+> ptext SLIT("changed") diffDecls :: VersionInfo -- Old version - -> NameEnv Fixity -> NameEnv Fixity -- Old and new fixities + -> FixityEnv -> FixityEnv -- Old and new fixities -> [RenamedTyClDecl] -> [RenamedTyClDecl] -- Old and new decls -> (Bool, -- True <=> no change SDoc, -- Record of differences @@ -404,7 +461,7 @@ diffDecls (VersionInfo { vers_module = old_mod_vers, vers_decls = old_decls_vers -- When seeing if two decls are the same, -- remember to check whether any relevant fixity has changed eq_tc d1 d2 = d1 == d2 && all (same_fixity . fst) (tyClDeclNames d1) - same_fixity n = lookupNameEnv old_fixities n == lookupNameEnv new_fixities n + same_fixity n = lookupFixity old_fixities n == lookupFixity new_fixities n diff ok_so_far pp new_vers [] [] = (ok_so_far, pp, new_vers) diff ok_so_far pp new_vers (od:ods) [] = diff False (pp $$ only_old od) new_vers ods [] @@ -449,22 +506,25 @@ pprModDetails (ModDetails { md_types = type_env, md_insts = dfun_ids, md_rules = , dump_insts dfun_ids , dump_rules rules] +dump_types :: [Var] -> TypeEnv -> SDoc dump_types dfun_ids type_env = text "TYPE SIGNATURES" $$ nest 4 (dump_sigs ids) where - ids = [id | AnId id <- nameEnvElts type_env, want_sig id] + ids = [id | id <- typeEnvIds type_env, want_sig id] want_sig id | opt_PprStyle_Debug = True | otherwise = isLocalId id && - isGlobalName (idName id) && + isExternalName (idName id) && not (id `elem` dfun_ids) -- isLocalId ignores data constructors, records selectors etc - -- The isGlobalName ignores local dictionary and method bindings + -- The isExternalName ignores local dictionary and method bindings -- that the type checker has invented. User-defined things have -- Global names. +dump_insts :: [Var] -> SDoc dump_insts [] = empty dump_insts dfun_ids = text "INSTANCES" $$ nest 4 (dump_sigs dfun_ids) +dump_sigs :: [Var] -> SDoc dump_sigs ids -- Print type signatures -- Convert to HsType so that we get source-language style printing @@ -476,6 +536,7 @@ dump_sigs ids lt_sig (n1,_) (n2,_) = n1 < n2 ppr_sig (n,t) = ppr n <+> dcolon <+> ppr t +dump_rules :: [IdCoreRule] -> SDoc dump_rules [] = empty dump_rules rs = vcat [ptext SLIT("{-# RULES"), nest 4 (vcat (map pprIdCoreRule rs)), @@ -500,19 +561,19 @@ writeIface hi_path mod_iface -- 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 = vcat [ ptext SLIT("__interface") - <+> doubleQuotes (ptext opt_InPackage) + <+> doubleQuotes (ptext (mi_package iface)) <+> ppr (mi_module iface) <+> ppr (vers_module version_info) <+> pp_sub_vers <+> (if mi_orphan iface then char '!' else empty) <+> int opt_HiVersion <+> ptext SLIT("where") - , vcat (map pprExport (mi_exports iface)) - , vcat (map pprUsage (mi_usages iface)) + , pprExports nameOccName (mi_exports iface) + , pprUsages nameOccName (mi_usages iface) , pprFixities (mi_fixities iface) (dcl_tycl decls) , pprIfaceDecls (vers_decls version_info) decls @@ -522,6 +583,7 @@ pprIface iface version_info = mi_version iface decls = mi_decls iface exp_vers = vers_exports version_info + rule_vers = vers_rules version_info pp_sub_vers | exp_vers == initialVersion && rule_vers == initialVersion = empty @@ -534,18 +596,22 @@ When printing export lists, we print like this: AvailTC C [x, y] C!(x,y) -- Exporting x, y but not C \begin{code} -pprExport :: (ModuleName, Avails) -> SDoc -pprExport (mod, items) +pprExports :: Eq a => (a -> OccName) -> [(ModuleName, [GenAvailInfo a])] -> SDoc +pprExports getOcc exports = vcat (map (pprExport getOcc) exports) + +pprExport :: Eq a => (a -> OccName) -> (ModuleName, [GenAvailInfo a]) -> SDoc +pprExport getOcc (mod, items) = hsep [ ptext SLIT("__export "), ppr mod, hsep (map pp_avail items) ] <> semi where - pp_avail :: AvailInfo -> SDoc - 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_avail :: GenAvailInfo a -> SDoc + pp_avail (Avail name) = ppr (getOcc name) + pp_avail (AvailTC _ []) = empty + pp_avail (AvailTC n (n':ns)) + | n==n' = ppr (getOcc n) <> pp_export ns + | otherwise = ppr (getOcc n) <> char '|' <> pp_export (n':ns) pp_export [] = empty - pp_export names = braces (hsep (map pprOcc names)) + pp_export names = braces (hsep (map (ppr.getOcc) names)) pprOcc :: Name -> SDoc -- Print the occurrence name only pprOcc n = pprOccName (nameOccName n) @@ -553,8 +619,11 @@ pprOcc n = pprOccName (nameOccName n) \begin{code} -pprUsage :: ImportVersion Name -> SDoc -pprUsage (m, has_orphans, is_boot, whats_imported) +pprUsages :: (a -> OccName) -> [ImportVersion a] -> SDoc +pprUsages getOcc usages = vcat (map (pprUsage getOcc) usages) + +pprUsage :: (a -> OccName) -> ImportVersion a -> SDoc +pprUsage getOcc (m, has_orphans, is_boot, whats_imported) = hsep [ptext SLIT("import"), ppr m, pp_orphan, pp_boot, pp_versions whats_imported @@ -568,14 +637,16 @@ pprUsage (m, has_orphans, is_boot, whats_imported) -- Importing the whole module is indicated by an empty list 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 [ pprOcc n <+> int v | (n,v) <- nvs ] + pp_versions (Specifically vm ve nvs vr) = + dcolon <+> int vm <+> pp_export_version ve <+> int vr + <+> hsep [ ppr (getOcc n) <+> int v | (n,v) <- nvs ] pp_export_version Nothing = empty pp_export_version (Just v) = int v \end{code} \begin{code} +pprIfaceDecls :: NameEnv Int -> IfaceDecls -> SDoc pprIfaceDecls version_map decls = vcat [ vcat [ppr i <+> semi | i <- dcl_insts decls] , vcat (map ppr_decl (dcl_tycl decls)) @@ -590,14 +661,16 @@ pprIfaceDecls version_map decls \end{code} \begin{code} +pprFixities :: NameEnv Fixity + -> [TyClDecl Name pat] + -> SDoc pprFixities fixity_map decls = hsep [ ppr fix <+> ppr n - | d <- decls, - (n,_) <- tyClDeclNames d, - Just fix <- [lookupNameEnv fixity_map n]] <> semi + | (n,fix) <- collectFixities fixity_map decls ] <> semi -- Disgusting to print these two together, but that's -- the way the interface parser currently expects them. +pprRulesAndDeprecs :: (Outputable a) => [a] -> Deprecations -> SDoc pprRulesAndDeprecs [] NoDeprecs = empty pprRulesAndDeprecs rules deprecs = ptext SLIT("{-##") <+> (pp_rules rules $$ pp_deprecs deprecs) <+> ptext SLIT("##-}") @@ -612,6 +685,7 @@ pprRulesAndDeprecs rules deprecs DeprecAll txt -> doubleQuotes (ptext txt) DeprecSome env -> ppr_deprec_env env +ppr_deprec_env :: NameEnv (Name, FAST_STRING) -> SDoc ppr_deprec_env env = vcat (punctuate semi (map pp_deprec (nameEnvElts env))) where pp_deprec (name, txt) = pprOcc name <+> doubleQuotes (ptext txt)