summaryrefslogtreecommitdiff
path: root/compiler/rename
diff options
context:
space:
mode:
authorJose Pedro Magalhaes <jpm@cs.uu.nl>2011-05-10 08:12:21 +0200
committerJose Pedro Magalhaes <jpm@cs.uu.nl>2011-05-10 08:12:21 +0200
commit9e4c8ad32eff3bf0350480109b2f5a5ad4738f09 (patch)
treef7a025f43701f115d2390b9e5f2a7acd898c45da /compiler/rename
parent61d89bc49eb75d74ed9196ba5f7b7b32018b914b (diff)
parent2d5205118357cac8a2dd43b33bcd93a3c00f5558 (diff)
downloadhaskell-9e4c8ad32eff3bf0350480109b2f5a5ad4738f09.tar.gz
Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
Diffstat (limited to 'compiler/rename')
-rw-r--r--compiler/rename/RnExpr.lhs2
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rename/RnExpr.lhs b/compiler/rename/RnExpr.lhs
index 46eef670f2..88e0462e74 100644
--- a/compiler/rename/RnExpr.lhs
+++ b/compiler/rename/RnExpr.lhs
@@ -694,6 +694,8 @@ rnStmt ctxt (L loc (ExprStmt expr _ _ _)) thing_inside
then lookupStmtName ctxt guardMName
else return (noSyntaxExpr, emptyFVs)
-- Only list/parr/monad comprehensions use 'guard'
+ -- Also for sub-stmts of same eg [ e | x<-xs, gd | blah ]
+ -- Here "gd" is a guard
; (thing, fvs3) <- thing_inside []
; return (([L loc (ExprStmt expr' then_op guard_op placeHolderType)], thing),
fv_expr `plusFV` fvs1 `plusFV` fvs2 `plusFV` fvs3) }