diff options
| author | Brendan Zabarauskas <bjzaba@yahoo.com.au> | 2013-04-22 01:58:53 +1000 |
|---|---|---|
| committer | Brendan Zabarauskas <bjzaba@yahoo.com.au> | 2013-04-22 01:58:53 +1000 |
| commit | 01eb5e8ad39a57e9fc31569983c1b9d5905a7e58 (patch) | |
| tree | 5523ef76c48368ff911e1f7399d2f79f73ba43fb /src/libsyntax/parse | |
| parent | 2104cd69d491c622a70208a7b70a4d948fc30d05 (diff) | |
| download | rust-01eb5e8ad39a57e9fc31569983c1b9d5905a7e58.tar.gz rust-01eb5e8ad39a57e9fc31569983c1b9d5905a7e58.zip | |
Rename Div operator trait to Quot and Modulo operator trait to Rem
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/parse/prec.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index e892f212b05..42275aca0a3 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -21,7 +21,7 @@ use ast::{_mod, add, arg, arm, attribute, bind_by_ref, bind_infer}; use ast::{bind_by_copy, bitand, bitor, bitxor, blk}; use ast::{blk_check_mode, box, by_copy, by_ref}; use ast::{crate, crate_cfg, decl, decl_item}; -use ast::{decl_local, default_blk, deref, div, enum_def}; +use ast::{decl_local, default_blk, deref, quot, enum_def}; use ast::{expl, expr, expr_, expr_addr_of, expr_match, expr_again}; use ast::{expr_assign, expr_assign_op, expr_binary, expr_block}; use ast::{expr_break, expr_call, expr_cast, expr_copy, expr_do_body}; @@ -1786,7 +1786,7 @@ pub impl Parser { token::PLUS => aop = add, token::MINUS => aop = subtract, token::STAR => aop = mul, - token::SLASH => aop = div, + token::SLASH => aop = quot, token::PERCENT => aop = rem, token::CARET => aop = bitxor, token::AND => aop = bitand, diff --git a/src/libsyntax/parse/prec.rs b/src/libsyntax/parse/prec.rs index 79adabec9b7..d8c829740fa 100644 --- a/src/libsyntax/parse/prec.rs +++ b/src/libsyntax/parse/prec.rs @@ -31,7 +31,7 @@ pub static as_prec: uint = 11u; pub fn token_to_binop(tok: Token) -> Option<ast::binop> { match tok { BINOP(STAR) => Some(mul), - BINOP(SLASH) => Some(div), + BINOP(SLASH) => Some(quot), BINOP(PERCENT) => Some(rem), // 'as' sits between here with 11 BINOP(PLUS) => Some(add), |
