[project @ 2000-11-27 14:23:03 by sewardj]

[ghc-hetmet.git] / ghc / compiler / rename / RnIfaces.lhs

diff --git a/ghc/compiler/rename/RnIfaces.lhs b/ghc/compiler/rename/RnIfaces.lhs
index 7311439..54ec9e6 100644 (file)
--- a/ghc/compiler/rename/RnIfaces.lhs
+++ b/ghc/compiler/rename/RnIfaces.lhs
@@ -44,7 +44,7 @@ import Name           ( Name {-instance NamedThing-}, nameOccName,
                         )
 import Name            ( elemNameEnv, delFromNameEnv )
 import Module          ( Module, ModuleEnv, 
-                         moduleName, isModuleInThisPackage,
+                         moduleName, isHomeModule,
                          ModuleName, WhereFrom(..),
                          emptyModuleEnv, 
                          extendModuleEnv_C, foldModuleEnv, lookupModuleEnv,
@@ -178,7 +178,7 @@ mkImportInfo this_mod imports
 
            mod             = mi_module iface
            mod_name        = moduleName mod
-           is_home_pkg_mod = isModuleInThisPackage mod
+           is_home_pkg_mod = isHomeModule mod
            version_info    = mi_version iface
            version_env     = vers_decls   version_info
            mod_vers        = vers_module  version_info
@@ -213,22 +213,20 @@ slurpImpDecls source_fvs
   = traceRn (text "slurpImp" <+> fsep (map ppr (nameSetToList source_fvs))) `thenRn_`
 
        -- The current slurped-set records all local things
-    getSlurped                                 `thenRn` \ source_binders ->
-    slurpSourceRefs source_binders source_fvs  `thenRn` \ (decls, needed) ->
+    slurpSourceRefs source_fvs `thenRn` \ (decls, needed) ->
 
        -- Then get everything else
     closeDecls decls needed
 
 
 -------------------------------------------------------
-slurpSourceRefs :: NameSet                     -- Variables defined in source
-               -> FreeVars                     -- Variables referenced in source
+slurpSourceRefs :: FreeVars                    -- Variables referenced in source
                -> RnMG ([RenamedHsDecl],
                         FreeVars)              -- Un-satisfied needs
 -- The declaration (and hence home module) of each gate has
 -- already been loaded
 
-slurpSourceRefs source_binders source_fvs
+slurpSourceRefs source_fvs
   = go_outer []                        -- Accumulating decls
             emptyFVs                   -- Unsatisfied needs
             emptyFVs                   -- Accumulating gates
@@ -324,10 +322,6 @@ rnIfaceTyClDecl (mod, decl) = initIfaceRnMS mod (rnTyClDecl decl)  `thenRn` \ dec
 
 
 \begin{code}
-getSlurped
-  = getIfacesRn        `thenRn` \ ifaces ->
-    returnRn (iSlurp ifaces)
-
 recordSlurp ifaces@(Ifaces { iDecls = (decls_map, n_slurped),
                             iSlurp = slurped_names, 
                             iVSlurp = (imp_mods, imp_names) })
@@ -341,8 +335,8 @@ recordSlurp ifaces@(Ifaces { iDecls = (decls_map, n_slurped),
     main_name  = availName avail
     mod               = nameModule main_name
     new_slurped_names = addAvailToNameSet slurped_names avail
-    new_vslurp | isModuleInThisPackage mod = (imp_mods, addOneToNameSet imp_names main_name)
-              | otherwise                 = (extendModuleSet imp_mods mod, imp_names)
+    new_vslurp | isHomeModule mod = (imp_mods, addOneToNameSet imp_names main_name)
+              | otherwise        = (extendModuleSet imp_mods mod, imp_names)
 
 recordLocalSlurps new_names
   = getIfacesRn        `thenRn` \ ifaces ->
@@ -424,10 +418,9 @@ getGates :: FreeVars               -- Things mentioned in the source program
 getGates source_fvs decl 
   = get_gates (\n -> n `elemNameSet` source_fvs) decl
 
-get_gates is_used (IfaceSig _ ty _ _)
-  = extractHsTyNames ty
+get_gates is_used (IfaceSig {tcdType = ty}) = extractHsTyNames ty
 
-get_gates is_used (ClassDecl ctxt cls tvs _ sigs _ _ _ )
+get_gates is_used (ClassDecl { tcdCtxt = ctxt, tcdName = cls, tcdTyVars = tvs, tcdSigs = sigs})
   = (delListFromNameSet (foldr (plusFV . get) (extractHsCtxtTyNames ctxt) sigs)
                        (hsTyVarNames tvs)
      `addOneToNameSet` cls)
@@ -447,11 +440,11 @@ get_gates is_used (ClassDecl ctxt cls tvs _ sigs _ _ _ )
                 | otherwise
                 = emptyFVs
 
-get_gates is_used (TySynonym tycon tvs ty _)
+get_gates is_used (TySynonym {tcdTyVars = tvs, tcdSynRhs = ty})
   = delListFromNameSet (extractHsTyNames ty) (hsTyVarNames tvs)
        -- A type synonym type constructor isn't a "gate" for instance decls
 
-get_gates is_used (TyData _ ctxt tycon tvs cons _ _ _ _ _)
+get_gates is_used (TyData {tcdCtxt = ctxt, tcdName = tycon, tcdTyVars = tvs, tcdCons = cons})
   = delListFromNameSet (foldr (plusFV . get) (extractHsCtxtTyNames ctxt) cons)
                       (hsTyVarNames tvs)
     `addOneToNameSet` tycon