Skip to content

Further on the path toward self-awareness. #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Further on the path toward self-awareness. #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/comp/front/ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(@expr, vec[@expr], ann);
expr_call_self(ident, 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);
Expand Down
4 changes: 3 additions & 1 deletion src/comp/front/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,10 +887,12 @@ 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,
Expand Down
2 changes: 2 additions & 0 deletions src/comp/front/token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,8 @@ fn to_str(token t) -> str {

/* Object type */
case (OBJ) { ret "obj"; }
case (SELF) { ret "self"; }


/* Comm and task types */
case (CHAN) { ret "chan"; }
Expand Down
11 changes: 5 additions & 6 deletions src/comp/middle/fold.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ type ast_fold[ENV] =
ann a) -> @expr) fold_expr_call,

(fn(&ENV e, &span sp,
@expr f, vec[@expr] args,
ident id, vec[@expr] args,
ann a) -> @expr) fold_expr_call_self,

(fn(&ENV e, &span sp,
Expand Down Expand Up @@ -566,10 +566,9 @@ fn fold_expr[ENV](&ENV env, ast_fold[ENV] fld, &@expr e) -> @expr {
ret fld.fold_expr_call(env_, e.span, ff, aargs, t);
}

case (ast.expr_call_self(?f, ?args, ?t)) {
auto ff = fold_expr(env_, fld, f);
case (ast.expr_call_self(?ident, ?args, ?t)) {
auto aargs = fold_exprs(env_, fld, args);
ret fld.fold_expr_call_self(env_, e.span, ff, aargs, t);
ret fld.fold_expr_call_self(env_, e.span, ident, aargs, t);
}

case (ast.expr_bind(?f, ?args_opt, ?t)) {
Expand Down Expand Up @@ -1185,9 +1184,9 @@ fn identity_fold_expr_call[ENV](&ENV env, &span sp, @expr f,
ret @respan(sp, ast.expr_call(f, args, a));
}

fn identity_fold_expr_call_self[ENV](&ENV env, &span sp, @expr f,
fn identity_fold_expr_call_self[ENV](&ENV env, &span sp, ident id,
vec[@expr] args, ann a) -> @expr {
ret @respan(sp, ast.expr_call_self(f, args, a));
ret @respan(sp, ast.expr_call_self(id, args, a));
}

fn identity_fold_expr_bind[ENV](&ENV env, &span sp, @expr f,
Expand Down
Loading