Beginnings of support for magical self prefix; nothing profound happening yet.
This commit is contained in:
parent
f6490a6f03
commit
55fbed3d8d
8 changed files with 56 additions and 1 deletions
|
|
@ -252,6 +252,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(@expr, vec[@expr], 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);
|
||||
|
|
|
|||
|
|
@ -169,6 +169,7 @@ impure fn new_reader(io.reader rdr, str filename) -> reader
|
|||
keywords.insert("any", token.ANY);
|
||||
|
||||
keywords.insert("obj", token.OBJ);
|
||||
keywords.insert("self", token.SELF);
|
||||
|
||||
keywords.insert("port", token.PORT);
|
||||
keywords.insert("chan", token.CHAN);
|
||||
|
|
|
|||
|
|
@ -883,6 +883,20 @@ impure fn parse_bottom_expr(parser p) -> @ast.expr {
|
|||
ex = ast.expr_chan(e, ast.ann_none);
|
||||
}
|
||||
|
||||
case (token.SELF) {
|
||||
p.bump();
|
||||
expect(p, token.DOT);
|
||||
// The rest is a call expression.
|
||||
auto e = parse_bottom_expr(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);
|
||||
}
|
||||
|
||||
case (_) {
|
||||
auto lit = parse_lit(p);
|
||||
hi = lit.span;
|
||||
|
|
@ -1646,6 +1660,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_binary(_,_,_,_)) { ret true; }
|
||||
case (ast.expr_unary(_,_,_)) { ret true; }
|
||||
case (ast.expr_lit(_,_)) { ret true; }
|
||||
|
|
|
|||
|
|
@ -160,8 +160,9 @@ tag token {
|
|||
FN;
|
||||
ITER;
|
||||
|
||||
/* Object type */
|
||||
/* Object type and related keywords */
|
||||
OBJ;
|
||||
SELF;
|
||||
|
||||
/* Comm and task types */
|
||||
CHAN;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue