mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-18 22:30:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify some logic

Browse Source
This commit is contained in:
Astrash
2023-09-12 09:53:18 +10:00
parent 002da30fd5
commit 0a46e9050d
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/Type.java
View File

@@ -4,6 +4,7 @@ import java.util.Optional;
// TODO - Make not enum // TODO - Make not enum
// TODO - Add integer type
public enum Type { public enum Type {
NUMBER, NUMBER,
STRING, STRING,

10
common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/codegen/asm/TerraScriptClassGenerator.java
View File

@@ -504,8 +504,7 @@ public class TerraScriptClassGenerator {
jumpIf(INTEGERS_NOT_EQUAL, exit); jumpIf(INTEGERS_NOT_EQUAL, exit);
} else if (binaryOperandsSameType(Type.NUMBER, binaryCondition)) { // Operands assumed doubles } else if (binaryOperandsSameType(Type.NUMBER, binaryCondition)) { // Operands assumed doubles
pushBinaryOperands(binaryCondition); binaryInsn(binaryCondition, Opcodes.DCMPG);
method.visitInsn(Opcodes.DCMPG);
jumpIf(CMP_NOT_EQUALS, exit); jumpIf(CMP_NOT_EQUALS, exit);
} else if (binaryOperandsSameType(Type.STRING, binaryCondition)) { } else if (binaryOperandsSameType(Type.STRING, binaryCondition)) {
@@ -520,8 +519,7 @@ public class TerraScriptClassGenerator {
jumpIf(INTEGERS_EQUAL, exit); jumpIf(INTEGERS_EQUAL, exit);
} else if (binaryOperandsSameType(Type.NUMBER, binaryCondition)) { // Operands assumed doubles } else if (binaryOperandsSameType(Type.NUMBER, binaryCondition)) { // Operands assumed doubles
pushBinaryOperands(binaryCondition); binaryInsn(binaryCondition, Opcodes.DCMPG);
method.visitInsn(Opcodes.DCMPG);
jumpIf(CMP_EQUALS, exit); jumpIf(CMP_EQUALS, exit);
} else if (binaryOperandsSameType(Type.STRING, binaryCondition)) { // Operands assumed references } else if (binaryOperandsSameType(Type.STRING, binaryCondition)) { // Operands assumed references
@@ -533,9 +531,7 @@ public class TerraScriptClassGenerator {
} }
case GREATER, GREATER_EQUALS, LESS, LESS_EQUALS -> { case GREATER, GREATER_EQUALS, LESS, LESS_EQUALS -> {
// Left and right assumed double // Left and right assumed double
pushBinaryOperands(binaryCondition); binaryInsn(binaryCondition, switch(binaryCondition.operator) {
method.visitInsn(switch(binaryCondition.operator) {
case GREATER, GREATER_EQUALS -> Opcodes.DCMPL; case GREATER, GREATER_EQUALS -> Opcodes.DCMPL;
case LESS, LESS_EQUALS -> Opcodes.DCMPG; case LESS, LESS_EQUALS -> Opcodes.DCMPG;
default -> throw new IllegalStateException(); default -> throw new IllegalStateException();