rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move call_expr parse rule to the place where it needs to be to understand complex calls.

Browse Source
This commit is contained in:
Graydon Hoare
2010-12-14 16:59:13 -08:00
parent e0998847be
commit a7eb1ac90f
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/comp/front/parser.rs
View File

@@ -392,20 +392,6 @@ impure fn parse_bottom_expr(parser p) -> @ast.expr {
auto n = parse_name(p, i); auto n = parse_name(p, i);
hi = n.span; hi = n.span;
ex = ast.expr_name(n, none[ast.def], ast.ann_none); ex = ast.expr_name(n, none[ast.def], ast.ann_none);
alt (p.peek()) {
case (token.LPAREN) {
// Call expr.
auto pf = parse_expr;
auto es = parse_seq[@ast.expr](token.LPAREN,
token.RPAREN,
some(token.COMMA),
pf, p);
ex = ast.expr_call(@spanned(lo, hi, ex),
es.node, ast.ann_none);
hi = es.span;
}
case (_) { /* fall through */ }
}
} }
case (token.LPAREN) { case (token.LPAREN) {
@@ -488,6 +474,19 @@ impure fn parse_path_expr(parser p) -> @ast.expr {
auto hi = e.span; auto hi = e.span;
while (true) { while (true) {
alt (p.peek()) { alt (p.peek()) {
case (token.LPAREN) {
// Call expr.
auto pf = parse_expr;
auto es = parse_seq[@ast.expr](token.LPAREN,
token.RPAREN,
some(token.COMMA),
pf, p);
hi = es.span;
auto e_ = ast.expr_call(e, es.node, ast.ann_none);
e = @spanned(lo, hi, e_);
}
case (token.DOT) { case (token.DOT) {
p.bump(); p.bump();
alt (p.peek()) { alt (p.peek()) {