feat(objectionary#540): fix the bug related to LDC type determination

volodya-lombrozo · Oct 7, 2024 · 34afa42 · 34afa42
1 parent 029d4da
commit 34afa42
Showing 1 changed file with 12 additions and 32 deletions.
diff --git a/src/main/java/org/eolang/jeo/representation/bytecode/BytecodeInstruction.java b/src/main/java/org/eolang/jeo/representation/bytecode/BytecodeInstruction.java
@@ -191,7 +191,8 @@ public String testCode() {
     }
 
     public int stack() {
-        switch (Instruction.find(this.opcode)) {
+        final Instruction instruction = Instruction.find(this.opcode);
+        switch (instruction) {
             case NOP:
                 return 0;
             case ACONST_NULL:
@@ -392,42 +393,22 @@ public int stack() {
                 return 0;
             case IINC:
                 return 0;
-            case LDC:
-                final Type ldcType = Type.getType(this.args.get(0).getClass());
-                if (ldcType == Type.DOUBLE_TYPE || ldcType == Type.LONG_TYPE) {
+            case LDC: {
+                final Class<?> clazz = this.args.get(0).getClass();
+                if (clazz == Long.class || clazz == Double.class) {
                     return 2;
                 } else {
-                    return 1;
+                    return this.typeSize(Type.getType(clazz));
                 }
+            }
             case GETSTATIC:
-                final Type type = Type.getType(String.valueOf(this.args.get(2)));
-                if (type == Type.DOUBLE_TYPE || type == Type.LONG_TYPE) {
-                    return 2;
-                } else {
-                    return 1;
-                }
+                return this.typeSize(Type.getType(String.valueOf(this.args.get(2))));
             case PUTSTATIC:
-                final Type putType = Type.getType(String.valueOf(this.args.get(2)));
-                if (putType == Type.DOUBLE_TYPE || putType == Type.LONG_TYPE) {
-                    return -2;
-                } else {
-                    return -1;
-                }
+                return this.typeSize(Type.getType(String.valueOf(this.args.get(2)))) * -1;
             case GETFIELD:
-                final Type fieldType = Type.getType(String.valueOf(this.args.get(2)));
-                if (fieldType == Type.DOUBLE_TYPE || fieldType == Type.LONG_TYPE) {
-                    return 1;
-                } else {
-                    return 0;
-                }
+                return this.typeSize(Type.getType(String.valueOf(this.args.get(2)))) - 1;
             case PUTFIELD:
-                final Type putFieldType = Type.getType(String.valueOf(this.args.get(2)));
-                if (putFieldType == Type.DOUBLE_TYPE || putFieldType == Type.LONG_TYPE) {
-                    return -3;
-                } else {
-                    return -2;
-                }
-                // Invoke method instructions
+                return (this.typeSize(Type.getType(String.valueOf(this.args.get(2)))) * -1) - 1;
             case INVOKEVIRTUAL:
             case INVOKESPECIAL:
             case INVOKEINTERFACE: {
@@ -445,9 +426,8 @@ public int stack() {
                 return this.typeSize(ret) - args;
             }
             case INVOKEDYNAMIC: {
-                return 0;
+                return 0; //todo
             }
-            // New object
             case NEW:
                 return 1;
             case NEWARRAY: