Refactor TcRnDriver, and check exports on hi-boot files

[ghc-hetmet.git] / compiler / deSugar / DsMonad.lhs

diff --git a/compiler/deSugar/DsMonad.lhs b/compiler/deSugar/DsMonad.lhs
index d3dd0e1..9251a81 100644 (file)
--- a/compiler/deSugar/DsMonad.lhs
+++ b/compiler/deSugar/DsMonad.lhs
@@ -23,7 +23,7 @@ module DsMonad (
 
        DsMetaEnv, DsMetaVal(..), dsLookupMetaEnv, dsExtendMetaEnv,
 
-        bindLocalsDs, getLocalBindsDs, getBkptSitesDs,
+        bindLocalsDs, getLocalBindsDs, getBkptSitesDs, getModNameRefDs, withModNameRefDs,
        -- Warnings
        DsWarning, warnDs, failWithDs,
 
@@ -144,7 +144,9 @@ data DsGblEnv = DsGblEnv {
 data DsLclEnv = DsLclEnv {
        ds_meta    :: DsMetaEnv,        -- Template Haskell bindings
        ds_loc     :: SrcSpan,          -- to put in pattern-matching error msgs
-        ds_locals  :: OccEnv Id         -- For locals in breakpoints
+        ds_locals  :: OccEnv Id,        -- For locals in breakpoints
+        ds_mod_name_ref :: Maybe Id     -- The Id used to store the Module name 
+                                        --  used by the breakpoint desugaring 
      }
 
 -- Inside [| |] brackets, the desugarer looks 
@@ -211,7 +213,8 @@ mkDsEnvs mod rdr_env type_env msg_var
                                     ds_bkptSites = sites_var}
                lcl_env = DsLclEnv { ds_meta = emptyNameEnv, 
                                    ds_loc = noSrcSpan,
-                                    ds_locals = emptyOccEnv }
+                                    ds_locals = emptyOccEnv,
+                                    ds_mod_name_ref = Nothing }
 
        return (gbl_env, lcl_env)
 
@@ -337,6 +340,13 @@ dsExtendMetaEnv menv thing_inside
 getLocalBindsDs :: DsM [Id]
 getLocalBindsDs = do { env <- getLclEnv; return (occEnvElts$ ds_locals env) }
 
+getModNameRefDs :: DsM (Maybe Id)
+getModNameRefDs = do { env <- getLclEnv; return (ds_mod_name_ref env) }
+
+withModNameRefDs :: Id -> DsM a -> DsM a
+withModNameRefDs id thing_inside =
+    updLclEnv (\env -> env {ds_mod_name_ref = Just id}) thing_inside
+
 bindLocalsDs :: [Id] -> DsM a -> DsM a
 bindLocalsDs new_ids enclosed_scope = 
     updLclEnv (\env-> env {ds_locals = ds_locals env `extendOccEnvList` occnamed_ids})