X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnDriver.lhs;h=0a4895f63a070d3ec4957a38a04a51e213e99d50;hp=9e1bfb97a5bd9e28cb1ee0e1f97f58ceb5e3f5e8;hb=3e83dfb21b2f2220dce97427fff5c19459ae68d1;hpb=b360db770ca5e147066b7647b225208d531a6eaf

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index 9e1bfb9..0a4895f 100644
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -113,7 +113,7 @@ import MkId		( unsafeCoerceId )
 import TyCon		( tyConName )
 import TysWiredIn	( mkListTy, unitTy )
 import IdInfo		( GlobalIdDetails(..) )
-import Kind		( Kind )
+import {- Kind parts of -} Type		( Kind, eqKind )
 import Var		( globaliseId )
 import Name		( isBuiltInSyntax, isInternalName )
 import OccName		( isTcOcc )
@@ -997,10 +997,12 @@ tcGhciStmts stmts
 		-- then the type checker would instantiate x..z, and we wouldn't
 		-- get their *polymorphic* values.  (And we'd get ambiguity errs
 		-- if they were overloaded, since they aren't applied to anything.)
-	    mk_return ids = nlHsApp (noLoc $ TyApp (nlHsVar ret_id) [ret_ty]) 
+	    mk_return ids = nlHsApp (mkHsTyApp ret_id [ret_ty]) 
 			 	    (noLoc $ ExplicitList unitTy (map mk_item ids)) ;
-	    mk_item id = nlHsApp (noLoc $ TyApp (nlHsVar unsafeCoerceId) [idType id, unitTy])
-		    	         (nlHsVar id) 
+	    mk_item id = nlHsApp (noLoc $ unsafeCoerce)
+		    	         (nlHsVar id)
+ 
+            unsafeCoerce x = Cast x (mkUnsafeCoercion [idType id, unitTy]) 
 	 } ;
 
 	-- OK, we're ready to typecheck the stmts