projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
474955a
)
[project @ 2002-09-30 13:38:30 by simonpj]
author
simonpj
<unknown>
Mon, 30 Sep 2002 13:38:30 +0000
(13:38 +0000)
committer
simonpj
<unknown>
Mon, 30 Sep 2002 13:38:30 +0000
(13:38 +0000)
Minor wibble
ghc/compiler/rename/RnExpr.lhs
patch
|
blob
|
history
diff --git
a/ghc/compiler/rename/RnExpr.lhs
b/ghc/compiler/rename/RnExpr.lhs
index
66ec772
..
36bbc4b
100644
(file)
--- a/
ghc/compiler/rename/RnExpr.lhs
+++ b/
ghc/compiler/rename/RnExpr.lhs
@@
-286,7
+286,7
@@
rnExpr e@(HsDo do_or_lc stmts _ _ src_loc)
-- Check the statement list ends in an expression
case last stmts' of {
ResultStmt _ _ -> returnM () ;
-- Check the statement list ends in an expression
case last stmts' of {
ResultStmt _ _ -> returnM () ;
- _ -> addErr (doStmtListErr (binder_name do_or_lc) e)
+ _ -> addErr (doStmtListErr do_or_lc e)
} `thenM_`
-- Generate the rebindable syntax for the monad
} `thenM_`
-- Generate the rebindable syntax for the monad
@@
-305,9
+305,6
@@
rnExpr e@(HsDo do_or_lc stmts _ _ src_loc)
syntax_names MDoExpr = monadNames ++ [mfixName]
syntax_names other = []
syntax_names MDoExpr = monadNames ++ [mfixName]
syntax_names other = []
- binder_name MDoExpr = "mdo"
- binder_name other = "do"
-
rnExpr (ExplicitList _ exps)
= rnExprs exps `thenM` \ (exps', fvs) ->
returnM (ExplicitList placeHolderType exps', fvs `addOneFV` listTyCon_name)
rnExpr (ExplicitList _ exps)
= rnExprs exps `thenM` \ (exps', fvs) ->
returnM (ExplicitList placeHolderType exps', fvs `addOneFV` listTyCon_name)
@@
-906,9
+903,13
@@
patSynErr e
= sep [ptext SLIT("Pattern syntax in expression context:"),
nest 4 (ppr e)]
= sep [ptext SLIT("Pattern syntax in expression context:"),
nest 4 (ppr e)]
-doStmtListErr name e
- = sep [quotes (text name) <+> ptext SLIT("statements must end in expression:"),
+doStmtListErr do_or_lc e
+ = sep [quotes (text binder_name) <+> ptext SLIT("statements must end in expression:"),
nest 4 (ppr e)]
nest 4 (ppr e)]
+ where
+ binder_name = case do_or_lc of
+ MDoExpr -> "mdo"
+ other -> "do"
thErr what
= ptext SLIT("Template Haskell") <+> text what <+>
thErr what
= ptext SLIT("Template Haskell") <+> text what <+>