X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Ftypecheck%2FTcEnv.lhs;h=c638c04d5e060aef26355946d6870a255c03eb6d;hb=49c98d143c382a1341e1046f5ca00819a25691ba;hp=6e5f381d1cf93fe72681314ab1ed241e4d473838;hpb=2ce87c70529c2a75071161bd3d22b029f003ba36;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcEnv.lhs b/compiler/typecheck/TcEnv.lhs
index 6e5f381..c638c04 100644
--- a/compiler/typecheck/TcEnv.lhs
+++ b/compiler/typecheck/TcEnv.lhs
@@ -1,3 +1,7 @@
+%
+% (c) The University of Glasgow 2006
+%
+
 \begin{code}
 module TcEnv(
 	TyThing(..), TcTyThing(..), TcId,
@@ -43,37 +47,29 @@ module TcEnv(
 
 #include "HsVersions.h"
 
-import HsSyn		( LRuleDecl, LHsBinds, LSig, 
-			  LHsTyVarBndr, HsTyVarBndr(..), pprLHsBinds,
-		 	  idCoercion, (<.>) )
-import TcIface		( tcImportDecl )
-import IfaceEnv		( newGlobalBinder )
+import HsSyn
+import TcIface
+import IfaceEnv
 import TcRnMonad
-import TcMType		( zonkTcType, zonkTcTyVarsAndFV )
-import TcType		( Type, TcKind, TcTyVar, TcTyVarSet, TcType, PredType,
-			  tyVarsOfType, tcTyVarsOfTypes, mkTyConApp,
-			  getDFunTyKey, tcTyConAppTyCon, tcGetTyVar, mkTyVarTy,
-			  tidyOpenType, isRefineableTy
-			)
-import TcGadt		( Refinement, refineType )
-import qualified Type	( getTyVar_maybe )
-import Id		( idName, isLocalId )
-import Var		( TyVar, Id, idType, tyVarName )
+import TcMType
+import TcType
+import TcGadt
+import qualified Type
+import Id
+import Var
 import VarSet
 import VarEnv
-import RdrName		( extendLocalRdrEnv )
-import InstEnv		( Instance, DFunId, instanceDFunId, instanceHead )
-import DataCon		( DataCon )
-import TyCon		( TyCon )
-import Class		( Class )
-import Name		( Name, NamedThing(..), getSrcLoc, nameModule,
-			  nameOccName )
-import PrelNames	( thFAKE )
+import RdrName
+import InstEnv
+import DataCon
+import TyCon
+import Class
+import Name
+import PrelNames
 import NameEnv
-import OccName		( mkDFunOcc, occNameString, mkInstTyTcOcc )
-import HscTypes		( extendTypeEnvList, lookupType, TyThing(..),
-			  ExternalPackageState(..) )
-import SrcLoc		( SrcLoc, Located(..) )
+import OccName
+import HscTypes
+import SrcLoc
 import Outputable
 \end{code}
 
@@ -114,13 +110,15 @@ tcLookupGlobal name
 	    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
+	{ case nameModule_maybe name of
+		Nothing -> notFound name	-- Internal names can happen in GHCi
+
+		Just mod | mod == tcg_mod env 	-- Names from this module 
+			 -> notFound name	-- should be in tcg_type_env
+			 | mod == thFAKE	-- Names bound in TH declaration brackets
+			 -> notFound name	-- should be in tcg_env
+			 | otherwise
+		         -> tcImportDecl name	-- Go find it in an interface
 	}}}}}
 
 tcLookupField :: Name -> TcM Id		-- Returns the selector Id
@@ -326,7 +324,7 @@ tcExtendIdEnv2 names_w_ids thing_inside
 					       tct_level = th_lvl,
 					       tct_type = id_ty, 
 					       tct_co = if isRefineableTy id_ty 
-							then Just idCoercion
+							then Just idHsWrapper
 							else Nothing })
 			      | (name,id) <- names_w_ids, let id_ty = idType id]
 	le'		    = extendNameEnvList (tcl_env env) extra_env
@@ -614,7 +612,7 @@ newDFunName clas (ty:_) loc
 			    occNameString (getDFunTyKey ty)
 	      dfun_occ = mkDFunOcc info_string is_boot index
 
-	; newGlobalBinder mod dfun_occ Nothing loc }
+	; newGlobalBinder mod dfun_occ loc }
 
 newDFunName clas [] loc = pprPanic "newDFunName" (ppr clas <+> ppr loc)
 \end{code}
@@ -629,7 +627,7 @@ newFamInstTyConName tc_name loc
   = do	{ index <- nextDFunIndex
 	; mod   <- getModule
 	; let occ = nameOccName tc_name
-	; newGlobalBinder mod (mkInstTyTcOcc index occ) Nothing loc }
+	; newGlobalBinder mod (mkInstTyTcOcc index occ) loc }
 \end{code}