X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FdeSugar%2FDsMonad.lhs;h=ac6a0c0ed79b25129b55f61e5f2ee13aa3dc375b;hb=36f77deda25312534200f10ccdb18528b6ee6e27;hp=8d119318facc6b55b6b299431405f72819df66c7;hpb=376101055fb111ebd52b5ef1fb76e00334b44304;p=ghc-hetmet.git

diff --git a/compiler/deSugar/DsMonad.lhs b/compiler/deSugar/DsMonad.lhs
index 8d11931..ac6a0c0 100644
--- a/compiler/deSugar/DsMonad.lhs
+++ b/compiler/deSugar/DsMonad.lhs
@@ -23,7 +23,7 @@ module DsMonad (
 
 	DsMetaEnv, DsMetaVal(..), dsLookupMetaEnv, dsExtendMetaEnv,
 
-        getBkptSitesDs,
+        bindLocalsDs, getLocalBindsDs,
 	-- Warnings
 	DsWarning, warnDs, failWithDs,
 
@@ -57,7 +57,6 @@ import OccName
 import DynFlags
 import ErrUtils
 import Bag
-import Breakpoints
 import OccName
 
 import Data.IORef
@@ -136,14 +135,14 @@ data DsGblEnv = DsGblEnv {
 	ds_mod	   :: Module,       		-- For SCC profiling
 	ds_unqual  :: PrintUnqualified,
 	ds_msgs    :: IORef Messages,		-- Warning messages
-	ds_if_env  :: (IfGblEnv, IfLclEnv),	-- Used for looking up global, 
+	ds_if_env  :: (IfGblEnv, IfLclEnv)	-- Used for looking up global, 
 						-- possibly-imported things
-        ds_bkptSites :: IORef SiteMap  -- Inserted Breakpoints sites
     }
 
 data DsLclEnv = DsLclEnv {
 	ds_meta	   :: DsMetaEnv,	-- Template Haskell bindings
-	ds_loc	   :: SrcSpan		-- to put in pattern-matching error msgs
+	ds_loc	   :: SrcSpan,		-- to put in pattern-matching error msgs
+        ds_locals  :: OccEnv Id         -- For locals in breakpoints
      }
 
 -- Inside [| |] brackets, the desugarer looks 
@@ -166,7 +165,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)
@@ -194,21 +193,25 @@ 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,
+                                    ds_locals = emptyOccEnv }
+
+       return (gbl_env, lcl_env)
+
 \end{code}
 
 %************************************************************************
@@ -328,9 +331,13 @@ dsExtendMetaEnv menv thing_inside
 \end{code}
 
 \begin{code}
-
-getBkptSitesDs :: DsM (IORef SiteMap)
-getBkptSitesDs = do { env <- getGblEnv; return (ds_bkptSites env) }
-
+getLocalBindsDs :: DsM [Id]
+getLocalBindsDs = do { env <- getLclEnv; return (occEnvElts$ ds_locals env) }
+
+bindLocalsDs :: [Id] -> DsM a -> DsM a
+bindLocalsDs new_ids enclosed_scope = 
+    updLclEnv (\env-> env {ds_locals = ds_locals env `extendOccEnvList` occnamed_ids})
+	      enclosed_scope
+  where occnamed_ids = [ (nameOccName (idName id),id) | id <- new_ids ] 
 \end{code}