Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add more expression test cases, fix bugs

Browse Source 
Also added a few more comments + reorganized exceptions that are
invoke-internal.

(cherry picked from commit cbd686548fd62248fabbaab551a6875a14170957)
This commit is contained in:
Octavia Togami 2020-02-24 03:33:49 -05:00 committed by MattBDev
parent cd1948648c
commit eb950bd75e
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/invoke/CompilingVisitor.java
View File

@ -678,13 +678,10 @@ class CompilingVisitor extends ExpressionBaseVisitor<MethodHandle> {
// MH:oldResult,result = (ExecutionData)Double // MH:oldResult,result = (ExecutionData)Double
// Execute `oldResult` but ignore its return value, then execute result and return that. // Execute `oldResult` but ignore its return value, then execute result and return that.
// If either result is `defaultResult`, it's bogus, so just skip it // If `oldResult` (the old value) is `defaultResult`, it's bogus, so just skip it
if (oldResult == DEFAULT_RESULT) { if (oldResult == DEFAULT_RESULT) {
return result; return result;
} }
if (result == DEFAULT_RESULT) {
return oldResult;
}
// Add a dummy Double parameter to the end // Add a dummy Double parameter to the end
// MH:dummyDouble = (ExecutionData, Double)Double // MH:dummyDouble = (ExecutionData, Double)Double
MethodHandle dummyDouble = MethodHandles.dropArguments( MethodHandle dummyDouble = MethodHandles.dropArguments(

12
worldedit-core/src/test/java/com/sk89q/worldedit/internal/expression/ExpressionTest.java
View File

@ -55,7 +55,17 @@ class ExpressionTest extends BaseExpressionTest {
testCase("0 || 5", 5), testCase("0 || 5", 5),
testCase("2 || 5", 2), testCase("2 || 5", 2),
testCase("2 && 5", 5), testCase("2 && 5", 5),
testCase("5 && 0", 0) testCase("5 && 0", 0),
// check ternaries
testCase("false ? 1 : 2", 2),
testCase("true ? 1 : 2", 1),
// - ternary binds inside
testCase("true ? true ? 1 : 2 : 3", 1),
testCase("true ? false ? 1 : 2 : 3", 2),
testCase("false ? true ? 1 : 2 : 3", 3),
testCase("false ? false ? 1 : 2 : 3", 3),
// check return
testCase("return 1; 0", 1)
); );
return testCases.stream() return testCases.stream()
.map(testCase -> DynamicTest.dynamicTest( .map(testCase -> DynamicTest.dynamicTest(