Skip to content

Commit 9787a8b

Browse files
committed
unified: Group enum entries
Same as in the preceding commit.
1 parent c8f7c3d commit 9787a8b

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

unified/extractor/tree-sitter-swift/grammar.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1681,15 +1681,14 @@ module.exports = grammar({
16811681
field("modifiers", optional($.modifiers)),
16821682
optional("indirect"),
16831683
"case",
1684-
sep1(
1685-
seq(
1686-
field("name", $.simple_identifier),
1687-
optional($._enum_entry_suffix)
1688-
),
1689-
","
1690-
),
1684+
sep1(field("case", $.enum_case_entry), ","),
16911685
optional(";")
16921686
),
1687+
enum_case_entry: ($) =>
1688+
seq(
1689+
field("name", $.simple_identifier),
1690+
optional($._enum_entry_suffix)
1691+
),
16931692
_enum_entry_suffix: ($) =>
16941693
choice(
16951694
field("data_contents", $.enum_type_parameters),

unified/extractor/tree-sitter-swift/node-types.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,13 +271,15 @@ named:
271271
body: block
272272
catch*: catch_block
273273
else:
274+
enum_case_entry:
275+
data_contents?: enum_type_parameters
276+
name: simple_identifier
277+
raw_value?: expression
274278
enum_class_body:
275279
member*: [enum_entry, type_level_declaration]
276280
enum_entry:
277-
data_contents*: enum_type_parameters
281+
case+: enum_case_entry
278282
modifiers?: modifiers
279-
name+: simple_identifier
280-
raw_value*: expression
281283
enum_type_parameter:
282284
default_value?: expression
283285
external_name?: wildcard_pattern

0 commit comments

Comments
 (0)