---

yaml
---
r: 5317
b: refs/heads/master
c: 906f1fc
h: refs/heads/master
i:
  5315: 5e42817
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7364a8c2b04c0d1ea9079a07348fe693bce90e0c
+refs/heads/master: 906f1fc425a827d7bbbb87a6e86ce0aa7faf0bb8

trunk/src/test/pretty/block-disambig.rs

@@ -0,0 +1,37 @@
+// A bunch of tests for syntactic forms involving blocks that were
+// previously ambiguous (e.g. 'if true { } *val;' gets parsed as a
+// binop)
+
+fn test1() { let val = @0; { } *val; }
+
+fn test2() -> int { let val = @0; { } *val }
+
+fn test3() {
+    let regs = @{mutable eax: 0};
+    alt true { true { } }
+    (*regs).eax = 1;
+}
+
+fn test4() -> bool { let regs = @true; if true { } *regs || false }
+
+fn test5() -> (int, int) { { } (0, 1) }
+
+fn test6() -> bool { { } (true || false) && true }
+
+fn test7() -> uint {
+    let regs = @0;
+    alt true { true { } }
+    (*regs < 2) as uint
+}
+
+fn test8() -> int { let val = @0; alt true { true { } } *val < 1 ? 0 : 1 }
+
+fn test9() { let regs = @mutable 0; alt true { true { } } *regs += 1; }
+
+fn test10() -> int {
+    let regs = @mutable [0];
+    alt true { true { } }
+    (*regs)[0]
+}
+
+fn test11() -> [int] { if true { } [1, 2] }