diff options
| author | Patrick Walton <[email protected]> | 2011-04-06 10:25:32 -0700 |
|---|---|---|
| committer | Patrick Walton <[email protected]> | 2011-04-06 10:25:32 -0700 |
| commit | d9da43984b5e9d50f711320d2afc3307537dfb44 (patch) | |
| tree | 6b9b3eefc8909c7621c01b7e039375deb019e7b1 /src/comp/front/parser.rs | |
| parent | rustc: Make type_of() return the type of the wrapper for native functions. li... (diff) | |
| parent | Minimal testcase for next bootstrap blocker. (diff) | |
| download | rust-d9da43984b5e9d50f711320d2afc3307537dfb44.tar.xz rust-d9da43984b5e9d50f711320d2afc3307537dfb44.zip | |
Merge branch 'master' of github.com:graydon/rust
Diffstat (limited to 'src/comp/front/parser.rs')
| -rw-r--r-- | src/comp/front/parser.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs index 4c3e6cf0..27fdc7fe 100644 --- a/src/comp/front/parser.rs +++ b/src/comp/front/parser.rs @@ -887,17 +887,19 @@ impure fn parse_bottom_expr(parser p) -> @ast.expr { } case (token.SELF) { + log "parsing a self-call..."; + p.bump(); expect(p, token.DOT); // The rest is a call expression. - auto e = parse_bottom_expr(p); + auto e = parse_ident(p); auto pf = parse_expr; auto es = parse_seq[@ast.expr](token.LPAREN, token.RPAREN, some(token.COMMA), pf, p); hi = es.span; - auto ex = ast.expr_call_self(e, es.node, ast.ann_none); + ex = ast.expr_call_self(e, es.node, ast.ann_none); } case (_) { @@ -1074,9 +1076,10 @@ impure fn parse_prefix_expr(parser p) -> @ast.expr { case (token.AT) { p.bump(); + auto m = parse_mutability(p); auto e = parse_prefix_expr(p); hi = e.span; - ex = ast.expr_unary(ast.box, e, ast.ann_none); + ex = ast.expr_unary(ast.box(m), e, ast.ann_none); } case (_) { |