OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rustc: Assignment expressions have nil type. Closes #483

This commit is contained in:
Brian Anderson 2011-06-13 17:25:36 -07:00
parent d65ad8c31c
commit 1595c9d767
3 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/comp/middle/trans.rs
View File

@ -5832,30 +5832,32 @@ fn trans_expr_out(&@block_ctxt cx, &@ast::expr e, out_method output)
ret res(next_cx, sub.val);
}
case (ast::expr_move(?dst, ?src, ?ann)) {
case (ast::expr_move(?dst, ?src, _)) {
auto lhs_res = trans_lval(cx, dst);
assert (lhs_res.is_mem);
*(lhs_res.res.bcx) = rec(sp=src.span with *(lhs_res.res.bcx));
auto rhs_res = trans_lval(lhs_res.res.bcx, src);
auto t = node_ann_type(cx.fcx.lcx.ccx, ann);
auto t = ty::expr_ty(cx.fcx.lcx.ccx.tcx, src);
// FIXME: calculate copy init-ness in typestate.
ret move_val(rhs_res.res.bcx, DROP_EXISTING,
lhs_res.res.val, rhs_res.res.val, t);
auto move_res = move_val(rhs_res.res.bcx, DROP_EXISTING,
lhs_res.res.val, rhs_res.res.val, t);
ret res(move_res.bcx, C_nil());
}
case (ast::expr_assign(?dst, ?src, ?ann)) {
case (ast::expr_assign(?dst, ?src, _)) {
auto lhs_res = trans_lval(cx, dst);
assert (lhs_res.is_mem);
*(lhs_res.res.bcx) = rec(sp=src.span with *(lhs_res.res.bcx));
auto rhs_res = trans_expr(lhs_res.res.bcx, src);
auto t = node_ann_type(cx.fcx.lcx.ccx, ann);
auto t = ty::expr_ty(cx.fcx.lcx.ccx.tcx, src);
// FIXME: calculate copy init-ness in typestate.
ret copy_val(rhs_res.bcx, DROP_EXISTING,
lhs_res.res.val, rhs_res.val, t);
auto copy_res = copy_val(rhs_res.bcx, DROP_EXISTING,
lhs_res.res.val, rhs_res.val, t);
ret res(copy_res.bcx, C_nil());
}
case (ast::expr_assign_op(?op, ?dst, ?src, ?ann)) {
auto t = node_ann_type(cx.fcx.lcx.ccx, ann);
case (ast::expr_assign_op(?op, ?dst, ?src, _)) {
auto t = ty::expr_ty(cx.fcx.lcx.ccx.tcx, src);
auto lhs_res = trans_lval(cx, dst);
assert (lhs_res.is_mem);
*(lhs_res.res.bcx) = rec(sp=src.span with *(lhs_res.res.bcx));
@ -5875,8 +5877,9 @@ fn trans_expr_out(&@block_ctxt cx, &@ast::expr e, out_method output)
auto v = trans_eager_binop(rhs_res.bcx, op, t,
lhs_val, rhs_res.val);
// FIXME: calculate copy init-ness in typestate.
ret copy_val(v.bcx, DROP_EXISTING,
lhs_res.res.val, v.val, t);
auto copy_res = copy_val(v.bcx, DROP_EXISTING,
lhs_res.res.val, v.val, t);
ret res(copy_res.bcx, C_nil());
}
case (ast::expr_bind(?f, ?args, ?ann)) {

2
src/comp/middle/typeck.rs
View File

@ -1504,7 +1504,7 @@ fn check_expr(&@fn_ctxt fcx, &@ast::expr expr) {
auto typ = demand::simple(fcx, sp,
expr_ty(fcx.ccx.tcx, lhs),
expr_ty(fcx.ccx.tcx, rhs));
write::ty_only_fixup(fcx, a.id, typ);
write::ty_only_fixup(fcx, a.id, ty::mk_nil(fcx.ccx.tcx));
}
// A generic function for checking call expressions

30
src/test/run-pass/assign-assign.rs Normal file
View File

@ -0,0 +1,30 @@
// xfail-stage0
// Issue 483 - Assignment expressions result in nil
fn test_assign() {
let int x;
let () y = (x = 10);
assert (x == 10);
auto z = (x = 11);
assert (x == 11);
z = (x = 12);
assert ( x == 12);
}
fn test_assign_op() {
let int x = 0;
let () y = (x += 10);
assert (x == 10);
auto z = (x += 11);
assert (x == 21);
z = (x += 12);
assert ( x == 33);
}
fn main() {
test_assign();
test_assign_op();
}