---

yaml
---
r: 4162
b: refs/heads/master
c: e9b2487
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6260ebaa2b3ba6c13cd6bc6d6cbbbe5b7c96595
+refs/heads/master: e9b2487db73a6088267650538f20d12c5a5dbf33

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

@@ -741,7 +741,7 @@ fn print_expr(&ps s, &@ast::expr expr) {
             word(s.s, "}");
         }
         case (ast::expr_call(?func, ?args)) {
-            print_expr(s, func);
+            print_expr_parens_if_unary(s, func);
             popen(s);
             commasep_exprs(s, inconsistent, args);
             pclose(s);
@@ -909,12 +909,12 @@ fn print_expr(&ps s, &@ast::expr expr) {
             print_expr(s, rhs);
         }
         case (ast::expr_field(?expr, ?id)) {
-            print_expr(s, expr);
+            print_expr_parens_if_unary(s, expr);
             word(s.s, ".");
             word(s.s, id);
         }
         case (ast::expr_index(?expr, ?index)) {
-            print_expr(s, expr);
+            print_expr_parens_if_unary(s, expr);
             word(s.s, ".");
             popen(s);
             print_expr(s, index);
@@ -1051,6 +1051,16 @@ fn print_expr(&ps s, &@ast::expr expr) {
     end(s);
 }
 
+fn print_expr_parens_if_unary(&ps s, &@ast::expr ex) {
+    auto parens = alt ex.node {
+      ast::expr_unary(_, _) { true }
+      _ { false }
+    };
+    if parens { popen(s); }
+    print_expr(s, ex);
+    if parens { pclose(s); }
+}
+
 fn print_decl(&ps s, &@ast::decl decl) {
     maybe_print_comment(s, decl.span.lo);
     alt (decl.node) {