---

yaml
---
r: 5327
b: refs/heads/master
c: ce1877d
h: refs/heads/master
i:
  5325: b56d81e
  5323: de2dfa6
  5319: e8273ed
  5311: e5e921d
v: v3

Author: jruderman

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c6eba00dd4b410159d85889beefc6978da41faa
+refs/heads/master: ce1877dc8ed18847024c2b199263554686f3d150

trunk/src/comp/syntax/print/pprust.rs

@@ -625,7 +625,7 @@ fn print_if(s: ps, test: @ast::expr, blk: ast::blk,
                 cbox(s, indent_unit - 1u);
                 ibox(s, 0u);
                 word(s.s, " else if ");
-                print_expr(s, i);
+                print_maybe_parens_discrim(s, i);
                 space(s.s);
                 print_block(s, t);
                 do_else(s, e);

trunk/src/test/run-pass/wierd-exprs.rs

@@ -21,8 +21,15 @@ fn what() {
 }
 
 fn zombiejesus() {
-    do  { while (ret) { if (ret) { alt (ret) { _ { ret ? ret : ret } } } } }
-        while ret
+    do  {
+        while (ret) {
+            if (ret) {
+                alt (ret) { _ { ret ? ret : ret } };
+            } else if (ret) {
+                ret;
+            }
+        }
+    } while ret
 }
 
 fn notsure() {