aboutsummaryrefslogtreecommitdiff
path: root/src/comp/front/parser.rs
diff options
context:
space:
mode:
authorPatrick Walton <[email protected]>2010-10-12 16:30:44 -0700
committerPatrick Walton <[email protected]>2010-10-12 16:30:44 -0700
commit81a43ef6980e19f3965d2cbbe109a9c6f82fe287 (patch)
tree777baeda9bce74c5fc0e8b7db04ece576f6bfe58 /src/comp/front/parser.rs
parentrustc: Parse box types (diff)
downloadrust-81a43ef6980e19f3965d2cbbe109a9c6f82fe287.tar.xz
rust-81a43ef6980e19f3965d2cbbe109a9c6f82fe287.zip
rustc: Add mutability to tuple literals
Diffstat (limited to 'src/comp/front/parser.rs')
-rw-r--r--src/comp/front/parser.rs22
1 files changed, 17 insertions, 5 deletions
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);
}