diff options
| author | Ian D. Bollinger <ian.bollinger@gmail.com> | 2012-02-06 00:32:31 -0500 |
|---|---|---|
| committer | Marijn Haverbeke <marijnh@gmail.com> | 2012-02-06 09:56:41 +0100 |
| commit | d1158ca333fe6a982936bf69eeeaabaf21460911 (patch) | |
| tree | 64ea5604ebb8170224819ceab4444391c219e70e /src/comp/syntax/parse/parser.rs | |
| parent | 91da710d86a58f4596b6ea22ccf35dd896445ccf (diff) | |
| download | rust-d1158ca333fe6a982936bf69eeeaabaf21460911.tar.gz rust-d1158ca333fe6a982936bf69eeeaabaf21460911.zip | |
Removed sendfn from badwords and made the precedence of XOR between that of OR and AND.
Diffstat (limited to 'src/comp/syntax/parse/parser.rs')
| -rw-r--r-- | src/comp/syntax/parse/parser.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs index 7879aecb7a0..f0375d52c17 100644 --- a/src/comp/syntax/parse/parser.rs +++ b/src/comp/syntax/parse/parser.rs @@ -151,7 +151,7 @@ fn bad_expr_word_table() -> hashmap<str, ()> { "cont", "ret", "be", "fail", "type", "resource", "check", "assert", "claim", "native", "fn", "pure", "unsafe", "import", "export", "let", "const", - "log", "copy", "sendfn", "impl", "iface", "enum", + "log", "copy", "impl", "iface", "enum", "m32", "m64", "m128", "f80", "f16", "f128", "class", "trait"] { words.insert(word, ()); @@ -1167,7 +1167,7 @@ fn prec_table() -> @[op_spec] { {tok: token::BINOP(token::LSR), op: ast::lsr, prec: 9}, {tok: token::BINOP(token::ASR), op: ast::asr, prec: 9}, {tok: token::BINOP(token::AND), op: ast::bitand, prec: 8}, - {tok: token::BINOP(token::CARET), op: ast::bitxor, prec: 6}, + {tok: token::BINOP(token::CARET), op: ast::bitxor, prec: 7}, {tok: token::BINOP(token::OR), op: ast::bitor, prec: 6}, // 'as' sits between here with 5 {tok: token::LT, op: ast::lt, prec: 4}, |