squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

rustc: Push down types for all expressions; add logic for recv and send

Browse source
This commit is contained in:
Patrick Walton 2011-04-08 18:13:49 -07:00
parent 35573144c5
commit 3efb7f5459
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/comp/middle/ty.rs
View file

@ -792,6 +792,8 @@ fn expr_ty(@ast.expr expr) -> @t {
case (ast.expr_recv(_, _, ?ann)) { ret ann_to_type(ann); }
case (ast.expr_fail(_)) { ret plain_ty(ty_nil); }
case (ast.expr_break(_)) { ret plain_ty(ty_nil); }
case (ast.expr_cont(_)) { ret plain_ty(ty_nil); }
case (ast.expr_log(_,_)) { ret plain_ty(ty_nil); }
case (ast.expr_check_expr(_,_)) { ret plain_ty(ty_nil); }
case (ast.expr_ret(_,_)) { ret plain_ty(ty_nil); }

26
src/comp/middle/typeck.rs
View file

@ -1437,9 +1437,28 @@ mod Pushdown {
e_1 = ast.expr_alt(discrim, arms_1, triv_ann(t));
}
case (ast.expr_recv(?lval_0, ?expr_0, ?ann)) {
auto lval_1 = pushdown_expr(fcx, next_ty_var(fcx.ccx),
lval_0);
auto t = expr_ty(lval_1);
auto expr_1 = pushdown_expr(fcx, plain_ty(ty.ty_port(t)),
expr_0);
e_1 = ast.expr_recv(lval_1, expr_1, ann);
}
case (ast.expr_send(?lval_0, ?expr_0, ?ann)) {
auto expr_1 = pushdown_expr(fcx, next_ty_var(fcx.ccx),
expr_0);
auto t = expr_ty(expr_1);
auto lval_1 = pushdown_expr(fcx, plain_ty(ty.ty_chan(t)),
lval_0);
e_1 = ast.expr_send(lval_1, expr_1, ann);
}
case (_) {
fcx.ccx.sess.span_unimpl(e.span,
"type unification for expression variant");
#fmt("type unification for expression variant: %s",
pretty.pprust.expr_to_str(e)));
fail;
}
}
@ -2591,6 +2610,7 @@ fn check_stmt(&@fn_ctxt fcx, &@ast.stmt stmt) -> @ast.stmt {
case (ast.stmt_expr(?expr,?a)) {
auto expr_t = check_expr(fcx, expr);
expr_t = Pushdown.pushdown_expr(fcx, expr_ty(expr_t), expr_t);
ret @fold.respan[ast.stmt_](stmt.span, ast.stmt_expr(expr_t, a));
}
}
@ -2608,7 +2628,9 @@ fn check_block(&@fn_ctxt fcx, &ast.block block) -> ast.block {
alt (block.node.expr) {
case (none[@ast.expr]) { /* empty */ }
case (some[@ast.expr](?e)) {
expr = some[@ast.expr](check_expr(fcx, e));
auto expr_t = check_expr(fcx, e);
expr_t = Pushdown.pushdown_expr(fcx, expr_ty(expr_t), expr_t);
expr = some[@ast.expr](expr_t);
}
}