aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_syntax
diff options
context:
space:
mode:
authorGeoffry Song <[email protected]>2019-11-15 08:08:43 +0000
committerGeoffry Song <[email protected]>2019-11-15 08:18:28 +0000
commit989cebc99c02acd427f01724c4fa77d81691e886 (patch)
tree89c2ed0185257de734b60eb3db01be2f5270b7c3 /crates/ra_syntax
parent3ad11973ac7596323f085a9fcb9530e47f021c41 (diff)
Fix parsing of "postfix" range expressions.
Right now they are handled in `postfix_dot_expr`, but that doesn't allow it to correctly handle precedence. Integrate it more tightly with the Pratt parser instead. Also includes a drive-by fix for parsing `match .. {}`. Fixes #2242.
Diffstat (limited to 'crates/ra_syntax')
-rw-r--r--crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rs3
-rw-r--r--crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.txt24
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0060_as_range.rs4
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0060_as_range.txt56
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rs4
-rw-r--r--crates/ra_syntax/test_data/parser/ok/0061_match_full_range.txt27
6 files changed, 118 insertions, 0 deletions
diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rs b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rs
new file mode 100644
index 000000000..ecd25afaf
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rs
@@ -0,0 +1,3 @@
1fn main() {
2 0..=;
3}
diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.txt b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.txt
new file mode 100644
index 000000000..3efe98164
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.txt
@@ -0,0 +1,24 @@
1SOURCE_FILE@[0; 24)
2 FN_DEF@[0; 23)
3 FN_KW@[0; 2) "fn"
4 WHITESPACE@[2; 3) " "
5 NAME@[3; 7)
6 IDENT@[3; 7) "main"
7 PARAM_LIST@[7; 9)
8 L_PAREN@[7; 8) "("
9 R_PAREN@[8; 9) ")"
10 WHITESPACE@[9; 10) " "
11 BLOCK_EXPR@[10; 23)
12 BLOCK@[10; 23)
13 L_CURLY@[10; 11) "{"
14 WHITESPACE@[11; 16) "\n "
15 EXPR_STMT@[16; 21)
16 RANGE_EXPR@[16; 20)
17 LITERAL@[16; 17)
18 INT_NUMBER@[16; 17) "0"
19 DOTDOTEQ@[17; 20) "..="
20 SEMI@[20; 21) ";"
21 WHITESPACE@[21; 22) "\n"
22 R_CURLY@[22; 23) "}"
23 WHITESPACE@[23; 24) "\n"
24error 20: expected expression to end inclusive range
diff --git a/crates/ra_syntax/test_data/parser/ok/0060_as_range.rs b/crates/ra_syntax/test_data/parser/ok/0060_as_range.rs
new file mode 100644
index 000000000..f063ffadb
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/ok/0060_as_range.rs
@@ -0,0 +1,4 @@
1fn main() {
2 0 as usize ..;
3 1 + 2 as usize ..;
4}
diff --git a/crates/ra_syntax/test_data/parser/ok/0060_as_range.txt b/crates/ra_syntax/test_data/parser/ok/0060_as_range.txt
new file mode 100644
index 000000000..ad0c4a3fe
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/ok/0060_as_range.txt
@@ -0,0 +1,56 @@
1SOURCE_FILE@[0; 56)
2 FN_DEF@[0; 55)
3 FN_KW@[0; 2) "fn"
4 WHITESPACE@[2; 3) " "
5 NAME@[3; 7)
6 IDENT@[3; 7) "main"
7 PARAM_LIST@[7; 9)
8 L_PAREN@[7; 8) "("
9 R_PAREN@[8; 9) ")"
10 WHITESPACE@[9; 10) " "
11 BLOCK_EXPR@[10; 55)
12 BLOCK@[10; 55)
13 L_CURLY@[10; 11) "{"
14 WHITESPACE@[11; 16) "\n "
15 EXPR_STMT@[16; 30)
16 RANGE_EXPR@[16; 29)
17 CAST_EXPR@[16; 26)
18 LITERAL@[16; 17)
19 INT_NUMBER@[16; 17) "0"
20 WHITESPACE@[17; 18) " "
21 AS_KW@[18; 20) "as"
22 WHITESPACE@[20; 21) " "
23 PATH_TYPE@[21; 26)
24 PATH@[21; 26)
25 PATH_SEGMENT@[21; 26)
26 NAME_REF@[21; 26)
27 IDENT@[21; 26) "usize"
28 WHITESPACE@[26; 27) " "
29 DOTDOT@[27; 29) ".."
30 SEMI@[29; 30) ";"
31 WHITESPACE@[30; 35) "\n "
32 EXPR_STMT@[35; 53)
33 RANGE_EXPR@[35; 52)
34 BIN_EXPR@[35; 49)
35 LITERAL@[35; 36)
36 INT_NUMBER@[35; 36) "1"
37 WHITESPACE@[36; 37) " "
38 PLUS@[37; 38) "+"
39 WHITESPACE@[38; 39) " "
40 CAST_EXPR@[39; 49)
41 LITERAL@[39; 40)
42 INT_NUMBER@[39; 40) "2"
43 WHITESPACE@[40; 41) " "
44 AS_KW@[41; 43) "as"
45 WHITESPACE@[43; 44) " "
46 PATH_TYPE@[44; 49)
47 PATH@[44; 49)
48 PATH_SEGMENT@[44; 49)
49 NAME_REF@[44; 49)
50 IDENT@[44; 49) "usize"
51 WHITESPACE@[49; 50) " "
52 DOTDOT@[50; 52) ".."
53 SEMI@[52; 53) ";"
54 WHITESPACE@[53; 54) "\n"
55 R_CURLY@[54; 55) "}"
56 WHITESPACE@[55; 56) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rs b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rs
new file mode 100644
index 000000000..2c4ed11e1
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.rs
@@ -0,0 +1,4 @@
1fn main() {
2 match .. {
3 }
4}
diff --git a/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.txt b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.txt
new file mode 100644
index 000000000..bdfac9b76
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/ok/0061_match_full_range.txt
@@ -0,0 +1,27 @@
1SOURCE_FILE@[0; 35)
2 FN_DEF@[0; 34)
3 FN_KW@[0; 2) "fn"
4 WHITESPACE@[2; 3) " "
5 NAME@[3; 7)
6 IDENT@[3; 7) "main"
7 PARAM_LIST@[7; 9)
8 L_PAREN@[7; 8) "("
9 R_PAREN@[8; 9) ")"
10 WHITESPACE@[9; 10) " "
11 BLOCK_EXPR@[10; 34)
12 BLOCK@[10; 34)
13 L_CURLY@[10; 11) "{"
14 WHITESPACE@[11; 16) "\n "
15 MATCH_EXPR@[16; 32)
16 MATCH_KW@[16; 21) "match"
17 WHITESPACE@[21; 22) " "
18 RANGE_EXPR@[22; 24)
19 DOTDOT@[22; 24) ".."
20 WHITESPACE@[24; 25) " "
21 MATCH_ARM_LIST@[25; 32)
22 L_CURLY@[25; 26) "{"
23 WHITESPACE@[26; 31) "\n "
24 R_CURLY@[31; 32) "}"
25 WHITESPACE@[32; 33) "\n"
26 R_CURLY@[33; 34) "}"
27 WHITESPACE@[34; 35) "\n"