---

yaml
---
r: 3328
b: refs/heads/master
c: 1e7f06b
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3aa8d7ff4579137b483640969019463cce36f54b
+refs/heads/master: 1e7f06b17ae11b35e55a6f8655f13be8d590e91a

trunk/src/test/run-pass/ternary.rs

@@ -8,13 +8,19 @@ fn test_simple() {
 fn test_precedence() {
   auto x;
 
+  x = true || true ? 10 : 11;
+  assert (x == 10);
+
   x = true == false ? 10 : 11;
   assert (x == 11);
 
   x = true ? false ? 10 : 11 : 12;
   assert (x == 11);
 
-  auto y = false ? 10 : 0xF0 | 0x0F;
+  auto y = true ? 0xF0 : 0x0 | 0x0F;
+  assert (y == 0xF0);
+
+  y = true ? 0xF0 | 0x0F : 0x0;
   assert (y == 0xFF);
 }