Add {-# OPTIONS_GHC -w #-} and some blurb to all compiler modules

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

diff --git a/compiler/deSugar/DsMonad.lhs b/compiler/deSugar/DsMonad.lhs
index ac6a0c0..4af6f68 100644 (file)
--- a/compiler/deSugar/DsMonad.lhs
+++ b/compiler/deSugar/DsMonad.lhs
@@ -6,6 +6,13 @@
 @DsMonad@: monadery used in desugaring
 
 \begin{code}
+{-# OPTIONS_GHC -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/WorkingConventions#Warnings
+-- for details
+
 module DsMonad (
        DsM, mappM, mapAndUnzipM,
        initDs, initDsTc, returnDs, thenDs, listDs, fixDs, mapAndUnzipDs, 
@@ -20,10 +27,10 @@ module DsMonad (
        UniqSupply, newUniqueSupply,
        getDOptsDs, getGhcModeDs, doptDs,
        dsLookupGlobal, dsLookupGlobalId, dsLookupTyCon, dsLookupDataCon,
+        dsLookupClass,
 
        DsMetaEnv, DsMetaVal(..), dsLookupMetaEnv, dsExtendMetaEnv,
 
-        bindLocalsDs, getLocalBindsDs,
        -- Warnings
        DsWarning, warnDs, failWithDs,
 
@@ -44,6 +51,7 @@ import HscTypes
 import Bag
 import DataCon
 import TyCon
+import Class
 import Id
 import Module
 import Var
@@ -56,8 +64,6 @@ import NameEnv
 import OccName
 import DynFlags
 import ErrUtils
-import Bag
-import OccName
 
 import Data.IORef
 
@@ -141,8 +147,7 @@ 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_loc     :: SrcSpan           -- to put in pattern-matching error msgs
      }
 
 -- Inside [| |] brackets, the desugarer looks 
@@ -207,8 +212,7 @@ mkDsEnvs mod rdr_env type_env msg_var
                                    ds_unqual = mkPrintUnqualified rdr_env,
                                    ds_msgs = msg_var}
                lcl_env = DsLclEnv { ds_meta = emptyNameEnv, 
-                                   ds_loc = noSrcSpan,
-                                    ds_locals = emptyOccEnv }
+                                   ds_loc = noSrcSpan }
 
        return (gbl_env, lcl_env)
 
@@ -319,6 +323,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}
@@ -329,15 +338,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}
-
-\begin{code}
-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}
-