This goes with the patch for #1839, #1463

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

diff --git a/compiler/deSugar/DsMonad.lhs b/compiler/deSugar/DsMonad.lhs
index cbe182e..279416d 100644 (file)
--- a/compiler/deSugar/DsMonad.lhs
+++ b/compiler/deSugar/DsMonad.lhs
@@ -6,10 +6,17 @@
 @DsMonad@: monadery used in desugaring
 
 \begin{code}
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 module DsMonad (
        DsM, mappM, mapAndUnzipM,
        initDs, initDsTc, returnDs, thenDs, listDs, fixDs, mapAndUnzipDs, 
-       foldlDs, foldrDs,
+       foldlDs, foldrDs, ifOptDs,
 
        newTyVarsDs, newLocalName,
        duplicateLocalDs, newSysLocalDs, newSysLocalsDs, newUniqueId,
@@ -18,8 +25,9 @@ module DsMonad (
        getModuleDs,
        newUnique, 
        UniqSupply, newUniqueSupply,
-       getDOptsDs,
+       getDOptsDs, getGhcModeDs, doptDs,
        dsLookupGlobal, dsLookupGlobalId, dsLookupTyCon, dsLookupDataCon,
+        dsLookupClass,
 
        DsMetaEnv, DsMetaVal(..), dsLookupMetaEnv, dsExtendMetaEnv,
 
@@ -43,6 +51,7 @@ import HscTypes
 import Bag
 import DataCon
 import TyCon
+import Class
 import Id
 import Module
 import Var
@@ -121,7 +130,7 @@ listDs   = sequenceM
 foldlDs  = foldlM
 foldrDs  = foldrM
 mapAndUnzipDs = mapAndUnzipM
-
+ifOptDs   = ifOptM
 
 type DsWarning = (SrcSpan, SDoc)
        -- Not quite the same as a WarnMsg, we have an SDoc here 
@@ -161,14 +170,14 @@ 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
+       ; let dflags = hsc_dflags hsc_env
+        ; (ds_gbl_env, ds_lcl_env) <- mkDsEnvs dflags 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)
 
        -- Display any errors and warnings 
        -- Note: if -Werror is used, we don't signal an error here.
-       ; let dflags = hsc_dflags hsc_env
        ; msgs <- readIORef msg_var
         ; printErrorsAndWarnings dflags msgs 
 
@@ -187,23 +196,27 @@ initDsTc thing_inside
   = do { this_mod <- getModule
        ; tcg_env  <- getGblEnv
        ; msg_var  <- getErrsVar
+        ; dflags   <- getDOpts
        ; 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 }
-
-mkDsEnvs :: Module -> GlobalRdrEnv -> TypeEnv
-        -> IORef Messages -> (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 }
+        ; ds_envs <- ioToIOEnv$ mkDsEnvs dflags this_mod rdr_env type_env msg_var
+       ; setEnvs ds_envs thing_inside }
+
+mkDsEnvs :: DynFlags -> Module -> GlobalRdrEnv -> TypeEnv -> IORef Messages -> IO (DsGblEnv, DsLclEnv)
+mkDsEnvs dflags mod rdr_env type_env msg_var
+  = 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 dflags rdr_env,
+                                   ds_msgs = msg_var}
+               lcl_env = DsLclEnv { ds_meta = emptyNameEnv, 
+                                   ds_loc = noSrcSpan }
+
+       return (gbl_env, lcl_env)
+
 \end{code}
 
 %************************************************************************
@@ -256,6 +269,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) }
 
@@ -305,6 +324,11 @@ dsLookupDataCon :: Name -> DsM DataCon
 dsLookupDataCon name
   = dsLookupGlobal name                `thenDs` \ thing ->
     returnDs (tyThingDataCon thing)
+
+dsLookupClass :: Name -> DsM Class
+dsLookupClass name
+  = dsLookupGlobal name         `thenDs` \ thing ->
+    returnDs (tyThingClass thing)
 \end{code}
 
 \begin{code}
@@ -315,5 +339,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}
-
-