X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcExpr.lhs;h=27b4cf15a150a23f6f796a5f711f6b334b3aa181;hp=2c17568aefe5bfee1c2892da9034fbef6e02c94b;hb=3f1b316d7035c55cd712cd39a9981339bcef2e8c;hpb=bfe55fb767d566b5105c5584f698af1dd4a57346

diff --git a/compiler/typecheck/TcExpr.lhs b/compiler/typecheck/TcExpr.lhs
index 2c17568..27b4cf1 100644
--- a/compiler/typecheck/TcExpr.lhs
+++ b/compiler/typecheck/TcExpr.lhs
@@ -12,8 +12,7 @@
 --     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
 -- for details
 
-module TcExpr ( tcPolyExpr, tcPolyExprNC, 
-		tcMonoExpr, tcInferRho, tcSyntaxOp ) where
+module TcExpr ( tcPolyExpr, tcPolyExprNC, tcMonoExpr, tcInferRho, tcSyntaxOp) where
 
 #include "HsVersions.h"
 
@@ -1002,7 +1001,7 @@ thLocalId orig id id_ty th_bind_lvl
 
 --------------------------------------
 thBrackId orig id ps_var lie_var
-  | isExternalName id_name
+  | thTopLevelId id
   =	-- Top-level identifiers in this module,
 	-- (which have External Names)
 	-- are just like the imported case:
@@ -1013,7 +1012,7 @@ thBrackId orig id ps_var lie_var
 	-- But we do need to put f into the keep-alive
 	-- set, because after desugaring the code will
 	-- only mention f's *name*, not f itself.
-    do	{ keepAliveTc id_name; return id }
+    do	{ keepAliveTc id; return id }
 
   | otherwise
   = 	-- Nested identifiers, such as 'x' in
@@ -1045,11 +1044,9 @@ thBrackId orig id ps_var lie_var
 	   
 		   -- Update the pending splices
 	; ps <- readMutVar ps_var
-	; writeMutVar ps_var ((id_name, nlHsApp (nlHsVar lift) (nlHsVar id)) : ps)
+	; writeMutVar ps_var ((idName id, nlHsApp (nlHsVar lift) (nlHsVar id)) : ps)
 
 	; return id } }
- where
-   id_name = idName id
 #endif /* GHCI */
 \end{code}