X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FGHC.hs;h=6295d7dcbd6a5fec20983bf22f1f96cfd2ab7907;hb=53f50b718b9c6abcf4d61c95f1e4d355934a2550;hp=70039a9654b7d1aada8334b65affd8b87c1621a2;hpb=171c3d1ea2dc92a8b5e6e76c435286ce5be53386;p=ghc-hetmet.git

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index 70039a9..6295d7d 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 )
@@ -821,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
 			      }
@@ -1730,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
@@ -1756,15 +1756,15 @@ getModuleInfo s mdl = withSession s $ \hsc_env -> do
 getPackageModuleInfo :: HscEnv -> Module -> IO (Maybe ModuleInfo)
 getPackageModuleInfo hsc_env mdl = do
 #ifdef GHCI
-  (_msgs, mb_names) <- getModuleExports hsc_env mdl
-  case mb_names of
+  (_msgs, mb_avails) <- getModuleExports hsc_env mdl
+  case mb_avails of
     Nothing -> return Nothing
-    Just names -> do
+    Just avails -> do
 	eps <- readIORef (hsc_EPS hsc_env)
 	let 
+            names  = availsToNameSet avails
 	    pte    = eps_PTE eps
-	    n_list = nameSetToList names
-	    tys    = [ ty | name <- n_list,
+	    tys    = [ ty | name <- concatMap availNames avails,
 			    Just ty <- [lookupTypeEnv pte name] ]
 	--
 	return (Just (ModuleInfo {
@@ -1785,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
 			}))
@@ -1925,8 +1925,8 @@ mkExportEnv hsc_env mods = do
   stuff <- mapM (getModuleExports hsc_env) mods
   let 
 	(_msgs, mb_name_sets) = unzip stuff
-	gres = [ nameSetToGlobalRdrEnv name_set (moduleName mod)
-  	       | (Just name_set, mod) <- zip mb_name_sets mods ]
+	gres = [ nameSetToGlobalRdrEnv (availsToNameSet avails) (moduleName mod)
+  	       | (Just avails, mod) <- zip mb_name_sets mods ]
   --
   return $! foldr plusGlobalRdrEnv emptyGlobalRdrEnv gres