diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-24 07:28:40 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-24 07:28:40 +0100 |
commit | 4c293c0a57fbe91587f6517403c30bb61ac21dc5 (patch) | |
tree | e7755c4113e079ae6558d2ad2b5e0718ea5c7284 /crates/ra_syntax | |
parent | c12a713739e30019497ab0f5e7bfa776122bfc6d (diff) | |
parent | 66101e931c641b7d96dcfdbb83838130eab588bc (diff) |
Merge #1902
1902: simplify r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_syntax')
-rw-r--r-- | crates/ra_syntax/src/grammar.ron | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron index da9de2214..5f395501a 100644 --- a/crates/ra_syntax/src/grammar.ron +++ b/crates/ra_syntax/src/grammar.ron | |||
@@ -1,7 +1,7 @@ | |||
1 | // Stores definitions which must be used in multiple places | 1 | // Stores definitions which must be used in multiple places |
2 | // See `cargo gen-syntax` (defined in crates/tools/src/main.rs) | 2 | // See `cargo gen-syntax` (defined in crates/tools/src/main.rs) |
3 | Grammar( | 3 | Grammar( |
4 | single_byte_tokens: [ | 4 | punct: [ |
5 | (";", "SEMI"), | 5 | (";", "SEMI"), |
6 | (",", "COMMA"), | 6 | (",", "COMMA"), |
7 | ("(", "L_PAREN"), | 7 | ("(", "L_PAREN"), |
@@ -25,9 +25,6 @@ Grammar( | |||
25 | ("^", "CARET"), | 25 | ("^", "CARET"), |
26 | ("%", "PERCENT"), | 26 | ("%", "PERCENT"), |
27 | ("_", "UNDERSCORE"), | 27 | ("_", "UNDERSCORE"), |
28 | ], | ||
29 | // Tokens for which the longest match must be chosen (e.g. `..` is a DOTDOT, but `.` is a DOT) | ||
30 | multi_byte_tokens: [ | ||
31 | (".", "DOT"), | 28 | (".", "DOT"), |
32 | ("..", "DOTDOT"), | 29 | ("..", "DOTDOT"), |
33 | ("...", "DOTDOTDOT"), | 30 | ("...", "DOTDOTDOT"), |