X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcEnv.lhs;h=a23795cf6d3975b0546b4df357df73ec3959a8a4;hb=06f6f35dadc461336675e6d2b8a2192b1f518a1b;hp=58bda528cfedf6f6f65da9f0f84594b365a11db3;hpb=2eeaaa6f9eb206ad3473c151556629a2e2624f78;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcEnv.lhs b/compiler/typecheck/TcEnv.lhs
index 58bda52..a23795c 100644
--- a/compiler/typecheck/TcEnv.lhs
+++ b/compiler/typecheck/TcEnv.lhs
@@ -47,7 +47,7 @@ module TcEnv(
 
 	-- Template Haskell stuff
 	checkWellStaged, spliceOK, bracketOK, tcMetaTy, thLevel, 
-	topIdLvl, 
+	topIdLvl, thTopLevelId,
 
 	-- New Ids
 	newLocalName, newDFunName, newFamInstTyConName,
@@ -110,7 +110,7 @@ tcLookupGlobal name
   = do	{ env <- getGblEnv
 	
 		-- Try local envt
-	; case lookupNameEnv (tcg_type_env env) name of {
+	; case lookupNameEnv (tcg_type_env env) name of { 
 		Just thing -> return thing ;
 		Nothing	   -> do 
 	 
@@ -123,12 +123,12 @@ tcLookupGlobal name
 
 		-- Should it have been in the local envt?
 	{ case nameModule_maybe name of
-		Nothing -> notFound name	-- Internal names can happen in GHCi
+		Nothing -> notFound name env -- Internal names can happen in GHCi
 
 		Just mod | mod == tcg_mod env 	-- Names from this module 
-			 -> notFound name	-- should be in tcg_type_env
+			 -> notFound name env -- should be in tcg_type_env
 			 | mod == thFAKE	-- Names bound in TH declaration brackets
-			 -> notFound name	-- should be in tcg_env
+			 -> notFound name env -- should be in tcg_env
 			 | otherwise
 		         -> tcImportDecl name	-- Go find it in an interface
 	}}}}}
@@ -604,6 +604,10 @@ tcMetaTy :: Name -> TcM Type
 tcMetaTy tc_name
   = tcLookupTyCon tc_name	`thenM` \ t ->
     returnM (mkTyConApp t [])
+
+thTopLevelId :: Id -> Bool
+-- See Note [What is a top-level Id?] in TcSplice
+thTopLevelId id = isGlobalId id || isExternalName (idName id)
 \end{code}
 
 
@@ -708,9 +712,11 @@ pprBinders :: [Name] -> SDoc
 pprBinders [bndr] = quotes (ppr bndr)
 pprBinders bndrs  = pprWithCommas ppr bndrs
 
-notFound name 
-  = failWithTc (ptext SLIT("GHC internal error:") <+> quotes (ppr name) <+> 
-		ptext SLIT("is not in scope"))
+notFound name env
+  = failWithTc (vcat[ptext SLIT("GHC internal error:") <+> quotes (ppr name) <+> 
+                     ptext SLIT("is not in scope during type checking, but it passed the renamer"),
+                     ptext SLIT("tcg_type_env of environment:") <+> ppr (tcg_type_env env)]
+                    )
 
 wrongThingErr expected thing name
   = failWithTc (pprTcTyThingCategory thing <+> quotes (ppr name) <+>