diff options
Diffstat (limited to 'src/comp/front')
| -rw-r--r-- | src/comp/front/ast.rs | 2 | ||||
| -rw-r--r-- | src/comp/front/parser.rs | 22 |
2 files changed, 18 insertions, 6 deletions
diff --git a/src/comp/front/ast.rs b/src/comp/front/ast.rs index 1425db61..a7ef4e65 100644 --- a/src/comp/front/ast.rs +++ b/src/comp/front/ast.rs @@ -83,7 +83,7 @@ tag decl_ { type expr = spanned[expr_]; tag expr_ { expr_vec(vec[@expr]); - expr_tup(vec[@expr]); + expr_tup(vec[tup(bool /* mutability */, @expr)]); expr_rec(vec[tup(ident,@expr)]); expr_call(@expr, vec[@expr]); expr_binary(binop, @expr, @expr); diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs index 597d578f..8d945dd8 100644 --- a/src/comp/front/parser.rs +++ b/src/comp/front/parser.rs @@ -219,6 +219,18 @@ io fn parse_name(parser p, ast.ident id) -> ast.name { ret spanned(lo, tys.span, rec(ident=id, types=tys.node)); } +io fn parse_possibly_mutable_expr(parser p) -> tup(bool, @ast.expr) { + auto mut; + if (p.peek() == token.MUTABLE) { + p.bump(); + mut = true; + } else { + mut = false; + } + + ret tup(mut, parse_expr(p)); +} + io fn parse_bottom_expr(parser p) -> @ast.expr { auto lo = p.get_span(); @@ -239,11 +251,11 @@ io fn parse_bottom_expr(parser p) -> @ast.expr { case (token.TUP) { p.bump(); - auto pf = parse_expr; - auto es = parse_seq[@ast.expr](token.LPAREN, - token.RPAREN, - some(token.COMMA), - pf, p); + auto pf = parse_possibly_mutable_expr; + auto es = parse_seq[tup(bool, @ast.expr)](token.LPAREN, + token.RPAREN, + some(token.COMMA), + pf, p); hi = es.span; ex = ast.expr_tup(es.node); } |