Skip to content
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.

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

Fix node naming in {param,field}_declaration #65

Merged
merged 6 commits into from
Mar 24, 2022
Merged

Fix node naming in {param,field}_declaration #65

merged 6 commits into from
Mar 24, 2022

Conversation

adonovan
Copy link
Contributor

@adonovan adonovan commented Mar 22, 2022

This change commutes the field(...) and commaSep(...) operations so that the commas don't get named.
The set of accepted inputs has not changed.

Fixes #45

Checklist:

  • All tests pass in CI.
  • There are sufficient tests for the new fix/feature.
  • Grammar rules have not been renamed unless absolutely necessary.
  • The conflicts section hasn't grown too much.
  • The parser size hasn't grown too much (check the value of STATE_COUNT in src/parser.c).

@adonovan adonovan marked this pull request as draft March 22, 2022 21:06
@adonovan adonovan marked this pull request as ready for review March 22, 2022 21:08
Copy link
Contributor

@maxbrunsfeld maxbrunsfeld left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this. I left one stylistic suggestion.

grammar.js Outdated Show resolved Hide resolved
@maxbrunsfeld
Copy link
Contributor

Can you update the generated parser by running tree-sitter generate? We currently check the generated code into these repositories.

@adonovan
Copy link
Contributor Author

adonovan commented Mar 23, 2022

Can you update the generated parser by running tree-sitter generate? We currently check the generated code into these repositories.

Done. Is there a document that explains the usual contributing process to which I can link the README?

@aryx
Copy link
Contributor

aryx commented Mar 23, 2022

This need to be rebased from the latest.
Sorry for accepting this a bit later than your other PRs.

@adonovan adonovan merged commit 76be132 into tree-sitter:master Mar 24, 2022
@adonovan adonovan deleted the fix-param-fields branch March 24, 2022 01:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

var_spec includes the Comma in the "name" Field.
3 participants