Syntax Simplification #7841
Open
Syntax Simplification #7841
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
sovdeeth
added
the
enhancement
Closed
src/main/java/org/skriptlang/skript/lang/simplification/SimplifiedLiteral.java
Show resolved
Hide resolved
…) on expressions capable of it.
APickledWalrus
requested changes
May 9, 2025
| * Gets the original expression this literal was created from. | ||
| * @return the original expression | ||
| */ | ||
| public Expression<T> getPresimplifiedExpr() { |
There was a problem hiding this comment.
Isn't this just the same as Expression#getSource? Could you override that?
| @@ -375,6 +375,9 @@ private static void userDisableHooks(Class<? extends Hook<?>> hookClass, boolean | |||
| public static final Option<Integer> variableChangesUntilSave = new Option<>("variable changes until save", 1000) | |||
| .setter(FlatFileStorage::setRequiredChangesForResave); | |||
|
|
|||
| public static final Option<Boolean> simplifySyntaxesOnParse = new Option<>("simplify syntax on parse", true) | |||
There was a problem hiding this comment.
i would include a comment that this option is intentionally omitted from the config. that is, it has to be added manually
|
|
||
| @Override | ||
| public Expression<? extends Number> simplify() { | ||
| // as of INSERT VERSION, there are no literal locations but this is implemented for when pure functions can |
There was a problem hiding this comment.
just want to note that the insert version script won't cover cases like this
| @Override | ||
| @Nullable | ||
| public Class<?>[] acceptChange(final ChangeMode mode) { | ||
| if ((mode == ChangeMode.SET || mode == ChangeMode.ADD || mode == ChangeMode.REMOVE) && getExpr().isSingle() && ChangerUtils.acceptsChange(getExpr(), ChangeMode.SET, Location.class)) | ||
| public Class<?>[] acceptChange(final Changer.ChangeMode mode) { |
There was a problem hiding this comment.
Should keep ChangeMode directly imported
| Expression<? extends T> convertedExpression = source.simplify().getConvertedExpression(to); | ||
| if (convertedExpression != null) | ||
| return convertedExpression; | ||
| source = source.simplify(); |
There was a problem hiding this comment.
Why this change? Calling getConvertedExpression again could potentially result in a Literal of the desired (conversion) type, which seems like something we'd want. Or is the concern over losing the source information?
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
Skript has always had this little method on Expression called simplify(), which has never been implemented. It's intended to take expressions and, if possible, simplify them to Literals or similarly simplify the code tree.
This PR attempts to properly implement that idea via a Simplifiable interface. A config option is added to allow users to opt out if issues arise.
Every element is simplified immediately after init() in SkriptParser. In addition, it may be called at any time by parent elements, though it should be ensured that no other objects maintain critical references to the element, as simplify may return new objects.
ExprArithmetic is a special case that can only be simplified once all elements in the chain have been parsed and ordered, so it requires checking the ParsingStack to see if it's the top-level element in the chain. If so, it can then call simplify recursively on all elements in the chain.
Todo:
Target Minecraft Versions: any
Requirements: none
Related Issues: none