---

yaml
---
r: 4141
b: refs/heads/master
c: 4c17cb7
h: refs/heads/master
i:
  4139: 4308d24
v: v3

Author: msullivan

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ca0ce91bf2d33fdb3df63d2c4c1470d7e10f767
+refs/heads/master: 4c17cb73a26de704b2040ecd5d6e75633e27fe92

trunk/src/test/compile-fail/block-coerce-no.rs

@@ -0,0 +1,20 @@
+// error-pattern: mismatched types
+// xfail-stage0
+
+// Make sure that fn-to-block coercion isn't incorrectly lifted over
+// other tycons.
+
+fn coerce(&block() b) -> fn() {
+    fn lol(&fn(&block()) -> fn() f, &block() g) -> fn() {
+        ret f(g);
+    }
+    fn fn_id (&fn() f) -> fn() { ret f }
+    ret lol(fn_id, b);
+}
+
+
+fn main() {
+    auto i = 8;
+    auto f = coerce(block() { log_err i; } );
+    f();
+}

trunk/src/test/compile-fail/block-copy.rs

@@ -0,0 +1,9 @@
+// error-pattern: non-copyable
+// xfail-stage0
+
+fn lol(&block() f) -> block() { ret f; }
+fn main() {
+    auto i = 8;
+    auto f = lol(block() { log_err i; } );
+    f();
+}

trunk/src/test/compile-fail/block-uninit.rs

@@ -0,0 +1,8 @@
+// error-pattern: Unsatisfied precondition constraint
+// xfail-stage0
+
+fn force(&block() f) { f(); }
+fn main() {
+    let int x;
+    force(block() { log_err x; });
+}

trunk/src/test/run-pass/block-fn-coerce.rs

@@ -0,0 +1,9 @@
+// xfail-stage0
+
+fn force(&block() -> int f) -> int { ret f(); }
+fn main() {
+    auto f = fn() -> int { ret 7 };
+    assert(force(f) == 7);
+    auto g = bind force(f);
+    assert(g() == 7);
+}

trunk/src/test/run-pass/block-iter-1.rs

@@ -0,0 +1,22 @@
+// xfail-stage0
+
+fn iter_vec[T](&vec[T] v, &block (&T) f) {
+    for (T x in v) {
+        f(x);
+    }
+}
+
+fn main() {
+    auto v = [1,2,3,4,5,6,7];
+    auto odds = 0;
+    iter_vec(v,
+             block (&int i) {
+                 log_err i;
+                 if (i % 2 == 1) {
+                     odds += 1;
+                 }
+                 log_err odds;
+             });
+    log_err odds;
+    assert(odds == 4);
+}

trunk/src/test/run-pass/block-iter-2.rs

@@ -0,0 +1,22 @@
+// xfail-stage0
+
+fn iter_vec[T](&vec[T] v, &block (&T) f) {
+    for (T x in v) {
+        f(x);
+    }
+}
+
+fn main() {
+    auto v = [1,2,3,4,5];
+    auto sum = 0;
+    iter_vec(v, block (&int i)
+    {
+        iter_vec(v, block (&int j)
+        {
+            log_err i*j;
+            sum += i*j;
+        });
+    });
+    log_err sum;
+    assert(sum == 225);
+}