X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcEnv.lhs;h=31d81a4bd6d6712086978343309dc3e88449dc6e;hb=edf6bdfb5dee21f9bc5077083e5350ee64efffbc;hp=06b79f7c228ede933f5196e88f8b33c70f14332c;hpb=a7ecdf96844404b7bc8273d4ff6d85759278427c;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcEnv.lhs b/ghc/compiler/typecheck/TcEnv.lhs
index 06b79f7..31d81a4 100644
--- a/ghc/compiler/typecheck/TcEnv.lhs
+++ b/ghc/compiler/typecheck/TcEnv.lhs
@@ -46,7 +46,6 @@ import HsSyn		( LRuleDecl, LHsBinds, LSig,
 			  LHsTyVarBndr, HsTyVarBndr(..), pprLHsBinds )
 import TcIface		( tcImportDecl )
 import IfaceEnv		( newGlobalBinder )
-import TcRnTypes	( pprTcTyThingCategory )
 import TcRnMonad
 import TcMType		( zonkTcType, zonkTcTyVarsAndFV )
 import TcType		( Type, TcKind, TcTyVar, TcTyVarSet, TcType,
@@ -64,7 +63,8 @@ import InstEnv		( Instance, DFunId, instanceDFunId, instanceHead )
 import DataCon		( DataCon )
 import TyCon		( TyCon )
 import Class		( Class )
-import Name		( Name, NamedThing(..), getSrcLoc, nameIsLocalOrFrom )
+import Name		( Name, NamedThing(..), getSrcLoc, nameModule, isExternalName )
+import PrelNames	( thFAKE )
 import NameEnv
 import OccName		( mkDFunOcc, occNameString )
 import HscTypes		( extendTypeEnvList, lookupType,
@@ -93,21 +93,32 @@ tcLookupLocatedGlobal name
   = addLocM tcLookupGlobal name
 
 tcLookupGlobal :: Name -> TcM TyThing
+-- The Name is almost always an ExternalName, but not always
+-- In GHCi, we may make command-line bindings (ghci> let x = True)
+-- that bind a GlobalId, but with an InternalName
 tcLookupGlobal name
   = do	{ env <- getGblEnv
-	; if nameIsLocalOrFrom (tcg_mod env) name
-
-	  then	-- It's defined in this module
-	      case lookupNameEnv (tcg_type_env env) name of
-		Just thing -> return thing
-		Nothing	   -> notFound  name	-- Panic!
+	
+		-- Try local envt
+	; case lookupNameEnv (tcg_type_env env) name of {
+		Just thing -> return thing ;
+		Nothing	   -> do 
 	 
-	  else do 		-- It's imported
+		-- Try global envt
 	{ (eps,hpt) <- getEpsAndHpt
-	; case lookupType hpt (eps_PTE eps) name of 
-	    Just thing -> return thing 
-	    Nothing    -> tcImportDecl name
-    }}
+	; case lookupType hpt (eps_PTE eps) name of  {
+	    Just thing -> return thing ;
+	    Nothing    -> do
+
+		-- Should it have been in the local envt?
+	{ let mod = nameModule name
+	; if mod == tcg_mod env || mod == thFAKE then
+		notFound name	-- It should be local, so panic
+				-- The thFAKE possibility is because it
+				-- might be in a declaration bracket
+	  else
+		tcImportDecl name	-- Go find it in an interface
+	}}}}}
 
 tcLookupGlobalId :: Name -> TcM Id
 -- Never used for Haskell-source DataCons, hence no ADataCon case