accept naked exprs with commas in pattern arms

pretty printing will use them, but indentation is slightly off
if the expr is long

1 files changed, 19 insertions, 2 deletions

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index b9e5fadeb81..df8ee01bb3b 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -1511,8 +1511,25 @@ class parser {
             let pats = self.parse_pats();
             let mut guard = none;
             if self.eat_keyword(~"if") { guard = some(self.parse_expr()); }
-            if self.token == token::FAT_ARROW { self.bump(); }
-            let blk = self.parse_block();
+            let blk = if self.token != token::FAT_ARROW {
+                self.parse_block()
+            } else {
+                self.bump();
+                if self.token == token::LBRACE {
+                    self.parse_block()
+                } else {
+                    let expr = self.parse_expr();
+                    if self.token != token::RBRACE {
+                        self.expect(token::COMMA);
+                    }
+                    {node: {view_items: ~[],
+                            stmts: ~[],
+                            expr: some(expr),
+                            id: self.get_id(),
+                            rules: default_blk},
+                     span: expr.span}
+                }
+            };
             vec::push(arms, {pats: pats, guard: guard, body: blk});
         }
         let mut hi = self.span.hi;