projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix fwrite$UNIX2003 symbols when cross-compiling for Tiger
[ghc-hetmet.git]
/
compiler
/
deSugar
/
DsMonad.lhs
diff --git
a/compiler/deSugar/DsMonad.lhs
b/compiler/deSugar/DsMonad.lhs
index
6459ca8
..
3bb1493
100644
(file)
--- a/
compiler/deSugar/DsMonad.lhs
+++ b/
compiler/deSugar/DsMonad.lhs
@@
-6,17
+6,11
@@
@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/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,
+ foldlM, foldrM, ifOptM,
+ Applicative(..),(<$>),
newTyVarsDs, newLocalName,
duplicateLocalDs, newSysLocalDs, newSysLocalsDs, newUniqueId,
newTyVarsDs, newLocalName,
duplicateLocalDs, newSysLocalDs, newSysLocalsDs, newUniqueId,
@@
-40,8
+34,6
@@
module DsMonad (
CanItFail(..), orFail
) where
CanItFail(..), orFail
) where
-#include "HsVersions.h"
-
import TcRnMonad
import CoreSyn
import HsSyn
import TcRnMonad
import CoreSyn
import HsSyn
@@
-64,10
+56,10
@@
import NameEnv
import OccName
import DynFlags
import ErrUtils
import OccName
import DynFlags
import ErrUtils
+import MonadUtils
+import FastString
import Data.IORef
import Data.IORef
-
-infixr 9 `thenDs`
\end{code}
%************************************************************************
\end{code}
%************************************************************************
@@
-86,7
+78,11
@@
data EquationInfo
= EqnInfo { eqn_pats :: [Pat Id], -- The patterns for an eqn
eqn_rhs :: MatchResult } -- What to do after match
= EqnInfo { eqn_pats :: [Pat Id], -- The patterns for an eqn
eqn_rhs :: MatchResult } -- What to do after match
+instance Outputable EquationInfo where
+ ppr (EqnInfo pats _) = ppr pats
+
type DsWrapper = CoreExpr -> CoreExpr
type DsWrapper = CoreExpr -> CoreExpr
+idDsWrapper :: DsWrapper
idDsWrapper e = e
-- The semantics of (match vs (EqnInfo wrap pats rhs)) is the MatchResult
idDsWrapper e = e
-- The semantics of (match vs (EqnInfo wrap pats rhs)) is the MatchResult
@@
-105,8
+101,9
@@
data MatchResult
data CanItFail = CanFail | CantFail
data CanItFail = CanFail | CantFail
+orFail :: CanItFail -> CanItFail -> CanItFail
orFail CantFail CantFail = CantFail
orFail CantFail CantFail = CantFail
-orFail _ _ = CanFail
+orFail _ _ = CanFail
\end{code}
\end{code}
@@
-123,14
+120,8
@@
presumably include source-file location information:
type DsM result = TcRnIf DsGblEnv DsLclEnv result
-- Compatibility functions
type DsM result = TcRnIf DsGblEnv DsLclEnv result
-- Compatibility functions
+fixDs :: (a -> DsM a) -> DsM a
fixDs = fixM
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
@@
-170,14
+161,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
@@
-196,20
+187,20
@@
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
- = do
- sites_var <- newIORef []
+mkDsEnvs :: DynFlags -> Module -> GlobalRdrEnv -> TypeEnv -> IORef Messages -> IO (DsGblEnv, DsLclEnv)
+mkDsEnvs dflags mod rdr_env type_env msg_var
+ = do -- TODO: unnecessarily monadic
let if_genv = IfGblEnv { if_rec_types = Just (mod, return type_env) }
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)
+ 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),
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 }
@@
-232,33
+223,34
@@
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 :: [Type] -> DsM [Id]
+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
@@
-287,7
+279,7
@@
warnDs :: SDoc -> DsM ()
warnDs warn = do { env <- getGblEnv
; loc <- getSrcSpanDs
; let msg = mkWarnMsg loc (ds_unqual env)
warnDs warn = do { env <- getGblEnv
; loc <- getSrcSpanDs
; let msg = mkWarnMsg loc (ds_unqual env)
- (ptext SLIT("Warning:") <+> warn)
+ (ptext (sLit "Warning:") <+> warn)
; updMutVar (ds_msgs env) (\ (w,e) -> (w `snocBag` msg, e)) }
where
; updMutVar (ds_msgs env) (\ (w,e) -> (w `snocBag` msg, e)) }
where
@@
-311,23
+303,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
dsLookupClass :: Name -> DsM Class
dsLookupClass name
- = dsLookupGlobal name `thenDs` \ thing ->
- returnDs (tyThingClass thing)
+ = tyThingClass <$> dsLookupGlobal name
\end{code}
\begin{code}
\end{code}
\begin{code}