Fix expression conversion #7165
Merged
Conversation
This file contains 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
UnderscoreTud
added
the
bug
sovdeeth
approved these changes
Oct 27, 2024
Moderocky
approved these changes
Oct 27, 2024
Efnilite
approved these changes
Oct 28, 2024
APickledWalrus
previously requested changes
Nov 1, 2024
We need to use conversion whenever there are multiple return types. If the expression does not accept our supertype, then we can attempt to convert it, which will already handle safety checks for multiple return types
This fixes SimpleExpression not converting possible return types that are not contained in the desired types array. For example, if an expression can return a Number or a String, and we want an Expression that is a Number or an World, it will now include converters for String->Number and String->World
Moderocky
added
the
don't merge me !!
sovdeeth
reviewed
Dec 30, 2024
sovdeeth
approved these changes
Dec 30, 2024
|
I've gone ahead and moved the logic out of SimpleExpression and into ConvertedExpression. This is to preserve the behavior of expressions overriding the method AND that the logic/handling for this is consistent across Skript. The |
APickledWalrus
removed
the
don't merge me !!
Moderocky
approved these changes
Dec 30, 2024
Moderocky
added a commit
that referenced
this pull request
Dec 30, 2024
* Fix the REMOVE changer of variables (#7163) * Fix the REMOVE changer of variables * Fix wording * Fix tests * Update Variable.java --------- Co-authored-by: sovdee <[email protected]> * Fix Improperly Typed Array in ExprXOf (#7268) * Add boat data check to prevent error. (#7301) * Fix BlockIgniteEvent (#7252) Update BukkitEventValues.java Co-authored-by: Moderocky <[email protected]> * Fix expression conversion (#7165) * Fix expression conversion * Extract duplicate code into a separate helper method * improve conversion strategy * Add .sk to test file * Simplify conversion usage We need to use conversion whenever there are multiple return types. If the expression does not accept our supertype, then we can attempt to convert it, which will already handle safety checks for multiple return types * SimpleExpression: fix possible return type conversion This fixes SimpleExpression not converting possible return types that are not contained in the desired types array. For example, if an expression can return a Number or a String, and we want an Expression that is a Number or an World, it will now include converters for String->Number and String->World * Use safety checks of ConvertedExpression * Remove incorrect converter remake * Move logic from SimpleExpression to ConvertedExpression --------- Co-authored-by: APickledWalrus <[email protected]> Co-authored-by: Efnilite <[email protected]> Co-authored-by: Moderocky <[email protected]> --------- Co-authored-by: _tud <[email protected]> Co-authored-by: sovdee <[email protected]> Co-authored-by: Patrick Miller <[email protected]> Co-authored-by: kyoshuske <[email protected]> Co-authored-by: Efnilite <[email protected]>
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.
Description
This PR fixes an issue where the parser wouldn't attempt to convert an expression if
Expression#canReturn(Class)returnstrue. Causing issues when an expression could return a certain type but doesn't once evaluated. For instance, adding two unset variables, which can potentially return variety of types (such as a string), and using the expression in a pattern that expects strings (e.g.,formatted ({_foo} + {_bar})would result in a stack trace being thrown because the array returned from the arithmetic expression wasn't converted to a string array.Target Minecraft Versions: any
Requirements: none
Related Issues: #7164