X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnDriver.lhs;h=875d4f605fc04f265692399e2a446bf25b8bb55a;hb=00cc4d8773d1138f7b3b3ac122f3c98a6f93e68a;hp=e942eec71b6f476b5852f53d3b7ec68b29e04a2d;hpb=7a59afcebe45ea87c42006873f77eb4600d7316f;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index e942eec..875d4f6 100644
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -35,6 +35,7 @@ import RdrHsSyn		( findSplice )
 import PrelNames	( runMainIOName, rootMainKey, rOOT_MAIN, mAIN,
 			  main_RDR_Unqual )
 import RdrName		( RdrName, mkRdrUnqual, emptyGlobalRdrEnv )
+import TyCon		( isOpenTyCon )
 import TcHsSyn		( zonkTopDecls )
 import TcExpr 		( tcInferRho )
 import TcRnMonad
@@ -48,7 +49,8 @@ import TcRules		( tcRules )
 import TcForeign	( tcForeignImports, tcForeignExports )
 import TcInstDcls	( tcInstDecls1, tcInstDecls2 )
 import TcIface		( tcExtCoreBindings, tcHiBootIface )
-import IfaceSyn		( checkBootDecl, tyThingToIfaceDecl, IfaceExtName(..) )
+import MkIface		( tyThingToIfaceDecl )
+import IfaceSyn		( checkBootDecl, IfaceExtName(..) )
 import TcSimplify	( tcSimplifyTop )
 import TcTyClsDecls	( tcTyAndClassDecls )
 import LoadIface	( loadOrphanModules )
@@ -87,7 +89,7 @@ import HsSyn		( HsStmtContext(..), Stmt(..), HsExpr(..),
 			  HsLocalBinds(..), HsValBinds(..),
 			  LStmt, LHsExpr, LHsType, mkMatch, emptyLocalBinds,
 			  collectLStmtsBinders, collectLStmtBinders, nlVarPat,
-		   	  mkFunBind, placeHolderType, noSyntaxExpr )
+		   	  mkFunBind, placeHolderType, noSyntaxExpr, nlHsTyApp )
 import RdrName		( GlobalRdrElt(..), globalRdrEnvElts,
 			  unQualOK, lookupLocalRdrEnv, extendLocalRdrEnv )
 import RnSource		( addTcgDUs )
@@ -96,6 +98,7 @@ import TcHsType		( kcHsType )
 import TcMType		( zonkTcType, zonkQuantifiedTyVar )
 import TcMatches	( tcStmts, tcDoStmt )
 import TcSimplify	( tcSimplifyInteractive, tcSimplifyInfer )
+import TcGadt		( emptyRefinement )
 import TcType		( Type, mkForAllTys, mkFunTys, mkTyConApp, tyVarsOfType, isTauTy,
 			  isUnLiftedType, tyClsNamesOfDFunHead, tyClsNamesOfType, isUnitTy )
 import TcEnv		( tcLookupTyCon, tcLookupId, tcLookupGlobal )
@@ -112,7 +115,7 @@ import MkId		( unsafeCoerceId )
 import TyCon		( tyConName )
 import TysWiredIn	( mkListTy, unitTy )
 import IdInfo		( GlobalIdDetails(..) )
-import Kind		( Kind )
+import {- Kind parts of -} Type		( Kind )
 import Var		( globaliseId )
 import Name		( isBuiltInSyntax, isInternalName )
 import OccName		( isTcOcc )
@@ -229,9 +232,10 @@ tcRnModule hsc_env hsc_src save_rn_syntax
 	reportDeprecations (hsc_dflags hsc_env) tcg_env ;
 
 		-- Process the export list
-	rn_exports <- rnExports export_ies ;
+	rn_exports <- rnExports export_ies;
         let { liftM2' fn a b = do a' <- a; b' <- b; return (fn a' b') } ;
-        exports <- mkExportNameSet (isJust maybe_mod) (liftM2' (,) rn_exports export_ies) ;
+        exports <- mkExportNameSet (isJust maybe_mod) 
+				   (liftM2' (,) rn_exports export_ies) ;
 
 		-- Check whether the entire module is deprecated
 		-- This happens only once per module
@@ -428,6 +432,7 @@ tc_rn_src_decls boot_details ds
 	-- Rename the splice expression, and get its supporting decls
 	(rn_splice_expr, splice_fvs) <- rnLExpr splice_expr ;
 	failIfErrsM ;	-- Don't typecheck if renaming failed
+	rnDump (ppr rn_splice_expr) ;
 
 	-- Execute the splice
 	spliced_decls <- tcSpliceDecls rn_splice_expr ;
@@ -558,6 +563,7 @@ missingBootThing thing
   = ppr thing <+> ptext SLIT("is defined in the hs-boot file, but not in the module")
 bootMisMatch thing boot_decl real_decl
   = ppr thing <+> ptext SLIT("has conflicting definitions in the module and its hs-boot file")
+    $+$ (ppr boot_decl) $+$ (ppr real_decl)
 instMisMatch inst
   = hang (ppr inst)
        2 (ptext SLIT("is defined in the hs-boot file, but not in the module"))
@@ -981,6 +987,8 @@ tcGhciStmts stmts
 	    io_ty     = mkTyConApp ioTyCon [] ;
 	    ret_ty    = mkListTy unitTy ;
 	    io_ret_ty = mkTyConApp ioTyCon [ret_ty] ;
+	    tc_io_stmts stmts = tcStmts DoExpr (tcDoStmt io_ty) stmts 
+				        (emptyRefinement, io_ret_ty) ;
 
 	    names = map unLoc (collectLStmtsBinders stmts) ;
 
@@ -995,17 +1003,16 @@ 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 (nlHsTyApp ret_id [ret_ty]) 
 			 	    (noLoc $ ExplicitList unitTy (map mk_item ids)) ;
-	    mk_item id = nlHsApp (noLoc $ TyApp (nlHsVar unsafeCoerceId) [idType id, unitTy])
+	    mk_item id = nlHsApp (nlHsTyApp unsafeCoerceId [idType id, unitTy])
 		    	         (nlHsVar id) 
 	 } ;
 
 	-- OK, we're ready to typecheck the stmts
 	traceTc (text "tcs 2") ;
-	((tc_stmts, ids), lie) <- getLIE $ 
-				  tcStmts DoExpr (tcDoStmt io_ty) stmts io_ret_ty $ \ _ ->
-				  mappM tcLookupId names ;
+	((tc_stmts, ids), lie) <- getLIE $ tc_io_stmts stmts $ \ _ ->
+					   mappM tcLookupId names ;
 					-- Look up the names right in the middle,
 					-- where they will all be in scope