X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcEnv.lhs;h=d0388456e7ad153fdf1e3e84ae32f25d871e278b;hp=feafc2ea0a44fcd6ed48c2bdebdf8d7a8df0bda2;hb=61bcd16d4f3d4cf84b26bf7bb92f16f0440b7071;hpb=40437a76ae66881f01e68bbe6b4671ea3dc7e93d

diff --git a/compiler/typecheck/TcEnv.lhs b/compiler/typecheck/TcEnv.lhs
index feafc2e..d038845 100644
--- a/compiler/typecheck/TcEnv.lhs
+++ b/compiler/typecheck/TcEnv.lhs
@@ -12,7 +12,7 @@ module TcEnv(
 	InstBindings(..),
 
 	-- Global environment
-	tcExtendGlobalEnv, 
+	tcExtendGlobalEnv, setGlobalTypeEnv,
 	tcExtendGlobalValEnv,
 	tcLookupLocatedGlobal,	tcLookupGlobal, 
 	tcLookupField, tcLookupTyCon, tcLookupClass, tcLookupDataCon,
@@ -39,7 +39,7 @@ module TcEnv(
 
 	-- Template Haskell stuff
 	checkWellStaged, spliceOK, bracketOK, tcMetaTy, thLevel, 
-	topIdLvl, thTopLevelId,
+	topIdLvl, thTopLevelId, thRnBrack, isBrackStage,
 
 	-- New Ids
 	newLocalName, newDFunName, newFamInstTyConName, 
@@ -68,7 +68,6 @@ import TyCon
 import TypeRep
 import Class
 import Name
-import PrelNames
 import NameEnv
 import OccName
 import HscTypes
@@ -121,8 +120,6 @@ tcLookupGlobal name
 
 		Just mod | mod == tcg_mod env 	-- Names from this module 
 			 -> notFound name env -- should be in tcg_type_env
-			 | mod == thFAKE	-- Names bound in TH declaration brackets
-			 -> notFound name env -- should be in tcg_env
 			 | otherwise
 		         -> tcImportDecl name	-- Go find it in an interface
 	}}}}}
@@ -143,7 +140,7 @@ Then the renamer (which does not keep track of what is a record selector
 and what is not) will rename the definition thus
 	f_7 = e { f_7 = True }
 Now the type checker will find f_7 in the *local* type environment, not
-the global one. It's wrong, of course, but we want to report a tidy
+the global (imported) one. It's wrong, of course, but we want to report a tidy
 error, not in TcEnv.notFound.  -}
 
 tcLookupDataCon :: Name -> TcM DataCon
@@ -215,28 +212,37 @@ tcLookupFamInst tycon tys
 
 
 \begin{code}
+setGlobalTypeEnv :: TcGblEnv -> TypeEnv -> TcM TcGblEnv
+-- Use this to update the global type env 
+-- It updates both  * the normal tcg_type_env field
+-- 	   	    * the tcg_type_env_var field seen by interface files
+setGlobalTypeEnv tcg_env new_type_env
+  = do  {     -- Sync the type-envt variable seen by interface files
+    	   writeMutVar (tcg_type_env_var tcg_env) new_type_env
+	 ; return (tcg_env { tcg_type_env = new_type_env }) }
+
 tcExtendGlobalEnv :: [TyThing] -> TcM r -> TcM r
   -- Given a mixture of Ids, TyCons, Classes, all from the
   -- module being compiled, extend the global environment
 tcExtendGlobalEnv things thing_inside
-   = do	{ env <- getGblEnv
-	; let ge'  = extendTypeEnvList (tcg_type_env env) things
-	; setGblEnv (env {tcg_type_env = ge'}) thing_inside }
+   = do	{ tcg_env <- getGblEnv
+	; let ge'  = extendTypeEnvList (tcg_type_env tcg_env) things
+	; tcg_env' <- setGlobalTypeEnv tcg_env ge'
+	; setGblEnv tcg_env' thing_inside }
 
 tcExtendGlobalValEnv :: [Id] -> TcM a -> TcM a
   -- Same deal as tcExtendGlobalEnv, but for Ids
 tcExtendGlobalValEnv ids thing_inside 
   = tcExtendGlobalEnv [AnId id | id <- ids] thing_inside
-\end{code}
 
-\begin{code}
 tcExtendRecEnv :: [(Name,TyThing)] -> TcM r -> TcM r
 -- Extend the global environments for the type/class knot tying game
+-- Just like tcExtendGlobalEnv, except the argument is a list of pairs
 tcExtendRecEnv gbl_stuff thing_inside
- = updGblEnv upd thing_inside
- where
-   upd env = env { tcg_type_env = extend (tcg_type_env env) }
-   extend env = extendNameEnvList env gbl_stuff
+ = do  { tcg_env <- getGblEnv
+       ; let ge' = extendNameEnvList (tcg_type_env tcg_env) gbl_stuff 
+       ; tcg_env' <- setGlobalTypeEnv tcg_env ge'
+       ; setGblEnv tcg_env' thing_inside }
 \end{code}
 
 
@@ -580,6 +586,16 @@ tcMetaTy tc_name = do
     t <- tcLookupTyCon tc_name
     return (mkTyConApp t [])
 
+thRnBrack :: ThStage
+-- Used *only* to indicate that we are inside a TH bracket during renaming
+-- Tested by TcEnv.isBrackStage
+-- See Note [Top-level Names in Template Haskell decl quotes]
+thRnBrack = Brack (panic "thRnBrack1") (panic "thRnBrack2") (panic "thRnBrack3") 
+
+isBrackStage :: ThStage -> Bool
+isBrackStage (Brack {}) = True
+isBrackStage _other     = False
+
 thTopLevelId :: Id -> Bool
 -- See Note [What is a top-level Id?] in TcSplice
 thTopLevelId id = isGlobalId id || isExternalName (idName id)