modified: resources/AllgemeinTest/Box.jav

modified:   resources/bytecode/javFiles/Matrix.jav
	modified:   src/test/java/AllgemeinTest.java

resources/AllgemeinTest/Box.jav

@@ -9,4 +9,12 @@ public class Box {
 	set(x) {
 	  a = x;
 	}
+	
+	get() {
+		return a;
+	}
+	
+	m(b) {
+		//b.set(b.get());
+	}
 }

resources/bytecode/javFiles/Matrix.jav

@@ -23,9 +23,7 @@ public class Matrix    extends Vector<Vector<Integer>> {
 
     public mul(m) {
         var ret = new Matrix();
-        var i = 0;
-        while(i < size()) {
-            var v1 = this.elementAt(i);
+        for(v1 : this) {
             var v2 = new Vector<Integer>();
             var j = 0;
             while(j < v1.size()) {
@@ -39,7 +37,6 @@ public class Matrix    extends Vector<Vector<Integer>> {
                 v2.addElement(erg);
                 j++; }
             ret.addElement(v2);
-            i++; 
          }
         return ret;
     }

src/main/java/de/dhbwstuttgart/bytecode/Codegen.java

@@ -2,17 +2,24 @@ package de.dhbwstuttgart.bytecode;
 
 import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
+import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.Method;
+import de.dhbwstuttgart.syntaxtree.Pattern;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.target.generate.ASTToTargetAST;
+import de.dhbwstuttgart.target.generate.StatementToTargetExpression;
 import de.dhbwstuttgart.target.tree.*;
 import de.dhbwstuttgart.target.tree.expression.*;
 import de.dhbwstuttgart.target.tree.type.*;
+import org.antlr.v4.codegen.Target;
 import org.objectweb.asm.*;
 
 import java.lang.invoke.*;
 import java.lang.reflect.Modifier;
 import java.util.*;
+import java.util.stream.IntStream;
 
 import static org.objectweb.asm.Opcodes.*;
 import static de.dhbwstuttgart.target.tree.expression.TargetBinaryOp.*;
@@ -1462,27 +1469,10 @@ public class Codegen {
             // TODO Check if class is a Record
 
             for (var i = 0; i < cp.subPatterns().size(); i++) {
-                var subPattern = cp.subPatterns().get(i);
-
                 state.mv.visitInsn(DUP);
+
+                var subPattern = cp.subPatterns().get(i);
                 extractField(state, cp.type(), i, clazz);
-
-                if (subPattern.type() instanceof TargetRefType || subPattern.type() instanceof TargetExtendsWildcard) {
-                    state.mv.visitInsn(DUP);
-                    state.mv.visitTypeInsn(INSTANCEOF, subPattern.type().getInternalName());
-
-                    var cont = new Label();
-                    state.mv.visitJumpInsn(IFNE, cont);
-                    for (var j = 0; j < depth + 1; j++) {
-                        state.mv.visitInsn(POP);
-                    }
-
-                    state.mv.visitVarInsn(ALOAD, state.switchResultValue.peek());
-                    state.mv.visitLdcInsn(index + 1);
-                    state.mv.visitJumpInsn(GOTO, start);
-                    state.mv.visitLabel(cont);
-                }
-
                 bindPattern(state, subPattern.type(), subPattern, start, index, depth + 1);
             }
             state.mv.visitInsn(POP);
@@ -1568,8 +1558,7 @@ public class Codegen {
                 state.mv.visitInsn(DUP);
 
             extractField(state, cp.type(), i, clazz);
-            if (subPattern.type() instanceof TargetRefType)
-                state.mv.visitTypeInsn(CHECKCAST, subPattern.type().getInternalName());
+            state.mv.visitTypeInsn(CHECKCAST, subPattern.type().getInternalName());
             offset = state.createVariable(subPattern.name(), subPattern.type()).index;
             state.mv.visitVarInsn(ASTORE, offset);
             if (subPattern instanceof TargetComplexPattern cp2) {

src/main/java/de/dhbwstuttgart/syntaxtree/factory/ASTFactory.java

@@ -176,9 +176,8 @@ public class ASTFactory {
 		for (Type jreInterface : jreClass.getGenericInterfaces()) {
 			implementedInterfaces.add((RefType) createType(jreInterface));
 		}
-		List<RefType> permittedSubtypes = null;
+		List<RefType> permittedSubtypes = new ArrayList<>();
 		if (jreClass.isSealed()) {
-			permittedSubtypes = new ArrayList<>();
 			for (Class subclass : jreClass.getPermittedSubclasses()) {
 				permittedSubtypes.add((RefType) createType(subclass));
 			}

src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java

@@ -215,10 +215,6 @@ public class ASTToTargetAST {
             // Then check for methods with the same signature
             var resMethods = new HashSet<MethodWithTphs>();
 
-            for (var m1 : methodsWithTphs) {
-                System.out.println(m1.method.name() + " -> " + m1.method.signature().parameters().stream().map(m -> m.pattern().type()).toList());
-            }
-
             outer:
             for (var m1 : methodsWithTphs) {
                 for (var m2 : methodsWithTphs) {
@@ -242,12 +238,6 @@ public class ASTToTargetAST {
             }
         }
 
-        mapOfSignatures.values().forEach(e -> {
-            e.forEach(e2 -> {
-                System.out.println(e2.name() + " -> " + e2.signature().parameters().stream().map(m -> m.pattern().type()).toList());
-            });
-            System.out.println();
-        });
         return mapOfSignatures.values().stream().toList();
     }
 

src/test/java/AllgemeinTest.java

@@ -55,7 +55,7 @@ public class AllgemeinTest {
 		//String className = "VectorNotObject";
 		//String className = "WildcardCaptureConversionTest";
 		//String className = "CaptureConversion";
-		//String className = "Pair";
+		String className = "Pair2";
 		//String className = "UseWildcardPair";
 		//String className = "Assign";
 		//String className = "StreamTest";
@@ -64,8 +64,8 @@ public class AllgemeinTest {
 		//String className = "Cycle";
 		//String className = "TripleTest";
 		//String className = "WildcardList";
-		String className = "List";
-		//String className = "Box";
+		//String className = "List";
+		//String className = "BoxUse";
 		//String className = "GenBox";
 		//String className = "InnerInf";
 		//String className = "Foo";

src/test/java/TestComplete.java

@@ -940,9 +940,6 @@ public class TestComplete {
 
         var list1 = ConsCtor.newInstance(1, ConsCtor.newInstance(2, ConsCtor.newInstance(3, EmptyCtor.newInstance())));
         var list2 = ConsCtor.newInstance(4, ConsCtor.newInstance(5, ConsCtor.newInstance(6, EmptyCtor.newInstance())));
-
-        var append = clazz.getDeclaredMethod("append", List, List);
-        System.out.println(append.invoke(instance, list1, list2));
     }
 
     @Test