diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-08-07 13:35:51 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-08-07 13:35:51 -0700 |
| commit | bc267c696c015525ea303e03d448d1507b6afeb6 (patch) | |
| tree | 1a5ad468deba1a5b152caddfc88a1663bb909c5b /src/libsyntax/parse | |
| parent | 92ef17aaebb28a8fe6579f669a3ee162c931d9dd (diff) | |
| download | rust-bc267c696c015525ea303e03d448d1507b6afeb6.tar.gz rust-bc267c696c015525ea303e03d448d1507b6afeb6.zip | |
syntax: Rename expr_alt to expr_match
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/classify.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 4 |
2 files changed, 3 insertions, 3 deletions
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 { |