Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-29 06:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Parse inline const pattern in nested patterns

Browse source
This commit is contained in:
Ryo Yoshida 2023-04-16 02:30:59 +09:00
parent 89a1439de3
commit 83a93f4bd3
No known key found for this signature in database
GPG key ID: E25698A930586171
3 changed files with 138 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/parser/src/grammar/patterns.rs
View file

@ -5,6 +5,7 @@ pub(super) const PATTERN_FIRST: TokenSet =
T![box], T![box],
T![ref], T![ref],
T![mut], T![mut],
T![const],
T!['('], T!['('],
T!['['], T!['['],
T![&], T![&],
@ -17,7 +18,7 @@ const PAT_TOP_FIRST: TokenSet = PATTERN_FIRST.union(TokenSet::new(&[T![|]]));
/// Set of possible tokens at the start of a range pattern's end bound. /// Set of possible tokens at the start of a range pattern's end bound.
const RANGE_PAT_END_FIRST: TokenSet = const RANGE_PAT_END_FIRST: TokenSet =
expressions::LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[T![-]])); expressions::LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[T![-], T![const]]));
pub(crate) fn pattern(p: &mut Parser<'_>) { pub(crate) fn pattern(p: &mut Parser<'_>) {
pattern_r(p, PAT_RECOVERY_SET); pattern_r(p, PAT_RECOVERY_SET);
@ -499,6 +500,14 @@ fn box_pat(p: &mut Parser<'_>) -> CompletedMarker {
// fn main() { // fn main() {
// let const { 15 } = (); // let const { 15 } = ();
// let const { foo(); bar() } = (); // let const { foo(); bar() } = ();
//
// match 42 {
// const { 0 } .. const { 1 } => (),
// .. const { 0 } => (),
// const { 2 } .. => (),
// }
//
// let (const { () },) = ();
// } // }
fn const_block_pat(p: &mut Parser<'_>) -> CompletedMarker { fn const_block_pat(p: &mut Parser<'_>) -> CompletedMarker {
assert!(p.at(T![const])); assert!(p.at(T![const]));

120
crates/parser/test_data/parser/inline/ok/0156_const_block_pat.rast
View file

@ -74,6 +74,126 @@ SOURCE_FILE
L_PAREN "(" L_PAREN "("
R_PAREN ")" R_PAREN ")"
SEMICOLON ";" SEMICOLON ";"
WHITESPACE "\n\n "
EXPR_STMT
MATCH_EXPR
MATCH_KW "match"
WHITESPACE " "
LITERAL
INT_NUMBER "42"
WHITESPACE " "
MATCH_ARM_LIST
L_CURLY "{"
WHITESPACE "\n "
MATCH_ARM
RANGE_PAT
CONST_BLOCK_PAT
CONST_KW "const"
WHITESPACE " "
BLOCK_EXPR
STMT_LIST
L_CURLY "{"
WHITESPACE " "
LITERAL
INT_NUMBER "0"
WHITESPACE " "
R_CURLY "}"
WHITESPACE " "
DOT2 ".."
WHITESPACE " "
CONST_BLOCK_PAT
CONST_KW "const"
WHITESPACE " "
BLOCK_EXPR
STMT_LIST
L_CURLY "{"
WHITESPACE " "
LITERAL
INT_NUMBER "1"
WHITESPACE " "
R_CURLY "}"
WHITESPACE " "
FAT_ARROW "=>"
WHITESPACE " "
TUPLE_EXPR
L_PAREN "("
R_PAREN ")"
COMMA ","
WHITESPACE "\n "
MATCH_ARM
RANGE_PAT
DOT2 ".."
WHITESPACE " "
CONST_BLOCK_PAT
CONST_KW "const"
WHITESPACE " "
BLOCK_EXPR
STMT_LIST
L_CURLY "{"
WHITESPACE " "
LITERAL
INT_NUMBER "0"
WHITESPACE " "
R_CURLY "}"
WHITESPACE " "
FAT_ARROW "=>"
WHITESPACE " "
TUPLE_EXPR
L_PAREN "("
R_PAREN ")"
COMMA ","
WHITESPACE "\n "
MATCH_ARM
RANGE_PAT
CONST_BLOCK_PAT
CONST_KW "const"
WHITESPACE " "
BLOCK_EXPR
STMT_LIST
L_CURLY "{"
WHITESPACE " "
LITERAL
INT_NUMBER "2"
WHITESPACE " "
R_CURLY "}"
WHITESPACE " "
DOT2 ".."
WHITESPACE " "
FAT_ARROW "=>"
WHITESPACE " "
TUPLE_EXPR
L_PAREN "("
R_PAREN ")"
COMMA ","
WHITESPACE "\n "
R_CURLY "}"
WHITESPACE "\n\n "
LET_STMT
LET_KW "let"
WHITESPACE " "
TUPLE_PAT
L_PAREN "("
CONST_BLOCK_PAT
CONST_KW "const"
WHITESPACE " "
BLOCK_EXPR
STMT_LIST
L_CURLY "{"
WHITESPACE " "
TUPLE_EXPR
L_PAREN "("
R_PAREN ")"
WHITESPACE " "
R_CURLY "}"
COMMA ","
R_PAREN ")"
WHITESPACE " "
EQ "="
WHITESPACE " "
TUPLE_EXPR
L_PAREN "("
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n" WHITESPACE "\n"
R_CURLY "}" R_CURLY "}"
WHITESPACE "\n" WHITESPACE "\n"

8
crates/parser/test_data/parser/inline/ok/0156_const_block_pat.rs
View file

@ -1,4 +1,12 @@
fn main() { fn main() {
let const { 15 } = (); let const { 15 } = ();
let const { foo(); bar() } = (); let const { foo(); bar() } = ();
match 42 {
const { 0 } .. const { 1 } => (),
.. const { 0 } => (),
const { 2 } .. => (),
}
let (const { () },) = ();
} }