Improve ExprXOf Literal Handling #8081
Merged
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.
Problem
ExprXOf no longer allowed seemingly non-literal inputs (e.g. arithmetic) due to a check it has to prevent literal inputs. This is so that syntax like
10 of diamond
instead parses using the itemtype literal parser.Solution
The solution is to check the source of the literal. If the source of the literal is another literal, it was likely created by the parser (and not from a simplified syntax). The source of parser-created literals will always be a literal. Additionally, I cleaned up the class and corrected a mistake with the return types implementation. It is not correct to simply mirror the possible return types of the source Expression. For example, if the possible return types were ItemStack and Integer (whereas this expression would only return an ItemStack).
Testing Completed
I added a test for a statement that previously failed to parse.
Supporting Information
Completes: none
Related: #8080