X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnMonad.lhs;h=eedf00bd4c864ac6f29649daaded4c19d6d3be9b;hp=7f1a7fe5d34d42ebc430e60bdf0701a00cddbacc;hb=61bcd16d4f3d4cf84b26bf7bb92f16f0440b7071;hpb=fce61e356063836debcc579e336e99a65d61284e

diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs
index 7f1a7fe..eedf00b 100644
--- a/compiler/typecheck/TcRnMonad.lhs
+++ b/compiler/typecheck/TcRnMonad.lhs
@@ -40,10 +40,9 @@ import StaticFlags
 import FastString
 import Panic
 import Util
- 
+
 import System.IO
 import Data.IORef
-import Control.Exception
 import Control.Monad
 \end{code}
 
@@ -86,7 +85,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,
@@ -103,7 +102,7 @@ initTc hsc_env hsc_src keep_rn_syntax mod do_this
 		tcg_rn_decls   = maybe_rn_syntax emptyRnGroup,
 
 		tcg_binds    = emptyLHsBinds,
-		tcg_deprecs  = NoDeprecs,
+		tcg_warns  = NoWarnings,
 		tcg_insts    = [],
 		tcg_fam_insts= [],
 		tcg_rules    = [],
@@ -148,11 +147,10 @@ initTcPrintErrors	-- Used from the interactive loop only
        :: HscEnv
        -> Module 
        -> TcM r
-       -> IO (Maybe r)
+       -> IO (Messages, Maybe r)
 initTcPrintErrors env mod todo = do
   (msgs, res) <- initTc env HsSrcFile False mod todo
-  printErrorsAndWarnings (hsc_dflags env) msgs
-  return res
+  return (msgs, res)
 \end{code}
 
 %************************************************************************
@@ -324,6 +322,10 @@ newSysLocalIds :: FastString -> [TcType] -> TcRnIf gbl lcl [TcId]
 newSysLocalIds fs tys
   = do	{ us <- newUniqueSupply
 	; return (zipWith (mkSysLocal fs) (uniqsFromSupply us) tys) }
+
+instance MonadUnique (IOEnv (Env gbl lcl)) where
+        getUniqueM = newUnique
+        getUniqueSupplyM = newUniqueSupply
 \end{code}
 
 
@@ -408,11 +410,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}
@@ -460,9 +457,12 @@ getErrsVar = do { env <- getLclEnv; return (tcl_errs env) }
 setErrsVar :: TcRef Messages -> TcRn a -> TcRn a
 setErrsVar v = updLclEnv (\ env -> env { tcl_errs =  v })
 
-addErr :: Message -> TcRn ()
+addErr :: Message -> TcRn ()	-- Ignores the context stack
 addErr msg = do { loc <- getSrcSpanM ; addErrAt loc msg }
 
+failWith :: Message -> TcRn a
+failWith msg = addErr msg >> failM
+
 addLocErr :: Located e -> (e -> Message) -> TcRn ()
 addLocErr (L loc e) fn = addErrAt loc (fn e)
 
@@ -537,7 +537,7 @@ discardWarnings thing_inside
 
 
 \begin{code}
-try_m :: TcRn r -> TcRn (Either Exception 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 ;
@@ -564,7 +564,7 @@ mapAndRecoverM :: (a -> TcRn b) -> [a] -> TcRn [b]
 -- Drop elements of the input that fail, so the result
 -- list can be shorter than the argument list
 mapAndRecoverM _ []     = return []
-mapAndRecoverM f (x:xs) = do { mb_r <- tryM (f x)
+mapAndRecoverM f (x:xs) = do { mb_r <- try_m (f x)
 			     ; rs <- mapAndRecoverM f xs
 			     ; return (case mb_r of
 					  Left _  -> rs