aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_parser/src/grammar
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-03-17 14:34:14 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-03-17 14:34:14 +0000
commit91e7a3b6f2a9f1a09f874e9644491898338a842f (patch)
treee8acfe8092e492bcda292f15203ee22bf5911100 /crates/ra_parser/src/grammar
parent290a3d0a6baeb1a198300cb3406c1ae25cb864d2 (diff)
parenta8ee994ae0fc986056b4d32c5797ab448ae5a812 (diff)
Merge #983
983: support remainder assignment operator r=matklad a=JeanMertz `%=` was returning errors for me, turns out it wasn't added as a valid assignment operation. I'm not sure what the best location would be to add a test for this. Please let me know and I'll add one. Co-authored-by: Jean Mertz <[email protected]>
Diffstat (limited to 'crates/ra_parser/src/grammar')
-rw-r--r--crates/ra_parser/src/grammar/expressions.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/ra_parser/src/grammar/expressions.rs b/crates/ra_parser/src/grammar/expressions.rs
index a0d5a99cb..5a3b9f589 100644
--- a/crates/ra_parser/src/grammar/expressions.rs
+++ b/crates/ra_parser/src/grammar/expressions.rs
@@ -154,6 +154,7 @@ fn current_op(p: &Parser) -> (u8, Op) {
154 (PLUS, EQ) => return (1, Op::Composite(PLUSEQ, 2)), 154 (PLUS, EQ) => return (1, Op::Composite(PLUSEQ, 2)),
155 (MINUS, EQ) => return (1, Op::Composite(MINUSEQ, 2)), 155 (MINUS, EQ) => return (1, Op::Composite(MINUSEQ, 2)),
156 (STAR, EQ) => return (1, Op::Composite(STAREQ, 2)), 156 (STAR, EQ) => return (1, Op::Composite(STAREQ, 2)),
157 (PERCENT, EQ) => return (1, Op::Composite(PERCENTEQ, 2)),
157 (SLASH, EQ) => return (1, Op::Composite(SLASHEQ, 2)), 158 (SLASH, EQ) => return (1, Op::Composite(SLASHEQ, 2)),
158 (PIPE, EQ) => return (1, Op::Composite(PIPEEQ, 2)), 159 (PIPE, EQ) => return (1, Op::Composite(PIPEEQ, 2)),
159 (AMP, EQ) => return (1, Op::Composite(AMPEQ, 2)), 160 (AMP, EQ) => return (1, Op::Composite(AMPEQ, 2)),