Skip to content

fix: allow preprocessor conditionals in field initializer lists #373

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

Open
sontek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: allow preprocessor conditionals in field initializer lists #373

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
19 changes: 18 additions & 1 deletion grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ module.exports = grammar(C, {
],

conflicts: $ => [
[$.field_initializer_list],
// C
[$.type_specifier, $._declarator],
[$.type_specifier, $.expression],
Expand Down Expand Up @@ -540,11 +541,27 @@ module.exports = grammar(C, {
// A b {};
compound_statement: (_, original) => prec(-1, original),

// An initializer under `#if` carries its own comma: after it when it
// comes before the last unconditional initializer, before it when it
// comes after the first one.
field_initializer_list: $ => seq(
':',
commaSep1($.field_initializer),
repeat(choice(
seq($.field_initializer, ','),
alias($.preproc_if_in_field_initializer_list, $.preproc_if),
alias($.preproc_ifdef_in_field_initializer_list, $.preproc_ifdef),
)),
$.field_initializer,
repeat(choice(
seq(',', $.field_initializer),
alias($.preproc_if_in_field_initializer_list_leading_comma, $.preproc_if),
alias($.preproc_ifdef_in_field_initializer_list_leading_comma, $.preproc_ifdef),
)),
),

...preprocIf('_in_field_initializer_list', $ => seq($.field_initializer, ',')),
...preprocIf('_in_field_initializer_list_leading_comma', $ => seq(',', $.field_initializer)),

field_initializer: $ => prec(1, seq(
choice(
$._field_identifier,
Expand Down
Loading