From 2e90bd94de32c739733966bfac96cf35e9a08655 Mon Sep 17 00:00:00 2001 From: Tim Chevalier Date: Wed, 6 Apr 2011 17:56:44 -0700 Subject: Continued sketching out code for checking states against preconditions. It's still sketchy. I added a typestate annotation field to statements tagged stmt_decl or stmt_expr, because a stmt_decl statement has a typestate that's different from that of its child node. This necessitated trivial changes to a bunch of other files all over to the compiler. I also added a few small standard library functions, some of which I didn't actually end up using but which I thought might be useful anyway. --- src/comp/middle/trans.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/comp/middle/trans.rs') diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index 980c88db..fff3f126 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -5208,11 +5208,11 @@ fn init_local(@block_ctxt cx, @ast.local local) -> result { fn trans_stmt(@block_ctxt cx, &ast.stmt s) -> result { auto bcx = cx; alt (s.node) { - case (ast.stmt_expr(?e)) { + case (ast.stmt_expr(?e,_)) { bcx = trans_expr(cx, e).bcx; } - case (ast.stmt_decl(?d)) { + case (ast.stmt_decl(?d,_)) { alt (d.node) { case (ast.decl_local(?local)) { bcx = init_local(bcx, local).bcx; @@ -5302,7 +5302,7 @@ iter block_locals(&ast.block b) -> @ast.local { // use the index here. for (@ast.stmt s in b.node.stmts) { alt (s.node) { - case (ast.stmt_decl(?d)) { + case (ast.stmt_decl(?d,_)) { alt (d.node) { case (ast.decl_local(?local)) { put local; -- cgit v1.2.3