projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove javaGen; part of trac #2243
[ghc-hetmet.git]
/
compiler
/
deSugar
/
DsMonad.lhs
diff --git
a/compiler/deSugar/DsMonad.lhs
b/compiler/deSugar/DsMonad.lhs
index
52b7705
..
3bb1493
100644
(file)
--- a/
compiler/deSugar/DsMonad.lhs
+++ b/
compiler/deSugar/DsMonad.lhs
@@
-34,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
@@
-59,6
+57,7
@@
import OccName
import DynFlags
import ErrUtils
import MonadUtils
import DynFlags
import ErrUtils
import MonadUtils
+import FastString
import Data.IORef
\end{code}
import Data.IORef
\end{code}
@@
-79,6
+78,9
@@
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
idDsWrapper :: DsWrapper
idDsWrapper e = e
type DsWrapper = CoreExpr -> CoreExpr
idDsWrapper :: DsWrapper
idDsWrapper e = e
@@
-195,7
+197,7
@@
mkDsEnvs :: DynFlags -> Module -> GlobalRdrEnv -> TypeEnv -> IORef Messages -> I
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) }
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) }
- 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),
ds_unqual = mkPrintUnqualified dflags rdr_env,
gbl_env = DsGblEnv { ds_mod = mod,
ds_if_env = (if_genv, if_lenv),
ds_unqual = mkPrintUnqualified dflags rdr_env,
@@
-233,14
+235,14
@@
duplicateLocalDs old_local = do
newSysLocalDs, newFailLocalDs :: Type -> DsM Id
newSysLocalDs ty = do
uniq <- newUnique
newSysLocalDs, newFailLocalDs :: Type -> DsM Id
newSysLocalDs ty = do
uniq <- newUnique
- return (mkSysLocal FSLIT("ds") uniq ty)
+ return (mkSysLocal (fsLit "ds") uniq ty)
newSysLocalsDs :: [Type] -> DsM [Id]
newSysLocalsDs tys = mapM newSysLocalDs tys
newFailLocalDs ty = do
uniq <- newUnique
newSysLocalsDs :: [Type] -> DsM [Id]
newSysLocalsDs tys = mapM newSysLocalDs tys
newFailLocalDs ty = do
uniq <- newUnique
- return (mkSysLocal FSLIT("fail") uniq ty)
+ return (mkSysLocal (fsLit "fail") uniq ty)
-- The UserLocal bit just helps make the code a little clearer
\end{code}
-- The UserLocal bit just helps make the code a little clearer
\end{code}
@@
-277,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