Skip to content

fix: parse the range pat inside the tuple pat #10794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2021
Merged

fix: parse the range pat inside the tuple pat #10794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion crates/parser/src/grammar/patterns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ fn pattern_single_r(p: &mut Parser, recovery_set: TokenSet) {
// Some(0) | None => (),
// Some(1..) => ()
// }
//
// match (10 as u8, 5 as u8) {
// (0, _) => (),
// (1.., _) => ()
// }
// }

// FIXME: support half_open_range_patterns (`..=2`),
Expand All @@ -85,7 +90,7 @@ fn pattern_single_r(p: &mut Parser, recovery_set: TokenSet) {

// `0 .. =>` or `let 0 .. =` or `Some(0 .. )`
// ^ ^ ^
if p.at(T![=]) | p.at(T![')']) {
if p.at(T![=]) | p.at(T![')']) | p.at(T![,]) {
// test half_open_range_pat
// fn f() { let 0 .. = 1u32; }
} else {
Expand Down
238 changes: 157 additions & 81 deletions crates/syntax/test_data/parser/inline/ok/0058_range_pat.rast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SOURCE_FILE@0..223
FN@0..222
SOURCE_FILE@0..307
FN@0..306
[email protected] "fn"
[email protected] " "
[email protected]
Expand All @@ -8,8 +8,8 @@ [email protected]
[email protected] "("
[email protected] ")"
[email protected] " "
BLOCK_EXPR@10..222
STMT_LIST@10..222
BLOCK_EXPR@10..306
STMT_LIST@10..306
[email protected] "{"
[email protected] "\n "
[email protected]
Expand Down Expand Up @@ -96,80 +96,156 @@ [email protected]
[email protected] "\n "
[email protected] "}"
[email protected] "\n\n "
[email protected]
[email protected] "match"
[email protected] " "
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected] "Some"
[email protected]
[email protected] "("
[email protected]
[email protected]
[email protected] "10"
[email protected] " "
[email protected] "as"
[email protected] " "
[email protected]
[email protected]
[email protected]
[email protected]
[email protected] "u8"
[email protected] ")"
[email protected] " "
[email protected]
[email protected] "{"
[email protected] "\n "
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected] "Some"
[email protected] "("
[email protected]
[email protected]
[email protected] "0"
[email protected] ")"
[email protected] " "
[email protected] "|"
[email protected] " "
[email protected]
[email protected]
[email protected] "None"
[email protected] " "
[email protected] "=>"
[email protected] " "
[email protected]
[email protected] "("
[email protected] ")"
[email protected] ","
[email protected] "\n "
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected] "Some"
[email protected] "("
[email protected]
[email protected]
[email protected]
[email protected] "1"
[email protected] ".."
[email protected] ")"
[email protected] " "
[email protected] "=>"
[email protected] " "
[email protected]
[email protected] "("
[email protected] ")"
[email protected] "\n "
[email protected] "}"
[email protected] "\n"
[email protected] "}"
[email protected] "\n"
[email protected]
[email protected]
[email protected] "match"
[email protected] " "
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected] "Some"
[email protected]
[email protected] "("
[email protected]
[email protected]
[email protected] "10"
[email protected] " "
[email protected] "as"
[email protected] " "
[email protected]
[email protected]
[email protected]
[email protected]
[email protected] "u8"
[email protected] ")"
[email protected] " "
[email protected]
[email protected] "{"
[email protected] "\n "
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected] "Some"
[email protected] "("
[email protected]
[email protected]
[email protected] "0"
[email protected] ")"
[email protected] " "
[email protected] "|"
[email protected] " "
[email protected]
[email protected]
[email protected] "None"
[email protected] " "
[email protected] "=>"
[email protected] " "
[email protected]
[email protected] "("
[email protected] ")"
[email protected] ","
[email protected] "\n "
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected] "Some"
[email protected] "("
[email protected]
[email protected]
[email protected]
[email protected] "1"
[email protected] ".."
[email protected] ")"
[email protected] " "
[email protected] "=>"
[email protected] " "
[email protected]
[email protected] "("
[email protected] ")"
[email protected] "\n "
[email protected] "}"
[email protected] "\n\n "
[email protected]
[email protected] "match"
[email protected] " "
[email protected]
[email protected] "("
[email protected]
[email protected]
[email protected] "10"
[email protected] " "
[email protected] "as"
[email protected] " "
[email protected]
[email protected]
[email protected]
[email protected]
[email protected] "u8"
[email protected] ","
[email protected] " "
[email protected]
[email protected]
[email protected] "5"
[email protected] " "
[email protected] "as"
[email protected] " "
[email protected]
[email protected]
[email protected]
[email protected]
[email protected] "u8"
[email protected] ")"
[email protected] " "
[email protected]
[email protected] "{"
[email protected] "\n "
[email protected]
[email protected]
[email protected] "("
[email protected]
[email protected]
[email protected] "0"
[email protected] ","
[email protected] " "
[email protected]
[email protected] "_"
[email protected] ")"
[email protected] " "
[email protected] "=>"
[email protected] " "
[email protected]
[email protected] "("
[email protected] ")"
[email protected] ","
[email protected] "\n "
[email protected]
[email protected]
[email protected] "("
[email protected]
[email protected]
[email protected]
[email protected] "1"
[email protected] ".."
[email protected] ","
[email protected] " "
[email protected]
[email protected] "_"
[email protected] ")"
[email protected] " "
[email protected] "=>"
[email protected] " "
[email protected]
[email protected] "("
[email protected] ")"
[email protected] "\n "
[email protected] "}"
[email protected] "\n"
[email protected] "}"
[email protected] "\n"
5 changes: 5 additions & 0 deletions crates/syntax/test_data/parser/inline/ok/0058_range_pat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,9 @@ fn main() {
Some(0) | None => (),
Some(1..) => ()
}

match (10 as u8, 5 as u8) {
(0, _) => (),
(1.., _) => ()
}
}