From 20b5ca3d2ffaf7b26a0f13c5490d06a889455f07 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sun, 24 Jun 2012 17:07:42 -0700
Subject: [PATCH] syntax: Merge parse_for_expr, parse_do_expr
---
src/libsyntax/parse/parser.rs | 28 ++++++----------------------
1 file changed, 6 insertions(+), 22 deletions(-)
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 28fee93fad7..ddd44b1abe6 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -771,9 +771,9 @@ class parser {
} else if self.eat_keyword("if") {
ret pexpr(self.parse_if_expr());
} else if self.eat_keyword("for") {
- ret pexpr(self.parse_for_expr());
+ ret pexpr(self.parse_sugary_call_expr("for", expr_loop_body));
} else if self.eat_keyword("do") {
- ret pexpr(self.parse_do_expr());
+ ret pexpr(self.parse_sugary_call_expr("do", expr_do_body));
} else if self.eat_keyword("while") {
ret pexpr(self.parse_while_expr());
} else if self.eat_keyword("loop") {
@@ -1283,36 +1283,20 @@ class parser {
}
}
- fn parse_for_expr() -> @expr {
+ fn parse_sugary_call_expr(keyword: str, ctor: fn(+@expr) -> expr_) -> @expr {
let lo = self.last_span;
let call = self.parse_expr_res(RESTRICT_STMT_EXPR);
alt call.node {
expr_call(f, args, true) {
let b_arg = vec::last(args);
let last = self.mk_expr(b_arg.span.lo, b_arg.span.hi,
- expr_loop_body(b_arg));
+ ctor(b_arg));
@{node: expr_call(f, vec::init(args) + [last], true)
with *call}
}
_ {
- self.span_fatal(lo, "`for` must be followed by a block call");
- }
- }
- }
-
- fn parse_do_expr() -> @expr {
- let lo = self.last_span;
- let call = self.parse_expr_res(RESTRICT_STMT_EXPR);
- alt call.node {
- expr_call(f, args, true) {
- let b_arg = vec::last(args);
- let last = self.mk_expr(b_arg.span.lo, b_arg.span.hi,
- expr_do_body(b_arg));
- @{node: expr_call(f, vec::init(args) + [last], true)
- with *call}
- }
- _ {
- self.span_fatal(lo, "`do` must be followed by a block call");
+ self.span_fatal(
+ lo, #fmt("`%s` must be followed by a block call", keyword));
}
}
}