X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FGHC.hs;h=c786cbba1616b4bde39e3d77be45cdaca4e6d695;hb=49c98d143c382a1341e1046f5ca00819a25691ba;hp=dab148a7a5dbbee0a1b034b3d856aa6236e49e3a;hpb=190f24892156953d73b55401d0467a6f1a88ce5d;p=ghc-hetmet.git

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index dab148a..c786cbb 100644
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -94,7 +94,7 @@ module GHC (
 
 	-- ** Names
 	Name, 
-	nameModule, nameParent_maybe, pprParenSymName, nameSrcLoc,
+	nameModule, pprParenSymName, nameSrcLoc,
 	NamedThing(..),
 	RdrName(Qual,Unqual),
 	
@@ -215,8 +215,7 @@ import FunDeps		( pprFundeps )
 import DataCon		( DataCon, dataConWrapId, dataConSig, dataConTyCon,
 			  dataConFieldLabels, dataConStrictMarks, 
 			  dataConIsInfix, isVanillaDataCon )
-import Name		( Name, nameModule, NamedThing(..), nameParent_maybe,
-			  nameSrcLoc )
+import Name		( Name, nameModule, NamedThing(..), nameSrcLoc )
 import OccName		( parenSymOcc )
 import NameEnv		( nameEnvElts )
 import InstEnv		( Instance, instanceDFunId, pprInstance, pprInstanceHdr )
@@ -654,6 +653,8 @@ load2 s@(Session ref) how_much mod_graph = do
 	let cleanup = cleanTempFilesExcept dflags
 			  (ppFilesFromSummaries (flattenSCCs mg2_with_srcimps))
 
+	debugTraceMsg dflags 2 (hang (text "Ready for upsweep") 
+				   2 (ppr mg))
         (upsweep_ok, hsc_env1, modsUpswept)
            <- upsweep (hsc_env { hsc_HPT = emptyHomePackageTable })
 			   pruned_hpt stable_mods cleanup mg
@@ -819,7 +820,8 @@ checkModule session@(Session ref) mod = do
 			   (Just (tc_binds, rdr_env, details))) -> do
 		   let minf = ModuleInfo {
 				minf_type_env  = md_types details,
-				minf_exports   = md_exports details,
+				minf_exports   = availsToNameSet $
+                                                     md_exports details,
 				minf_rdr_env   = Just rdr_env,
 				minf_instances = md_insts details
 			      }
@@ -1728,7 +1730,7 @@ getPrintUnqual s = withSession s (return . icPrintUnqual . hsc_IC)
 -- | Container for information about a 'Module'.
 data ModuleInfo = ModuleInfo {
 	minf_type_env  :: TypeEnv,
-	minf_exports   :: NameSet,
+	minf_exports   :: NameSet, -- ToDo, [AvailInfo] like ModDetails?
 	minf_rdr_env   :: Maybe GlobalRdrEnv,	-- Nothing for a compiled/package mod
 	minf_instances :: [Instance]
 	-- ToDo: this should really contain the ModIface too
@@ -1783,7 +1785,7 @@ getHomeModuleInfo hsc_env mdl =
       let details = hm_details hmi
       return (Just (ModuleInfo {
 			minf_type_env  = md_types details,
-			minf_exports   = md_exports details,
+			minf_exports   = availsToNameSet (md_exports details),
 			minf_rdr_env   = mi_globals $! hm_iface hmi,
 			minf_instances = md_insts details
 			}))