diff options
| author | Brian Anderson <[email protected]> | 2011-03-13 14:56:52 -0400 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2011-03-14 16:41:46 -0700 |
| commit | b83a4af93c1da96002db120af336ad8ef6a68e30 (patch) | |
| tree | 0df4b7e23d7dba3c07947ae11b9f4157d3c7e244 /src | |
| parent | Add ty_port and ty_chan to expr_ty function (diff) | |
| download | rust-b83a4af93c1da96002db120af336ad8ef6a68e30.tar.xz rust-b83a4af93c1da96002db120af336ad8ef6a68e30.zip | |
Fix the typechecking for expr_send and expr_recv
Diffstat (limited to 'src')
| -rw-r--r-- | src/comp/middle/typeck.rs | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs index a654a2fc..f76ae44d 100644 --- a/src/comp/middle/typeck.rs +++ b/src/comp/middle/typeck.rs @@ -1831,18 +1831,48 @@ fn check_expr(&@fn_ctxt fcx, @ast.expr expr) -> @ast.expr { } case (ast.expr_send(?lhs, ?rhs, _)) { - auto checked = check_assignment_like(fcx, lhs, rhs); - auto newexpr = ast.expr_send(checked._0, - checked._1, - checked._2); + auto lhs_0 = check_expr(fcx, lhs); + auto rhs_0 = check_expr(fcx, rhs); + auto rhs_t = expr_ty(rhs_0); + + auto chan_t = plain_ty(ty.ty_chan(rhs_t)); + auto lhs_1 = demand_expr(fcx, chan_t, lhs_0); + auto item_t; + alt (expr_ty(lhs_1).struct) { + case (ty.ty_chan(?it)) { + item_t = it; + } + case (_) { + fail; + } + } + auto rhs_1 = demand_expr(fcx, item_t, rhs_0); + + auto ann = ast.ann_type(chan_t, none[vec[@ty.t]]); + auto newexpr = ast.expr_send(lhs_1, rhs_1, ann); ret @fold.respan[ast.expr_](expr.span, newexpr); } case (ast.expr_recv(?lhs, ?rhs, _)) { - auto checked = check_assignment_like(fcx, lhs, rhs); - auto newexpr = ast.expr_recv(checked._0, - checked._1, - checked._2); + auto lhs_0 = check_expr(fcx, lhs); + auto rhs_0 = check_expr(fcx, rhs); + auto lhs_t1 = expr_ty(lhs_0); + + auto port_t = plain_ty(ty.ty_port(lhs_t1)); + auto rhs_1 = demand_expr(fcx, port_t, rhs_0); + auto item_t; + alt (expr_ty(rhs_0).struct) { + case (ty.ty_port(?it)) { + item_t = it; + } + case (_) { + fail; + } + } + auto lhs_1 = demand_expr(fcx, item_t, lhs_0); + + auto ann = ast.ann_type(item_t, none[vec[@ty.t]]); + auto newexpr = ast.expr_recv(lhs_1, rhs_1, ann); ret @fold.respan[ast.expr_](expr.span, newexpr); } |