Add test for a merge stort

modified:   resources/AllgemeinTest/Pair.jav
	modified:   src/test/java/AllgemeinTest.java

resources/AllgemeinTest/Kombinatoren_After.jav

@@ -0,0 +1,19 @@
+import java.util.stream.Stream;
+import Pair;
+import java.util.function.Function;     
+     
+public class Kombinatoren_After {  
+ 
+
+    after (fst, snd) { //System.out.println("after2");
+	       
+	    return () -> Stream.of(
+	    		toks ->	{
+	    		return fst.apply().flatMap(x -> 
+	    		    x.apply(toks).flatMap(p1 -> 
+	    		    snd.apply().flatMap(y ->   y.apply(p1.snd()).map(p2 -> 
+	    		              new Pair<>(new Pair<>(p1.fst(), p2.fst()), p2.snd()))))); } );    			
+    }
+}
+  
+     

resources/AllgemeinTest/Kombinatoren_After_Lazy.jav

@@ -0,0 +1,17 @@
+import java.util.stream.Stream;
+import Pair;
+import java.util.function.Function;     
+     
+public class Kombinatoren_After_Lazy {  
+
+	       
+	afterP (fst, snd) {
+    return toks -> { 
+        return fst.apply(toks).flatMap(p1 ->
+		   snd.apply(p1.snd()).map(p2 -> 
+                     new Pair<>(new Pair<>(p1.fst(), p2.fst()), p2.snd())));
+	};
+}
+}
+  
+     

resources/AllgemeinTest/Kombinatoren_Or.jav

@@ -0,0 +1,30 @@
+import java.util.stream.Stream;
+import Pair;
+import java.util.function.Function;     
+     
+public class Kombinatoren_Or {  
+ 
+
+    orP (p1,  p2) {
+			return ()-> Stream.concat(p1.apply(), p2.apply()); 
+    }
+    
+    /*
+    after (fst, snd) { //System.out.println("after2");
+	       
+	    return () -> Stream.of(
+	    		toks ->	{
+	    		return fst.apply().flatMap(x -> 
+	    		    x.apply(toks).flatMap(p1 -> 
+	    		    snd.apply().flatMap(y ->   y.apply(p1.snd()).map(p2 -> 
+	    		              new Pair<>(new Pair<>(p1.fst(), p2.fst()), p2.snd()))))); } );    			
+    }
+	
+	
+	trans (p, f) {
+    	return () -> p.apply().map(x -> (toks -> x.apply(toks).map(pr -> new Pair<>(f.apply(pr.fst()), pr.snd() ) ) ) );
+    }
+    */
+}
+  
+     

resources/AllgemeinTest/Kombinatoren_Satisfy.jav

@@ -0,0 +1,70 @@
+import java.util.stream.Stream;
+//import java.util.List;
+import java.util.ArrayList;
+import java.io.PrintStream;
+import java.lang.System;
+
+//import java.lang.String; 
+import java.lang.Boolean;
+
+import java.util.function.Function;
+
+import Pair; 
+import Kombinatoren_failure;
+     
+public class Kombinatoren_Satisfy {  
+    
+    kb = new Kombinatoren_failure();
+
+    satisfy(cond) { 
+	//	return () -> Stream.of (newToks -> new Kombinatoren_failure().failure().apply().map(x -> x.apply(newToks)));
+    //}
+		return () -> Stream.of (toks -> { 
+			if(toks.isEmpty()) { 
+				return new ArrayList<>().stream(); 
+			}
+			else 
+			{
+				var fst = toks.getFirst();
+				if (cond.apply(fst)) 
+				{ 
+					 //var newToks = List.copyOf(toks.subList(1, toks.size()));
+					 var newToks = new ArrayList<>(toks);
+					 return newToks.removeFirst();
+					 kb.getContent(
+					 	kb.succeed(fst).apply().map(x -> x.apply(newToks))
+						);
+				//	 ;
+					 
+				}
+			}		  
+		
+		}
+		); 
+	}
+ /*     () -> Stream.of (toks -> {
+            //System.out.println(toks);
+            if(toks.isEmpty()) 
+			{
+                return new ArrayList<>().stream(); 
+			}
+            else {
+                var fst = toks.getFirst();
+                if (cond.apply(fst)) 
+				{
+                        var newToks = List.copyOf(toks.subList(1, toks.size()));
+                    //System.out.println("satisfy ok " + fst.toString());
+                    //return get(succeed(fst).apply().map(x -> x.apply(newToks)));
+                }
+                else {
+                    //System.out.println("satisfy failure " + fst.toString());
+                    //return get(failure().apply()).apply(toks);
+                }
+				return new ArrayList<>().stream();
+            } } ) ;
+    }
+*/
+
+	
+}  
+     

resources/AllgemeinTest/Kombinatoren_Trans.jav

@@ -0,0 +1,13 @@
+import java.util.stream.Stream;
+import Pair;
+//import java.util.function.Function;     
+     
+public class Kombinatoren_Trans {  
+ 
+	
+	trans (p, f) {
+    	return () -> p.apply().map(x -> (toks -> x.apply(toks).map(pr -> new Pair<>(f.apply(pr.fst()), pr.snd() ) ) ) );
+    }
+}
+  
+     

resources/AllgemeinTest/Kombinatoren_failure.jav

@@ -0,0 +1,73 @@
+import java.util.stream.Stream;
+import java.util.stream.IntStream;
+import java.util.List;
+import java.util.ArrayList;
+import java.io.PrintStream;
+import java.lang.System;
+import java.util.Optional;
+
+import java.lang.String; 
+import java.lang.Boolean;
+import java.util.function.Function;
+
+import Pair; 
+
+     
+public class Kombinatoren_failure {
+    public getContent(s) { 
+	 	return s.toList().getFirst();
+	 }
+     
+     public failure() {
+    	return () -> Stream.of(
+    			toks -> new ArrayList<>().stream());
+    } 
+	public succeed( value) {
+	    return () -> Stream.of(toks -> { 
+	    	//System.out.println("succeed");
+			var al = new ArrayList<>();
+			al.add(new Pair<>(value, toks));
+			//al.forEach(x -> { System.out.println(x.toString());});
+			return al.stream();});      
+	}
+	
+	parser(p, inp) { 
+    	return p.map(y -> y.apply(
+    			inp.chars().mapToObj(c -> (char) c)
+    					   .collect(Collectors.toList())))
+    					   .flatMap(x -> x)
+    					   .filter(x -> x.snd().isEmpty())
+    					   .findFirst()
+    					   .get()
+    					   .fst();
+    }
+  
+}
+/*	
+	
+	satisfy(cond) { 
+		return newToks -> failure().apply().map(x -> x.apply(newToks));
+		/*
+		return () -> Stream.of (toks -> { 
+			if(toks.isEmpty()) { 
+			  return new ArrayList<>().stream(); 
+			}
+			else {
+			var fst = toks.getFirst();
+			if (cond.apply(fst)) { 
+			    var newToks = List.copyOf(toks.subList(1, toks.size()));
+				    this.getContent(
+				    succeed(fst)
+				    .apply().map(x -> x.apply(newToks))
+					)
+			    ;
+					 
+			}
+				}		  
+		
+		}
+		); 
+		*/
+	}  
+}  
+*/     

resources/AllgemeinTest/Pair.jav

@@ -1,36 +1,24 @@
-import java.util.Vector;
+
 import java.lang.Boolean;
 import java.lang.Object;
 
-class Pair<U, T> {
-    U a;
-    T b;
-    
-    make(x) {
-		var ret = new Pair<>();
-		ret.a = x.elementAt(0);
-		ret.b = x.elementAt(1);
-		return ret;
+import java.util.List;
+
+class Pair<T, U> {
+	T a;
+	U b;
+	
+	public Pair() { }
+	public Pair(T a, U b) {
+		this.a = a;
+		this.b = b;
+	}
+	
+	public T fst () {
+		return a;
+	}
+	
+	public U snd () { 
+		return b;
     }
-
- 
-    eq(a, b) {
-    	b = a;
-    	return a == b;
-    }
-
-
-    compare( p) {
-		return  eq(p.a, p.b);
-		//return p.a == p.b;
-    }
-
-
-/*
-    void m(Pair<?, ?> p, Vector<?> b)
-    {
-	//this.compare(p); //1, type incorrect
-	this.compare(this.make(b)); //2, OK
-    }
-*/
-}
+}

resources/AllgemeinTest/Pair.java

@@ -0,0 +1,27 @@
+import java.util.*;
+
+public class Pair<T, U> {
+	T a;
+	U b;
+	
+	public Pair() { }
+	public Pair(T a, U b) {
+	    System.out.println("Pair a; " + a + " b: " + b);
+		this.a = a;
+		this.b = b;
+	}
+	
+	public T fst () {
+		return a;
+	}
+	 
+	public U snd () {
+	    System.out.println("snd b: " + b);
+	    return b;
+	}
+
+    public String toString() {
+	return "Pair<"+a.toString()+","+b.toString()+">";
+    }
+}
+

resources/AllgemeinTest/Parser.jav

@@ -0,0 +1,82 @@
+import java.util.stream.Stream;
+//import java.util.stream.IntStream;
+//import java.util.List;
+import java.util.ArrayList;
+import java.io.PrintStream;
+import java.lang.System;
+import java.util.Optional;
+import java.lang.Character;
+import java.lang.String; 
+import java.lang.Boolean;
+import java.lang.Integer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+//import java.util.function.IntFunction;
+
+import Pair; 
+
+     
+public class Parser {
+ 
+	
+	strToList(s) {
+		var al;
+		al = new ArrayList<>();
+		var i = 0;
+		while (i < s.length()) { 	
+			al.add(s.charAt(i));
+			i=i+1;
+		}
+		return al;
+	}
+/*
+
+	parser(p, inp) { 
+    	return p.map(y -> y.apply(
+    			strToList(inp)//chars().mapToObj(c -> (Character) c)
+    					   //.toList()
+    					   ))
+    					   
+    					   //.flatMap(x -> x)
+    					   
+    					   //.filter(x -> x.snd().isEmpty())
+    					   ;
+    					   /*
+    					   .findFirst()
+    					   .get()
+    					   .fst()
+    					   
+    					   ;
+    }
+    */
+
+}
+
+/*	
+	
+	satisfy(cond) { 
+		return newToks -> failure().apply().map(x -> x.apply(newToks));
+		/*
+		return () -> Stream.of (toks -> { 
+			if(toks.isEmpty()) { 
+			  return new ArrayList<>().stream(); 
+			}
+			else {
+			var fst = toks.getFirst();
+			if (cond.apply(fst)) { 
+			    var newToks = List.copyOf(toks.subList(1, toks.size()));
+				    this.getContent(
+				    succeed(fst)
+				    .apply().map(x -> x.apply(newToks))
+					)
+			    ;
+					 
+			}
+				}		  
+		
+		}
+		); 
+		*/
+	}  
+}  
+*/     

resources/bytecode/javFiles/Bug389.jav

@@ -0,0 +1,10 @@
+import java.lang.String;
+
+public class Bug389 {
+    public swap(f) {
+        return x -> y -> f.apply(y).apply(x);
+    }
+    public swap(f) {
+        return x -> y -> z -> f.apply(z).apply(x).apply(y);
+    }
+}

resources/bytecode/javFiles/Bug389Main.jav

@@ -0,0 +1,12 @@
+import Bug389;
+import java.util.List;
+import java.lang.String;
+import java.lang.Integer;
+
+public class Bug389Main {
+    public static main(args) {
+        var func = x -> y -> z -> x + y + z;
+        var swap = new Bug389();
+        swap.swap(func).apply(1).apply(2).apply(3);
+    }
+}

resources/bytecode/javFiles/GenericRecordSwitchCase.jav

@@ -1,11 +1,9 @@
 import java.lang.String;
 import java.lang.Integer;
 
