X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Ftypecheck%2FTcEnv.lhs;h=c6789f4f5e840585303cac8759f9d2a6c082adcc;hb=9176377bf7d989919fe7d27cad1f56bd9c4e7b6b;hp=c51f78645cdc2942fa961be99af257b9e38084b6;hpb=47673f2f689b0c3294c119afd217afab1044f213;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcEnv.lhs b/compiler/typecheck/TcEnv.lhs
index c51f786..c6789f4 100644
--- a/compiler/typecheck/TcEnv.lhs
+++ b/compiler/typecheck/TcEnv.lhs
@@ -29,6 +29,7 @@ module TcEnv(
 	tcLookupId, tcLookupTyVar, getScopedTyVarBinds,
 	getInLocalScope,
 	wrongThingErr, pprBinders,
+        getHetMetLevel,
 
 	tcExtendRecEnv,    	-- For knot-tying
 
@@ -203,6 +204,7 @@ tcLookupFamInst tycon tys
   = do { env <- getGblEnv
        ; eps <- getEps
        ; let instEnv = (eps_fam_inst_env eps, tcg_fam_inst_env env)
+       ; traceTc "lookupFamInst" ((ppr tycon <+> ppr tys) $$ ppr instEnv)
        ; case lookupFamInstEnv instEnv tycon tys of
 	   []                      -> return Nothing
 	   ((fam_inst, rep_tys):_) 
@@ -404,11 +406,19 @@ tcExtendIdEnv ids thing_inside = tcExtendIdEnv2 [(idName id, id) | id <- ids] th
 tcExtendIdEnv1 :: Name -> TcId -> TcM a -> TcM a
 tcExtendIdEnv1 name id thing_inside = tcExtendIdEnv2 [(name,id)] thing_inside
 
+getHetMetLevel :: TcM [TyVar]
+getHetMetLevel =
+    do { env <- getEnv
+       ; return $ case env of Env { env_lcl = e' } -> case e' of TcLclEnv { tcl_hetMetLevel = x } -> x
+       }
+
 tcExtendIdEnv2 :: [(Name,TcId)] -> TcM a -> TcM a
 -- Invariant: the TcIds are fully zonked (see tcExtendIdEnv above)
 tcExtendIdEnv2 names_w_ids thing_inside
   = do	{ env <- getLclEnv
-	; tc_extend_local_id_env env (thLevel (tcl_th_ctxt env)) names_w_ids thing_inside }
+        ; hetMetLevel <- getHetMetLevel
+	; tc_extend_local_id_env env (thLevel (tcl_th_ctxt env)) hetMetLevel names_w_ids thing_inside }
+
 
 tcExtendGhciEnv :: [TcId] -> TcM a -> TcM a
 -- Used to bind Ids for GHCi identifiers bound earlier in the user interaction
@@ -417,11 +427,13 @@ tcExtendGhciEnv :: [TcId] -> TcM a -> TcM a
 -- GHCi has already compiled it to bytecode
 tcExtendGhciEnv ids thing_inside
   = do	{ env <- getLclEnv
-	; tc_extend_local_id_env env impLevel [(idName id, id) | id <- ids] thing_inside }
+        ; hetMetLevel <- getHetMetLevel
+	; tc_extend_local_id_env env impLevel hetMetLevel [(idName id, id) | id <- ids] thing_inside }
 
 tc_extend_local_id_env		-- This is the guy who does the work
 	:: TcLclEnv
 	-> ThLevel
+	-> [TyVar]
 	-> [(Name,TcId)]
 	-> TcM a -> TcM a
 -- Invariant: the TcIds are fully zonked. Reasons:
@@ -431,7 +443,7 @@ tc_extend_local_id_env		-- This is the guy who does the work
 --	    in the types, because instantiation does not look through such things
 --	(c) The call to tyVarsOfTypes is ok without looking through refs
 
-tc_extend_local_id_env env th_lvl names_w_ids thing_inside
+tc_extend_local_id_env env th_lvl hetMetLevel names_w_ids thing_inside
   = do	{ traceTc "env2" (ppr extra_env)
 	; gtvs' <- tcExtendGlobalTyVars (tcl_tyvars env) extra_global_tyvars
 	; let env' = env {tcl_env = le', tcl_tyvars = gtvs', tcl_rdr = rdr_env'}
@@ -439,7 +451,9 @@ tc_extend_local_id_env env th_lvl names_w_ids thing_inside
   where
     extra_global_tyvars = tcTyVarsOfTypes [idType id | (_,id) <- names_w_ids]
     extra_env	    = [ (name, ATcId { tct_id = id, 
-    				       tct_level = th_lvl })
+    				       tct_level = th_lvl,
+    				       tct_hetMetLevel = hetMetLevel
+                                     })
     		      | (name,id) <- names_w_ids]
     le'		    = extendNameEnvList (tcl_env env) extra_env
     rdr_env'	    = extendLocalRdrEnvList (tcl_rdr env) [name | (name,_) <- names_w_ids]