Skip to content

improve switch match #193

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
Feb 3, 2023
Merged

improve switch match #193

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
70 changes: 28 additions & 42 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,14 @@ module.exports = grammar({
[$._inline_type, $.function_type_parameters],
[$.primary_expression, $.parameter, $._pattern],
[$.parameter, $._pattern],
[$.parameter, $._parenthesized_pattern],
[$._switch_value_pattern, $._parenthesized_pattern],
[$.parameter, $.parenthesized_pattern],
[$.variant_declaration],
[$.unit, $._function_type_parameter_list],
[$.functor_parameter, $.module_primary_expression, $.module_identifier_path],
[$._reserved_identifier, $.function],
[$.polyvar_type]
[$.polyvar_type],
[$._let_binding, $.or_pattern],
[$.exception_pattern, $.or_pattern]
],

rules: {
Expand Down Expand Up @@ -690,45 +691,17 @@ module.exports = grammar({

switch_match: $ => prec.dynamic(-1, seq(
'|',
$._switch_pattern,
field('pattern', $._pattern),
optional($.guard),
'=>',
$._one_or_more_statements,
)),

_switch_pattern: $ => barSep1(choice(
alias($._switch_exception_pattern, $.exception),
$._parenthesized_switch_pattern,
$._switch_value_pattern,
$._switch_range_pattern,
field('body', alias($._one_or_more_statements, $.sequence_expression)),
Copy link
Collaborator Author

@aspeddro aspeddro Jan 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This alias is so that the switch_match body has only one field.

)),

_switch_exception_pattern: $ => seq(
'exception',
$._switch_value_pattern,
),

_parenthesized_switch_pattern: $ => seq(
'(',
$._switch_pattern,
')',
),

_switch_value_pattern: $ => seq(
$._pattern,
optional($.switch_pattern_condition),
),

switch_pattern_condition: $ => seq(
guard: $ => seq(
choice('if', 'when'),
$.expression,
),

_switch_range_pattern: $ => seq(
$._literal_pattern,
'..',
$._literal_pattern,
),

polyvar_type_pattern: $ => seq(
'#',
'...',
Expand Down Expand Up @@ -867,21 +840,34 @@ module.exports = grammar({
// unfinished constructs are generally treated as literal expressions,
// not patterns.
_pattern: $ => prec.dynamic(-1, seq(
barSep1(choice(
choice(
$.value_identifier,
$._literal_pattern,
$._destructuring_pattern,
$.polyvar_type_pattern,
$.unit,
$.module_pack,
$.lazy_pattern,
$._parenthesized_pattern,
)),
$.parenthesized_pattern,
$.or_pattern,
$.range_pattern,
$.exception_pattern
),
optional($.type_annotation),
optional($.as_aliasing),
)),

_parenthesized_pattern: $ => seq('(', $._pattern, ')'),
parenthesized_pattern: $ => seq('(', $._pattern, ')'),

range_pattern: $ => seq(
$._literal_pattern,
'..',
$._literal_pattern,
),

or_pattern: $ => prec.left(seq($._pattern, '|', $._pattern)),

exception_pattern: $ => seq('exception', $._pattern),

_destructuring_pattern: $ => choice(
$.variant_pattern,
Expand Down Expand Up @@ -916,7 +902,7 @@ module.exports = grammar({
),

_variant_pattern_parameter: $ => seq(
barSep1($._pattern),
$._pattern,
optional($.type_annotation),
),

Expand All @@ -934,7 +920,7 @@ module.exports = grammar({
),
optional(seq(
':',
barSep1($._pattern),
$._pattern,
)),
)),
'}'
Expand Down Expand Up @@ -984,7 +970,7 @@ module.exports = grammar({
$._literal_pattern,
$._destructuring_pattern,
$.polyvar_type_pattern,
$._parenthesized_pattern,
$.parenthesized_pattern,
)
),

Expand Down
4 changes: 3 additions & 1 deletion test/corpus/comments.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,7 @@ switch foo {
(expression_statement
(switch_expression
(value_identifier)
(switch_match (number) (expression_statement (number)))
(switch_match
(number)
(sequence_expression (expression_statement (number))))
(comment))))
Loading