-
Notifications
You must be signed in to change notification settings - Fork 89
Combine merge tools #977
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
Merged
Merged
Combine merge tools #977
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For the grammar, we separate the unsafe code extensions. Make that distinction in the clauses.json, the code that reads it, and the section renumbering tool.
The section renumbering tool now replicates the output from the grammar extraction tool. Refactoring to come.
It's no longer needed because it's functionality has been replicated in the section renumber tool.
Simplify the loop that reads all the grammar productions from parts of the standard, and writes them to the grammar annex.
Read the existing text outside of the ANTLR productions from the existing annex. That way, we can make any edits to this text (including any changing section numbers) in the markdown file, rather than in the program source code.
jskeet
approved these changes
Oct 31, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good - a few comments, but generally seems like a very useful change :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR combines the section renumbering tool with the grammar extraction tool.
The grammar extractor runs after the section renumbering tool. Both tools use the same JSON input to determine the input files.
As part of this PR, update the grammar extraction algorithm to read the existing text from the grammar.md source, discarding the existing grammar productions. That way, any future updates made to the MD source will be automatically picked up by the tool.
This also removes the grammar extractor source from the repo and updates the workflows to run the renumbering tool, but not the grammar extractor when a PR is merged.
Fixes #933
This may be easier to review commit by commit.