mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #13777 - dzvon:fix-13776, r=jonas-schievink

Browse Source 
fix: add a check for `if` token in patterns parser

Closes #13776
This commit is contained in:
bors 2022-12-16 03:23:38 +00:00
commit 4909d4fbdb
3 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/parser/src/grammar/patterns.rs
View File

@ -126,11 +126,21 @@ fn pattern_single_r(p: &mut Parser<'_>, recovery_set: TokenSet) {
// ^ // ^
// `[0..]` // `[0..]`
// ^ // ^
if matches!(p.current(), T![=] | T![,] | T![:] | T![')'] | T!['}'] | T![']']) { // `0 .. if`
// ^
if matches!(
p.current(),
T![=] | T![,] | T![:] | T![')'] | T!['}'] | T![']'] | T![if]
) {
// test half_open_range_pat // test half_open_range_pat
// fn f() { // fn f() {
// let 0 .. = 1u32; // let 0 .. = 1u32;
// let 0..: _ = 1u32; // let 0..: _ = 1u32;
//
// match 42 {
// 0 .. if true => (),
// _ => (),
// }
// } // }
} else { } else {
atom_pat(p, recovery_set); atom_pat(p, recovery_set);

43
crates/parser/test_data/parser/inline/ok/0166_half_open_range_pat.rast
View File

@ -46,6 +46,49 @@ SOURCE_FILE
LITERAL LITERAL
INT_NUMBER "1u32" INT_NUMBER "1u32"
SEMICOLON ";" SEMICOLON ";"
WHITESPACE "\n\n "
MATCH_EXPR
MATCH_KW "match"
WHITESPACE " "
LITERAL
INT_NUMBER "42"
WHITESPACE " "
MATCH_ARM_LIST
L_CURLY "{"
WHITESPACE "\n "
MATCH_ARM
RANGE_PAT
LITERAL_PAT
LITERAL
INT_NUMBER "0"
WHITESPACE " "
DOT2 ".."
WHITESPACE " "
MATCH_GUARD
IF_KW "if"
WHITESPACE " "
LITERAL
TRUE_KW "true"
WHITESPACE " "
FAT_ARROW "=>"
WHITESPACE " "
TUPLE_EXPR
L_PAREN "("
R_PAREN ")"
COMMA ","
WHITESPACE "\n "
MATCH_ARM
WILDCARD_PAT
UNDERSCORE "_"
WHITESPACE " "
FAT_ARROW "=>"
WHITESPACE " "
TUPLE_EXPR
L_PAREN "("
R_PAREN ")"
COMMA ","
WHITESPACE "\n "
R_CURLY "}"
WHITESPACE "\n" WHITESPACE "\n"
R_CURLY "}" R_CURLY "}"
WHITESPACE "\n" WHITESPACE "\n"

5
crates/parser/test_data/parser/inline/ok/0166_half_open_range_pat.rs
View File

@ -1,4 +1,9 @@
fn f() { fn f() {
let 0 .. = 1u32; let 0 .. = 1u32;
let 0..: _ = 1u32; let 0..: _ = 1u32;
match 42 {
0 .. if true => (),
_ => (),
}
} }