Interface file optimisation and removal of nameParent

[ghc-hetmet.git] / compiler / typecheck / TcRnMonad.lhs

diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs
index 3b7a2e8..3272dea 100644 (file)
--- a/compiler/typecheck/TcRnMonad.lhs
+++ b/compiler/typecheck/TcRnMonad.lhs
@@ -22,7 +22,7 @@ import NameEnv          ( mkNameEnv )
 import TcEnv            ( tcExtendIdEnv )
 #endif
 
-import HsSyn           ( emptyLHsBinds )
+import HsSyn           ( emptyLHsBinds, HaddockModInfo(..) )
 import HscTypes                ( HscEnv(..), ModGuts(..), ModIface(..),
                          TypeEnv, emptyTypeEnv, HscSource(..), isHsBoot,
                          ExternalPackageState(..), HomePackageTable,
@@ -108,7 +108,7 @@ initTc hsc_env hsc_src mod do_this
                tcg_fam_inst_env  = emptyFamInstEnv,
                tcg_inst_uses = dfuns_var,
                tcg_th_used   = th_var,
-               tcg_exports  = emptyNameSet,
+               tcg_exports  = [],
                tcg_imports  = init_imports,
                tcg_dus      = emptyDUs,
                 tcg_rn_imports = Nothing,
@@ -117,10 +117,13 @@ initTc hsc_env hsc_src mod do_this
                tcg_binds    = emptyLHsBinds,
                tcg_deprecs  = NoDeprecs,
                tcg_insts    = [],
+               tcg_fam_insts= [],
                tcg_rules    = [],
                tcg_fords    = [],
                tcg_dfun_n   = dfun_n_var,
-               tcg_keep     = keep_var
+               tcg_keep     = keep_var,
+               tcg_doc      = Nothing,
+               tcg_hmi      = HaddockModInfo Nothing Nothing Nothing Nothing
             } ;
             lcl_env = TcLclEnv {
                tcl_errs       = errs_var,
@@ -153,8 +156,7 @@ initTc hsc_env hsc_src mod do_this
        return (msgs, final_res)
     }
   where
-    init_imports = emptyImportAvails {imp_env = 
-                                       unitUFM (moduleName mod) emptyNameSet}
+    init_imports = emptyImportAvails {imp_env = unitUFM (moduleName mod) []}
        -- Initialise tcg_imports with an empty set of bindings for
        -- this module, so that if we see 'module M' in the export
        -- list, and there are no bindings in M, we don't bleat