about summary refs log tree commit diff
path: root/src/libsyntax/parse/classify.rs
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-08-03 19:59:04 -0700
committerBrian Anderson <banderson@mozilla.com>2012-08-05 22:08:09 -0700
commit025d86624de982cdab7e6b13600fec1499c02b56 (patch)
tree96ba196f8a420c52e6034acd14f323d3d2239e29 /src/libsyntax/parse/classify.rs
parentc9d27693796fe4ced8568e11aa465750f743097b (diff)
downloadrust-025d86624de982cdab7e6b13600fec1499c02b56.tar.gz
rust-025d86624de982cdab7e6b13600fec1499c02b56.zip
Switch alts to use arrows
Diffstat (limited to 'src/libsyntax/parse/classify.rs')
-rw-r--r--src/libsyntax/parse/classify.rs59
1 files changed, 26 insertions, 33 deletions
diff --git a/src/libsyntax/parse/classify.rs b/src/libsyntax/parse/classify.rs
index 8a5e02163be..8450ce0038d 100644
--- a/src/libsyntax/parse/classify.rs
+++ b/src/libsyntax/parse/classify.rs
@@ -8,25 +8,23 @@ fn expr_requires_semi_to_be_stmt(e: @ast::expr) -> bool {
     alt e.node {
       ast::expr_if(_, _, _) | ast::expr_alt(_, _, _) | ast::expr_block(_)
       | ast::expr_while(_, _) | ast::expr_loop(_)
-      | ast::expr_call(_, _, true) {
-        false
-      }
-      _ { true }
+      | ast::expr_call(_, _, true) => false,
+      _ => true
     }
 }
 
 fn stmt_ends_with_semi(stmt: ast::stmt) -> bool {
     alt stmt.node {
-      ast::stmt_decl(d, _) {
+      ast::stmt_decl(d, _) => {
         return alt d.node {
-              ast::decl_local(_) { true }
-              ast::decl_item(_) { false }
+              ast::decl_local(_) => true,
+              ast::decl_item(_) => false
             }
       }
-      ast::stmt_expr(e, _) {
+      ast::stmt_expr(e, _) => {
         return expr_requires_semi_to_be_stmt(e);
       }
-      ast::stmt_semi(e, _) {
+      ast::stmt_semi(e, _) => {
         return false;
       }
     }
@@ -34,43 +32,38 @@ fn stmt_ends_with_semi(stmt: ast::stmt) -> bool {
 
 fn need_parens(expr: @ast::expr, outer_prec: uint) -> bool {
     alt expr.node {
-      ast::expr_binary(op, _, _) { operator_prec(op) < outer_prec }
-      ast::expr_cast(_, _) { parse::prec::as_prec < outer_prec }
+      ast::expr_binary(op, _, _) => operator_prec(op) < outer_prec,
+      ast::expr_cast(_, _) => parse::prec::as_prec < outer_prec,
       // This may be too conservative in some cases
-      ast::expr_assign(_, _) { true }
-      ast::expr_move(_, _) { true }
-      ast::expr_swap(_, _) { true }
-      ast::expr_assign_op(_, _, _) { true }
-      ast::expr_ret(_) { true }
-      ast::expr_assert(_) { true }
-      ast::expr_log(_, _, _) { true }
-      _ { !parse::classify::expr_requires_semi_to_be_stmt(expr) }
+      ast::expr_assign(_, _) => true,
+      ast::expr_move(_, _) => true,
+      ast::expr_swap(_, _) => true,
+      ast::expr_assign_op(_, _, _) => true,
+      ast::expr_ret(_) => true,
+      ast::expr_assert(_) => true,
+      ast::expr_log(_, _, _) => true,
+      _ => !parse::classify::expr_requires_semi_to_be_stmt(expr)
     }
 }
 
 fn ends_in_lit_int(ex: @ast::expr) -> bool {
     alt ex.node {
-      ast::expr_lit(node) {
-        alt node {
-          @{node: ast::lit_int(_, ast::ty_i), _} |
-          @{node: ast::lit_int_unsuffixed(_), _}
-          { true }
-          _ { false }
-        }
+      ast::expr_lit(node) => alt node {
+        @{node: ast::lit_int(_, ast::ty_i), _}
+        | @{node: ast::lit_int_unsuffixed(_), _} => true,
+        _ => false
       }
       ast::expr_binary(_, _, sub) | ast::expr_unary(_, sub) |
       ast::expr_move(_, sub) | ast::expr_copy(sub) |
       ast::expr_assign(_, sub) |
       ast::expr_assign_op(_, _, sub) | ast::expr_swap(_, sub) |
-      ast::expr_log(_, _, sub) | ast::expr_assert(sub) {
+      ast::expr_log(_, _, sub) | ast::expr_assert(sub) => {
         ends_in_lit_int(sub)
       }
-      ast::expr_fail(osub) | ast::expr_ret(osub) {
-        alt osub {
-          some(ex) { ends_in_lit_int(ex) }
-          _ { false }
-        }
+      ast::expr_fail(osub) | ast::expr_ret(osub) => alt osub {
+        some(ex) => ends_in_lit_int(ex),
+        _ => false
       }
-      _ { false }
+      _ => false
     }
 }