X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcEnv.lhs;h=b0678c7964278c0b505c4660263c553f1f04c2f5;hb=7129b3c1fb6386212ce0a544dd4dafcf96b2a106;hp=c93dbe156bf98a586ac4b1040198dd1913087333;hpb=1fa3580c54985d73178d1d396b897176a57cd7f3;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcEnv.lhs b/compiler/typecheck/TcEnv.lhs
index c93dbe1..b0678c7 100644
--- a/compiler/typecheck/TcEnv.lhs
+++ b/compiler/typecheck/TcEnv.lhs
@@ -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
 	}}}}}
@@ -589,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)