---

yaml
---
r: 7915
b: refs/heads/snap-stage3
c: e1f15a7
h: refs/heads/master
i:
  7913: 990d7b0
  7911: 4a29d9a
v: v3

Author: Paul Woolcock

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 86d473ad1fa297536b56fb3e1012d7dcbe4f21a3
+refs/heads/snap-stage3: e1f15a71e3dc1d24454594e068ed3df2271448e3
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/test/pretty/block-disambig.rs

@@ -24,7 +24,7 @@ fn test7() -> uint {
     (*regs < 2) as uint
 }
 
-fn test8() -> int { let val = @0; alt true { true { } } *val < 1 ? 0 : 1 }
+fn test8() -> int { let val = @0; alt true { true { } } if *val < 1 { 0 } else { 1 } }
 
 fn test9() { let regs = @mutable 0; alt true { true { } } *regs += 1; }
 

branches/snap-stage3/src/test/run-pass/block-arg-in-ternary.rs

@@ -11,7 +11,7 @@ impl point_ops for point {
         {x: -self.x, y: -self.y}
     }
     fn [](x: bool) -> int {
-        x ? self.x : self.y
+        if x { self.x } else { self.y }
     }
 }
 

branches/snap-stage3/src/test/run-pass/operator-overloading.rs

@@ -19,7 +19,7 @@ fn zombiejesus() {
     do  {
         while (ret) {
             if (ret) {
-                alt (ret) { _ { ret ? ret : ret } };
+                alt (ret) { _ { if ret { ret } else { ret } } };
             } else if (ret) {
                 ret;
             }