X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnMonad.lhs;h=f36be69fa8f671f1936b7c878203941a599545a1;hp=56f073fdc15885df48a6fec07c5e35fa13d46b20;hb=c1681a73fa4ca4cf8758264ae387ac09a9e900d8;hpb=ec0b859902e717c24addff49f9a83efb927fb669

diff --git a/compiler/typecheck/TcRnMonad.lhs b/compiler/typecheck/TcRnMonad.lhs
index 56f073f..f36be69 100644
--- a/compiler/typecheck/TcRnMonad.lhs
+++ b/compiler/typecheck/TcRnMonad.lhs
@@ -14,14 +14,6 @@ module TcRnMonad(
 import TcRnTypes	-- Re-export all
 import IOEnv		-- Re-export all
 
-#if defined(GHCI)
-import TypeRep
-import IdInfo
-import TysWiredIn
-import PrelNames
-import {-#SOURCE#-} TcEnv
-#endif
-
 import HsSyn hiding (LIE)
 import HscTypes
 import Module
@@ -92,12 +84,13 @@ initTc hsc_env hsc_src keep_rn_syntax mod do_this
 		| otherwise	 = Nothing ;
 			
 	     gbl_env = TcGblEnv {
-		tcg_mod      = mod,
-		tcg_src	     = hsc_src,
-		tcg_rdr_env  = hsc_global_rdr_env hsc_env,
-		tcg_fix_env  = emptyNameEnv,
-		tcg_default  = Nothing,
-		tcg_type_env = hsc_global_type_env hsc_env,
+		tcg_mod       = mod,
+		tcg_src	      = hsc_src,
+		tcg_rdr_env   = hsc_global_rdr_env hsc_env,
+		tcg_fix_env   = emptyNameEnv,
+		tcg_field_env = emptyNameEnv,
+		tcg_default   = Nothing,
+		tcg_type_env  = hsc_global_type_env hsc_env,
 		tcg_type_env_var = type_env_var,
 		tcg_inst_env  = emptyInstEnv,
 		tcg_fam_inst_env  = emptyFamInstEnv,
@@ -120,7 +113,8 @@ initTc hsc_env hsc_src keep_rn_syntax mod do_this
 		tcg_dfun_n   = dfun_n_var,
 		tcg_keep     = keep_var,
 		tcg_doc      = Nothing,
-		tcg_hmi      = HaddockModInfo Nothing Nothing Nothing Nothing
+		tcg_hmi      = HaddockModInfo Nothing Nothing Nothing Nothing,
+                tcg_hpc      = False
 	     } ;
 	     lcl_env = TcLclEnv {
 		tcl_errs       = errs_var,
@@ -137,7 +131,6 @@ initTc hsc_env hsc_src keep_rn_syntax mod do_this
    
 	-- OK, here's the business end!
 	maybe_res <- initTcRnIf 'a' hsc_env gbl_env lcl_env $
-		     addBreakpointBindings $
 		     do { r <- tryM do_this
 			; case r of
 			  Right res -> return (Just res)
@@ -164,12 +157,6 @@ initTcPrintErrors env mod todo = do
   return res
 \end{code}
 
-\begin{code}
-addBreakpointBindings :: TcM a -> TcM a
-addBreakpointBindings thing_inside
-   = thing_inside
-\end{code}
-
 %************************************************************************
 %*									*
 		Initialisation
@@ -332,7 +319,7 @@ newUniqueSupply
 newLocalName :: Name -> TcRnIf gbl lcl Name
 newLocalName name	-- Make a clone
   = do	{ uniq <- newUnique
-	; return (mkInternalName uniq (nameOccName name) (getSrcLoc name)) }
+	; return (mkInternalName uniq (nameOccName name) (getSrcSpan name)) }
 
 newSysLocalIds :: FastString -> [TcType] -> TcRnIf gbl lcl [TcId]
 newSysLocalIds fs tys
@@ -411,6 +398,14 @@ extendFixityEnv new_bit
   = updGblEnv (\env@(TcGblEnv { tcg_fix_env = old_fix_env }) -> 
 		env {tcg_fix_env = extendNameEnvList old_fix_env 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}
@@ -733,11 +728,14 @@ checkTc False err = failWithTc err
 
 \begin{code}
 addWarnTc :: Message -> TcM ()
-addWarnTc msg
+addWarnTc msg = do { env0 <- tcInitTidyEnv 
+		   ; addWarnTcM (env0, msg) }
+
+addWarnTcM :: (TidyEnv, Message) -> TcM ()
+addWarnTcM (env0, msg)
  = do { ctxt <- getErrCtxt ;
-	env0 <- tcInitTidyEnv ;
 	ctxt_msgs <- do_ctxt env0 ctxt ;
-	addWarn (vcat (msg : ctxt_to_use ctxt_msgs)) }
+	addReport (vcat (ptext SLIT("Warning:") <+> msg : ctxt_to_use ctxt_msgs)) }
 
 warnTc :: Bool -> Message -> TcM ()
 warnTc warn_if_true warn_msg