-sealed interface List permits LinkedElem, Elem {}
-
-
-public record LinkedElem<T>(T a,List l) implements List{}
-public record Elem<T>(T c) implements List{}
+sealed interface List<T> permits LinkedElem, Elem {}
+public record LinkedElem<T>(T a, List<T> l) implements List<T>{}
+public record Elem<T>(T c) implements List<T>{}
 
 public class GenericRecordSwitchCase {
     public main(o) {

resources/bytecode/javFiles/HelloWorld.jav

@@ -1,9 +1,12 @@
 import java.lang.System;
 import java.lang.String;
 import java.io.PrintStream;
+import java.lang.Object;
 
 public class HelloWorld {
     public static hello() {
         System.out.println("Hello World!");
+        System.out.println("Bye World!");
+        System.out.println("The end!");
     }
 }

resources/bytecode/javFiles/PatternMatching.jav

@@ -1,14 +1,14 @@
-sealed interface List<T> permits Cons, Empty {}
+public sealed interface List<T> permits Cons, Empty {}
 
 public record Cons<T>(T a, List<T> l) implements List<T> {}
 public record Empty<T>() implements List<T> {}
-public record Tuple<T1, T2>(T1 a, T2 b) {}
+public record Pair<T1, T2>(T1 a, T2 b) {}
 
 public class PatternMatching {
     public zip(Cons(x, xs), Cons(y, ys)) {
-        return new Cons(new Tuple(x, y), zip(xs, ys));
+        return new Cons<>(new Pair<>(x, y), zip(xs, ys));
     }
-    public zip(Empty x, Empty y) { return new Empty(); }
+    public zip(Empty(), Empty()) { return new Empty<>(); }
 
     /*public zip(Empty x, Cons y) { return new Empty(); }
     public zip(Cons x, Empty y) { return new Empty(); }

resources/bytecode/javFiles/PatternMatchingCaptures.jav

@@ -0,0 +1,35 @@
+import java.lang.Integer;
+import java.lang.Object;
+
+public interface Base {
+    Object value();
+}
+public record R(Integer a) implements Base {
+    public Object value() { return this.a; }
+}
+
+public class PatternMatchingCaptures {
+    public test1(Base R(a)@r) {
+        return r.value();
+    }
+
+    public test2(Base R(a)) {
+        return a;
+    }
+
+    public test3(R(a)@r) {
+        return r.a;
+    }
+
+    public test4(R(a)) {
+        return a;
+    }
+
+    public test5(R r) {
+        return r.a;
+    }
+
+    public test6(r) {
+        return r.a;
+    }
+}

resources/bytecode/javFiles/PatternMatchingJava.jav

@@ -2,18 +2,24 @@ import java.lang.Object;
 import List;
 import Cons;
 import Empty;
-import Tuple;
+import Pair;
 
 public class PatternMatchingJava {
-    public zip(a, b) {
+    public <A, B> Cons<Pair<A, B>> zip(Cons<A> a, Cons<B> b) {
         switch (a) {
             case Cons(x, Cons xs) -> {
                 switch (b) {
-                    case Cons(y, Cons ys) -> { return new Cons<>(new Tuple<>(x, y), zip(xs, ys)); }
-                    case Cons(y, Empty()) -> { return new Empty<>(); }
+                    case Cons(y, Cons ys) -> { return new Cons<>(new Pair<>(x, y), zip(xs, ys)); }
+                };
+            }
+            case Cons(x, Empty xs) -> {
+                switch (b) {
+                    case Cons(y, Empty ys) -> { return new Cons<>(new Pair<>(x, y), zip(xs, ys)); }
                 };
             }
-            case Cons(x, Empty()) -> { return new Empty<>(); }
         };
     }
+    public <A, B> Empty<Pair<A, B>> zip(Empty<A> a, Empty<B>) {
+        return new Empty<>();
+    }
 }

resources/bytecode/javFiles/PatternMatchingJava2.jav

@@ -1,5 +1,5 @@
-sealed interface List<T> permits Cons, Empty {}
+public sealed interface List<T> permits Cons, Empty {}
 
 public record Cons<T>(T a, List<T> l) implements List<T> {}
 public record Empty<T>() implements List<T> {}
-public record Tuple<T1, T2>(T1 a, T2 b) {}
+public record Pair<T1, T2>(T1 a, T2 b) {}

resources/bytecode/javFiles/PatternMatchingListAppend.jav

@@ -1,7 +1,7 @@
 import java.lang.Boolean;
 import java.lang.Object;
 
-sealed interface List<T> permits Cons, Empty {}
+public sealed interface List<T> permits Cons, Empty {}
 
 public record Cons<T>(T a, List<T> l) implements List<T> {}
 public record Empty<T>() implements List<T> {}

resources/bytecode/javFiles/PatternMatchingSpecificity.jav

@@ -0,0 +1,9 @@
+import java.lang.Integer;
+import java.lang.Number;
+
+public record R(Number n) {}
+
+public class PatternMatchingSpecificity {
+    public m(R(Number n)) { return 0; }
+    public m(R(Integer i)) { return 1; }
+}

resources/bytecode/javFiles/Sorting.jav

@@ -1,23 +1,25 @@
 import java.util.List;
 import java.util.ArrayList;
-import java.lang.String;
+import java.lang.Integer;
 
-public class Sorting{
-    merge(a, b){
-        a.addAll(b);
-        return a;
+public class Sorting {
+    List<Integer> merge(List<Integer> a, List<Integer> b) {
+        var r = new ArrayList<>();
+        for (var i = 0, j = 0; i < a.size() || j < b.size();)
+            if (j == b.size() || (i < a.size() && a.get(i) <= b.get(j)))
+                r.add(a.get(i++));
+            else r.add(b.get(j++));
+        return r;
     }
 
-sort(in){
-	var firstHalf = in;
-	var secondHalf = in; 
-	return merge(sort(firstHalf), sort(secondHalf));
-}
+    split(list) {
+        var mid = list.size() / 2;
+        return List.of(list.subList(0, mid), list.subList(mid, list.size()));
+    }
 
-
-	/*
-	void sort(a){
-		a = merge(a,a);
-	}
-	*/
+    public sort(in) {
+        if (in.size() <= 1) return in;
+        var halves = split(in);
+        return merge(sort(halves.get(0)), sort(halves.get(1)));
+    }
 }

src/main/antlr4/de/dhbwstuttgart/parser/antlr/Java17Parser.g4

@@ -658,7 +658,7 @@ primaryPattern
     ;
 
 recordPattern
-    : typeType recordStructurePattern identifier?
+    : type=typeType? ctor=typeType recordStructurePattern ('@' identifier)?
     //| recordStructurePattern identifier?
     ;
 

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

@@ -4,6 +4,7 @@ import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.Pattern;
 import de.dhbwstuttgart.target.generate.ASTToTargetAST;
 import de.dhbwstuttgart.target.tree.*;
 import de.dhbwstuttgart.target.tree.expression.*;
@@ -349,6 +350,8 @@ public class Codegen {
     }
 
     private TargetType largerType(TargetType left, TargetType right) {
+        if (left instanceof TargetExtendsWildcard wc) left = wc.innerType();
+        if (right instanceof TargetExtendsWildcard wc) right = wc.innerType();
         if (left.equals(TargetType.String) || right.equals(TargetType.String)) {
             return TargetType.String;
         } else if (left.equals(TargetType.Double) || right.equals(TargetType.Double)) {
@@ -1498,12 +1501,14 @@ public class Codegen {
         state.exitScope();
     }
 
-    private void extractField(State state, TargetType type, int i, ClassOrInterface clazz) {
+    private void extractField(State state, TargetType ret, TargetType type, int i, ClassOrInterface clazz) {
+        state.mv.visitTypeInsn(CHECKCAST, type.getInternalName());
         if (i >= clazz.getFieldDecl().size())
             throw new CodeGenException("Couldn't find suitable field accessor for '" + type.name() + "'");
         var field = clazz.getFieldDecl().get(i);
         var fieldType = converter.convert(field.getType());
         state.mv.visitMethodInsn(INVOKEVIRTUAL, type.getInternalName(), field.getName(), "()" + fieldType.toDescriptor(), false);
+        if (ret != null) convertTo(state, fieldType, ret);
     }
 
     private void bindPattern(State state, TargetType type, TargetPattern pat, Label start, int index, int depth) {
@@ -1558,7 +1563,7 @@ public class Codegen {
                 state.mv.visitVarInsn(ASTORE, local.index);
             }
 
-            var clazz = findClass(new JavaClassName(cp.type().name()));
+            var clazz = findClass(new JavaClassName(cp.ctor().name()));
             if (clazz == null) throw new CodeGenException("Class definition for '" + cp.type().name() + "' not found");
             // TODO Check if class is a Record
 
@@ -1566,7 +1571,7 @@ public class Codegen {
                 var subPattern = cp.subPatterns().get(i);
 
                 state.mv.visitInsn(DUP);
-                extractField(state, cp.type(), i, clazz);
+                extractField(state, null, cp.ctor(), i, clazz);
 
                 if (subPattern.type() instanceof TargetRefType || subPattern.type() instanceof TargetExtendsWildcard) {
                     state.mv.visitInsn(DUP);
@@ -1659,7 +1664,7 @@ public class Codegen {
     private void bindLocalVariables(State state, TargetComplexPattern cp, int offset) {
         state.mv.visitVarInsn(ALOAD, offset);
 
-        var clazz = findClass(new JavaClassName(cp.type().name()));
+        var clazz = findClass(new JavaClassName(cp.ctor().name()));
         if (clazz == null) throw new CodeGenException("Class definition for '" + cp.type().name() + "' not found");
 
         for (var i = 0; i < cp.subPatterns().size(); i++) {
@@ -1668,7 +1673,7 @@ public class Codegen {
             if (i < cp.subPatterns().size() - 1)
                 state.mv.visitInsn(DUP);
 
-            extractField(state, cp.type(), i, clazz);
+            extractField(state, subPattern.type(), cp.ctor(), i, clazz);
             if (subPattern.type() instanceof TargetRefType)
                 state.mv.visitTypeInsn(CHECKCAST, subPattern.type().getInternalName());
             offset = state.createVariable(subPattern.name(), subPattern.type()).index;

src/main/java/de/dhbwstuttgart/core/ConsoleInterface.java

@@ -33,6 +33,7 @@ class Args {
 
 public class ConsoleInterface {
     public static Logger.LogLevel logLevel = Logger.LogLevel.ERROR;
+    public static boolean writeToConsole = true;
     public static boolean writeLogFiles = false;
     public static boolean inferTogether = false;
     public static Optional<String> unifyServerUrl = Optional.empty();

src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java

@@ -5,8 +5,9 @@ import de.dhbwstuttgart.bytecode.Codegen;
 import de.dhbwstuttgart.bytecode.FunNGenerator;
 import de.dhbwstuttgart.environment.CompilationEnvironment;
 import de.dhbwstuttgart.environment.DirectoryClassLoader;
+import de.dhbwstuttgart.exceptions.CompilerWarning;
 import de.dhbwstuttgart.exceptions.DebugException;
-import de.dhbwstuttgart.languageServerInterface.model.LanguageServerTransferObject;
+import de.dhbwstuttgart.exceptions.WarningsException;
 import de.dhbwstuttgart.parser.JavaTXParser;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.antlr.Java17Parser;
@@ -20,14 +21,10 @@ import de.dhbwstuttgart.server.SocketFuture;
 import de.dhbwstuttgart.server.packet.SetAutoclosePacket;
 import de.dhbwstuttgart.server.packet.UnifyRequestPacket;
 import de.dhbwstuttgart.server.packet.UnifyResultPacket;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
-import de.dhbwstuttgart.syntaxtree.Method;
-import de.dhbwstuttgart.syntaxtree.ParameterList;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-import de.dhbwstuttgart.syntaxtree.GenericDeclarationList;
+import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
+import de.dhbwstuttgart.syntaxtree.statement.Block;
 import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
@@ -35,9 +32,12 @@ import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.syntaxtree.type.TypeVisitor;
+import de.dhbwstuttgart.syntaxtree.type.Void;
 import de.dhbwstuttgart.syntaxtree.visual.ASTTypePrinter;
 import de.dhbwstuttgart.target.generate.ASTToTargetAST;
 import de.dhbwstuttgart.target.generate.GenericsResult;
+import de.dhbwstuttgart.target.tree.*;
+import de.dhbwstuttgart.target.tree.type.*;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
@@ -62,7 +62,9 @@ import de.dhbwstuttgart.typeinference.unify.UnifyTaskModel;
 
 import de.dhbwstuttgart.util.Logger;
 import java.io.*;
+import java.lang.Record;
 import java.lang.reflect.Modifier;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.sql.Array;
 import java.util.*;
@@ -82,7 +84,9 @@ public class JavaTXCompiler {
 	// public static JavaTXCompiler INSTANCE;
 	final CompilationEnvironment environment;
 	Boolean resultmodel = true;
-	public final Map<File, SourceFile> sourceFiles = new HashMap<>();
+
+	private final List<File> sources;
+	public final Map<File, SourceFile> sourceFiles = new LinkedHashMap<>();
 	public final Set<JavaClassName> input = new HashSet<>();
 
 	public volatile UnifyTaskModel usedTasks = new UnifyTaskModel();
@@ -100,6 +104,7 @@ public class JavaTXCompiler {
 	public DirectoryClassLoader getClassLoader() {
 		return classLoader;
 	}
+	public final List<CompilerWarning> generatedWarnings = new ArrayList<>();
 
 	public JavaTXCompiler(File sourceFile) throws IOException, ClassNotFoundException {
 		this(Collections.singletonList(sourceFile), List.of(), new File("."), ConsoleInterface.inferTogether);
@@ -124,7 +129,23 @@ public class JavaTXCompiler {
 		environment = new CompilationEnvironment(sources, classLoader);
 		classPath = path;
 		this.outputPath = outputPath;
+		this.sources = sources;
+		// INSTANCE = this;
+	}
 
+	public void warn(CompilerWarning warning) {
+		this.generatedWarnings.add(warning);
+	}
+	public void checkWarnings() {
+		for (var warning : this.generatedWarnings) {
+			defaultLogger.error("[Warning] " + warning.getMessage());
+		}
+		if (!generatedWarnings.isEmpty()) {
+			throw new WarningsException(generatedWarnings.size() + " warnings in code, aborting!", this.generatedWarnings);
+		}
+	}
+
+	private List<SourceFileContext> generateSources(List<File> sources) throws IOException, ClassNotFoundException {
 		// TODO This should maybe be moved elsewhere
 		var treeList = new ArrayList<SourceFileContext>(sources.size());
 		for (var s : sources) {
@@ -154,11 +175,7 @@ public class JavaTXCompiler {
 				input.add(classRegistry.getName(className));
 			}
 		}
-
-		for (var i = 0; i < sources.size(); i++) {
-			parse(treeList.get(i), sources.get(i));
-		}
-		// INSTANCE = this;
+		return treeList;
 	}
 
 	private void addSourceFile(File file, SourceFile sf) {
@@ -422,6 +439,8 @@ public class JavaTXCompiler {
 		return typeInference(List.of(file));
 	}
 
+	public ConstraintSet<?> lastConstraints;
+
 	public List<ResultSet> typeInference(List<File> files) throws ClassNotFoundException, IOException {
 		Set<ClassOrInterface> allClasses = new HashSet<>();
 
@@ -437,14 +456,12 @@ public class JavaTXCompiler {
 
 		TYPE ty = new TYPE(definedClasses, allClasses);
 		var cons = ty.getConstraints();
+		lastConstraints = cons;
 
 		Set<Set<UnifyPair>> results = new HashSet<>();
 		PlaceholderRegistry placeholderRegistry = new PlaceholderRegistry();
 
-		var logFolder = new File(System.getProperty("user.dir") + "/logFiles/");
-		if (ConsoleInterface.writeLogFiles && !logFolder.mkdirs()) throw new RuntimeException("Could not create directory for log files: " + logFolder);
-		Writer logFile = ConsoleInterface.writeLogFiles ? new FileWriter(new File(logFolder, "log_" + sourceFiles.keySet().iterator().next().getName())) : new OutputStreamWriter(new NullOutputStream());
-		Logger logger = new Logger(logFile, "TypeInference");
+		Logger logger = new Logger("TypeInference");
 
 		FiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses.stream().toList(), logger, classLoader, this, placeholderRegistry);
 		logger.info(finiteClosure.toString());
@@ -548,87 +565,6 @@ public class JavaTXCompiler {
 		return results.stream().map((unifyPairs -> new ResultSet(UnifyTypeFactory.convert(unifyPairs, Pair.generateTPHMap(cons), placeholderRegistry)))).collect(Collectors.toList());
 	}
 
-	/**
-	 * TEMPORARY - Only for Language Server Usage
-	 */
-	public LanguageServerTransferObject getResultSetAndAbstractSyntax(File file) throws IOException, ClassNotFoundException {
-		var sf = sourceFiles.get(file);
-		if(sf == null){
-			sf = sourceFiles.values().stream().findFirst().get();
-		}
-		Set<ClassOrInterface> allClasses = new HashSet<>();
-		allClasses.addAll(getAvailableClasses(sf));
-		allClasses.addAll(sf.getClasses());
-		var newClasses = CompilationEnvironment.loadDefaultPackageClasses(sf.getPkgName(), file, this).stream().map(ASTFactory::createClass).collect(Collectors.toSet());
-		for (var clazz : newClasses) {
-			// Don't load classes that get recompiled
-			if (sf.getClasses().stream().anyMatch(nf -> nf.getClassName().equals(clazz.getClassName())))
-				continue;
-			if (allClasses.stream().noneMatch(old -> old.getClassName().equals(clazz.getClassName())))
-				allClasses.add(clazz);
-		}
-
-		final ConstraintSet<Pair> cons = getConstraints(file);
-		Set<Set<UnifyPair>> results = new HashSet<>();
-
-		Writer logFile = new OutputStreamWriter(new NullOutputStream());
-		Logger logger = new Logger(logFile, "TypeInferenceAsync");
-		UnifyContext context = new UnifyContext(logger, false, null, usedTasks, defaultClientPlaceholderRegistry);
-		try {
-			IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses.stream().toList(), logger, classLoader, this, context.placeholderRegistry());
-			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(this, cons, context.placeholderRegistry());
-			Function<UnifyPair, UnifyPair> distributeInnerVars = x -> {
-				UnifyType lhs, rhs;
-				if (((lhs = x.getLhsType()) instanceof PlaceholderType) && ((rhs = x.getRhsType()) instanceof PlaceholderType) && (((PlaceholderType) lhs).isInnerType() || ((PlaceholderType) rhs).isInnerType())) {
-					((PlaceholderType) lhs).setInnerType(true);
-					((PlaceholderType) rhs).setInnerType(true);
-				}
-				return x;
-
-			};
-
-
-			unifyCons = unifyCons.map(distributeInnerVars);
-			Set<PlaceholderType> varianceTPHold;
-			Set<PlaceholderType> varianceTPH = new HashSet<>();
-			varianceTPH = varianceInheritanceConstraintSet(unifyCons);
-
-			List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints();
-
-			if (resultmodel) {
-				/* UnifyResultModel Anfang */
-				UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
-				UnifyResultListenerImpl li = new UnifyResultListenerImpl();
-				urm.addUnifyResultListener(li);
-				TypeUnify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, context);
-				generateBytecode(sf, li.getResults());
-				return new LanguageServerTransferObject(li.getResults(), sf, ASTTypePrinter.print(sf), generatedGenerics);
-			}
-			/* UnifyResultModel End */
-			else {
-				Set<Set<UnifyPair>> result = TypeUnify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, context);
-				results.addAll(result);
-
-				results = results.stream().map(x -> {
-					Optional<Set<UnifyPair>> res = new RuleSet(context.placeholderRegistry()).subst(x.stream().map(y -> {
-						if (y.getPairOp() == PairOperator.SMALLERDOTWC)
-							y.setPairOp(PairOperator.EQUALSDOT);
-						return y; // alle Paare a <.? b erden durch a =. b ersetzt
-					}).collect(Collectors.toCollection(HashSet::new)));
-					if (res.isPresent()) {// wenn subst ein Erg liefert wurde was veraendert
-						return new TypeUnifyTask(context).applyTypeUnificationRules(res.get(), finiteClosure);
-					} else
-						return x; // wenn nichts veraendert wurde wird x zurueckgegeben
-				}).collect(Collectors.toCollection(HashSet::new));
-			}
-		} catch (ClassNotFoundException e) {
-		}
-		generateBytecode(sf, results.stream().map((unifyPairs -> new ResultSet(UnifyTypeFactory.convert(unifyPairs, Pair.generateTPHMap(cons), context.placeholderRegistry())))).collect(Collectors.toList()));
-		return new LanguageServerTransferObject(results.stream().map((unifyPairs -> new ResultSet(UnifyTypeFactory.convert(unifyPairs, Pair.generateTPHMap(cons), context.placeholderRegistry())))).collect(Collectors.toList()), sf, ASTTypePrinter.print(sf), generatedGenerics);
-	}
-
-
-
 	/**
 	 * Vererbt alle Variancen bei Paaren (a <. theta) oder (Theta <. a) wenn a eine Variance !=0 hat auf alle Typvariablen in Theta.
 	 * 
@@ -686,7 +622,7 @@ public class JavaTXCompiler {
 
 	public final JavaClassRegistry classRegistry = new JavaClassRegistry();
 
-	private void parse(SourceFileContext tree, File sourceFile) throws IOException, java.lang.ClassNotFoundException {
+	private void parse(SourceFileContext tree, File sourceFile) throws IOException, ClassNotFoundException {
 		SyntaxTreeGenerator generator = new SyntaxTreeGenerator(this, classRegistry, new GenericsRegistry(null), sourceFile.getName());
 		environment.addClassesToRegistry(classRegistry, tree, sourceFile, this);
 		var classes = new ArrayList<ClassOrInterface>();
@@ -697,29 +633,45 @@ public class JavaTXCompiler {
 		sf.imports.addAll(generator.imports);
 	}
 
+	public void parseAll() throws IOException, ClassNotFoundException {
+		var treeList = generateSources(sources);
+		for (var i = 0; i < sources.size(); i++) {
+			parse(treeList.get(i), sources.get(i));
+		}
+	}
+
 	public void generateBytecode() throws ClassNotFoundException, IOException {
+		// The compiler has two modes, one is to infer all files together and the other one is to do them in sequence
 		if (inferTogether) {
+			parseAll();
+
 			var files = sourceFiles.keySet().stream().toList();
 			var typeinferenceResult = this.typeInference(files);
 			for (var file : files) {
 				var sf = sourceFiles.get(file);
 				if (sf.isGenerated()) continue;
 				var classes = generateBytecode(sf, typeinferenceResult);
+				checkWarnings();
 				sf.setGenerated();
-				writeClassFile(classes, outputPath == null ? file.getParentFile() : outputPath, outputPath == null);
+				writeClassFile(classes, file);
 			}
 		} else {
-			for (var file : sourceFiles.keySet()) {
+			var treeList = generateSources(sources);
+			for (var i = 0; i < sources.size(); i++) {
+				var file = sources.get(i);
+				parse(treeList.get(i), file);
+
 				var sf = sourceFiles.get(file);
 				if (sf.isGenerated()) continue;
 				var classes = generateBytecode(file);
+				checkWarnings();
 				sf.setGenerated();
-				writeClassFile(classes, outputPath == null ? file.getParentFile() : outputPath, outputPath == null);
+				writeClassFile(classes, file);
 			}
 		}
 	}
 
-	public Map<JavaClassName, byte[]> generateBytecode(File sourceFile) throws ClassNotFoundException, IOException {
+	private Map<JavaClassName, byte[]> generateBytecode(File sourceFile) throws ClassNotFoundException, IOException {
 		var sf = sourceFiles.get(sourceFile);
 		if (sf.isGenerated()) return null;
 		List<ResultSet> typeinferenceResult = this.typeInference(sourceFile);
@@ -753,11 +705,92 @@ public class JavaTXCompiler {
 		}
 	}
 
+	// TODO Maybe move this elsewhere it doesn't really belong here
+	private static RefTypeOrTPHOrWildcardOrGeneric toRefType(TargetType type) {
+		return switch(type) {
+            case TargetExtendsWildcard targetExtendsWildcard ->
+				new ExtendsWildcardType(toRefType(targetExtendsWildcard.innerType()), new NullToken());
+			case TargetSuperWildcard targetSuperWildcard ->
+				new SuperWildcardType(toRefType(targetSuperWildcard.innerType()), new NullToken());
+			case TargetGenericType targetGenericType -> new GenericRefType(targetGenericType.name(), new NullToken());
+            case TargetPrimitiveType targetPrimitiveType -> toRefType(TargetType.toWrapper(targetPrimitiveType));
+            case TargetSpecializedType targetSpecializedType ->
+				new RefType(new JavaClassName(targetSpecializedType.name()),
+					targetSpecializedType.params().stream().map(JavaTXCompiler::toRefType).toList(), new NullToken()
+				);
+			case null -> new Void(new NullToken());
+        };
+	}
+
+	private static ParameterList toParameterList(List<MethodParameter> params) {
+		return new ParameterList(params.stream().map(mp
+			-> (Pattern) new FormalParameter(mp.pattern().name(), toRefType(mp.pattern().type()), new NullToken())).toList(),
+			new NullToken()
+		);
+	}
+
+	private static GenericDeclarationList toGenerics(Set<TargetGeneric> generics) {
+		return new GenericDeclarationList(
+			generics.stream().map(g
+					-> new GenericTypeVar(g.name(), List.of(toRefType(g.bound())), new NullToken(), new NullToken())
+			).toList(), new NullToken()
+		);
+	}
+
+	/**
+	 * This writes back the compiled target structure into the loadedClasses map so that it can be used
+	 * as an input in further processing
+	 * @param target
+	 */
+	private void writeBackToClass(TargetStructure target) {
+		var fielddecl = new ArrayList<Field>();
+        for (var field : target.fields()) {
+            fielddecl.add(new Field(field.name(), toRefType(field.type()), field.access(), new NullToken()));
+        }
+
+		var methods = new ArrayList<Method>();
+		for (var method : target.methods()) {
+			methods.add(new Method(method.access(), method.name(), toRefType(method.signature().returnType()),
+				toParameterList(method.signature().parameters()), new Block(new ArrayList<>(), new NullToken()), toGenerics(method.signature().generics()), new NullToken())
+			);
+		}
+
+		var constructors = new ArrayList<Constructor>();
+		for (var ctor : target.constructors()) {
+			constructors.add(new Constructor(ctor.access(), target.getName(), new RefType(target.qualifiedName(), new NullToken()),
+				toParameterList(ctor.parameters()), new Block(new ArrayList<>(), new NullToken()), toGenerics(ctor.generics()), new NullToken())
+			);
+		}
+
+		var generics = new GenericDeclarationList(toGenerics(target.generics()), new NullToken());
+		var superClass = (RefType) toRefType(target.superType());
+		var isInterface = target instanceof TargetInterface;
+		var isFunctionalInterface = false; // TODO We might actually want to generate those
+		var implementedInterfaces = target.implementingInterfaces().stream()
+			.map(t -> (RefType) toRefType(t)).toList();
+		List<RefType> permittedSubtypes = null;
+		if (target instanceof TargetInterface tinf && tinf.permittedSubtypes() != null) {
+			permittedSubtypes = tinf.permittedSubtypes().stream().map(t -> (RefType) toRefType(t)).toList();
+		}
+
+		var clazz = new ClassOrInterface(
+			target.modifiers(), target.qualifiedName(),
+			fielddecl, Optional.empty(), Optional.empty(),
+			methods, constructors, generics, superClass,
+			isInterface, isFunctionalInterface, implementedInterfaces,
+			permittedSubtypes, new NullToken(), ""
+		);
+		loadedClasses.put(target.qualifiedName(), clazz);
+	}
+
 	public synchronized Map<JavaClassName, byte[]> generateBytecode(SourceFile sf, List<ResultSet> typeInferenceResult) {
+		this.generatedWarnings.clear();
 		var converter = new ASTToTargetAST(this, typeInferenceResult, sf, classLoader);
 		var generatedClasses = new HashMap<JavaClassName, byte[]>();
 		for (var clazz : sf.getClasses()) {
-			var codegen = new Codegen(converter.convert(clazz), this, converter);
+			var target = converter.convert(clazz);
+			writeBackToClass(target);
+			var codegen = new Codegen(target, this, converter);
 			var code = codegen.generate();
 			generatedClasses.put(clazz.getClassName(), code);
 		}
@@ -769,6 +802,10 @@ public class JavaTXCompiler {
 		return generatedClasses;
 	}
 
+	public void writeClassFile(Map<JavaClassName, byte[]> classFiles, File file) throws IOException {
+		writeClassFile(classFiles, outputPath == null ? file.getParentFile() : outputPath, outputPath == null);
+	}
+
 	public synchronized void writeClassFile(Map<JavaClassName, byte[]> classFiles, File path, boolean preserveHierarchy) throws IOException {
 		FileOutputStream output;
 		for (JavaClassName name : classFiles.keySet()) {

src/main/java/de/dhbwstuttgart/exceptions/CompilerWarning.java

@@ -0,0 +1,16 @@
+package de.dhbwstuttgart.exceptions;
+
+import org.antlr.v4.runtime.Token;
+
+public class CompilerWarning extends RuntimeException {
+    private final Token offset;
+
+    public CompilerWarning(Token offset, String message) {
+        super(message);
+        this.offset = offset;
+    }
+
+    public Token getOffset() {
+        return this.offset;
+    }
+}

src/main/java/de/dhbwstuttgart/exceptions/DebugException.java

@@ -3,6 +3,6 @@ package de.dhbwstuttgart.exceptions;
 public class DebugException extends RuntimeException {
 
 	public DebugException(String message) {
-		System.err.print(message);
+		super(message);
 	}
 }

src/main/java/de/dhbwstuttgart/exceptions/WarningsException.java

@@ -0,0 +1,14 @@
+package de.dhbwstuttgart.exceptions;
+
+import java.util.Collections;
+import java.util.List;
+
+public class WarningsException extends RuntimeException {
+
+    public final List<CompilerWarning> compilerWarnings;
+
+    public WarningsException(String message, List<CompilerWarning> warnings) {
+        super(message);
+        this.compilerWarnings = Collections.unmodifiableList(warnings);
+    }
+}

src/main/java/de/dhbwstuttgart/languageServerInterface/LanguageServerInterface.java

@@ -2,8 +2,11 @@ package de.dhbwstuttgart.languageServerInterface;
 
 
 import de.dhbwstuttgart.bytecode.Codegen;
+import de.dhbwstuttgart.core.ConsoleInterface;
 import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.environment.IByteArrayClassLoader;
+import de.dhbwstuttgart.exceptions.CompilerWarning;
+import de.dhbwstuttgart.exceptions.WarningsException;
 import de.dhbwstuttgart.languageServerInterface.model.LanguageServerTransferObject;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
@@ -11,6 +14,7 @@ import de.dhbwstuttgart.syntaxtree.factory.NameGenerator;
 import de.dhbwstuttgart.target.generate.ASTToTargetAST;
 import de.dhbwstuttgart.target.generate.GenericsResult;
 import de.dhbwstuttgart.target.tree.TargetStructure;
+import de.dhbwstuttgart.util.Logger;
 import org.apache.commons.io.FileUtils;
 
 import java.io.*;
@@ -31,7 +35,7 @@ import java.util.stream.Stream;
 public class LanguageServerInterface {
 
 
-    public LanguageServerTransferObject getResultSetAndAbastractSyntax(String path, String resetNamesTo) throws IOException, URISyntaxException, ClassNotFoundException {
+    public LanguageServerTransferObject getResultSetAndAbstractSyntax(String path, String resetNamesTo) throws IOException, URISyntaxException, ClassNotFoundException {
         NameGenerator.resetTo(resetNamesTo);
         return getResultSetAndAbstractSyntax(path);
 
@@ -52,21 +56,32 @@ public class LanguageServerInterface {
      */
     public LanguageServerTransferObject getResultSetAndAbstractSyntax(String pathAsString){
         System.setOut(new PrintStream(OutputStream.nullOutputStream()));
+        ConsoleInterface.logLevel = Logger.LogLevel.DEBUG;
+        ConsoleInterface.writeLogFiles = true;
+        ConsoleInterface.writeToConsole = false;
+        Logger.resetLogs();
+
         try {
             var uri = new URI(pathAsString);
             var path = Path.of(uri);
             var file = path.toFile();
             Files.createDirectories(path.getParent().resolve("out"));
-            var compiler = new JavaTXCompiler(List.of(file), List.of(path.getParent().toFile()), path.getParent().resolve("out").toFile(), false);
+            var compiler = new JavaTXCompiler(List.of(file), List.of(path.getParent().toFile()), path.getParent().resolve("out").toFile(), true);
+            compiler.parseAll();
 
+            List<CompilerWarning> warnings = List.of();
             var parsedSource = compiler.sourceFiles.get(file);
             var tiResults = compiler.typeInference(file);
+            var classFiles = compiler.generateBytecode(parsedSource, tiResults);
 
-            Map<JavaClassName, byte[]> bytecode = compiler.generateBytecode(parsedSource, tiResults);
-            Files.createDirectories(path.getParent().resolve("out"));
-            compiler.writeClassFile(bytecode, path.getParent().resolve("out").toFile(), false);
+            try {
+                compiler.checkWarnings();
+                compiler.writeClassFile(classFiles, file);
+            } catch(WarningsException e) {
+                warnings = e.compilerWarnings;
+            }
 
-            return new LanguageServerTransferObject(tiResults, parsedSource, "", compiler.getGeneratedGenerics());
+            return new LanguageServerTransferObject(parsedSource, "", compiler.lastConstraints, compiler.getGeneratedGenerics(), warnings);
         } catch (Exception e) {
             throw new RuntimeException(e.getMessage(), e);
         }

src/main/java/de/dhbwstuttgart/languageServerInterface/model/LanguageServerTransferObject.java

@@ -2,8 +2,10 @@ package de.dhbwstuttgart.languageServerInterface.model;
 
 
 
+import de.dhbwstuttgart.exceptions.CompilerWarning;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
 import de.dhbwstuttgart.target.generate.GenericsResult;
+import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 
 import java.util.HashMap;
@@ -11,21 +13,23 @@ import java.util.List;
 import java.util.Map;
 
 public class LanguageServerTransferObject {
-    List<ResultSet> resultSets;
     SourceFile Ast;
     String printedAst;
     Map<SourceFile, List<GenericsResult>> generatedGenerics = new HashMap<>();
+    List<CompilerWarning> warnings;
+    ConstraintSet<?> constraints;
 
-
-    public LanguageServerTransferObject(List<ResultSet> resultSets, SourceFile Ast, String printedAst, Map<SourceFile, List<GenericsResult>> generatedGenerics) {
-        this.resultSets = resultSets;
+    public LanguageServerTransferObject(SourceFile Ast, String printedAst, ConstraintSet<?> constraints, Map<SourceFile, List<GenericsResult>> generatedGenerics, List<CompilerWarning> warnings) {
         this.Ast = Ast;
         this.printedAst = printedAst;
+        this.constraints = constraints;
         this.generatedGenerics = generatedGenerics;
+        this.warnings = warnings;
     }
 
-    public List<ResultSet> getResultSets() {return resultSets;}
     public SourceFile getAst() {return Ast;}
     public String getPrintedAst() {return printedAst;}
     public Map<SourceFile, List<GenericsResult>> getGeneratedGenerics() {return generatedGenerics;}
+    public List<CompilerWarning> getWarnings() { return warnings; };
+    public ConstraintSet<?> getConstraints() { return constraints; };
 }

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java

@@ -149,9 +149,7 @@ public class StatementGenerator {
                 if (fp.typeType() != null) {
                     type = TypeGenerator.convert(fp.typeType(), reg, generics);
                 } else {
-                	type = methodparameters?
-                			TypePlaceholder.fresh(fp.getStart(), 1, false) 
-                			: TypePlaceholder.fresh(fp.getStart(), 1, false);
+                	type = TypePlaceholder.fresh(fp.getStart(), 1, false);
                 }
                 ret.add(new FormalParameter(paramName, type, fp.getStart()));
                 localVars.put(paramName, type); 
@@ -484,9 +482,10 @@ public class StatementGenerator {
         IdentifierContext identifierCtx = recordPatternCtx.identifier();
         var text = (identifierCtx != null) ? identifierCtx.getText() : null;
         //Hier evtl. Typ anpassen -> wenn kein Typ bekannt ist push neuen Typ auf Hashtable
-        var type = recordPatternCtx.typeType() == null ? TypePlaceholder.fresh(recordPatternCtx.getStart()) : TypeGenerator.convert(recordPatternCtx.typeType(), reg, generics);
+        var ctor = TypeGenerator.convert(recordPatternCtx.ctor, reg, generics);
+        var type = recordPatternCtx.type == null ? ctor : TypeGenerator.convert(recordPatternCtx.type, reg, generics);
         if (text != null) localVars.put(text, type);
-        var ret = new RecordPattern(subPattern, text, type, recordPatternCtx.getStart());
+        var ret = new RecordPattern(subPattern, text, type, (RefType)ctor, recordPatternCtx.getStart());
         return ret;
     }
 
@@ -700,7 +699,7 @@ public class StatementGenerator {
         case ConditionalassignexpressionContext condassign:
             return convert(condassign);
         default:
-            throw new NotImplementedException();
+            throw new NotImplementedException(expression.getClass().toString());
         }
     }
 

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java

@@ -204,7 +204,7 @@ public class SyntaxTreeGenerator {
     Boolean isInterface = false;
     Boolean isFunctionalInterface = false;
     List<RefType> implementedInterfaces = new ArrayList<>();
-    List<RefType> permittedSubtypes = new ArrayList<>();
+    List<RefType> permittedSubtypes = null;
     for (ClassBodyDeclarationContext clsbodydecl : ctx.classBody().classBodyDeclaration()) {
       convert(clsbodydecl, fielddecl, constructors, methods, name, superClass, generics);
     }
@@ -218,7 +218,7 @@ public class SyntaxTreeGenerator {
     if ((modifiers & 4096) != 0) {
       if (!Objects.isNull(ctx.PERMITS())) {
         // permitted subtypes sind letzte typeList (siehe Grammatikregel 'classDeclaration')
-        permittedSubtypes.addAll(convert(ctx.typeList(ctx.typeList().size() - 1), generics));
+        permittedSubtypes = new ArrayList<>(convert(ctx.typeList(ctx.typeList().size() - 1), generics));
       } else {
         // falls sealed modifier ohne 'permits'-List oder umgekehrt
         throw new NotImplementedException("Invalid sealed class declaration");

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java

@@ -64,6 +64,8 @@ public class TypeGenerator {
             switch (typeContext.primitiveType().getText()) {
             case "boolean":
                 return new RefType(ASTFactory.createClass(Boolean.class).getClassName(), typeContext.getStart());
+            case "char":
+                return new RefType(ASTFactory.createClass(Character.class).getClassName(), typeContext.getStart());
             case "int":
                 return new RefType(ASTFactory.createClass(Integer.class).getClassName(), typeContext.getStart());
             case "double":
@@ -71,7 +73,7 @@ public class TypeGenerator {
             case "float":
                 return new RefType(ASTFactory.createClass(Float.class).getClassName(), typeContext.getStart());
             default:
-                throw new NotImplementedException();
+                throw new NotImplementedException(typeContext.primitiveType().getText());
             }
         } else if (!typeContext.LBRACK().isEmpty()) { // ArrayType über eckige Klammer prüfen
             // JavaTXParser.logger.info(unannTypeContext.getText());

src/main/java/de/dhbwstuttgart/syntaxtree/Record.java

@@ -14,6 +14,6 @@ import javax.swing.text.html.Option;
 public class Record extends ClassOrInterface {
 
   public Record(int modifiers, JavaClassName name, List<Field> fielddecl, Optional<Constructor> fieldInitializations, Optional<Method> staticInitializer, List<Method> methods, List<Constructor> constructors, GenericDeclarationList genericClassParameters, RefType superClass, Boolean isInterface, List<RefType> implementedInterfaces, Token offset, String fileName) {
-    super(modifiers, name, fielddecl, fieldInitializations, staticInitializer, methods, constructors, genericClassParameters, superClass, isInterface, methods.size() == 1 ? true : false, implementedInterfaces, new ArrayList<>(), offset, fileName);
+    super(modifiers, name, fielddecl, fieldInitializations, staticInitializer, methods, constructors, genericClassParameters, superClass, isInterface, methods.size() == 1 ? true : false, implementedInterfaces, null, offset, fileName);
   }
 }

src/main/java/de/dhbwstuttgart/syntaxtree/RecordPattern.java

@@ -3,6 +3,7 @@ package de.dhbwstuttgart.syntaxtree;
 import java.util.ArrayList;
 import java.util.List;
 
+import de.dhbwstuttgart.syntaxtree.type.RefType;
 import org.antlr.v4.runtime.Token;
 
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
@@ -10,21 +11,22 @@ import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 public class RecordPattern extends FormalParameter {
 
   private final List<Pattern> subPattern;
+  private final RefType ctor;
 
-  public RecordPattern(String name, RefTypeOrTPHOrWildcardOrGeneric type, Token offset) {
-    super(name, type, offset);
-    subPattern = new ArrayList<>();
-  }
-
-  public RecordPattern(List<Pattern> subPattern, String name, RefTypeOrTPHOrWildcardOrGeneric type, Token offset) {
+  public RecordPattern(List<Pattern> subPattern, String name, RefTypeOrTPHOrWildcardOrGeneric type, RefType ctor, Token offset) {
     super(name, type, offset);
     this.subPattern = subPattern;
+    this.ctor = ctor;
   }
 
   public List<Pattern> getSubPattern() {
     return this.subPattern;
   }
 
+  public RefType getCtor() {
+    return ctor;
+  }
+
   @Override
   public void accept(ASTVisitor visitor) {
     visitor.visit(this);

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

@@ -229,9 +229,6 @@ public class ASTFactory {
 	public static Method createMethod(java.lang.reflect.Method jreMethod, String signature, java.lang.Class inClass, Boolean isInherited, Boolean isImplemented) {
 		String name = jreMethod.getName();
 		RefTypeOrTPHOrWildcardOrGeneric returnType;
-		if (inClass.getName().equals("Swap")){
-			System.out.println();
-		}
 		Type jreRetType;
 		if (jreMethod.getGenericReturnType() != null) {
 			jreRetType = jreMethod.getGenericReturnType();

src/main/java/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java

@@ -27,9 +27,10 @@ public class MethodCall extends Statement
     public RefTypeOrTPHOrWildcardOrGeneric receiverType;
     
     //sind Tphs, repraesentieren im Resultset die Signatur der aufgerufenen Methoden, letztes Element ist der Returntyp
-    public final ArrayList<TypePlaceholder> signature;  
+    public final ArrayList<TypePlaceholder> signature;
+    public int modifiers;
     
-    public MethodCall(RefTypeOrTPHOrWildcardOrGeneric retType, Receiver receiver, String methodName, ArgumentList argumentList, 
+    public MethodCall(RefTypeOrTPHOrWildcardOrGeneric retType, Receiver receiver, String methodName, ArgumentList argumentList,
     		          RefTypeOrTPHOrWildcardOrGeneric receiverType, ArrayList<TypePlaceholder> signature, Token offset){
 		super(retType,offset);
 		this.arglist = argumentList;

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

@@ -0,0 +1,9 @@
+package de.dhbwstuttgart.target.generate;
+
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+
+import java.util.List;
+
+public class DiscardResultSet extends RuntimeException {
+    public DiscardResultSet() {}
+}

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

@@ -21,6 +21,7 @@ import java.util.stream.Stream;
 public abstract class GenerateGenerics implements IGenerics {
 
     private final JavaTXCompiler compiler;
+    private final ResultSet constraints;
 
     public class TPH {
         private final TypePlaceholder wrap;
@@ -129,7 +130,7 @@ public abstract class GenerateGenerics implements IGenerics {
     final Map<Method, Set<Pair>> computedGenericsOfMethods = new HashMap<>();
     final Map<ClassOrInterface, Set<Pair>> computedGenericsOfClasses = new HashMap<>();
 
-    final Map<Method, Set<TPH>> usedTPHsOfMethods = new HashMap<>();
+    final Map<Method, Set<TPH>> usedTPHsOfMethodSignatures = new HashMap<>();
     final Map<Method, Set<Pair>> familyOfMethods = new HashMap<>();
 
     final Set<PairLT> simplifiedConstraints = new HashSet<>();
@@ -138,6 +139,7 @@ public abstract class GenerateGenerics implements IGenerics {
 
     GenerateGenerics(JavaTXCompiler compiler, ResultSet constraints) {
         this.compiler = compiler;
+        this.constraints = constraints;
         for (var constraint : constraints.results) {
             if (constraint instanceof PairTPHsmallerTPH p) {
                 Target.logger.info(p.left + " " + p.left.getVariance());
@@ -583,7 +585,7 @@ public abstract class GenerateGenerics implements IGenerics {
         referenced.addAll(typeVariablesOfClass);
 
         generics(owner, method, result, referenced);
-        usedTPHsOfMethods.put(method, usedTphs);
+        usedTPHsOfMethodSignatures.put(method, usedTphs);
 
         normalize(result, classGenerics, usedTphs);
 
@@ -782,7 +784,7 @@ public abstract class GenerateGenerics implements IGenerics {
         }
         doIterationForMethods(classOrInterface);
         for (var method : classOrInterface.getMethods()) {
-            var usedTPHs = usedTPHsOfMethods.get(method);
+            var usedTPHs = usedTPHsOfMethodSignatures.get(method);
             if (usedTPHs != null)
                 referenced.addAll(usedTPHs);
         }
@@ -981,6 +983,11 @@ public abstract class GenerateGenerics implements IGenerics {
         } while (foundInfima);
     }
 
+    @Override
+    public ResultSet getResultSet() {
+        return this.constraints;
+    }
+
     @Override
     public TypePlaceholder getEqualType(TypePlaceholder tph) {
         return this.equality.getOrDefault(tph, tph);
@@ -1001,7 +1008,9 @@ public abstract class GenerateGenerics implements IGenerics {
     public TargetType getTargetType(RefTypeOrTPHOrWildcardOrGeneric in) {
         if (in instanceof TypePlaceholder tph) {
             if (equality.containsKey(tph)) {
-                return getTargetType(equality.get(tph));
+                var tph2 = equality.get(tph);
+                // Sanity check, they should not be equal!
+                if (!Objects.equals(in, tph2)) return getTargetType(tph2);
             }
             var type = concreteTypes.get(new TPH(tph));
             if (type == null) return new TargetGenericType(tph.getName());

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

@@ -15,6 +15,10 @@ public class GenericsResult {
         this.generics = generics;
     }
 
+    public IGenerics getGenerics() {
+        return this.generics;
+    }
+
     public GenericsResultSet get(ClassOrInterface clazz) {
         var generics = this.generics.generics(clazz);
         return new GenericsResultSet(generics, this.generics);

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

@@ -1,10 +1,12 @@
 package de.dhbwstuttgart.target.generate;
 
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.target.tree.type.TargetType;
 import de.dhbwstuttgart.typeinference.result.PairTPHequalRefTypeOrWildcardType;
 import de.dhbwstuttgart.typeinference.result.PairTPHsmallerTPH;
 import de.dhbwstuttgart.typeinference.result.ResultPair;
 import org.antlr.v4.codegen.model.decl.ContextRuleListIndexedGetterDecl;
+import org.jspecify.annotations.NonNull;
 
 import java.util.*;
 
@@ -18,7 +20,12 @@ public class GenericsResultSet extends AbstractSet<GenerateGenerics.Pair> {
         this.generics = generics;
     }
 
+    public IGenerics getGenerics() {
+        return this.generics;
+    }
+
     @Override
+    @NonNull
     public Iterator<GenerateGenerics.Pair> iterator() {
         return backing.iterator();
     }
@@ -28,17 +35,8 @@ public class GenericsResultSet extends AbstractSet<GenerateGenerics.Pair> {
         return backing.size();
     }
 
-    public Optional<ResultPair<?, ?>> getResultPairFor(TypePlaceholder tph) {
+    public Optional<GenerateGenerics.Pair> getResultPairFor(TypePlaceholder tph) {
         var tph2 = generics.getEqualType(tph);
-        return this.stream().filter(pair -> {
-            return pair.left.resolve().equals(tph2);
-        }).findFirst().map(pair -> {
-            ResultPair<?, ?> res = null;
-            if (pair instanceof GenerateGenerics.PairLT lt)
-                res = new PairTPHsmallerTPH(lt.left.resolve(), lt.right.resolve());
-            else if (pair instanceof GenerateGenerics.PairEQ eq)
-                res = new PairTPHequalRefTypeOrWildcardType(eq.left.resolve(), eq.right);
-            return res;
-        });
+        return this.stream().filter(pair -> pair.left.resolve().equals(tph2)).findFirst();
     }
 }

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

@@ -5,6 +5,7 @@ import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.target.tree.type.TargetType;
+import de.dhbwstuttgart.typeinference.result.ResultSet;
 
 import java.util.Set;
 
@@ -19,4 +20,6 @@ public interface IGenerics {
     TypePlaceholder getEqualType(TypePlaceholder tph);
 
     TargetType getTargetType(RefTypeOrTPHOrWildcardOrGeneric in);
+
+    ResultSet getResultSet();
 }

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

@@ -6,6 +6,7 @@ import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.target.tree.type.TargetGenericType;
 import de.dhbwstuttgart.target.tree.type.TargetType;
+import de.dhbwstuttgart.typeinference.result.ResultSet;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -57,4 +58,9 @@ public class OverlayGenerics implements IGenerics {
         }
         return ASTToTargetAST.convert(in, this, converter.compiler);
     }
+
+    @Override
+    public ResultSet getResultSet() {
+        return wrapped.getResultSet();
+    }
 }

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

@@ -1,5 +1,6 @@
 package de.dhbwstuttgart.target.generate;
 
+import com.google.common.collect.Iterables;
 import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.exceptions.DebugException;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
@@ -216,8 +217,25 @@ public class StatementToTargetExpression implements ASTVisitor {
         return ASTToTargetAST.findMethod(converter.compiler.getClass(className), name, args, generics, compiler);
     }
 
+    Optional<Method> findMethod(JavaClassName className, String name, List<TargetType> args, JavaTXCompiler compiler) {
+        return ASTToTargetAST.findMethod(converter.compiler.getClass(className), name, args, compiler);
+    }
+
     @Override
     public void visit(MethodCall methodCall) {
+
+        // Look at the signature in all result sets and check if a more specific insertion exists.
+        // If so, discard this result set by throwing an exception
+        for (var tph : Iterables.concat(List.of(methodCall.receiver.getType()), methodCall.signatureArguments())) {
+            var currentType = converter.convert(tph, generics);
+            for (var g2 : converter.all) if (g2.javaGenerics() != generics) {
+                var type = g2.javaGenerics().getTargetType(tph);
+                if (!Objects.equals(type, currentType) && converter.isSubtype(type, currentType)) {
+                    throw new DiscardResultSet();
+                }
+            }
+        }
+
         var receiverType = converter.convert(methodCall.receiver.getType(), generics);
         var isFunNType = receiverType instanceof TargetFunNType;
 
@@ -246,18 +264,20 @@ public class StatementToTargetExpression implements ASTVisitor {
         } else if (!isFunNType) {
             receiverClass = converter.compiler.getClass(receiverName);
             if (receiverClass == null) throw new DebugException("Class " + receiverName + " does not exist!");
-            foundMethod = findMethod(receiverName, methodCall.name, signature, generics, converter.compiler).orElseThrow();
+            foundMethod = findMethod(receiverName, methodCall.name, signature, converter.compiler).orElseThrow(
+                () -> new DebugException("Method " + methodCall.name + " not found (" + signature + ") on class " + receiverName)
+            );
         }
 
         if (!isFunNType) {
-            returnType = converter.convert(foundMethod.getReturnType(), generics);
+            // NOTE Not using the direct conversion method on converter to bypass adding the TPH to the used TPH list
+            returnType = ASTToTargetAST.convert(foundMethod.getReturnType(), generics, converter.compiler);
             argList = foundMethod.getParameterList().getFormalparalist().stream().map(e -> converter.convert(e.getType(), generics)).toList();
             isStatic = Modifier.isStatic(foundMethod.modifier);
             isPrivate = Modifier.isPrivate(foundMethod.modifier);
             isInterface = receiverClass.isInterface();
         }
 
-        //System.out.println(argList);
         result = new TargetMethodCall(
             converter.convert(methodCall.getType(), generics), returnType, argList,
             converter.convert(methodCall.receiver, generics),
@@ -605,6 +625,7 @@ public class StatementToTargetExpression implements ASTVisitor {
     @Override
     public void visit(RecordPattern aRecordPattern) {
         result = new TargetComplexPattern(
+            converter.convert(aRecordPattern.getCtor(), generics),
             converter.convert(aRecordPattern.getType(), generics),
             aRecordPattern.getName(),
             aRecordPattern.getSubPattern().stream().map(x -> (TargetPattern) converter.convert(x, generics)).toList()

src/main/java/de/dhbwstuttgart/target/tree/TargetGeneric.java

@@ -3,4 +3,9 @@ package de.dhbwstuttgart.target.tree;
 import de.dhbwstuttgart.target.tree.type.TargetType;
 
 public record TargetGeneric(String name, TargetType bound) {
+    @Override
+    public String toString() {
+        if (bound.equals(TargetType.Object)) return "'" + name;
+        else return "'" + name + " < " + bound;
+    }
 }

src/main/java/de/dhbwstuttgart/target/tree/TargetInterface.java

@@ -1,12 +1,13 @@
 package de.dhbwstuttgart.target.tree;
 
 import de.dhbwstuttgart.parser.scope.JavaClassName;
+import de.dhbwstuttgart.target.tree.type.TargetRefType;
 import de.dhbwstuttgart.target.tree.type.TargetType;
 
 import java.util.List;
 import java.util.Set;
 
-public record TargetInterface(int modifiers, JavaClassName qualifiedName, Set<TargetGeneric> generics, Set<TargetGeneric> txGenerics, List<TargetMethod> methods, List<TargetType> implementingInterfaces, TargetMethod staticConstructor) implements TargetStructure {
+public record TargetInterface(int modifiers, JavaClassName qualifiedName, Set<TargetGeneric> generics, Set<TargetGeneric> txGenerics, List<TargetMethod> methods, List<TargetType> implementingInterfaces, TargetMethod staticConstructor, List<TargetRefType> permittedSubtypes) implements TargetStructure {
     @Override
     public TargetType superType() {
         return null;

src/main/java/de/dhbwstuttgart/target/tree/TargetMethod.java

@@ -1,5 +1,7 @@
 package de.dhbwstuttgart.target.tree;
 
+import de.dhbwstuttgart.syntaxtree.Method;
+import de.dhbwstuttgart.target.generate.IGenerics;
 import de.dhbwstuttgart.target.tree.expression.TargetBlock;
 import de.dhbwstuttgart.target.tree.expression.TargetPattern;
 import de.dhbwstuttgart.target.tree.type.TargetType;
@@ -9,7 +11,11 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
-public record TargetMethod(int access, String name, TargetBlock block, Signature signature, Signature txSignature) {
+public record TargetMethod(int access, String name, TargetBlock block, Signature signature, Signature txSignature, Method base, IGenerics generics) {
+    public TargetMethod(int access, String name, TargetBlock block, Signature signature, Signature txSignature) {
+        this(access, name, block, signature, txSignature, null, null);
+    }
+
     public record Signature(Set<TargetGeneric> generics, List<MethodParameter> parameters, TargetType returnType) {
         public String getSignature() {
             return TargetMethod.getSignature(generics, parameters, returnType);

src/main/java/de/dhbwstuttgart/target/tree/expression/TargetComplexPattern.java

@@ -4,15 +4,15 @@ import de.dhbwstuttgart.target.tree.type.TargetType;
 
 import java.util.List;
 
-public record TargetComplexPattern(TargetType type, String name, List<TargetPattern> subPatterns) implements TargetPattern {
+public record TargetComplexPattern(TargetType ctor, TargetType type, String name, List<TargetPattern> subPatterns) implements TargetPattern {
     @Override
     public TargetComplexPattern withType(TargetType type) {
-        return new TargetComplexPattern(type, name, subPatterns);
+        return new TargetComplexPattern(ctor, type, name, subPatterns);
     }
 
     @Override
     public TargetComplexPattern withName(String name) {
-        return new TargetComplexPattern(type, name, subPatterns);
+        return new TargetComplexPattern(ctor, type, name, subPatterns);
     }
 
     @Override

src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertFactory.java

@@ -187,14 +187,14 @@ class TypeToInsertString implements ResultSetVisitor{
 
     @Override
     public void visit(TypePlaceholder typePlaceholder) {
-        ResultPair<?, ?> resultPair = null;
+        GenerateGenerics.Pair resultPair = null;
         if (constraints != null)
             resultPair = constraints.getResultPairFor(typePlaceholder).orElse(null);
         if (resultPair == null)
             resultPair = classConstraints.getResultPairFor(typePlaceholder).orElse(null);
 
         if (resultPair != null)
-            insert += ((TypePlaceholder)resultPair.getLeft()).getName();
+            insert += resultPair.left.toString();
     }
 
     @Override

src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPE.java

@@ -120,10 +120,12 @@ public class TYPE {
 
         var subPatternList = recordPattern.getSubPattern();
         var resolver = new GenericsResolverSameName();
-        var refType = (RefType) recordPattern.getType();
+        var ctorType = recordPattern.getCtor();
+
+        constraintSet.addUndConstraint(new Pair(ctorType, recordPattern.getType(), PairOperator.SMALLERDOT));
 
         var allClasses = blockInformation.getAvailableClasses();
-        var typename = refType.getName().getClassName();
+        var typename = ctorType.getName().getClassName();
 
         ClassOrInterface allClass = allClasses.stream().filter(c -> c.getClassName().getClassName().equals(typename)).findFirst().orElseThrow();
 
@@ -136,12 +138,12 @@ public class TYPE {
                 FieldAssumption assumption = new FieldAssumption(param.getName(), allClass, param.getType(), blockInformation.getCurrentTypeScope());
 
                 var fieldCons = new Pair(el.getType(), assumption.getType(resolver), PairOperator.SMALLERDOT);
-                var recvCons = new Pair(refType, assumption.getReceiverType(resolver), PairOperator.EQUALSDOT);
+                var recvCons = new Pair(ctorType, assumption.getReceiverType(resolver), PairOperator.EQUALSDOT);
                 constraintSet.addUndConstraint(fieldCons);
                 constraintSet.addUndConstraint(recvCons);
 
-                for (var i = 0; i < refType.getParaList().size(); i++) {
-                    constraintSet.addUndConstraint(new Pair(refType.getParaList().get(i),
+                for (var i = 0; i < ctorType.getParaList().size(); i++) {
+                    constraintSet.addUndConstraint(new Pair(ctorType.getParaList().get(i),
                             ((RefType)assumption.getReceiverType(resolver)).getParaList().get(i),
                             PairOperator.EQUALSDOT));
                 }

src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java

@@ -392,6 +392,8 @@ public class TYPEStmt implements StatementVisitor {
 
     @Override
     public void visit(BoolExpression expr) {
+        expr.lexpr.accept(this);
+        expr.rexpr.accept(this);
 
         constraintsSet.addUndConstraint(new Pair(bool, expr.getType(), PairOperator.EQUALSDOT, loc(expr.getOffset())));
         constraintsSet.addUndConstraint(new Pair(bool, expr.lexpr.getType(), PairOperator.EQUALSDOT, loc(expr.getOffset())));
@@ -736,12 +738,12 @@ public class TYPEStmt implements StatementVisitor {
 
         for (int i = 0; i < foMethod.arglist.getArguments().size(); i++) {
             // Zuordnung von MethoCall.signature (Argumenttypen) zu der Argumenttypen der ausgewaehlten Methode (assumption.params)
-            ret.add(new Pair(foMethod.signature.get(i), assumption.getArgTypes().get(i), PairOperator.EQUALSDOT));
+            ret.add(new Pair(resolver.resolve(foMethod.signature.get(i)), resolver.resolve(assumption.getArgTypes().get(i)), PairOperator.EQUALSDOT));
 
         }
 
         // Zuordnung von MethodCall.signature(ReturnType) zu dem ReturnType der ausgewaehlten Methode (assumption.returnType)
-        ret.add(new Pair(foMethod.signature.getLast(), assumption.getReturnType(), PairOperator.EQUALSDOT));
+        ret.add(new Pair(resolver.resolve(foMethod.signature.getLast()), resolver.resolve(assumption.getReturnType()), PairOperator.EQUALSDOT));
         return ret;
     }
 

src/main/java/de/dhbwstuttgart/typeinference/unify/RuleSet.java

@@ -755,7 +755,7 @@ public class RuleSet implements IRuleSet{
 		
 		UnifyType lhsType = pair.getLhsType();
 		UnifyType rhsType = pair.getRhsType();
-		if(!(lhsType instanceof ReferenceType) || !(rhsType instanceof ExtendsType))
+		if((!(lhsType instanceof ReferenceType) && !(lhsType instanceof FunNType)) || !(rhsType instanceof ExtendsType))
 			return Optional.empty();
 		
 		return Optional.of(new UnifyPair(lhsType, ((ExtendsType) rhsType).getExtendedType(), PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
@@ -781,7 +781,7 @@ public class RuleSet implements IRuleSet{
 		
 		UnifyType lhsType = pair.getLhsType();
 		UnifyType rhsType = pair.getRhsType();
-		if(!(lhsType instanceof ReferenceType) || !(rhsType instanceof SuperType))
+		if((!(lhsType instanceof ReferenceType) && !(lhsType instanceof FunNType)) || !(rhsType instanceof SuperType))
 			return Optional.empty();
 		
 		return Optional.of(new UnifyPair(((SuperType) rhsType).getSuperedType(), lhsType, PairOperator.SMALLERDOTWC, pair.getSubstitution(), pair.getBasePair()));
@@ -904,7 +904,7 @@ public class RuleSet implements IRuleSet{
 
 			var fiArgs = intf.getFunctionalInterfaceTypeArguments(refType);
 			var retType = fiArgs.getFirst();
-			var lhsArgs = intf.getFunctionalInterfaceTypeArguments(lhsType);
+			var lhsArgs = intf.getFunctionalInterfaceTypeArguments(lhsType); //FALSCHRUM????
 			var lhsRet = lhsArgs.getFirst();
 
 			Set<UnifyPair> result = new HashSet<>();
@@ -972,15 +972,65 @@ public class RuleSet implements IRuleSet{
 	}
 
 	@Override
-	public Optional<Set<UnifyPair>> smallerFunN(UnifyPair pair) {
+	public Optional<Set<UnifyPair>> smallerFunN(UnifyPair pair, IFiniteClosure fc) {
 		if(pair.getPairOp() != PairOperator.SMALLERDOT)
 			return Optional.empty();
 		
 		UnifyType lhsType = pair.getLhsType();
 		UnifyType rhsType = pair.getRhsType();
 		
-		if(!(lhsType instanceof PlaceholderType) || !(rhsType instanceof FunNType))
+		if(!(rhsType instanceof FunNType))
 			return Optional.empty();
+		
+		/* muss nach angepasst werden */
+		//FunN$$<...> <. FunctinalInterface<...> wird umgewandelt in FunN$$<...> <. FunN$$<... args aus FuntionalInterface ...>
+		if (lhsType instanceof ReferenceType) {
+			UnifyType typeFI = pair.getLhsType();
+					
+			Optional<UnifyType> opt = fc.getRightHandedFunctionalInterfaceType(typeFI.getName());
+			if(!opt.isPresent())
+				return Optional.empty();
+					
+			if (!(typeFI instanceof ReferenceType refType) || !(refType instanceof FunInterfaceType intf))
+				return Optional.empty();
+
+			var fiArgs = intf.getFunctionalInterfaceTypeArguments(refType);
+			var retType = fiArgs.getFirst();
+			var rhsArgs = intf.getFunctionalInterfaceTypeArguments(rhsType);
+			var rhsRet = rhsArgs.getFirst();
+
+			Set<UnifyPair> result = new HashSet<>();
+			//if (retType instanceof ExtendsType) {
+				result.add(new UnifyPair(retType, rhsRet, PairOperator.SMALLER));
+			//} else if (retType instanceof SuperType) {
+			//	return Optional.empty();
+			//} else {
+			//	result.add(new UnifyPair(lhsRet, retType, PairOperator.EQUALSDOT));
+			//}
+
+			for (var i = 1; i < fiArgs.size(); i++) {
+				var rh = rhsArgs.get(i);
+				var lh = fiArgs.get(i);
+
+				//if (rh instanceof SuperType) {
+					result.add(new UnifyPair(rh, lh, PairOperator.SMALLER));
+				//} else if (rh instanceof ExtendsType) {
+				//			return Optional.empty();
+				//} else {
+				//	result.add(new UnifyPair(lh, rh, PairOperator.EQUALSDOT));
+				//}
+			}
+
+			return Optional.of(result);
+		}
+
+		else {
+			if(!(lhsType instanceof PlaceholderType))
+				return Optional.empty();
+		}
+		
+		
+		
 
 		FunNType funNRhsType = (FunNType) rhsType;
 
@@ -1017,7 +1067,122 @@ public class RuleSet implements IRuleSet{
 
 		return Optional.of(result);
 	}
+	
+	@Override
+	public Optional<Set<UnifyPair>> reduceFIFunN(UnifyPair pair, IFiniteClosure fc) {
+		if(pair.getPairOp() != PairOperator.EQUALSDOT)
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		UnifyType rhsType = pair.getRhsType();
+		
+		if(!(rhsType instanceof FunNType))
+			return Optional.empty();
+		
+		/* muss nach angepasst werden */
+		//FunN$$<...> <. FunctinalInterface<...> wird umgewandelt in FunN$$<...> <. FunN$$<... args aus FuntionalInterface ...>
+		if (lhsType instanceof ReferenceType) {
+			UnifyType typeFI = pair.getLhsType();
+					
+			Optional<UnifyType> opt = fc.getRightHandedFunctionalInterfaceType(typeFI.getName());
+			if(!opt.isPresent())
+				return Optional.empty();
+					
+			if (!(typeFI instanceof ReferenceType refType) || !(refType instanceof FunInterfaceType intf))
+				return Optional.empty();
 
+			var fiArgs = intf.getFunctionalInterfaceTypeArguments(refType);
+			var retType = fiArgs.getFirst();
+			var rhsArgs = intf.getFunctionalInterfaceTypeArguments(rhsType);
+			var rhsRet = rhsArgs.getFirst();
+
+			Set<UnifyPair> result = new HashSet<>();
+			//if (retType instanceof ExtendsType) {
+				result.add(new UnifyPair(retType, rhsRet, PairOperator.EQUALSDOT));
+			//} else if (retType instanceof SuperType) {
+			//	return Optional.empty();
+			//} else {
+			//	result.add(new UnifyPair(lhsRet, retType, PairOperator.EQUALSDOT));
+			//}
+
+			for (var i = 1; i < fiArgs.size(); i++) {
+				var rh = rhsArgs.get(i);
+				var lh = fiArgs.get(i);
+
+				//if (rh instanceof SuperType) {
+					result.add(new UnifyPair(rh, lh, PairOperator.EQUALSDOT));
+				//} else if (rh instanceof ExtendsType) {
+				//			return Optional.empty();
+				//} else {
+				//	result.add(new UnifyPair(lh, rh, PairOperator.EQUALSDOT));
+				//}
+			}
+
+			return Optional.of(result);
+		}
+		else {
+			return Optional.empty();
+		}
+	}
+	
+	@Override
+	public Optional<Set<UnifyPair>> reduceFunNFi(UnifyPair pair, IFiniteClosure fc) {
+		if(pair.getPairOp() != PairOperator.EQUALSDOT)
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		UnifyType rhsType = pair.getRhsType();
+		
+		if(!(lhsType instanceof FunNType)) 
+			return Optional.empty();
+		
+		//FunN$$<...> <. FunctinalInterface<...> wird umgewandelt in FunN$$<...> <. FunN$$<... args aus FuntionalInterface ...>
+		if (rhsType instanceof ReferenceType) {
+			UnifyType typeFI = pair.getRhsType();
+			
+			Optional<UnifyType> opt = fc.getRightHandedFunctionalInterfaceType(typeFI.getName());
+			if(!opt.isPresent())
+				return Optional.empty();
+			
+			if (!(typeFI instanceof ReferenceType refType) || !(refType instanceof FunInterfaceType intf))
+				return Optional.empty();
+
+			var fiArgs = intf.getFunctionalInterfaceTypeArguments(refType);
+			var retType = fiArgs.getFirst();
+			var lhsArgs = intf.getFunctionalInterfaceTypeArguments(lhsType);
+			var lhsRet = lhsArgs.getFirst();
+
+			Set<UnifyPair> result = new HashSet<>();
+			//if (retType instanceof ExtendsType) {
+			//	result.add(new UnifyPair(lhsRet, retType, PairOperator.SMALLERDOTWC));
+			//} else if (retType instanceof SuperType) {
+			//	return Optional.empty();
+			//} else {
+				result.add(new UnifyPair(lhsRet, retType, PairOperator.EQUALSDOT));
+			//}
+
+			for (var i = 1; i < fiArgs.size(); i++) {
+				var lh = lhsArgs.get(i);
+				var rh = fiArgs.get(i);
+
+				//if (rh instanceof SuperType) {
+				//	result.add(new UnifyPair(lh, rh, PairOperator.SMALLERDOTWC));
+				//} else if (rh instanceof ExtendsType) {
+				//	return Optional.empty();
+				//} else {
+					result.add(new UnifyPair(lh, rh, PairOperator.EQUALSDOT));
+				//}
+			}
+
+			return Optional.of(result);
+		}
+
+		else {
+				return Optional.empty();
+		}
+	}
+
+	
 	@Override
 	public Optional<UnifyPair> reduceTph(UnifyPair pair) {
 		if(pair.getPairOp() != PairOperator.SMALLERDOTWC)
@@ -1025,7 +1190,7 @@ public class RuleSet implements IRuleSet{
 		
 		UnifyType lhsType = pair.getLhsType();
 		UnifyType rhsType = pair.getRhsType();
-		if(!(lhsType instanceof PlaceholderType) || !(rhsType instanceof ReferenceType))
+		if(!(lhsType instanceof PlaceholderType) || (!(rhsType instanceof ReferenceType) && !(rhsType instanceof FunNType)))
 			return Optional.empty();
 		
 		return Optional.of(new UnifyPair(lhsType, rhsType, PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));

src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java

@@ -29,6 +29,7 @@ import de.dhbwstuttgart.util.Logger;
 import de.dhbwstuttgart.util.Pair;
 import de.dhbwstuttgart.util.Tuple;
 import java.io.Serial;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -150,12 +151,15 @@ public class TypeUnifyTask extends CancellableTask<CompletableFuture<Set<Set<Uni
     this.fc = fc;
     this.oup = new OrderingUnifyPair(fc, context);
 
-    this.context = (!ConsoleInterface.writeLogFiles || context.logger() instanceof ServerTaskLogger) ? context : context.newWithLogger(
-      Logger.forFile(
-        System.getProperty("user.dir") + "/logFiles/" + "Thread",
-        "Unify"
-      )
-    );
+    if (!ConsoleInterface.writeLogFiles || context.logger() instanceof ServerTaskLogger) this.context = context;
+    else {
+      var baseFolder = Path.of(System.getProperty("user.dir"), "logFiles");
+      this.context = context.newWithLogger(
+        Logger.forFile(
+          baseFolder.resolve("Thread_" + Thread.currentThread().hashCode() + ".txt").toString(), "Unify"
+        )
+      );
+    }
 
     /*Abbruchtest
     if (thNo > 10) {
@@ -1239,7 +1243,7 @@ public class TypeUnifyTask extends CancellableTask<CompletableFuture<Set<Set<Uni
       // FunN Rules
       optSet = optSet.isPresent() ? optSet : rules.reduceFunN(pair);
       optSet = optSet.isPresent() ? optSet : rules.greaterFunN(pair, fc);
-      optSet = optSet.isPresent() ? optSet : rules.smallerFunN(pair);
+      optSet = optSet.isPresent() ? optSet : rules.smallerFunN(pair, fc);
 
       // One of the rules has been applied
       if (optSet.isPresent()) {

src/main/java/de/dhbwstuttgart/typeinference/unify/UnifyResultModel.java

@@ -39,7 +39,8 @@ public class UnifyResultModel {
 	public void notify(Set<Set<UnifyPair>> eqPrimePrimeSet, UnifyContext context) {
 		Set<Set<UnifyPair>> eqPrimePrimeSetRet = eqPrimePrimeSet.stream().map(x -> {
 			Optional<Set<UnifyPair>> res = new RuleSet(context.placeholderRegistry()).subst(x.stream().map(y -> {
-				if (y.getPairOp() == PairOperator.SMALLERDOTWC) y.setPairOp(PairOperator.EQUALSDOT);
+				if (y.getPairOp() == PairOperator.SMALLERDOTWC) 
+					y.setPairOp(PairOperator.EQUALSDOT);
 				return y; //alle Paare a <.? b erden durch a =. b ersetzt
 			}).collect(Collectors.toCollection(HashSet::new)));
 			if (res.isPresent()) {//wenn subst ein Erg liefert wurde was veraendert

src/main/java/de/dhbwstuttgart/typeinference/unify/interfaces/IRuleSet.java

@@ -61,7 +61,9 @@ public interface IRuleSet {
 	 */
 	public Optional<Set<UnifyPair>> reduceFunN(UnifyPair pair);
 	public Optional<Set<UnifyPair>> greaterFunN(UnifyPair pair, IFiniteClosure fc);
-	public Optional<Set<UnifyPair>> smallerFunN(UnifyPair pair);
+	public Optional<Set<UnifyPair>> smallerFunN(UnifyPair pair,  IFiniteClosure fc);
+	public Optional<Set<UnifyPair>> reduceFIFunN(UnifyPair pair, IFiniteClosure fc);
+	public Optional<Set<UnifyPair>> reduceFunNFi(UnifyPair pair, IFiniteClosure fc);
 	
 	/**
 	 * Checks whether the erase1-Rule applies to the pair.

src/main/java/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java

@@ -684,6 +684,7 @@ public class FiniteClosure //extends Ordering<UnifyType> //entfernt PL 2018-12-1
 
         return Optional.empty();
     }
+  
 
     @Override
     public Set<UnifyType> getAncestors(UnifyType t) {

src/main/java/de/dhbwstuttgart/util/Logger.java

@@ -3,11 +3,13 @@ package de.dhbwstuttgart.util;
 import com.diogonunes.jcolor.Attribute;
 import de.dhbwstuttgart.core.ConsoleInterface;
 import de.dhbwstuttgart.server.SocketServer;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.output.NullOutputStream;
+
+import java.io.*;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
@@ -19,12 +21,42 @@ import static com.diogonunes.jcolor.Ansi.colorize;
 
 public class Logger {
 
-  public static final Logger NULL_LOGGER = new NullLogger();
   private static final DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
   protected final Writer writer;
   protected final String prefix;
 
+  private static final File logFolder = new File(System.getProperty("user.dir") + "/logFiles/");
+  public static final Logger NULL_LOGGER = new NullLogger();
+
+  private static Writer defaultWriter;
+  private static void initLogger() {
+    if (defaultWriter != null) return;
+    if (!ConsoleInterface.writeLogFiles) return;
+    try {
+      Files.createDirectories(logFolder.toPath());
+    } catch (Exception e) {
+      throw new RuntimeException("Could not create directory for log files: " + logFolder, e);
+    }
+    var formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm-ss");
+    var currentTimestamp = LocalDateTime.now().format(formatter);
+    try {
+      defaultWriter = new FileWriter(new File(logFolder, currentTimestamp + ".txt"));
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public static void resetLogs() {
+    defaultWriter = null;
+      try {
+          FileUtils.cleanDirectory(logFolder);
+      } catch (IOException e) {
+          throw new RuntimeException(e);
+      }
+      initLogger();
+  }
+
   public Logger() {
     this(null, "");
   }
@@ -35,9 +67,15 @@ public class Logger {
 
   public Logger(Writer writer, String prefix) {
     this.prefix = (Objects.equals(prefix, "")) ? "" : "["+prefix+"] ";
+    initLogger();
     this.writer = writer;
   }
 
+  private Writer getWriter() {
+    if (writer != null) return writer;
+    return defaultWriter;
+  }
+
   /**
    * Create a new logger object from the path provided
    *
@@ -87,6 +125,7 @@ public class Logger {
    * @param logLevel  If logLevel == error, then print to stderr or print to stdout otherwise
    */
   protected void print(String s, LogLevel logLevel) {
+    if (!ConsoleInterface.writeToConsole) return;
     String coloredPrefix = this.getPrefix(logLevel);
 
     // if we are running the server, prepend the timestamp
@@ -113,11 +152,13 @@ public class Logger {
    * @param s   The string to print
    */
   protected void write(String s) {
+    var writer = getWriter();
     if (writer != null && ConsoleInterface.writeLogFiles) {
       // writing to file should only be done when necessary
       synchronized (writer) {
         try {
-          writer.write(s);
+          writer.write(s + "\n");
+          writer.flush();
         }
         catch (IOException exception) {
           throw new RuntimeException("Failed writing to file", exception);

src/test/java/AllgemeinTest.java

@@ -14,7 +14,9 @@ import org.junit.jupiter.api.Test;
 
 import com.google.common.collect.Lists;
 
+import de.dhbwstuttgart.core.ConsoleInterface;
 import de.dhbwstuttgart.core.JavaTXCompiler;
+import de.dhbwstuttgart.util.Logger.LogLevel;
 
 public class AllgemeinTest {
 
@@ -29,6 +31,7 @@ public class AllgemeinTest {
 
 	@Test
 	public void test() throws Exception {
+		ConsoleInterface.logLevel = LogLevel.DEBUG;
 		//String className = "GenTest";
 		//String className = "Overloading_Generics";
 		//String className = "Generics";
@@ -55,6 +58,7 @@ public class AllgemeinTest {
 		//String className = "WildcardCaptureConversionTest";
 		//String className = "CaptureConversion";
 		//String className = "Pair";
+		//String className = "DublicateWildcard";
 		//String className = "UseWildcardPair";
 		//String className = "Assign";
 		//String className = "StreamTest";
@@ -63,11 +67,14 @@ public class AllgemeinTest {
 		//String className = "Cycle";
 		//String className = "TripleTest";
 		//String className = "WildcardList";
-		String className = "List";
+		//String className = "List";
 		//String className = "Box";
 		//String className = "GenBox";
 		//String className = "InnerInf";
 		//String className = "Foo";
+		//String className = "Kombinatoren_failure";
+		String className = "Kombinatoren_After_Lazy";
+		//String className = "Parser";
 		//PL 2019-10-24: genutzt fuer unterschiedliche Tests
 		path = System.getProperty("user.dir")+"/resources/AllgemeinTest/" + className + ".jav";
 		//path = System.getProperty("user.dir")+"/src/test/resources/AllgemeinTest/Overloading_Generics.jav";
@@ -76,7 +83,7 @@ public class AllgemeinTest {
 		///*
 		   compiler = new JavaTXCompiler(
                 Lists.newArrayList(new File(path)),
-                Lists.newArrayList(new File(System.getProperty("user.dir")+"/resources/bytecode/classFiles/")),
+                Lists.newArrayList(new File(System.getProperty("user.dir")+"/resources/AllgemeinTest/")),
 			   	new File(System.getProperty("user.dir")+"/resources/bytecode/classFiles/"), true);
 		//*/
 		compiler.generateBytecode();

src/test/java/TestComplete.java

@@ -1,6 +1,8 @@
 
 import de.dhbwstuttgart.core.ConsoleInterface;
 import de.dhbwstuttgart.util.Logger;
+import de.dhbwstuttgart.util.Logger.LogLevel;
+
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -318,9 +320,17 @@ public class TestComplete {
     }
 
     @Test
-    public void overloadingSortingTest() throws Exception {
+    public void sortingTest() throws Exception {
         var classFiles = generateClassFiles(createClassLoader(), "Sorting.jav");
-        var instance = classFiles.get("Sorting").getDeclaredConstructor().newInstance();
+        var Sorting = classFiles.get("Sorting");
+        var instance = Sorting.getDeclaredConstructor().newInstance();
+
+        var unsorted = List.of(10, 2, 1, 20, -1, 5);
+        var sorted = List.of(-1, 1, 2, 5, 10, 20);
+        var sort = Sorting.getDeclaredMethod("sort", List.class);
+
+        var result = sort.invoke(instance, unsorted);
+        assertEquals(sorted, result);
     }
 
     @Test
@@ -764,6 +774,8 @@ public class TestComplete {
         assertEquals("Second Element is a Text", swtch.invoke(instance, r1));
         assertEquals("Second Element is a Number", swtch.invoke(instance, r2));
     }
+
+    @Disabled("Infinite loop in type inference")
     @Test
     public void testSwitchListRecord() throws Exception {
         var classFiles = generateClassFiles(createClassLoader(), "SwitchRecordList.jav");
@@ -953,20 +965,77 @@ 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", Cons, Cons);
+        var append = clazz.getDeclaredMethod("append", List, List);
         System.out.println(append.invoke(instance, list1, list2));
     }
 
+    @Test
+    public void testPatternMatchingSpecificity() throws Exception {
+        var classFiles = generateClassFiles(createClassLoader(), "PatternMatchingSpecificity.jav");
+
+        var clazz = classFiles.get("PatternMatchingSpecificity");
+        var instance = clazz.getDeclaredConstructor().newInstance();
+        var R = classFiles.get("R");
+
+        Integer i = 20;
+        var r = R.getDeclaredConstructor(Number.class).newInstance(i);
+
+        var m = clazz.getDeclaredMethod("m", R);
+        assertEquals(1, m.invoke(instance, r));
+    }
+
+    @Test
+    public void testPatternMatchingCaptures() throws Exception {
+        var classFiles = generateClassFiles(createClassLoader(), "PatternMatchingCaptures.jav");
+
+        var clazz = classFiles.get("PatternMatchingCaptures");
+        var R = classFiles.get("R");
+        var Base = classFiles.get("Base");
+        var r = R.getDeclaredConstructor(Integer.class).newInstance(10);
+
+        var instance = clazz.getDeclaredConstructor().newInstance();
+        var test1 = clazz.getDeclaredMethod("test1", Base);
+        assertEquals(10, test1.invoke(instance, r));
+
+        var test2 = clazz.getDeclaredMethod("test2", Base);
+        assertEquals(10, test1.invoke(instance, r));
+
+        var test3 = clazz.getDeclaredMethod("test3", R);
+        assertEquals(10, test1.invoke(instance, r));
+
+        var test4 = clazz.getDeclaredMethod("test4", R);
+        assertEquals(10, test1.invoke(instance, r));
+
+        var test5 = clazz.getDeclaredMethod("test5", R);
+        assertEquals(10, test1.invoke(instance, r));
+
+        var test6 = clazz.getDeclaredMethod("test6", R);
+        assertEquals(10, test1.invoke(instance, r));
+    }
+
     @Test
     public void testPatternMatchingZip() throws Exception {
         var classFiles = generateClassFiles(createClassLoader(), "PatternMatching.jav");
         var clazz = classFiles.get("PatternMatching");
         var instance = clazz.getDeclaredConstructor().newInstance();
+
+        var Cons = classFiles.get("Cons");
+        var Empty = classFiles.get("Empty");
+        var List = classFiles.get("List");
+
+        var ConsCtor = Cons.getDeclaredConstructor(Object.class, List);
+        var EmptyCtor = Empty.getDeclaredConstructor();
+
+        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 zip = clazz.getDeclaredMethod("zip", List, List);
+        System.out.println(zip.invoke(instance, list1, list2));
     }
 
+    @Disabled("Invalid file, check this later")
     @Test
     public void testPatternMatchingZipJava() throws Exception {
-        ConsoleInterface.logLevel = Logger.LogLevel.DEBUG;
         var classFiles = generateClassFiles(createClassLoader(), false, "PatternMatchingJava.jav", "PatternMatchingJava2.jav");
         var clazz = classFiles.get("PatternMatchingJava");
         var instance = clazz.getDeclaredConstructor().newInstance();
@@ -1388,6 +1457,7 @@ public class TestComplete {
     }
 
     @Test
+    @Disabled("too slow")
     public void testBug325() throws Exception {
         var classFiles = generateClassFiles(createClassLoader(), "Bug325.jav");
         var clazz = classFiles.get("Bug325");
@@ -1536,10 +1606,24 @@ public class TestComplete {
         // TODO This logs output that we should validate
     }
 
+    @Test
+    public void testBug389() throws Exception {
+        var classFiles = generateClassFiles(createClassLoader(), false, "Bug389.jav", "Bug389Main.jav");
+        var clazz = classFiles.get("Bug389Main");
+        clazz.getDeclaredMethod("main", List.class).invoke(null, List.of());
+    }
+
     @Test
     public void testBug390() throws Exception {
         var classFiles = generateClassFiles(createClassLoader(), "Bug390.jav");
         var clazz = classFiles.get("Bug390");
         clazz.getDeclaredMethod("main", List.class).invoke(null, List.of());
     }
+
+    @Test
+    public void testBug392() throws Exception {
+        var classFiles = generateClassFiles(createClassLoader(), "Bug392.jav");
+        var clazz = classFiles.get("Bug392");
+        clazz.getDeclaredMethod("main", List.class).invoke(null, List.of());
+    }
 }

src/test/java/TestTypeDeployment.java

@@ -19,14 +19,11 @@ public class TestTypeDeployment {
         var path = Path.of(System.getProperty("user.dir"), "/resources/bytecode/javFiles/Cycle.jav");
         var file = path.toFile();
         var compiler = new JavaTXCompiler(file);
+        compiler.parseAll();
         var parsedSource = compiler.sourceFiles.get(file);
         var tiResults = compiler.typeInference(file);
         Set<TypeInsert> tips = new HashSet<>();
 
-        for (var sf : compiler.sourceFiles.values()) {
-            Map<JavaClassName, byte[]> bytecode = compiler.generateBytecode(sf, tiResults);
-        }
-
         System.out.println(compiler.getGeneratedGenerics());
 
         for (int i = 0; i < tiResults.size(); i++) {

src/test/java/server/ServerTest.java

@@ -59,6 +59,7 @@ public class ServerTest {
 
     // get information from the compiler
     JavaTXCompiler compiler = new JavaTXCompiler(List.of(file));
+    compiler.parseAll();
 
     // NOW: simulate the call to method typeInference. Once via server and once locally
     // if everything works, they should neither interfere with each other nor differ in their result

src/test/java/targetast/TestGenerics.java

@@ -49,6 +49,7 @@ public class TestGenerics {
     private static Result computeGenerics(String filename) throws IOException, ClassNotFoundException {
         var file = Path.of(rootDirectory + filename).toFile();
         var compiler = new JavaTXCompiler(List.of(file), List.of(file.getParentFile()), new File(bytecodeDirectory), true);
+        compiler.parseAll();
         var inference = compiler.typeInference(file);
         compiler.generateBytecode(new File(bytecodeDirectory), inference);
         var sf = compiler.sourceFiles.get(file);