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

Let typestate constraints mention pattern-bound vars

Browse source
This commit is contained in:
Tim Chevalier 2011-08-26 00:39:50 -07:00
parent b099760269
commit 26e1cacb21
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/comp/middle/tstate/auxiliary.rs
View file

@ -621,9 +621,18 @@ fn expr_to_constr_arg(tcx: ty::ctxt, e: &@expr) -> @constr_arg_use {
carg_ident({ident: p.node.idents[0],
node: a_id.node}));
}
_ {
some (def_binding(b_id)) {
ret @respan(p.span,
carg_ident({ident: p.node.idents[0],
node: b_id.node}));
}
some(_) {
tcx.sess.bug("exprs_to_constr_args: non-local variable " +
"as pred arg");
}
none {
tcx.sess.bug("exprs_to_constr_args: NONE " +
"as pred arg");
}
}
@ -646,10 +655,6 @@ fn exprs_to_constr_args(tcx: ty::ctxt, args: &[@expr]) -> [@constr_arg_use] {
fn expr_to_constr(tcx: ty::ctxt, e: &@expr) -> sp_constr {
alt e.node {
// FIXME change the first pattern to expr_path to test a
// typechecker bug
expr_call(operator, args) {
alt operator.node {
expr_path(p) {