X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnDriver.lhs;h=7c79e6252382603777a03931f7c14d945e1a9a67;hp=4a3cb5e7a01e4f18f9d5542ac84b94b034fa25bd;hb=eeb635d0ed2346568e312ac06ce7f2f1ecb434be;hpb=b0d80aa3d908a6b9991920a5ac7fd1b437ecafd3

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index 4a3cb5e..7c79e62 100644
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -5,6 +5,13 @@
 \section[TcModule]{Typechecking a whole module}
 
 \begin{code}
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 module TcRnDriver (
 #ifdef GHCI
 	tcRnStmt, tcRnExpr, tcRnType,
@@ -245,7 +252,7 @@ tcRnImports hsc_env this_mod import_decls
 
 		-- Check type-familily consistency
 	; traceRn (text "rn1: checking family instance consistency")
-	; let { dir_imp_mods = map (\ (mod, _, _) -> mod) 
+	; let { dir_imp_mods = map (\ (mod, _) -> mod) 
 			     . moduleEnvElts 
 			     . imp_mods 
 			     $ imports }
@@ -830,16 +837,16 @@ get two defns for 'main' in the interface file!
 #ifdef GHCI
 setInteractiveContext :: HscEnv -> InteractiveContext -> TcRn a -> TcRn a
 setInteractiveContext hsc_env icxt thing_inside 
-  = let 
-	-- Initialise the tcg_inst_env with instances 
-	-- from all home modules.  This mimics the more selective
-	-- call to hptInstances in tcRnModule
-	dfuns = fst (hptInstances hsc_env (\mod -> True))
+  = let -- Initialise the tcg_inst_env with instances from all home modules.  
+        -- This mimics the more selective call to hptInstances in tcRnModule.
+	(home_insts, home_fam_insts) = hptInstances hsc_env (\mod -> True)
     in
     updGblEnv (\env -> env { 
-	tcg_rdr_env  = ic_rn_gbl_env icxt,
-	tcg_inst_env = extendInstEnvList (tcg_inst_env env) dfuns }) $
-
+	tcg_rdr_env      = ic_rn_gbl_env icxt,
+	tcg_inst_env     = extendInstEnvList    (tcg_inst_env env) home_insts,
+	tcg_fam_inst_env = extendFamInstEnvList (tcg_fam_inst_env env) 
+                                                home_fam_insts 
+      }) $
 
     tcExtendGhciEnv (ic_tmp_ids icxt) $
         -- tcExtendGhciEnv does lots: 
@@ -1060,16 +1067,18 @@ tcGhciStmts stmts
 	 } ;
 
 	-- OK, we're ready to typecheck the stmts
-	traceTc (text "tcs 2") ;
+	traceTc (text "TcRnDriver.tcGhciStmts: tc stmts") ;
 	((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
 
 	-- Simplify the context
+	traceTc (text "TcRnDriver.tcGhciStmts: simplify ctxt") ;
 	const_binds <- checkNoErrs (tcSimplifyInteractive lie) ;
 		-- checkNoErrs ensures that the plan fails if context redn fails
 
+	traceTc (text "TcRnDriver.tcGhciStmts: done") ;
 	return (ids, mkHsDictLet const_binds $
 		     noLoc (HsDo DoExpr tc_stmts (mk_return ids) io_ret_ty))
     }