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.
Description
This PR makes some tweaks to the Keyword class to improve simplicity.
I have removed the
flatten
utility method. Instead, a recursive approach is taken for building keyword(s) from a choice pattern (it will only go one level down from the root for choices). I have replacedGroupKeyword
withChoiceKeyword
is a set of the keywords for each choice. The same idea follows that one of the sets of keywords must apply for the input expression to match.I've also added some overrides to the keyword implementations (idk about the hashcode implementations).
Some brief testing indicated a possible minor performance increase, though the goal is really only to maintain performance (while improving the implementation).
Target Minecraft Versions: any
Requirements: none
Related Issues: none