Rebase dev onto refactor. #140
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
revert of a revert
kindlich
commented
May 28, 2024
...ompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaExpressionVisitor.java
Outdated
Show resolved
Hide resolved
| @@ -558,6 +556,13 @@ public Void builtinStaticMethod(BuiltinMethodSymbol method, TypeID returnType, C | |||
| } | |||
|
|
|||
| switch (method) { | |||
| case FUNCTION_CALL: // ToDo: Was added from dev->refactor branch during rebase, is this still needed? | |||
There was a problem hiding this comment.
Basically what the ToDO said.
I'm not even sure if this is the proper place, it was part of one of these humongous switch-statements inside the JavaExpressionVisitors: b11c1ff
Maybe this can be removed, even?
...er/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaMethodBytecodeCompiler.java
Show resolved
Hide resolved
...Compiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaStatementVisitor.java
Show resolved
Hide resolved
JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaContext.java
Show resolved
Hide resolved
...red/src/main/java/org/openzen/zenscript/javashared/prepare/JavaPrepareDefinitionVisitor.java
Outdated
Show resolved
Hide resolved
...java/org/openzen/zenscript/scriptingexample/tests/actual_test/arrays/ArrayCreationTests.java
Outdated
Show resolved
Hide resolved
...java/org/openzen/zenscript/scriptingexample/tests/actual_test/arrays/ArrayOperatorTests.java
Show resolved
Hide resolved
...java/org/openzen/zenscript/scriptingexample/tests/actual_test/arrays/ArrayOperatorTests.java
Outdated
Show resolved
Hide resolved
...java/org/openzen/zenscript/scriptingexample/tests/actual_test/arrays/ArrayOperatorTests.java
Outdated
Show resolved
Hide resolved
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.
In this branch I basically took all commits from current
develop(up until e643a46) and put them ontop of feature/refactor so that the stuff that @jaredlll08 did for CraftTweaker isn't lost.However, I can't ascertain that nothing got lost in rebase hell 😉
Let's see which of these changes we actually need..?
Test results (I didn't check if these are the same failing tests or if something else broke)