OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Have the pretty-printer parentesize unary ops when needed

Browse Source
This commit is contained in:
Marijn Haverbeke 2011-07-27 13:48:28 +02:00
parent a6260ebaa2
commit e9b2487db7
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/comp/syntax/print/pprust.rs
View File

@ -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) {