X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnMonad.lhs;h=dbe822a222aa87bf0f5c5d76133d52da3cc71acc;hp=1d562e34ad8c5d82133f84f37a3f4c077cc8d104;hb=7bb3d1fc79521d591cd9f824893963141a7997b6;hpb=1f3a7730cd7f831344d2a3b74a0ce700c382e858

diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs
index 1d562e3..dbe822a 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
 
@@ -40,10 +42,10 @@ import StaticFlags
 import FastString
 import Panic
 import Util
-import Exception
 
 import System.IO
 import Data.IORef
+import qualified Data.Set as Set
 import Control.Monad
 \end{code}
 
@@ -71,6 +73,7 @@ initTc hsc_env hsc_src keep_rn_syntax mod do_this
       	tvs_var      <- newIORef emptyVarSet ;
 	dfuns_var    <- newIORef emptyNameSet ;
 	keep_var     <- newIORef emptyNameSet ;
+    used_rdrnames_var <- newIORef Set.empty ;
 	th_var	     <- newIORef False ;
 	dfun_n_var   <- newIORef 1 ;
 	type_env_var <- case hsc_type_env_var hsc_env of {
@@ -86,7 +89,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,
@@ -96,14 +99,16 @@ initTc hsc_env hsc_src keep_rn_syntax mod do_this
 		tcg_th_used   = th_var,
 		tcg_exports  = [],
 		tcg_imports  = emptyImportAvails,
+        tcg_used_rdrnames = used_rdrnames_var,
 		tcg_dus      = emptyDUs,
 
-                tcg_rn_imports = maybe_rn_syntax [],
+                tcg_rn_imports = [],
                 tcg_rn_exports = maybe_rn_syntax [],
 		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    = [],
@@ -123,7 +128,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
 	     } ;
 	} ;
    
@@ -362,9 +369,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 ()
@@ -411,11 +418,6 @@ extendFixityEnv new_bit
 getRecFieldEnv :: TcRn RecFieldEnv
 getRecFieldEnv = do { env <- getGblEnv; return (tcg_field_env env) }
 
-extendRecFieldEnv :: RecFieldEnv -> RnM a -> RnM a
-extendRecFieldEnv new_bit
-  = updGblEnv (\env@(TcGblEnv { tcg_field_env = old_env }) -> 
-		env {tcg_field_env = old_env `plusNameEnv` new_bit})	     
-
 getDeclaredDefaultTys :: TcRn (Maybe [Type])
 getDeclaredDefaultTys = do { env <- getGblEnv; return (tcg_default env) }
 \end{code}
@@ -543,7 +545,7 @@ discardWarnings thing_inside
 
 
 \begin{code}
-try_m :: TcRn r -> TcRn (Either IOException r)
+try_m :: TcRn r -> TcRn (Either IOEnvFailure r)
 -- Does try_m, with a debug-trace on failure
 try_m thing 
   = do { mb_r <- tryM thing ;
@@ -828,7 +830,7 @@ debugTc thing
  | otherwise = return ()
 \end{code}
 
- %************************************************************************
+%************************************************************************
 %*									*
 	     Type constraints (the so-called LIE)
 %*									*
@@ -886,6 +888,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
 %*									*
 %************************************************************************