cleanup: hoist duplicated generator state and helpers into Generator - #461
Open
Andrei Efanov (goto1134) wants to merge 1 commit into
Open
cleanup: hoist duplicated generator state and helpers into Generator#461Andrei Efanov (goto1134) wants to merge 1 commit into
Andrei Efanov (goto1134) wants to merge 1 commit into
Conversation
JavaParserGenerator and KotlinParserGenerator declare myExpressionHelper, myJavaHelper and myTokensUsedInGrammar with the same initializers, and carry byte-identical copies of getRuleConsumeType, getEffectiveConsumeType, collectMetaParametersFormatted and isIgnoredWhitespaceToken. Move all of them to the shared base. Generator is sealed, so protected exposes nothing outside the hierarchy. JavaParserGenerator also shadowed Generator.myGrammarRoot with the same expression the base already evaluates; drop the shadow. myGrammarRootParser stays: the base computes it from the root attribute while the subclass takes it from RuleInfo, so the two generators disagree once the root rule declares its own parserClass. Unifying that changes generated output. BnfGeneratorPsiTest reads myJavaHelper through getDeclaredField, which only sees fields of the exact class, so it now asks Generator for it.
Max Medvedev (maxmedvedev)
self-requested a review
August 10, 2026 12:14
Max Medvedev (maxmedvedev)
approved these changes
Aug 10, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
JavaParserGenerator and KotlinParserGenerator declare myExpressionHelper, myJavaHelper and myTokensUsedInGrammar with the same initializers, and carry byte-identical copies of getRuleConsumeType, getEffectiveConsumeType, collectMetaParametersFormatted and isIgnoredWhitespaceToken. Move all of them to the shared base.
Generator is sealed, so protected exposes nothing outside the hierarchy.
JavaParserGenerator also shadowed Generator.myGrammarRoot with the same expression the base already evaluates; drop the shadow. myGrammarRootParser stays: the base computes it from the root attribute while the subclass takes it from RuleInfo, so the two generators disagree once the root rule declares its own parserClass. Unifying that changes generated output.
BnfGeneratorPsiTest reads myJavaHelper through getDeclaredField, which only sees fields of the exact class, so it now asks Generator for it.