Skip to content

Commit d1158ca

Browse files
ianbollingermarijnh
authored andcommitted
Removed sendfn from badwords and made the precedence of XOR between that of OR and AND.
1 parent 91da710 commit d1158ca

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/comp/syntax/parse/parser.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ fn bad_expr_word_table() -> hashmap<str, ()> {
151151
"cont", "ret", "be", "fail", "type", "resource", "check",
152152
"assert", "claim", "native", "fn", "pure",
153153
"unsafe", "import", "export", "let", "const",
154-
"log", "copy", "sendfn", "impl", "iface", "enum",
154+
"log", "copy", "impl", "iface", "enum",
155155
"m32", "m64", "m128", "f80", "f16", "f128",
156156
"class", "trait"] {
157157
words.insert(word, ());
@@ -1167,7 +1167,7 @@ fn prec_table() -> @[op_spec] {
11671167
{tok: token::BINOP(token::LSR), op: ast::lsr, prec: 9},
11681168
{tok: token::BINOP(token::ASR), op: ast::asr, prec: 9},
11691169
{tok: token::BINOP(token::AND), op: ast::bitand, prec: 8},
1170-
{tok: token::BINOP(token::CARET), op: ast::bitxor, prec: 6},
1170+
{tok: token::BINOP(token::CARET), op: ast::bitxor, prec: 7},
11711171
{tok: token::BINOP(token::OR), op: ast::bitor, prec: 6},
11721172
// 'as' sits between here with 5
11731173
{tok: token::LT, op: ast::lt, prec: 4},

0 commit comments

Comments
 (0)