user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support for self-calls that take arguments.

Browse source 
Nicer parsing of self-calls (expr_self_method nodes inside expr_call
nodes, rather than a separate expr_call_self) makes typechecking
tractable.  We can now write self-calls that take arguments and return
values (see: test/run-pass/obj-self-*.rs).
This commit is contained in:
Lindsey Kuper 2011-04-07 13:49:27 -07:00 • committed by Graydon Hoare
parent 39774e88b4
commit 1092bbfff0
9 changed files with 120 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/comp/front/ast.rs
View file

@ -258,7 +258,7 @@ tag expr_ {
expr_tup(vec[elt], ann);
expr_rec(vec[field], option.t[@expr], ann);
expr_call(@expr, vec[@expr], ann);
expr_call_self(ident, vec[@expr], ann);
expr_self_method(ident, ann);
expr_bind(@expr, vec[option.t[@expr]], ann);
expr_spawn(spawn_dom, option.t[str], @expr, vec[@expr], ann);
expr_binary(binop, @expr, @expr, ann);

13
src/comp/front/parser.rs
View file

@ -893,14 +893,14 @@ impure fn parse_bottom_expr(parser p) -> @ast.expr {
p.bump();
expect(p, token.DOT);
// The rest is a call expression.
auto e = parse_ident(p);
let @ast.expr f = parse_self_method(p);
auto pf = parse_expr;
auto es = parse_seq[@ast.expr](token.LPAREN,
token.RPAREN,
some(token.COMMA),
pf, p);
hi = es.span;
ex = ast.expr_call_self(e, es.node, ast.ann_none);
ex = ast.expr_call(f, es.node, ast.ann_none);
}
case (_) {
@ -966,6 +966,13 @@ impure fn extend_expr_by_ident(parser p, span lo, span hi,
ret @spanned(lo, hi, e_);
}
impure fn parse_self_method(parser p) -> @ast.expr {
auto lo = p.get_span();
let ast.ident f_name = parse_ident(p);
auto hi = p.get_span();
ret @spanned(lo, hi, ast.expr_self_method(f_name, ast.ann_none));
}
impure fn parse_dot_or_call_expr(parser p) -> @ast.expr {
auto lo = p.get_span();
auto e = parse_bottom_expr(p);
@ -1634,7 +1641,7 @@ fn stmt_ends_with_semi(@ast.stmt stmt) -> bool {
case (ast.expr_tup(_,_)) { ret true; }
case (ast.expr_rec(_,_,_)) { ret true; }
case (ast.expr_call(_,_,_)) { ret true; }
case (ast.expr_call_self(_,_,_)){ ret true; }
case (ast.expr_self_method(_,_)){ ret false; }
case (ast.expr_binary(_,_,_,_)) { ret true; }
case (ast.expr_unary(_,_,_)) { ret true; }
case (ast.expr_lit(_,_)) { ret true; }