---

yaml
---
r: 4946
b: refs/heads/master
c: 1b60bba
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b9a78e8c48eda153fe49e62c94465bb1bd3ffb8
+refs/heads/master: 1b60bba141c54f374d3378aa229c756d4a8f7f3d

trunk/src/comp/middle/trans.rs

@@ -4450,7 +4450,14 @@ fn trans_expr_out(cx: &@block_ctxt, e: &@ast::expr, output: out_method) ->
       ast::expr_cont. { ret trans_cont(e.span, cx); }
       ast::expr_ret(ex) { ret trans_ret(cx, ex); }
       ast::expr_put(ex) { ret trans_put(cx, ex); }
-      ast::expr_be(ex) { ret trans_be(cx, ex); }
+      ast::expr_be(ex) {
+        // Ideally, the expr_be tag would have a precondition
+        // that is_call_expr(ex) -- but we don't support that
+        // yet
+        // FIXME
+        check ast_util::is_call_expr(ex);
+        ret trans_be(cx, ex);
+      }
       ast::expr_anon_obj(anon_obj) {
         ret trans_anon_obj(cx, e.span, anon_obj, e.id);
       }
@@ -4776,10 +4783,10 @@ fn trans_ret(cx: &@block_ctxt, e: &option::t<@ast::expr>) -> result {
 
 fn build_return(bcx: &@block_ctxt) { bld::Br(bcx, bcx_fcx(bcx).llreturn); }
 
-fn trans_be(cx: &@block_ctxt, e: &@ast::expr) -> result {
-    // FIXME: This should be a typestate precondition
+// fn trans_be(cx: &@block_ctxt, e: &@ast::expr) -> result {
+fn trans_be(cx: &@block_ctxt, e: &@ast::expr)
+    : ast_util::is_call_expr(e) -> result {
 
-    assert (ast_util::is_call_expr(e));
     // FIXME: Turn this into a real tail call once
     // calling convention issues are settled
 

trunk/src/comp/syntax/ast_util.rs

@@ -167,8 +167,8 @@ fn is_exported(i: ident, m: _mod) -> bool {
     ret count == 0u && !nonlocal;
 }
 
-fn is_call_expr(e: @expr) -> bool {
-    alt e.node { expr_call(_, _) { ret true; } _ { ret false; } }
+pure fn is_call_expr(e: @expr) -> bool {
+    alt e.node { expr_call(_, _) { true } _ { false } }
 }
 
 fn is_constraint_arg(e: @expr) -> bool {

trunk/src/snapshots.txt

@@ -1,8 +1,3 @@
-S 2011-08-26 844e2d7
-  linux-i386 a896a6fe1bfbf38fac66db71edfa3750871edd55
-  macos-i386 d8d5c6144870389d9c233684576ac7b816e82655
-  winnt-i386 570d7515403f9bd5afa41e98f027ceedba88d588
-
 S 2011-08-25 e241f29
   linux-i386 af777f99bf51da80f24c53092773546868b27d02
   macos-i386 5f460da5988e469ced04670dc4bcfb9b95128717