Merge branch 'main' of https://github.com/JonathanFleischmann/CompilerULTIMATE

src/main/java/de/maishai/typedast/MethodContext.java

@@ -2,21 +2,39 @@ package de.maishai.typedast;
 
 import lombok.*;
 import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
 
 import java.util.HashMap;
 import java.util.Map;
 
-@NoArgsConstructor
 @Getter
 @Setter
 @Data
 public class MethodContext {
     private Label startLabel;
     private Label endLabel;
+    private MethodVisitor mv;
     private int localVarIndex = 0;
     private Map<String, Integer> variableIndex = new HashMap<>();
 
-    public void addVariable(String name, int index) {
+    public MethodContext(MethodVisitor mv) {
+        startLabel = new Label();
+        endLabel = new Label();
+        this.mv = mv;
+        mv.visitCode();
+        mv.visitLabel(startLabel);
+    }
+
+    public int addVariable(String name) {
+        int index = localVarIndex;
+        localVarIndex++;
         variableIndex.put(name, index);
+        return index;
+    }
+
+    public void wrapUp() {
+        mv.visitLabel(endLabel);
+        mv.visitMaxs(0, 0);
+        mv.visitEnd();
     }
 }

src/main/java/de/maishai/typedast/typedclass/TypedConstructor.java

@@ -91,18 +91,15 @@ public class TypedConstructor implements TypedNode {
     public void codeGen(ClassWriter cw) {
         int accessModifier = Opcodes.ACC_PUBLIC; // ist laut Andi ok
         MethodVisitor mv = cw.visitMethod(accessModifier, "<init>", CodeGenUtils.generateDescriptor(typedParameters, Type.VOID), null, null);
-        mv.visitCode();
+        MethodContext context = new MethodContext(mv);
-
         //super();
         mv.visitVarInsn(Opcodes.ALOAD, 0);
         mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
 
-        MethodContext context = new MethodContext();
         typedBlock.codeGen(mv, context);
 
         mv.visitInsn(Opcodes.RETURN);
 
-        mv.visitMaxs(0, 0);
+        context.wrapUp();
-        mv.visitEnd();
     }
 }

src/main/java/de/maishai/typedast/typedclass/TypedLocalVariable.java

@@ -38,9 +38,8 @@ public final class TypedLocalVariable implements TypedNode {
     }
 
     public void codeGen(MethodVisitor mv, MethodContext ctx) {
-        int index = ctx.getLocalVarIndex();
+        int index = ctx.addVariable(name);
-        ctx.setLocalVarIndex(index + 1);
-        ctx.addVariable(name, index);
         mv.visitLocalVariable(name, type.getDescriptor(), null, ctx.getStartLabel(), ctx.getEndLabel(), index);
+
     }
 }

src/main/java/de/maishai/typedast/typedclass/TypedMethod.java

@@ -93,14 +93,9 @@ public class TypedMethod implements TypedNode {
         int accessModifier = Opcodes.ACC_PUBLIC; // ist laut Andi ok
         MethodVisitor mv = cw.visitMethod(accessModifier, name,
                 CodeGenUtils.generateDescriptor(typedParameters, returnType), null, null);
-        mv.visitCode();
+        MethodContext context = new MethodContext(mv);
 
-
-        MethodContext context = new MethodContext();
         typedBlock.codeGen(mv, context);
-
-        mv.visitMaxs(0, 0);
-        mv.visitEnd();
     }
 
 }