typestate_check can now handle expr_block, expr_if, and expr_binary

(caveat for the latter: it assumes that binary operations are strict;
a TODO is to detect or and and and correctly reflect that they're lazy
in the second argument). I had to add an ann field to ast.block,
resulting in the usual boilerplate changes.

Test cases that currently work (if you uncomment the typestate pass
in the driver) (all these are under test/compile-fail):

fru-typestate
ret-uninit
use-uninit
use-uninit-2
use-uninit-3

2 files changed, 3 insertions, 2 deletions

diff --git a/src/comp/front/ast.rs b/src/comp/front/ast.rs
index dfc69695..b0035ba6 100644
--- a/src/comp/front/ast.rs
+++ b/src/comp/front/ast.rs
@@ -100,7 +100,8 @@ tag block_index_entry {
 }
 type block_ = rec(vec[@stmt] stmts,
                   option.t[@expr] expr,
-                  hashmap[ident,block_index_entry] index);
+                  hashmap[ident,block_index_entry] index,
+                  ann a); /* ann is only meaningful for the ts_ann field */
 
 type variant_def = tup(def_id /* tag */, def_id /* variant */);
 
diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs
index 85badb1e..ab44f638 100644
--- a/src/comp/front/parser.rs
+++ b/src/comp/front/parser.rs
@@ -1598,7 +1598,7 @@ fn index_block(vec[@ast.stmt] stmts, option.t[@ast.expr] expr) -> ast.block_ {
     for (@ast.stmt s in stmts) {
         ast.index_stmt(index, s);
     }
-    ret rec(stmts=stmts, expr=expr, index=index);
+    ret rec(stmts=stmts, expr=expr, index=index, a=ast.ann_none);
 }
 
 fn index_arm(@ast.pat pat) -> hashmap[ast.ident,ast.def_id] {