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

Fix pre- and post- ops

Browse Source 
(cherry picked from commit 0f787a89b8f2b0f29e0e4a2327224a3b0d050171)
This commit is contained in:
Octavia Togami 2020-02-25 16:20:21 -08:00 committed by MattBDev
parent 6d9f30e6a6
commit e20765beef
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,13 +269,14 @@ class CompilingVisitor extends ExpressionBaseVisitor<MethodHandle> {
return ExpressionHandles.call(data -> { return ExpressionHandles.call(data -> {
LocalSlot.Variable variable = ExpressionHandles.getVariable(data, target); LocalSlot.Variable variable = ExpressionHandles.getVariable(data, target);
double value = variable.getValue(); double value = variable.getValue();
double result = value;
if (opType == INCREMENT) { if (opType == INCREMENT) {
value++; value++;
} else { } else {
value--; value--;
} }
variable.setValue(value); variable.setValue(value);
return value; return result;
}); });
} }
@ -286,14 +287,13 @@ class CompilingVisitor extends ExpressionBaseVisitor<MethodHandle> {
return ExpressionHandles.call(data -> { return ExpressionHandles.call(data -> {
LocalSlot.Variable variable = ExpressionHandles.getVariable(data, target); LocalSlot.Variable variable = ExpressionHandles.getVariable(data, target);
double value = variable.getValue(); double value = variable.getValue();
double result = value;
if (opType == INCREMENT) { if (opType == INCREMENT) {
value++; value++;
} else { } else {
value--; value--;
} }
variable.setValue(value); variable.setValue(value);
return result; return value;
}); });
} }

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

@ -84,6 +84,14 @@ class ExpressionTest extends BaseExpressionTest {
checkTestCase("3+1", 4); checkTestCase("3+1", 4);
} }
@Test
void testPostPreOps() {
checkTestCase("a=0; b=a++; a+b", 1);
checkTestCase("a=0; b=++a; a+b", 2);
checkTestCase("a=0; b=a--; a+b", -1);
checkTestCase("a=0; b=--a; a+b", -2);
}
@Test @Test
public void testErrors() { public void testErrors() {
// test lexer errors // test lexer errors