X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnMonad.lhs;h=88de1ca8fd4b938a91b2281ba59e9233d702b458;hb=46f02d59813499ba2aa44e7831e0b69ec6d8f25d;hp=11036f4cceaaae354cdf8e0e1b929b800c1ea613;hpb=d7b36bbbcd56ee14656223d02e32f5a1f52ea17b;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs
index 11036f4..88de1ca 100644
--- a/compiler/typecheck/TcRnMonad.lhs
+++ b/compiler/typecheck/TcRnMonad.lhs
@@ -9,6 +9,8 @@ module TcRnMonad(
 	module IOEnv
   ) where
 
+#include "HsVersions.h"
+
 import TcRnTypes	-- Re-export all
 import IOEnv		-- Re-export all
 
@@ -85,7 +87,7 @@ initTc hsc_env hsc_src keep_rn_syntax mod do_this
 		tcg_src	      = hsc_src,
 		tcg_rdr_env   = hsc_global_rdr_env hsc_env,
 		tcg_fix_env   = emptyNameEnv,
-		tcg_field_env = emptyNameEnv,
+		tcg_field_env = RecFields emptyNameEnv emptyNameSet,
 		tcg_default   = Nothing,
 		tcg_type_env  = hsc_global_type_env hsc_env,
 		tcg_type_env_var = type_env_var,
@@ -102,7 +104,8 @@ initTc hsc_env hsc_src keep_rn_syntax mod do_this
 		tcg_rn_decls   = maybe_rn_syntax emptyRnGroup,
 
 		tcg_binds    = emptyLHsBinds,
-		tcg_warns  = NoWarnings,
+		tcg_warns    = NoWarnings,
+		tcg_anns     = [],
 		tcg_insts    = [],
 		tcg_fam_insts= [],
 		tcg_rules    = [],
@@ -122,7 +125,9 @@ initTc hsc_env hsc_src keep_rn_syntax mod do_this
 		tcl_arrow_ctxt = NoArrowCtxt,
 		tcl_env        = emptyNameEnv,
 		tcl_tyvars     = tvs_var,
-		tcl_lie	       = panic "initTc:LIE"	-- LIE only valid inside a getLIE
+		tcl_lie	       = panic "initTc:LIE", -- only valid inside getLIE
+		tcl_tybinds    = panic "initTc:tybinds"	
+                                               -- only valid inside a getTyBinds
 	     } ;
 	} ;
    
@@ -361,9 +366,9 @@ traceOptTcRn flag doc = ifOptM flag $ do
 			; dumpTcRn real_doc }
 
 dumpTcRn :: SDoc -> TcRn ()
-dumpTcRn doc = do { rdr_env <- getGlobalRdrEnv ;
-                    dflags <- getDOpts ;
-                        liftIO (printForUser stderr (mkPrintUnqualified dflags rdr_env) doc) }
+dumpTcRn doc = do { rdr_env <- getGlobalRdrEnv 
+                  ; dflags <- getDOpts 
+                  ; liftIO (printForUser stderr (mkPrintUnqualified dflags rdr_env) doc) }
 
 debugDumpTcRn :: SDoc -> TcRn ()
 debugDumpTcRn doc | opt_NoDebugOutput = return ()
@@ -822,7 +827,7 @@ debugTc thing
  | otherwise = return ()
 \end{code}
 
- %************************************************************************
+%************************************************************************
 %*									*
 	     Type constraints (the so-called LIE)
 %*									*
@@ -880,6 +885,44 @@ setLclTypeEnv lcl_env thing_inside
 
 %************************************************************************
 %*									*
+	     Meta type variable bindings
+%*									*
+%************************************************************************
+
+\begin{code}
+getTcTyVarBindsVar :: TcM (TcRef TcTyVarBinds)
+getTcTyVarBindsVar = do { env <- getLclEnv; return (tcl_tybinds env) }
+
+getTcTyVarBinds :: TcM a -> TcM (a, TcTyVarBinds)
+getTcTyVarBinds thing_inside
+  = do { tybinds_var <- newMutVar emptyBag
+       ; res <- updLclEnv (\ env -> env { tcl_tybinds = tybinds_var }) 
+			  thing_inside
+       ; tybinds <- readMutVar tybinds_var
+       ; return (res, tybinds) 
+       }
+
+bindMetaTyVar :: TcTyVar -> TcType -> TcM ()
+bindMetaTyVar tv ty
+  = do { ASSERTM2( do { details <- readMutVar (metaTvRef tv)
+                      ; return (isFlexi details) }, ppr tv )
+       ; tybinds_var <- getTcTyVarBindsVar
+       ; tybinds <- readMutVar tybinds_var
+       ; writeMutVar tybinds_var (tybinds `snocBag` TcTyVarBind tv ty) 
+       }
+
+getTcTyVarBindsRelation :: TcM [(TcTyVar, TcTyVarSet)]
+getTcTyVarBindsRelation
+  = do { tybinds_var <- getTcTyVarBindsVar
+       ; tybinds <- readMutVar tybinds_var
+       ; return $ map freeTvs (bagToList tybinds)
+       }
+  where
+    freeTvs (TcTyVarBind tv ty) = (tv, tyVarsOfType ty)
+\end{code}
+
+%************************************************************************
+%*									*
 	     Template Haskell context
 %*									*
 %************************************************************************