---

yaml
---
r: 1517
b: refs/heads/master
c: d97c800
h: refs/heads/master
i:
  1515: d4b760d
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94b681afe4f8fb09141d459963b268c76fbd0072
+refs/heads/master: d97c800e3179604db82e35bff682ea1ed6ec3909

trunk/src/boot/me/typestate.ml

@@ -865,6 +865,11 @@ let rec build_flow_graph_for_stmt
         | Ast.STMT_block b ->
             blk predecessors b
 
+        | Ast.STMT_fail
+        | Ast.STMT_ret _ ->
+            connect predecessors [s.id];
+            []
+
         | _ ->
             connect predecessors [s.id];
             [s.id]

trunk/src/comp/front/lexer.rs

@@ -665,12 +665,9 @@ impure fn next_token(reader rdr) -> token.token {
         case ('%') {
             ret binop(rdr, token.PERCENT);
         }
-
     }
 
-    log "lexer stopping at ";
-    log c;
-    ret token.EOF;
+    fail;
 }
 
 

trunk/src/comp/middle/fold.rs

@@ -701,7 +701,7 @@ fn fold_expr[ENV](&ENV env, ast_fold[ENV] fld, &@expr e) -> @expr {
 
     }
 
-    ret e;
+    fail;
 }
 
 
@@ -724,7 +724,7 @@ fn fold_stmt[ENV](&ENV env, ast_fold[ENV] fld, &@stmt s) -> @stmt {
             ret fld.fold_stmt_expr(env_, s.span, ee);
         }
     }
-    ret s;
+    fail;
 }
 
 fn fold_block[ENV](&ENV env, ast_fold[ENV] fld, &block blk) -> block {

trunk/src/comp/middle/ty.rs

@@ -373,7 +373,7 @@ fn fold_ty(ty_fold fld, @t ty) -> @t {
         case (ty_param(_))      { ret fld.fold_simple_ty(ty); }
     }
 
-    ret ty;
+    fail;
 }
 
 // Type utilities