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, 5 insertions, 19 deletions
diff --git a/src/comp/front/ast.rs b/src/comp/front/ast.rs index 5e34d481..3b1a31b8 100644 --- a/src/comp/front/ast.rs +++ b/src/comp/front/ast.rs @@ -152,7 +152,7 @@ tag ty_ { ty_str; ty_box(@ty); ty_vec(@ty); - ty_tup(vec[tup(mutability, @ty)]); + ty_tup(vec[@ty]); ty_fn(vec[rec(mode mode, @ty ty)], @ty); // TODO: effect ty_path(path, option.t[def]); ty_mutable(@ty); diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs index e88760f6..6b0c2cc8 100644 --- a/src/comp/front/parser.rs +++ b/src/comp/front/parser.rs @@ -96,19 +96,6 @@ impure fn parse_ident(parser p) -> ast.ident { } } -impure fn parse_possibly_mutable_ty(parser p) - -> tup(ast.mutability, @ast.ty) { - auto mut; - if (p.peek() == token.MUTABLE) { - p.bump(); - mut = ast.mut; - } else { - mut = ast.imm; - } - - ret tup(mut, parse_ty(p)); -} - impure fn parse_ty_fn(parser p) -> ast.ty_ { impure fn parse_fn_input_ty(parser p) -> rec(ast.mode mode, @ast.ty ty) { auto mode; @@ -192,11 +179,10 @@ impure fn parse_ty(parser p) -> @ast.ty { case (token.TUP) { p.bump(); - auto f = parse_possibly_mutable_ty; // FIXME: trans_const_lval bug - auto elems = - parse_seq[tup(ast.mutability, @ast.ty)] - (token.LPAREN, - token.RPAREN, some(token.COMMA), f, p); + auto f = parse_ty; // FIXME: trans_const_lval bug + auto elems = parse_seq[@ast.ty] (token.LPAREN, + token.RPAREN, + some(token.COMMA), f, p); hi = p.get_span(); t = ast.ty_tup(elems.node); } |