From: simonpj <unknown>
Date: Tue, 4 Feb 2003 12:25:21 +0000 (+0000)
Subject: [project @ 2003-02-04 12:25:21 by simonpj]
X-Git-Tag: Approx_11550_changesets_converted~1214
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=60beff5f890d5faae37f443a5822ae85ac72aaf5;p=ghc-hetmet.git

[project @ 2003-02-04 12:25:21 by simonpj]
Use nameIsLocalOrFrom instead of open code
---

diff --git a/ghc/compiler/rename/RnIfaces.lhs b/ghc/compiler/rename/RnIfaces.lhs
index 9f52b96..309ab65 100644
--- a/ghc/compiler/rename/RnIfaces.lhs
+++ b/ghc/compiler/rename/RnIfaces.lhs
@@ -34,8 +34,8 @@ import FieldLabel	( fieldLabelTyCon )
 import DataCon		( dataConTyCon )
 import TyCon		( visibleDataCons, isSynTyCon, getSynTyConDefn, tyConClass_maybe, tyConName )
 import Class		( className, classSCTheta )
-import Name		( Name {-instance NamedThing-}, isWiredInName, isInternalName, nameModule, NamedThing(..)
-			 )
+import Name		( Name {-instance NamedThing-}, isWiredInName, nameIsLocalOrFrom, 
+			  nameModule, NamedThing(..) )
 import NameEnv 		( delFromNameEnv, lookupNameEnv )
 import NameSet
 import Module		( Module, isHomeModule )
@@ -233,7 +233,7 @@ importDecl already_slurped name
   = 	-- STEP 0: Check if it's from this module
 	-- Doing this catches a common case quickly
     getModule				`thenM` \ this_mod ->
-    if isInternalName name || nameModule name == this_mod then
+    if nameIsLocalOrFrom this_mod name then
 	-- Variables defined on the GHCi command line (e.g. let x = 3)
 	-- are Internal names (which don't have a Module)
 	returnM AlreadySlurped
@@ -535,8 +535,7 @@ getImportedRules slurped
   | otherwise
   = getEps		`thenM` \ eps ->
     getInGlobalScope	`thenM` \ in_type_env ->
-    let
-		-- Slurp rules for anything that is slurped, 
+    let		-- Slurp rules for anything that is slurped, 
 		-- either now, or previously
 	available n        = n `elemNameSet` slurped || in_type_env n
 	(decls, new_rules) = selectGated available (eps_rules eps)