X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FdeSugar%2FDsMonad.lhs;h=c9fe054d30a958a99e779cc6fa927172a9ab9dc5;hb=8a2809c29de9f23eba7ca682b48390033a9d40f6;hp=acdecfee37a7566d0a19fc2e8213371fc956baa2;hpb=7a59afcebe45ea87c42006873f77eb4600d7316f;p=ghc-hetmet.git

diff --git a/compiler/deSugar/DsMonad.lhs b/compiler/deSugar/DsMonad.lhs
index acdecfe..c9fe054 100644
--- a/compiler/deSugar/DsMonad.lhs
+++ b/compiler/deSugar/DsMonad.lhs
@@ -1,7 +1,9 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
-\section[DsMonad]{@DsMonad@: monadery used in desugaring}
+
+@DsMonad@: monadery used in desugaring
 
 \begin{code}
 module DsMonad (
@@ -16,7 +18,7 @@ module DsMonad (
 	getModuleDs,
 	newUnique, 
 	UniqSupply, newUniqueSupply,
-	getDOptsDs,
+	getDOptsDs, getGhcModeDs, doptDs,
 	dsLookupGlobal, dsLookupGlobalId, dsLookupTyCon, dsLookupDataCon,
 
 	DsMetaEnv, DsMetaVal(..), dsLookupMetaEnv, dsExtendMetaEnv,
@@ -26,36 +28,35 @@ module DsMonad (
 
 	-- Data types
 	DsMatchContext(..),
-	EquationInfo(..), MatchResult(..), DsWrapper, idWrapper,
+	EquationInfo(..), MatchResult(..), DsWrapper, idDsWrapper,
 	CanItFail(..), orFail
     ) where
 
 #include "HsVersions.h"
 
 import TcRnMonad
-import CoreSyn		( CoreExpr )
-import HsSyn		( HsExpr, HsMatchContext, Pat )
-import TcIface		( tcIfaceGlobal )
-import RdrName		( GlobalRdrEnv )
-import HscTypes		( TyThing(..), TypeEnv, HscEnv(..), 
-			  tyThingId, tyThingTyCon, tyThingDataCon, mkPrintUnqualified )
-import Bag		( emptyBag, snocBag )
-import DataCon		( DataCon )
-import TyCon		( TyCon )
-import Id		( mkSysLocal, setIdUnique, Id )
-import Module		( Module )
-import Var		( TyVar, setTyVarUnique )
+import CoreSyn
+import HsSyn
+import TcIface
+import RdrName
+import HscTypes
+import Bag
+import DataCon
+import TyCon
+import Id
+import Module
+import Var
 import Outputable
-import SrcLoc		( noSrcSpan, SrcSpan )
-import Type             ( Type )
-import UniqSupply	( UniqSupply, uniqsFromSupply )
-import Name		( Name, nameOccName )
+import SrcLoc
+import Type
+import UniqSupply
+import Name
 import NameEnv
-import OccName          ( occNameFS )
-import DynFlags	( DynFlags )
-import ErrUtils		( Messages, mkWarnMsg, mkErrMsg, 
-			  printErrorsAndWarnings, errorsFound )
-import DATA_IOREF	( newIORef, readIORef )
+import OccName
+import DynFlags
+import ErrUtils
+
+import Data.IORef
 
 infixr 9 `thenDs`
 \end{code}
@@ -73,12 +74,11 @@ data DsMatchContext
   deriving ()
 
 data EquationInfo
-  = EqnInfo { eqn_wrap :: DsWrapper,	-- Bindings
-	      eqn_pats :: [Pat Id],    	-- The patterns for an eqn
+  = EqnInfo { eqn_pats :: [Pat Id],    	-- The patterns for an eqn
 	      eqn_rhs  :: MatchResult }	-- What to do after match
 
 type DsWrapper = CoreExpr -> CoreExpr
-idWrapper e = e
+idDsWrapper e = e
 
 -- The semantics of (match vs (EqnInfo wrap pats rhs)) is the MatchResult
 --	\fail. wrap (case vs of { pats -> rhs fail })
@@ -161,7 +161,7 @@ initDs  :: HscEnv
 
 initDs hsc_env mod rdr_env type_env thing_inside
   = do 	{ msg_var <- newIORef (emptyBag, emptyBag)
-	; let (ds_gbl_env, ds_lcl_env) = mkDsEnvs mod rdr_env type_env msg_var
+        ; (ds_gbl_env, ds_lcl_env) <- mkDsEnvs mod rdr_env type_env msg_var
 
 	; either_res <- initTcRnIf 'd' hsc_env ds_gbl_env ds_lcl_env $
 		        tryM thing_inside	-- Catch exceptions (= errors during desugaring)
@@ -189,21 +189,24 @@ initDsTc thing_inside
 	; msg_var  <- getErrsVar
 	; let type_env = tcg_type_env tcg_env
 	      rdr_env  = tcg_rdr_env tcg_env
-	; setEnvs (mkDsEnvs this_mod rdr_env type_env msg_var) thing_inside }
+        ; ds_envs <- ioToIOEnv$ mkDsEnvs this_mod rdr_env type_env msg_var
+	; setEnvs ds_envs thing_inside }
 
-mkDsEnvs :: Module -> GlobalRdrEnv -> TypeEnv
-	 -> IORef Messages -> (DsGblEnv, DsLclEnv)
+mkDsEnvs :: Module -> GlobalRdrEnv -> TypeEnv -> IORef Messages -> IO (DsGblEnv, DsLclEnv)
 mkDsEnvs mod rdr_env type_env msg_var
-  = (gbl_env, lcl_env)
-  where
-    if_genv = IfGblEnv { if_rec_types = Just (mod, return type_env) }
-    if_lenv = mkIfLclEnv mod (ptext SLIT("GHC error in desugarer lookup in") <+> ppr mod)
-    gbl_env = DsGblEnv { ds_mod = mod, 
-    			 ds_if_env = (if_genv, if_lenv),
-    			 ds_unqual = mkPrintUnqualified rdr_env,
-    			 ds_msgs = msg_var }
-    lcl_env = DsLclEnv { ds_meta = emptyNameEnv, 
-			 ds_loc = noSrcSpan }
+  = do 
+       sites_var <- newIORef []
+       let     if_genv = IfGblEnv { if_rec_types = Just (mod, return type_env) }
+               if_lenv = mkIfLclEnv mod (ptext SLIT("GHC error in desugarer lookup in") <+> ppr mod)
+               gbl_env = DsGblEnv { ds_mod = mod, 
+    			            ds_if_env = (if_genv, if_lenv),
+    			            ds_unqual = mkPrintUnqualified rdr_env,
+    			            ds_msgs = msg_var}
+               lcl_env = DsLclEnv { ds_meta = emptyNameEnv, 
+			            ds_loc = noSrcSpan }
+
+       return (gbl_env, lcl_env)
+
 \end{code}
 
 %************************************************************************
@@ -256,6 +259,12 @@ the @SrcSpan@ being carried around.
 getDOptsDs :: DsM DynFlags
 getDOptsDs = getDOpts
 
+doptDs :: DynFlag -> TcRnIf gbl lcl Bool
+doptDs = doptM
+
+getGhcModeDs :: DsM GhcMode
+getGhcModeDs =  getDOptsDs >>= return . ghcMode
+
 getModuleDs :: DsM Module
 getModuleDs = do { env <- getGblEnv; return (ds_mod env) }
 
@@ -315,5 +324,3 @@ dsExtendMetaEnv :: DsMetaEnv -> DsM a -> DsM a
 dsExtendMetaEnv menv thing_inside
   = updLclEnv (\env -> env { ds_meta = ds_meta env `plusNameEnv` menv }) thing_inside
 \end{code}
-
-