projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the correct libffi type for pointers
[ghc-hetmet.git]
/
compiler
/
deSugar
/
DsMonad.lhs
diff --git
a/compiler/deSugar/DsMonad.lhs
b/compiler/deSugar/DsMonad.lhs
index
c9fe054
..
2cab8be
100644
(file)
--- a/
compiler/deSugar/DsMonad.lhs
+++ b/
compiler/deSugar/DsMonad.lhs
@@
-6,10
+6,18
@@
@DsMonad@: monadery used in desugaring
\begin{code}
@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 (
module DsMonad (
- DsM, mappM, mapAndUnzipM,
- initDs, initDsTc, returnDs, thenDs, listDs, fixDs, mapAndUnzipDs,
- foldlDs, foldrDs,
+ DsM, mapM, mapAndUnzipM,
+ initDs, initDsTc, fixDs, mapAndUnzipM,
+ foldlM, foldrM, ifOptM,
+ Applicative(..),(<$>),
newTyVarsDs, newLocalName,
duplicateLocalDs, newSysLocalDs, newSysLocalsDs, newUniqueId,
newTyVarsDs, newLocalName,
duplicateLocalDs, newSysLocalDs, newSysLocalsDs, newUniqueId,
@@
-20,6
+28,7
@@
module DsMonad (
UniqSupply, newUniqueSupply,
getDOptsDs, getGhcModeDs, doptDs,
dsLookupGlobal, dsLookupGlobalId, dsLookupTyCon, dsLookupDataCon,
UniqSupply, newUniqueSupply,
getDOptsDs, getGhcModeDs, doptDs,
dsLookupGlobal, dsLookupGlobalId, dsLookupTyCon, dsLookupDataCon,
+ dsLookupClass,
DsMetaEnv, DsMetaVal(..), dsLookupMetaEnv, dsExtendMetaEnv,
DsMetaEnv, DsMetaVal(..), dsLookupMetaEnv, dsExtendMetaEnv,
@@
-43,6
+52,7
@@
import HscTypes
import Bag
import DataCon
import TyCon
import Bag
import DataCon
import TyCon
+import Class
import Id
import Module
import Var
import Id
import Module
import Var
@@
-55,10
+65,9
@@
import NameEnv
import OccName
import DynFlags
import ErrUtils
import OccName
import DynFlags
import ErrUtils
+import MonadUtils
import Data.IORef
import Data.IORef
-
-infixr 9 `thenDs`
\end{code}
%************************************************************************
\end{code}
%************************************************************************
@@
-115,13
+124,6
@@
type DsM result = TcRnIf DsGblEnv DsLclEnv result
-- Compatibility functions
fixDs = fixM
-- Compatibility functions
fixDs = fixM
-thenDs = thenM
-returnDs = returnM
-listDs = sequenceM
-foldlDs = foldlM
-foldrDs = foldrM
-mapAndUnzipDs = mapAndUnzipM
-
type DsWarning = (SrcSpan, SDoc)
-- Not quite the same as a WarnMsg, we have an SDoc here
type DsWarning = (SrcSpan, SDoc)
-- Not quite the same as a WarnMsg, we have an SDoc here
@@
-161,14
+163,14
@@
initDs :: HscEnv
initDs hsc_env mod rdr_env type_env thing_inside
= do { msg_var <- newIORef (emptyBag, emptyBag)
initDs hsc_env mod rdr_env type_env thing_inside
= do { msg_var <- newIORef (emptyBag, emptyBag)
- ; (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.
; 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
; msgs <- readIORef msg_var
; printErrorsAndWarnings dflags msgs
@@
-187,20
+189,21
@@
initDsTc thing_inside
= do { this_mod <- getModule
; tcg_env <- getGblEnv
; msg_var <- getErrsVar
= 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
; let type_env = tcg_type_env tcg_env
rdr_env = tcg_rdr_env tcg_env
- ; ds_envs <- ioToIOEnv$ mkDsEnvs this_mod rdr_env type_env msg_var
+ ; ds_envs <- liftIO $ mkDsEnvs dflags this_mod rdr_env type_env msg_var
; setEnvs ds_envs thing_inside }
; setEnvs ds_envs thing_inside }
-mkDsEnvs :: Module -> GlobalRdrEnv -> TypeEnv -> IORef Messages -> IO (DsGblEnv, DsLclEnv)
-mkDsEnvs mod rdr_env type_env msg_var
+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),
= 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_unqual = mkPrintUnqualified dflags rdr_env,
ds_msgs = msg_var}
lcl_env = DsLclEnv { ds_meta = emptyNameEnv,
ds_loc = noSrcSpan }
ds_msgs = msg_var}
lcl_env = DsLclEnv { ds_meta = emptyNameEnv,
ds_loc = noSrcSpan }
@@
-223,33
+226,33
@@
it easier to read debugging output.
\begin{code}
-- Make a new Id with the same print name, but different type, and new unique
newUniqueId :: Name -> Type -> DsM Id
\begin{code}
-- Make a new Id with the same print name, but different type, and new unique
newUniqueId :: Name -> Type -> DsM Id
-newUniqueId id ty
- = newUnique `thenDs` \ uniq ->
- returnDs (mkSysLocal (occNameFS (nameOccName id)) uniq ty)
+newUniqueId id ty = do
+ uniq <- newUnique
+ return (mkSysLocal (occNameFS (nameOccName id)) uniq ty)
duplicateLocalDs :: Id -> DsM Id
duplicateLocalDs :: Id -> DsM Id
-duplicateLocalDs old_local
- = newUnique `thenDs` \ uniq ->
- returnDs (setIdUnique old_local uniq)
+duplicateLocalDs old_local = do
+ uniq <- newUnique
+ return (setIdUnique old_local uniq)
newSysLocalDs, newFailLocalDs :: Type -> DsM Id
newSysLocalDs, newFailLocalDs :: Type -> DsM Id
-newSysLocalDs ty
- = newUnique `thenDs` \ uniq ->
- returnDs (mkSysLocal FSLIT("ds") uniq ty)
+newSysLocalDs ty = do
+ uniq <- newUnique
+ return (mkSysLocal FSLIT("ds") uniq ty)
-newSysLocalsDs tys = mappM newSysLocalDs tys
+newSysLocalsDs tys = mapM newSysLocalDs tys
-newFailLocalDs ty
- = newUnique `thenDs` \ uniq ->
- returnDs (mkSysLocal FSLIT("fail") uniq ty)
+newFailLocalDs ty = do
+ uniq <- newUnique
+ return (mkSysLocal FSLIT("fail") uniq ty)
-- The UserLocal bit just helps make the code a little clearer
\end{code}
\begin{code}
newTyVarsDs :: [TyVar] -> DsM [TyVar]
-- The UserLocal bit just helps make the code a little clearer
\end{code}
\begin{code}
newTyVarsDs :: [TyVar] -> DsM [TyVar]
-newTyVarsDs tyvar_tmpls
- = newUniqueSupply `thenDs` \ uniqs ->
- returnDs (zipWith setTyVarUnique tyvar_tmpls (uniqsFromSupply uniqs))
+newTyVarsDs tyvar_tmpls = do
+ uniqs <- newUniqueSupply
+ return (zipWith setTyVarUnique tyvar_tmpls (uniqsFromSupply uniqs))
\end{code}
We can also reach out and either set/grab location information from
\end{code}
We can also reach out and either set/grab location information from
@@
-302,18
+305,19
@@
dsLookupGlobal name
dsLookupGlobalId :: Name -> DsM Id
dsLookupGlobalId name
dsLookupGlobalId :: Name -> DsM Id
dsLookupGlobalId name
- = dsLookupGlobal name `thenDs` \ thing ->
- returnDs (tyThingId thing)
+ = tyThingId <$> dsLookupGlobal name
dsLookupTyCon :: Name -> DsM TyCon
dsLookupTyCon name
dsLookupTyCon :: Name -> DsM TyCon
dsLookupTyCon name
- = dsLookupGlobal name `thenDs` \ thing ->
- returnDs (tyThingTyCon thing)
+ = tyThingTyCon <$> dsLookupGlobal name
dsLookupDataCon :: Name -> DsM DataCon
dsLookupDataCon name
dsLookupDataCon :: Name -> DsM DataCon
dsLookupDataCon name
- = dsLookupGlobal name `thenDs` \ thing ->
- returnDs (tyThingDataCon thing)
+ = tyThingDataCon <$> dsLookupGlobal name
+
+dsLookupClass :: Name -> DsM Class
+dsLookupClass name
+ = tyThingClass <$> dsLookupGlobal name
\end{code}
\begin{code}
\end{code}
\begin{code}