X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcRnDriver.lhs;h=e557edfb5029da23db20780892c1e036b36ef782;hb=4e84be0ce335385e094ba12d284855b510a36f53;hp=1210d3ccda827ada422830e60ab494f6527d56df;hpb=e0445ffa5a89632b542e7d7bc2ad46d944716453;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcRnDriver.lhs b/ghc/compiler/typecheck/TcRnDriver.lhs index 1210d3c..e557edf 100644 --- a/ghc/compiler/typecheck/TcRnDriver.lhs +++ b/ghc/compiler/typecheck/TcRnDriver.lhs @@ -100,7 +100,7 @@ import HscTypes ( PersistentCompilerState(..), InteractiveContext(..), ModIface, ModDetails(..), ModGuts(..), HscEnv(..), ModIface(..), ModDetails(..), IfaceDecls(..), - GhciMode(..), + GhciMode(..), noDependencies, Deprecations(..), plusDeprecs, emptyGlobalRdrEnv, GenAvailInfo(Avail), availsToNameSet, @@ -147,7 +147,7 @@ tcRnModule hsc_env pcs updGblEnv ( \ gbl -> gbl { tcg_rdr_env = rdr_env, tcg_imports = tcg_imports gbl `plusImportAvails` imports }) $ do { - traceRn (text "rn1" <+> ppr (dep_mods imports)) ; + traceRn (text "rn1" <+> ppr (imp_dep_mods imports)) ; -- Fail if there are any errors so far -- The error printing (if needed) takes advantage -- of the tcg_env we have now set @@ -556,7 +556,7 @@ tcRnExtCore hsc_env pcs mod_guts = ModGuts { mg_module = this_mod, mg_usages = [], -- ToDo: compute usage mg_dir_imps = [], -- ?? - mg_deps = ([],[]), -- ?? + mg_deps = noDependencies, -- ?? mg_exports = my_exports, mg_types = final_type_env, mg_insts = tcg_insts tcg_env, @@ -1172,8 +1172,8 @@ pprTcGblEnv (TcGblEnv { tcg_type_env = type_env, , ppr_insts dfun_ids , vcat (map ppr rules) , ppr_gen_tycons (typeEnvTyCons type_env) - , ppr (moduleEnvElts (dep_mods imports)) - , ppr (dep_pkgs imports)] + , ppr (moduleEnvElts (imp_dep_mods imports)) + , ppr (imp_dep_pkgs imports)] pprModGuts :: ModGuts -> SDoc pprModGuts (ModGuts { mg_types = type_env,