diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-04-28 17:51:02 +0100 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-04-28 17:51:02 +0100 |
| commit | 6618d1edc3edaad9ebdc216e6d7423ac9ac6a265 (patch) | |
| tree | 6134e50e3b501e810c6da140257d7ccdca90602a /crates/ra_syntax/tests/data/lexer | |
| parent | 8138b1da4f1564913a1a22407c65e77aa5320d56 (diff) | |
| parent | d436ab05810c208b41a1b61896d3d87691cd9e99 (diff) | |
Merge #1213
1213: Make lexer produce only single character puncts r=matklad a=edwin0cheng
As discussed in Zulip, this PR change `lexer` to produce only single char punct.
* Remove producing `DOTDOTDOT, DOTDOTEQ, DOTDOT, COLONCOLON, EQEQ, FAT_ARROW, NEQ, THIN_ARROW` in lexer.
* Add required code in parser to make sure everythings works fine.
* Change some tests (Mainly because the `ast::token_tree` is different)
Note: i think the use of `COLON` in rust is too overloaded :)
Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates/ra_syntax/tests/data/lexer')
| -rw-r--r-- | crates/ra_syntax/tests/data/lexer/0004_numbers.txt | 3 | ||||
| -rw-r--r-- | crates/ra_syntax/tests/data/lexer/0005_symbols.txt | 23 |
2 files changed, 18 insertions, 8 deletions
diff --git a/crates/ra_syntax/tests/data/lexer/0004_numbers.txt b/crates/ra_syntax/tests/data/lexer/0004_numbers.txt index 4b5fd9f71..39988aedc 100644 --- a/crates/ra_syntax/tests/data/lexer/0004_numbers.txt +++ b/crates/ra_syntax/tests/data/lexer/0004_numbers.txt | |||
| @@ -37,7 +37,8 @@ WHITESPACE 1 " " | |||
| 37 | INT_NUMBER 6 "0E1279" | 37 | INT_NUMBER 6 "0E1279" |
| 38 | WHITESPACE 1 "\n" | 38 | WHITESPACE 1 "\n" |
| 39 | INT_NUMBER 1 "0" | 39 | INT_NUMBER 1 "0" |
| 40 | DOTDOT 2 ".." | 40 | DOT 1 "." |
| 41 | DOT 1 "." | ||
| 41 | INT_NUMBER 1 "2" | 42 | INT_NUMBER 1 "2" |
| 42 | WHITESPACE 1 "\n" | 43 | WHITESPACE 1 "\n" |
| 43 | INT_NUMBER 1 "0" | 44 | INT_NUMBER 1 "0" |
diff --git a/crates/ra_syntax/tests/data/lexer/0005_symbols.txt b/crates/ra_syntax/tests/data/lexer/0005_symbols.txt index a6bc83a6f..469a90e42 100644 --- a/crates/ra_syntax/tests/data/lexer/0005_symbols.txt +++ b/crates/ra_syntax/tests/data/lexer/0005_symbols.txt | |||
| @@ -44,25 +44,34 @@ PERCENT 1 "%" | |||
| 44 | WHITESPACE 1 "\n" | 44 | WHITESPACE 1 "\n" |
| 45 | DOT 1 "." | 45 | DOT 1 "." |
| 46 | WHITESPACE 1 " " | 46 | WHITESPACE 1 " " |
| 47 | DOTDOT 2 ".." | 47 | DOT 1 "." |
| 48 | DOT 1 "." | ||
| 48 | WHITESPACE 1 " " | 49 | WHITESPACE 1 " " |
| 49 | DOTDOTDOT 3 "..." | 50 | DOT 1 "." |
| 51 | DOT 1 "." | ||
| 52 | DOT 1 "." | ||
| 50 | WHITESPACE 1 " " | 53 | WHITESPACE 1 " " |
| 51 | DOTDOTEQ 3 "..=" | 54 | DOT 1 "." |
| 55 | DOT 1 "." | ||
| 56 | EQ 1 "=" | ||
| 52 | WHITESPACE 1 "\n" | 57 | WHITESPACE 1 "\n" |
| 53 | COLON 1 ":" | 58 | COLON 1 ":" |
| 54 | WHITESPACE 1 " " | 59 | WHITESPACE 1 " " |
| 55 | COLONCOLON 2 "::" | 60 | COLON 1 ":" |
| 61 | COLON 1 ":" | ||
| 56 | WHITESPACE 1 "\n" | 62 | WHITESPACE 1 "\n" |
| 57 | EQ 1 "=" | 63 | EQ 1 "=" |
| 58 | WHITESPACE 1 " " | 64 | WHITESPACE 1 " " |
| 59 | FAT_ARROW 2 "=>" | 65 | EQ 1 "=" |
| 66 | R_ANGLE 1 ">" | ||
| 60 | WHITESPACE 1 "\n" | 67 | WHITESPACE 1 "\n" |
| 61 | EXCL 1 "!" | 68 | EXCL 1 "!" |
| 62 | WHITESPACE 1 " " | 69 | WHITESPACE 1 " " |
| 63 | NEQ 2 "!=" | 70 | EXCL 1 "!" |
| 71 | EQ 1 "=" | ||
| 64 | WHITESPACE 1 "\n" | 72 | WHITESPACE 1 "\n" |
| 65 | MINUS 1 "-" | 73 | MINUS 1 "-" |
| 66 | WHITESPACE 1 " " | 74 | WHITESPACE 1 " " |
| 67 | THIN_ARROW 2 "->" | 75 | MINUS 1 "-" |
| 76 | R_ANGLE 1 ">" | ||
| 68 | WHITESPACE 1 "\n" | 77 | WHITESPACE 1 "\n" |