X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnDriver.lhs;h=ef7e9293dd9e160d2faec9fe022e36ea27d4ad9b;hb=4da439a6b1e343fc5216d5c6bb51858c6d9aacd6;hp=15cda27fe13185d302c8fbbe0c8bc5fca31744f5;hpb=86bec4298d582ef1d8f0a201d6a81145e1be9498;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index 15cda27..ef7e929 100644
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -88,6 +88,7 @@ import TysWiredIn
 import IdInfo
 import {- Kind parts of -} Type
 import BasicTypes
+import Foreign.Ptr( Ptr )
 #endif
 
 import FastString
@@ -97,7 +98,6 @@ import Bag
 
 import Control.Monad    ( unless )
 import Data.Maybe	( isJust )
-import Foreign.Ptr      ( Ptr )
 
 \end{code}
 
@@ -210,7 +210,8 @@ tcRnImports hsc_env this_mod import_decls
 	      ; want_instances :: ModuleName -> Bool
 	      ; want_instances mod = mod `elemUFM` dep_mods
 				   && mod /= moduleName this_mod
-	      ; home_insts = hptInstances hsc_env want_instances
+	      ; (home_insts, home_fam_insts) = hptInstances hsc_env 
+                                                            want_instances
 	      } ;
 
 		-- Record boot-file info in the EPS, so that it's 
@@ -220,11 +221,14 @@ tcRnImports hsc_env this_mod import_decls
 
 		-- Update the gbl env
 	; updGblEnv ( \ gbl -> 
-		gbl { tcg_rdr_env    = plusOccEnv (tcg_rdr_env gbl) rdr_env,
-		      tcg_imports    = tcg_imports gbl `plusImportAvails` imports,
-                      tcg_rn_imports = fmap (const rn_imports) (tcg_rn_imports gbl),
-		      tcg_inst_env   = extendInstEnvList (tcg_inst_env gbl) home_insts
-		}) $ do {
+	    gbl { 
+              tcg_rdr_env      = plusOccEnv (tcg_rdr_env gbl) rdr_env,
+	      tcg_imports      = tcg_imports gbl `plusImportAvails` imports,
+              tcg_rn_imports   = fmap (const rn_imports) (tcg_rn_imports gbl),
+	      tcg_inst_env     = extendInstEnvList (tcg_inst_env gbl) home_insts,
+	      tcg_fam_inst_env = extendFamInstEnvList (tcg_fam_inst_env gbl) 
+                                                      home_fam_insts
+	    }) $ do {
 
 	; traceRn (text "rn1" <+> ppr (imp_dep_mods imports))
 		-- Fail if there are any errors so far
@@ -320,7 +324,8 @@ tcRnExtCore hsc_env (HsExtCore this_mod decls src_binds)
 				mg_deprecs   = NoDeprecs,
 				mg_foreign   = NoStubs,
 				mg_hpc_info  = noHpcInfo,
-                                mg_modBreaks = emptyModBreaks  
+                                mg_modBreaks = emptyModBreaks,
+                                mg_vect_info = noVectInfo
 		    } } ;
 
    tcCoreDump mod_guts ;
@@ -825,14 +830,14 @@ setInteractiveContext hsc_env icxt thing_inside
 	-- Initialise the tcg_inst_env with instances 
 	-- from all home modules.  This mimics the more selective
 	-- call to hptInstances in tcRnModule
-	dfuns = hptInstances hsc_env (\mod -> True)
+	dfuns = fst (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 }) $
 
 
-    tcExtendIdEnv (reverse (ic_tmp_ids icxt)) $
+    tcExtendIdEnv (ic_tmp_ids icxt) $
         -- tcExtendIdEnv does lots: 
         --   - it extends the local type env (tcl_env) with the given Ids,
         --   - it extends the local rdr env (tcl_rdr) with the Names from 
@@ -840,9 +845,8 @@ setInteractiveContext hsc_env icxt thing_inside
         --   - it adds the free tyvars of the Ids to the tcl_tyvars
         --     set.
         --
-        -- earlier ids in ic_tmp_ids must shadow later ones with the same
-        -- OccName, but tcExtendIdEnv has the opposite behaviour, hence the
-        -- reverse above.
+        -- later ids in ic_tmp_ids must shadow earlier ones with the same
+        -- OccName, and tcExtendIdEnv implements this behaviour.
 
     do	{ traceTc (text "setIC" <+> ppr (ic_tmp_ids icxt))
  	; thing_inside }