syntax: Rename expr_alt to expr_match

7 files changed, 10 insertions, 10 deletions

diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index 9bd6a5ccf7d..577ef1464cf 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -316,7 +316,7 @@ enum expr_ {
        Same semantics as while(true) { body }, but typestate knows that the
        (implicit) condition is always true. */
     expr_loop(blk),
-    expr_alt(@expr, ~[arm], alt_mode),
+    expr_match(@expr, ~[arm], alt_mode),
     expr_fn(proto, fn_decl, blk, capture_clause),
     expr_fn_block(fn_decl, blk, capture_clause),
     // Inner expr is always an expr_fn_block. We need the wrapping node to
diff --git a/src/libsyntax/ext/auto_serialize.rs b/src/libsyntax/ext/auto_serialize.rs
index 346b1cf5b59..053c972d1ea 100644
--- a/src/libsyntax/ext/auto_serialize.rs
+++ b/src/libsyntax/ext/auto_serialize.rs
@@ -246,7 +246,7 @@ impl helpers of ext_ctxt_helpers for ext_ctxt {
         self.stmt(
             self.expr(
                 span,
-                ast::expr_alt(v, arms, ast::alt_exhaustive)))
+                ast::expr_match(v, arms, ast::alt_exhaustive)))
     }
 
     fn lit_str(span: span, s: @~str) -> @ast::expr {
@@ -910,7 +910,7 @@ fn deser_enum(cx: ext_ctxt, tps: deser_tps_map, e_name: ast::ident,
     // Generate code like:
     let e_name = cx.lit_str(e_span, e_name);
     let alt_expr = cx.expr(e_span,
-                           ast::expr_alt(#ast{__i}, arms, ast::alt_check));
+                           ast::expr_match(#ast{__i}, arms, ast::alt_check));
     let var_lambda = #ast{ |__i| $(alt_expr) };
     let read_var = #ast{ $(cx.clone(d)).read_enum_variant($(var_lambda)) };
     let read_lambda = cx.lambda(cx.expr_blk(read_var));
diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs
index 7f2c2509f81..ab39bf53f6a 100644
--- a/src/libsyntax/fold.rs
+++ b/src/libsyntax/fold.rs
@@ -441,8 +441,8 @@ fn noop_fold_expr(e: expr_, fld: ast_fold) -> expr_ {
           expr_loop(body) => {
               expr_loop(fld.fold_block(body))
           }
-          expr_alt(expr, arms, mode) => {
-            expr_alt(fld.fold_expr(expr),
+          expr_match(expr, arms, mode) => {
+            expr_match(fld.fold_expr(expr),
                      vec::map(arms, |x| fld.fold_arm(x)), mode)
           }
           expr_fn(proto, decl, body, captures) => {
diff --git a/src/libsyntax/parse/classify.rs b/src/libsyntax/parse/classify.rs
index a77c613cb60..d8ae8044370 100644
--- a/src/libsyntax/parse/classify.rs
+++ b/src/libsyntax/parse/classify.rs
@@ -6,7 +6,7 @@ import ast_util::operator_prec;
 
 fn expr_requires_semi_to_be_stmt(e: @ast::expr) -> bool {
     match e.node {
-      ast::expr_if(_, _, _) | ast::expr_alt(_, _, _) | ast::expr_block(_)
+      ast::expr_if(_, _, _) | ast::expr_match(_, _, _) | ast::expr_block(_)
       | ast::expr_while(_, _) | ast::expr_loop(_)
       | ast::expr_call(_, _, true) => false,
       _ => true
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 7eb96cbeb59..993419bd9c4 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -24,7 +24,7 @@ import ast::{_mod, add, alt_check, alt_exhaustive, arg, arm, attribute,
              cdir_view_item, class_immutable, class_member, class_method,
              class_mutable, crate, crate_cfg, crate_directive, decl,
              decl_item, decl_local, default_blk, deref, div, expl, expr,
-             expr_, expr_addr_of, expr_alt, expr_again, expr_assert,
+             expr_, expr_addr_of, expr_match, expr_again, expr_assert,
              expr_assign, expr_assign_op, expr_binary, expr_block, expr_break,
              expr_call, expr_cast, expr_copy, expr_do_body,
              expr_fail, expr_field, expr_fn, expr_fn_block, expr_if,
@@ -1599,7 +1599,7 @@ class parser {
         }
         let mut hi = self.span.hi;
         self.bump();
-        return self.mk_expr(lo, hi, expr_alt(discriminant, arms, mode));
+        return self.mk_expr(lo, hi, expr_match(discriminant, arms, mode));
     }
 
     fn parse_expr() -> @expr {
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index 865af11ee8b..41b61f57f92 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -1076,7 +1076,7 @@ fn print_expr(s: ps, &&expr: @ast::expr) {
         space(s.s);
         print_block(s, blk);
       }
-      ast::expr_alt(expr, arms, mode) => {
+      ast::expr_match(expr, arms, mode) => {
         cbox(s, alt_indent_unit);
         ibox(s, 4u);
         word_nbsp(s, ~"match");
diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs
index db84e0974ff..830114b47ad 100644
--- a/src/libsyntax/visit.rs
+++ b/src/libsyntax/visit.rs
@@ -400,7 +400,7 @@ fn visit_expr<E>(ex: @expr, e: E, v: vt<E>) {
       }
       expr_while(x, b) => { v.visit_expr(x, e, v); v.visit_block(b, e, v); }
       expr_loop(b) => v.visit_block(b, e, v),
-      expr_alt(x, arms, _) => {
+      expr_match(x, arms, _) => {
         v.visit_expr(x, e, v);
         for arms.each |a| { v.visit_arm(a, e, v); }
       }