Skip to content

implement range-to patterns #262

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 2 commits into from
Mar 3, 2025
+116,463 −115,549
Merged

implement range-to patterns #262

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c43c20
implement range-to patterns
m4rch3n1ng Mar 2, 2025
be731d8
chore: tree-sitter generate
m4rch3n1ng Mar 2, 2025
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
33 changes: 21 additions & 12 deletions grammar.js
View file
Original file line number Diff line number Diff line change
@@ -1454,20 +1454,29 @@ module.exports = grammar({
$._pattern,
)),

range_pattern: $ => seq(
choice(
$._literal_pattern,
$._path,
),
choice(
seq(
choice('...', '..=', '..'),
choice(
$._literal_pattern,
$._path,
range_pattern: $ => choice(
seq(
field('left', choice(
$._literal_pattern,
$._path,
)),
choice(
seq(
choice('...', '..=', '..'),
field('right', choice(
$._literal_pattern,
$._path,
)),
),
'..',
),
'..',
),
seq(
choice('..=', '..'),
field('right', choice(
$._literal_pattern,
$._path,
)),
),
),

120 changes: 84 additions & 36 deletions src/grammar.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

103 changes: 69 additions & 34 deletions src/node-types.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

231,724 changes: 116,266 additions & 115,458 deletions src/parser.c
View file

Large diffs are not rendered by default.

32 changes: 23 additions & 9 deletions test/corpus/patterns.txt
View file
Original file line number Diff line number Diff line change
@@ -192,6 +192,8 @@ match x {
a @ b...c => a,
a @ b..=c => a,
d.. => a,
..d => d,
a @ ..=5 => a
}

match name {
@@ -226,37 +228,49 @@ match name {
(captured_pattern
(identifier)
(range_pattern
(integer_literal)
(integer_literal))))
left: (integer_literal)
right: (integer_literal))))
value: (identifier))
(match_arm
pattern: (match_pattern
(tuple_struct_pattern
type: (identifier)
(range_pattern
(integer_literal)
(integer_literal))))
left: (integer_literal)
right: (integer_literal))))
value: (identifier))
(match_arm
pattern: (match_pattern
(captured_pattern
(identifier)
(range_pattern
(identifier)
(identifier))))
left: (identifier)
right: (identifier))))
value: (identifier))
(match_arm
pattern: (match_pattern
(captured_pattern
(identifier)
(range_pattern
(identifier)
(identifier))))
left: (identifier)
right: (identifier))))
value: (identifier))
(match_arm
pattern: (match_pattern
(range_pattern
(identifier)))
left: (identifier)))
value: (identifier))
(match_arm
pattern: (match_pattern
(range_pattern
right: (identifier)))
value: (identifier))
(match_arm
pattern: (match_pattern
(captured_pattern
(identifier)
(range_pattern
right: (integer_literal))))
value: (identifier)))))
(expression_statement
(match_expression