Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,8 @@ dist/
*.tar.gz
*.tgz
*.zip

# Build artifacts
parser.exp
parser.lib
bindings/*
27 changes: 17 additions & 10 deletions grammar.js
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ module.exports = grammar({

class_declaration: $ => seq(
$._class_declaration_initializer,
$._optional_semi,
$._declaration_list_body,
),

_class_declaration_initializer: $ => seq(
Expand All @@ -275,13 +275,11 @@ module.exports = grammar({
field('name', $.identifier),
repeat(choice($.type_parameter_list, $.parameter_list, $.base_list)),
repeat($.type_parameter_constraints_clause),
field('body', $.declaration_list),
),

struct_declaration: $ => seq(
$._struct_declaration_initializer,
field('body', $.declaration_list),
$._optional_semi,
$._declaration_list_body,
),

_struct_declaration_initializer: $ => seq(
Expand All @@ -295,13 +293,19 @@ module.exports = grammar({
),

enum_declaration: $ => seq(
$._enum_declaration_initializer,
choice(
seq(field('body', $.enum_member_declaration_list), $._optional_semi),
';',
),
),

_enum_declaration_initializer: $ => seq(
repeat($._attribute_list),
repeat($.modifier),
'enum',
field('name', $.identifier),
optional($.base_list),
field('body', $.enum_member_declaration_list),
$._optional_semi,
),

enum_member_declaration_list: $ => seq(
Expand All @@ -322,8 +326,7 @@ module.exports = grammar({

interface_declaration: $ => seq(
$._interface_declaration_initializer,
field('body', $.declaration_list),
$._optional_semi,
$._declaration_list_body,
),

_interface_declaration_initializer: $ => seq(
Expand Down Expand Up @@ -354,8 +357,7 @@ module.exports = grammar({

record_declaration: $ => seq(
$._record_declaration_initializer,
choice(field('body', $.declaration_list), ';'),
$._optional_semi,
$._declaration_list_body,
),

_record_declaration_initializer: $ => seq(
Expand All @@ -374,6 +376,11 @@ module.exports = grammar({
seq(':', $.primary_constructor_base_type, optional(seq(',', commaSep1($._name)))),
),

_declaration_list_body: $ => choice(
seq(field('body', $.declaration_list), $._optional_semi),
';',
),

primary_constructor_base_type: $ => seq(
field('type', $._name),
$.argument_list,
Expand Down
15 changes: 11 additions & 4 deletions package.json

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

122 changes: 65 additions & 57 deletions src/grammar.json

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

Loading
Loading