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

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index 3c9f14b..7c79e62 100644
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -5,11 +5,11 @@
 \section[TcModule]{Typechecking a whole module}
 
 \begin{code}
-{-# OPTIONS_GHC -w #-}
+{-# 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/WorkingConventions#Warnings
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
 -- for details
 
 module TcRnDriver (
@@ -837,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: