X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcEnv.lhs;h=cc50e50d732837f6d30763423dc6f151deb867e6;hb=2423c249f5ca7785d0ec89eb33e72662da7561c1;hp=6799653e547c1eb20c77b60d2f249d6ca0a0c569;hpb=e6d057711f4d6d6ff6342c39fa2b9e44d25447f1;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcEnv.lhs b/compiler/typecheck/TcEnv.lhs
index 6799653..cc50e50 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,
-		 	  idHsWrapper, (<.>) )
-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
@@ -402,16 +400,21 @@ refineEnvironment :: Refinement -> TcM a -> TcM a
 -- I don't think I have to refine the set of global type variables in scope
 -- Reason: the refinement never increases that set
 refineEnvironment reft thing_inside
+  | isEmptyRefinement reft		-- Common case
+  = thing_inside
+  | otherwise
   = do	{ env <- getLclEnv
 	; let le' = mapNameEnv refine (tcl_env env)
  	; setLclEnv (env {tcl_env = le'}) thing_inside }
   where
     refine elt@(ATcId { tct_co = Just co, tct_type = ty })
-			  = let (co', ty') = refineType reft ty
-			    in elt { tct_co = Just (co' <.> co), tct_type = ty' }
-    refine (ATyVar tv ty) = ATyVar tv (snd (refineType reft ty))
-				-- Ignore the coercion that refineType returns
-    refine elt		  = elt
+	| Just (co', ty') <- refineType reft ty
+	= elt { tct_co = Just (WpCo co' <.> co), tct_type = ty' }
+    refine (ATyVar tv ty) 
+	| Just (_, ty') <- refineType reft ty
+	= ATyVar tv ty'	-- Ignore the coercion that refineType returns
+
+    refine elt = elt	-- Common case
 \end{code}
 
 %************************************************************************
@@ -614,7 +617,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 +632,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}