prototype implementation of scc unification

resources/bytecode/javFiles/Bug365.jav

@@ -2,7 +2,7 @@ import java.lang.String;
 import java.lang.Object;
 
 public class Bug365{
-  swap(Fun1$$<String, Fun1$$<String, Object>> f){
+  swap(f){
     return x -> y -> f.apply(y).apply(x);
   }
 
@@ -18,8 +18,4 @@ public class Bug365{
     var func = x -> y -> z -> x + y + z;
     return swap(func).apply("A").apply("B").apply("C");
   }
-  public ex3() {
-    var func = x -> y -> x + y;
-    return swap(func).apply("A").apply("B");
-  }
 }

resources/bytecode/javFiles/Bug380.jav

@@ -3,7 +3,7 @@ record Cons<T>(T a , List<T> l ) implements List <T> {}
 record Empty<T>() implements List <T> {}
 
 public class Bug380 {
-    public <T> List<T> append(List<T> l1, List<T> l2) {
+    public <T> List<T> append(l1, List<T> l2) {
         return switch ( l1 ) {
             case Cons(e, rest) -> new Cons<>(e, append(rest, l2)); //::Typ TPH A
             case Empty() -> l2;//::TPH B

resources/bytecode/javFiles/Fac.jav

@@ -4,7 +4,7 @@ import java.lang.String;
 
 public class Fac {
 	getFac(n) {
-		Double res = 1;
+		var res = 1;
 		var i = 1;
 		while (i <= n) {
 			res = res * i;

resources/bytecode/javFiles/GenericRecordSwitchCase.jav

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

resources/bytecode/javFiles/HelloWorld.jav

@@ -5,8 +5,6 @@ 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!");
+        System.out.println((Object)"Hello World!");
     }
 }

resources/bytecode/javFiles/PatternMatching.jav

@@ -5,9 +5,21 @@ public record Empty<T>() implements List<T> {}
 public record Pair<T1, T2>(T1 a, T2 b) {}
 
 public class PatternMatching {
-    // Anmerkung: Typ muss angegeben werden
-    public <A, B> Cons<Pair<A, B>> zip(Cons(x, xs), Cons(y, ys)) {
+    public zip(Cons(x, xs), Cons(y, ys)) {
         return new Cons<>(new Pair<>(x, y), zip(xs, ys));
     }
     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(); }
+    public zip(Empty x, Empty y) { return new Empty(); }
+    */
+
+    /*
+    Generiert:
+    Cons zip<T>(Cons(T x, Cons xs), Cons(T y, Cons ys))
+    Cons zip<T>(Cons(T x, Cons xs), Cons(T y, Empty ys))
+    Cons zip<T>(Cons(T x, Empty xs), Cons(T y, Cons ys))
+    Cons zip<T>(Cons(T x, Empty xs), Cons(T y, Empty ys))
+    */
 }

resources/bytecode/javFiles/Sorting.jav

@@ -1,25 +1,23 @@
 import java.util.List;
 import java.util.ArrayList;
-import java.lang.Integer;
+import java.lang.String;
 
 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;
+    merge(a, b){
+        a.addAll(b);
+        return a;
     }
 
-    split(list) {
-        var mid = list.size() / 2;
-        return List.of(list.subList(0, mid), list.subList(mid, list.size()));
+sort(in){
+	var firstHalf = in;
+	var secondHalf = in; 
+	return merge(sort(firstHalf), sort(secondHalf));
 }
 
-    public sort(in) {
-        if (in.size() <= 1) return in;
-        var halves = split(in);
-        return merge(sort(halves.get(0)), sort(halves.get(1)));
+
+	/*
+	void sort(a){
+		a = merge(a,a);
 	}
+	*/
 }

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

@@ -350,8 +350,6 @@ 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)) {
@@ -815,9 +813,7 @@ public class Codegen {
     private static TargetType removeGenerics(TargetType param) {
         return switch (param) {
             case null -> null;
-            case TargetFunNType funNType -> new TargetFunNType(funNType.name(),
-                    funNType.funNParams().stream().map(Codegen::removeGenerics).toList(), List.of(),
-                    funNType.returnArguments(), funNType.isInterface());
+            case TargetFunNType funNType -> new TargetFunNType(funNType.name(), funNType.funNParams().stream().map(Codegen::removeGenerics).toList(), List.of(), funNType.returnArguments());
             case TargetRefType refType -> new TargetRefType(refType.name());
             case TargetGenericType targetGenericType -> TargetType.Object;
             default -> param;
@@ -1444,7 +1440,6 @@ public class Codegen {
         for (var i = 0; i < aSwitch.cases().size(); i++) {
             mv.visitLabel(caseLabels[i]);
             var cse = aSwitch.cases().get(i);
-            state.enterScope();
 
             if (cse.labels().size() == 1) {
                 var label = cse.labels().get(0);
@@ -1473,8 +1468,6 @@ public class Codegen {
             if (cse.isSingleExpression() && aSwitch.isExpression())
                 yieldValue(state, cse.body().statements().get(0).type());
             if (aSwitch.isExpression()) mv.visitJumpInsn(GOTO, end);
-
-            state.exitScope();
         }
 
         mv.visitLabel(defaultLabel);

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) {
-		super(message);
+		System.err.print(message);
 	}
 }

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

@@ -482,8 +482,8 @@ 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.type == null ? TypePlaceholder.fresh(recordPatternCtx.getStart()) : TypeGenerator.convert(recordPatternCtx.type, 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, (RefType)ctor, recordPatternCtx.getStart());
         return ret;

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

@@ -115,10 +115,8 @@ public class ASTToTargetAST {
     public static Optional<Method> findMethod(ClassOrInterface owner, String name, List<TargetType> argumentList, IGenerics generics, JavaTXCompiler compiler) {
         Optional<Method> method = Optional.empty();
         while (method.isEmpty()) {
-            method = owner.getMethods().stream().filter(m -> {
-                return m.name.equals(name) &&
-                    parameterEquals(m.getParameterList().getFormalparalist().stream().map(p -> generics.getTargetType(p.getType())).toList(), argumentList);
-            }).findFirst();
+            method = owner.getMethods().stream().filter(m -> m.name.equals(name) &&
+                    parameterEquals(m.getParameterList().getFormalparalist().stream().map(p -> generics.getTargetType(p.getType())).toList(), argumentList)).findFirst();
             if (owner.getClassName().toString().equals("java.lang.Object")) break;
             owner = compiler.getClass(owner.getSuperClass().getName());
         }
@@ -174,7 +172,7 @@ public class ASTToTargetAST {
             case TargetSuperWildcard targetSuperWildcard -> new SuperType(toUnifyType(targetSuperWildcard.innerType()));
             case TargetGenericType targetGenericType -> new PlaceholderType(targetGenericType.name(), JavaTXCompiler.defaultClientPlaceholderRegistry);
             case TargetPrimitiveType _ -> throw new NotImplementedException();
-            case TargetFunNType targetFunNType -> FunNType.getFunNType(new TypeParams(targetFunNType.funNParams().stream().map(ASTToTargetAST::toUnifyType).toList()));
+            case TargetFunNType targetFunNType -> FunNType.getFunNType(new TypeParams(targetFunNType.params().stream().map(ASTToTargetAST::toUnifyType).toList()));
             case TargetRefType targetRefType -> new ReferenceType(targetRefType.name(), new TypeParams(targetRefType.params().stream().map(ASTToTargetAST::toUnifyType).toList()));
         };
     }
@@ -184,7 +182,7 @@ public class ASTToTargetAST {
             case ExtendsType extendType -> new TargetExtendsWildcard(toTargetType(extendType.getExtendedType()));
             case SuperType superType -> new TargetSuperWildcard(toTargetType(superType.getSuperedType()));
             case PlaceholderType placeholderType -> new TargetGenericType(placeholderType.getName());
-            case FunNType funNType -> TargetFunNType.fromParams(StreamSupport.stream(funNType.getTypeParams().spliterator(), false).map(ASTToTargetAST::toTargetType).toList(), 1, false); // FIXME How does this work with Fun0??
+            case FunNType funNType -> TargetFunNType.fromParams(StreamSupport.stream(funNType.getTypeParams().spliterator(), false).map(ASTToTargetAST::toTargetType).toList(), 1); // FIXME How does this work with Fun0??
             case ReferenceType referenceType -> new TargetRefType(referenceType.getName(), StreamSupport.stream(referenceType.getTypeParams().spliterator(), false).map(ASTToTargetAST::toTargetType).toList());
             default -> throw new NotImplementedException();
         };
@@ -217,12 +215,9 @@ public class ASTToTargetAST {
 
     private static Optional<TargetType> unify(TargetType a, TargetType b) {
         if (typesStrictlyEqual(a, b)) return Optional.ofNullable(a);
-        if (a instanceof TargetFunNType || b instanceof TargetFunNType) return Optional.empty();
         var unify = new MartelliMontanariUnify();
         var ua = toUnifyType(a);
-        var ub = toUnifyType(b);
-        if (Objects.equals(ua, ub)) return Optional.of(a);
-        var unifier = unify.unify(Set.of(ua, ub));
+        var unifier = unify.unify(Set.of(ua, toUnifyType(b)));
         if (unifier.isEmpty()) return Optional.empty();
         return Optional.of(toTargetType(unifier.get().apply(ua)));
     }
@@ -336,16 +331,15 @@ public class ASTToTargetAST {
                     var u_opt = unify(m, m1);
                     if (u_opt.isPresent()) {
                         var u = u_opt.get();
-                        //System.out.println("Unified " + m + " AND " + m1 + "\n\t" + u);
+                        //Target.logger.info("Unified " + m + " AND " + m1 + "\n\t" + u);
                         i.remove(m1);
                         R.remove(m);
                         R.remove(m1);
                         R.add(u);
                         a.add(u);
-                        m = u;
-                    } else {
-                        //System.out.println("Couldn't unify " + m + " AND " + m1);
-                    }
+                    } /*else {
+                        Target.logger.info("Couldn't unify " + m + " AND " + m1);
+                    }*/
                 }
             }
         }
@@ -358,8 +352,6 @@ public class ASTToTargetAST {
         return R;
     }
 
-    private static final record CtorWithGenerics(TargetConstructor ctor, IGenerics generics) {}
-
     public TargetStructure convert(ClassOrInterface input) {
         var generics = all.getFirst();
         Set<TargetGeneric> javaGenerics = new HashSet<>();
@@ -389,33 +381,8 @@ public class ASTToTargetAST {
         TargetBlock finalFieldInitializer = fieldInitializer;
 
         var superInterfaces = input.getSuperInterfaces().stream().map(clazz -> convert(clazz, generics.javaGenerics, compiler)).toList();
-
-        var constructors = new ArrayList<TargetConstructor>();
-        for (var ctor : input.getConstructors()) {
-            var generated = new ArrayList<CtorWithGenerics>();
-            for (var g : all) {
-                try {
-                    generated.add(new CtorWithGenerics(this.convert(input, ctor, finalFieldInitializer, g), g.javaGenerics));
-                } catch (DiscardResultSet ignored) {}
-            }
-            constructors.add(generated.getFirst().ctor);
-            if (generated.size() > 1) {
-                var first = generated.getFirst();
-                for (var next : generated.subList(1, generated.size())) {
-                    if (typesAreDifferent(ctor, first.generics, next.generics)) {
-                        compiler.warn(new CompilerWarning(ctor.block.getOffset(), "Duplicate Constructor definition"));
-                    }
-                }
-            }
-        }
-
-        var fields = input.getFieldDecl().stream().map(f -> {
-            var possibleTypes = new HashSet<TargetType>();
-            for (var g : all) possibleTypes.add(convert(f.getType(), g.javaGenerics(), compiler));
-            if (possibleTypes.size() > 1)
-                compiler.warn(new CompilerWarning(f.getOffset(), "Multiple possible types for field " + f.getName() + ": " + possibleTypes + " please select one"));
-            return convert(f, generics.javaGenerics);
-        }).toList();
+        var constructors = input.getConstructors().stream().map(constructor -> this.convert(input, constructor, finalFieldInitializer, generics)).flatMap(List::stream).toList();
+        var fields = input.getFieldDecl().stream().map(f -> convert(f, generics.javaGenerics)).toList();
         var m0 = groupMethods(input, input.getMethods());
 
         var m1 = new ArrayList<TargetMethod>();
@@ -520,18 +487,29 @@ public class ASTToTargetAST {
         return convertedGenerics;
     }
 
-    private TargetConstructor convert(ClassOrInterface currentClass, Constructor input, TargetBlock fieldInitializer, Generics generics) {
+    private List<TargetConstructor> convert(ClassOrInterface currentClass, Constructor input, TargetBlock fieldInitializer, Generics generics) {
+        generics = all.get(0);
+        List<TargetConstructor> result = new ArrayList<>();
+        Set<List<MethodParameter>> parameterSet = new HashSet<>();
         this.currentMethod = input;
         this.usedTPHsOfMethods.put(input, new HashSet<>());
 
+        for (var s : all) {
+            generics = s;
             var javaGenerics = generics.javaGenerics.generics(currentClass, input);
             var txGenerics = generics.txGenerics.generics(currentClass, input);
             List<MethodParameter> params = convert(input.getParameterList(), generics.javaGenerics);
+            if (parameterSet.stream().noneMatch(p -> p.equals(params))) {
                 List<MethodParameter> txParams = convert(input.getParameterList(), generics.txGenerics);
                 var javaMethodGenerics = collectMethodGenerics(currentClass, generics.javaGenerics(), javaGenerics, input);
                 var txMethodGenerics = collectMethodGenerics(currentClass, generics.txGenerics(), txGenerics, input);
 
-        return new TargetConstructor(input.modifier, javaMethodGenerics, txMethodGenerics, params, txParams, convert(input.block, generics.javaGenerics), fieldInitializer);
+                result.add(new TargetConstructor(input.modifier, javaMethodGenerics, txMethodGenerics, params, txParams, convert(input.block, generics.javaGenerics), fieldInitializer));
+                parameterSet.add(params);
+            }
+        }
+
+        return result;
     }
 
     private static int counter = 0;
@@ -677,9 +655,7 @@ public class ASTToTargetAST {
 
     private Optional<TargetMethod> generateBridgeMethod(ClassOrInterface clazz, List<TargetMethod> methods) {
         // If there's only one method we don't need a bridge
-        if (clazz.isInterface()) return Optional.empty();
         if (methods.size() <= 1) return Optional.empty();
-
         var firstMethod = methods.getFirst();
         var ra = firstMethod.signature().returnType();
 
@@ -717,7 +693,6 @@ public class ASTToTargetAST {
 
         var classType = new TargetRefType(clazz.getClassName().getClassName());
         var stmt = generatePatternOverloadsRec(0, new TargetLocalVar(resParams.getFirst().pattern().type(), resParams.getFirst().pattern().name()), parameters, List.of(), methods, classType);
-        System.out.println(stmt);
         var block = new TargetBlock(List.of(stmt));
 
         var generics = new HashSet<>(firstMethod.signature().generics());
@@ -785,12 +760,7 @@ public class ASTToTargetAST {
                     generics.addOverlay(tph, signatureParams.get(i).pattern().type());
                 }
             }
-            TargetMethod tMethod;
-            try {
-                tMethod = convert(method, generics);
-            } catch (DiscardResultSet ignored) {
-                continue;
-            }
+            var tMethod = convert(method, generics);
             res.add(new TargetMethod(tMethod.access(), name, tMethod.block(), tMethod.signature(), tMethod.txSignature(), tMethod.base(), tMethod.generics()));
         }
 
@@ -881,12 +851,7 @@ public class ASTToTargetAST {
         for (var tph : tphs) {
             var left = a.getTargetType(tph);
             var right = b.getTargetType(tph);
-            if (left instanceof TargetExtendsWildcard wc) left = wc.innerType();
-            if (right instanceof TargetExtendsWildcard wc) right = wc.innerType();
-
-            if (!Objects.equals(left, right)) {
-                return true;
-            }
+            if (!Objects.equals(left, right)) return true;
         }
         return false;
     }
@@ -924,13 +889,10 @@ public class ASTToTargetAST {
             signatures.add(new Signature(javaSignature, txSignature, generics));
         }
 
-        for (var signature : new ArrayList<>(signatures)) {
-            try {
+        if (!signatures.isEmpty()) {
+            var signature = signatures.getFirst();
+            // We need to convert once to find out what TPHs are existing in the given method
             convert(new MethodWithTphs(method, signature.generics, signature));
-            } catch (DiscardResultSet discard) {
-                 // If a result set is discarded we skip it from now on
-                signatures.removeIf(s -> s == signature);
-            }
         }
 
         for (var signature : signatures) {
@@ -997,7 +959,7 @@ public class ASTToTargetAST {
         }
     }
 
-    static TargetType flattenFunNType(List<TargetType> params, FunNGenerator.GenericParameters gep, boolean isInterface) {
+    static TargetType flattenFunNType(List<TargetType> params, FunNGenerator.GenericParameters gep) {
         var newParams = new ArrayList<TargetType>();
         for (TargetType param : params) {
             if (param instanceof TargetSpecializedType fn) {
@@ -1011,30 +973,22 @@ public class ASTToTargetAST {
             if (i < gep.inParams.size() && gep.inParams.get(i) != null)
                 filteredParams.add(newParams.get(i));
         }
-        return TargetFunNType.fromParams(params, filteredParams, gep.getReturnType() != null ? 1 : 0, isInterface);
+        return TargetFunNType.fromParams(params, filteredParams, gep.getReturnType() != null ? 1 : 0);
     }
 
     private FunNGenerator.GenericParameters convertToParameters(TargetFunNType input) {
         return null;
     }
 
-    public boolean isSubtype(TargetType test, TargetType other) {
+    private boolean isSubtype(TargetType test, TargetType other) {
         if (other.equals(TargetType.Object)) return true;
-        if (test instanceof TargetGenericType || other instanceof TargetGenericType) return false;
         if (test instanceof TargetFunNType tfun && other instanceof TargetFunNType ofun)
             return isSubtype(new FunNGenerator.GenericParameters(tfun), new FunNGenerator.GenericParameters(ofun));
-        if (other instanceof TargetFunNType) return false;
 
         var testClass = compiler.getClass(new JavaClassName(test.name()));
         var otherClass = compiler.getClass(new JavaClassName(other.name()));
         if (testClass == null) return false;
         while (testClass != null) {
-            if (otherClass.isInterface()) {
-                for (var superInterface : testClass.getSuperInterfaces()) {
-                    if (superInterface.getName().equals(otherClass.getClassName())) return true;
-                    if (isSubtype(new TargetRefType(superInterface.getName().toString()), other)) return true;
-                }
-            }
             if (testClass.equals(otherClass)) return true;
             if (testClass.getClassName().equals(new JavaClassName("java.lang.Object"))) break;
             testClass = compiler.getClass(testClass.getSuperClass().getName());
@@ -1120,9 +1074,7 @@ public class ASTToTargetAST {
                     } else {
                         gep = compiler.usedFunN.get(className);
                     }
-                    return flattenFunNType(params, gep, true);
-                } else if (name.matches("Fun\\d+\\$\\$.*")) {
-                    return new TargetFunNType(name, List.of(), List.of(), 0, false);
+                    return flattenFunNType(params, gep);
                 }
                 return new TargetRefType(name, params);
             }

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

@@ -1,9 +0,0 @@
-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

@@ -153,6 +153,7 @@ public abstract class GenerateGenerics implements IGenerics {
         }
 
         Target.logger.info("Simplified constraints: " + simplifiedConstraints);
+
     }
 
     public record GenericsState(Map<TPH, RefTypeOrTPHOrWildcardOrGeneric> concreteTypes, Map<TypePlaceholder, TypePlaceholder> equality) {}
@@ -1008,9 +1009,7 @@ public abstract class GenerateGenerics implements IGenerics {
     public TargetType getTargetType(RefTypeOrTPHOrWildcardOrGeneric in) {
         if (in instanceof TypePlaceholder tph) {
             if (equality.containsKey(tph)) {
-                var tph2 = equality.get(tph);
-                // Sanity check, they should not be equal!
-                if (!Objects.equals(in, tph2)) return getTargetType(tph2);
+                return getTargetType(equality.get(tph));
             }
             var type = concreteTypes.get(new TPH(tph));
             if (type == null) return new TargetGenericType(tph.getName());

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

@@ -1,6 +1,5 @@
 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;
@@ -223,19 +222,6 @@ public class StatementToTargetExpression implements ASTVisitor {
 
     @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;
 
@@ -264,20 +250,18 @@ 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, converter.compiler).orElseThrow(
-                () -> new DebugException("Method " + methodCall.name + " not found (" + signature + ") on class " + receiverName)
-            );
+            foundMethod = findMethod(receiverName, methodCall.name, signature, converter.compiler).orElseThrow();
         }
 
         if (!isFunNType) {
-            // 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 -> ASTToTargetAST.convert(e.getType(), generics, converter.compiler)).toList();
+            returnType = converter.convert(foundMethod.getReturnType(), generics);
+            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),

src/main/java/de/dhbwstuttgart/target/tree/type/TargetFunNType.java

@@ -3,17 +3,16 @@ package de.dhbwstuttgart.target.tree.type;
 import de.dhbwstuttgart.bytecode.FunNGenerator;
 
 import java.util.List;
-import java.util.Objects;
 
-public record TargetFunNType(String name, List<TargetType> funNParams, List<TargetType> params, int returnArguments, boolean isInterface) implements TargetSpecializedType {
+public record TargetFunNType(String name, List<TargetType> funNParams, List<TargetType> params, int returnArguments) implements TargetSpecializedType {
 
-    public static TargetFunNType fromParams(List<TargetType> params, int returnArguments, boolean isInterface) {
-        return fromParams(params, params, returnArguments, isInterface);
+    public static TargetFunNType fromParams(List<TargetType> params, int returnArguments) {
+        return fromParams(params, params, returnArguments);
     }
 
-    public static TargetFunNType fromParams(List<TargetType> params, List<TargetType> realParams, int returnArguments, boolean isInterface) {
+    public static TargetFunNType fromParams(List<TargetType> params, List<TargetType> realParams, int returnArguments) {
         var name = FunNGenerator.getSpecializedClassName(FunNGenerator.getArguments(params), FunNGenerator.getReturnType(params));
-        return new TargetFunNType(name, params, realParams, returnArguments, isInterface);
+        return new TargetFunNType(name, params, realParams, returnArguments);
     }
 
     public String toMethodDescriptor() {
@@ -40,9 +39,4 @@ public record TargetFunNType(String name, List<TargetType> funNParams, List<Targ
         var args = FunNGenerator.getArguments(funNParams);
         return "LFun" + args.size() + "$$" + TargetSpecializedType.signatureParameters(funNParams) + ";";
     }
-
-    public boolean equals(Object other) {
-        if (!(other instanceof TargetFunNType otfn)) return false;
-        return Objects.equals(name, otfn.name);
-    }
 }

src/main/java/de/dhbwstuttgart/typeinference/dependency/CallGraphBuilder.java

@@ -0,0 +1,311 @@
+package de.dhbwstuttgart.typeinference.dependency;
+
+import de.dhbwstuttgart.core.JavaTXCompiler;
+import de.dhbwstuttgart.parser.scope.JavaClassName;
+import de.dhbwstuttgart.syntaxtree.AbstractASTWalker;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.Constructor;
+import de.dhbwstuttgart.syntaxtree.Method;
+import de.dhbwstuttgart.syntaxtree.statement.BinaryExpr;
+import de.dhbwstuttgart.syntaxtree.statement.BoolExpression;
+import de.dhbwstuttgart.syntaxtree.statement.CastExpr;
+import de.dhbwstuttgart.syntaxtree.statement.DoStmt;
+import de.dhbwstuttgart.syntaxtree.statement.Expression;
+import de.dhbwstuttgart.syntaxtree.statement.ExpressionReceiver;
+import de.dhbwstuttgart.syntaxtree.statement.ForEachStmt;
+import de.dhbwstuttgart.syntaxtree.statement.ForStmt;
+import de.dhbwstuttgart.syntaxtree.statement.IfStmt;
+import de.dhbwstuttgart.syntaxtree.statement.InstanceOf;
+import de.dhbwstuttgart.syntaxtree.statement.MethodCall;
+import de.dhbwstuttgart.syntaxtree.statement.NewClass;
+import de.dhbwstuttgart.syntaxtree.statement.Receiver;
+import de.dhbwstuttgart.syntaxtree.statement.Statement;
+import de.dhbwstuttgart.syntaxtree.statement.StaticClassName;
+import de.dhbwstuttgart.syntaxtree.statement.Super;
+import de.dhbwstuttgart.syntaxtree.statement.SuperCall;
+import de.dhbwstuttgart.syntaxtree.statement.This;
+import de.dhbwstuttgart.syntaxtree.statement.ThisCall;
+import de.dhbwstuttgart.syntaxtree.statement.Throw;
+import de.dhbwstuttgart.syntaxtree.statement.WhileStmt;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * --- Comment AI generated ---
+ * Builds the method/constructor call graph for the classes currently being compiled together --
+ * the input to splitting whole-program type inference into per-strongly-connected-component
+ * batches, so that only mutually recursive methods have to be inferred jointly.
+ *
+ * Scope, deliberately:
+ * <ul>
+ * <li>Nodes are methods and constructors with a body, declared directly in one of
+ *     {@code definedClasses}. Field initializers are NOT modeled as graph nodes here: a field is
+ *     never generalized (it has exactly one type, never a per-use-site instantiated scheme like a
+ *     method does), so it never needs SCC/mutual-recursion treatment -- only a simple topological
+ *     position relative to whatever it calls, which a separate, much simpler pass can handle.</li>
+ * <li>Inherited method copies ({@code Method.isInherited}, produced by
+ *     {@code JavaTXCompiler.addMethods}) are skipped. This builder is meant to run right after
+ *     parsing and before {@code addMethods} has run, so in practice those copies should not exist
+ *     yet; the check is kept as a defensive no-op in case that ordering assumption changes.</li>
+ * <li>Call targets are resolved using ordinary Java scoping where the receiver's type is known
+ *     syntactically without needing inference: member lookup through the current class's
+ *     hierarchy for unqualified/{@code this}-qualified calls (a member always shadows a
+ *     same-named import per JLS 15.12.1), direct resolution for {@code TypeName.foo()} calls,
+ *     {@code new Foo()}, and receivers with an explicit declared type. Only when the receiver's
+ *     own type is itself not yet known (an omitted/inferred TPH -- e.g. the result of a chained
+ *     call) does resolution fall back to a conservative name+arity match across all classes being
+ *     compiled. That fallback can only ever add edges that don't exist at runtime
+ *     (over-approximation, which just merges SCCs unnecessarily); it can never omit a real edge,
+ *     which is the property that actually matters for soundness.</li>
+ * </ul>
+ */
+public class CallGraphBuilder {
+
+
+    private final JavaTXCompiler compiler;
+    private final Set<ClassOrInterface> definedClasses;
+    private final IdentityHashMap<Method, DependencyNode> nodes = new IdentityHashMap<>();
+
+    public CallGraphBuilder(JavaTXCompiler compiler, Set<ClassOrInterface> definedClasses) {
+        this.compiler = compiler;
+        this.definedClasses = definedClasses;
+    }
+
+    public DependencyGraph build() {
+        for (ClassOrInterface cl : definedClasses) {
+            for (Method m : cl.getMethods()) {
+                if (!m.isInherited && m.block != null) nodeFor(cl, m);
+            }
+            for (Constructor c : cl.getConstructors()) {
+                if (c.block != null) nodeFor(cl, c);
+            }
+        }
+
+        Map<DependencyNode, Set<DependencyNode>> edges = new LinkedHashMap<>();
+        for (Map.Entry<Method, DependencyNode> entry : nodes.entrySet()) {
+            DependencyNode from = entry.getValue();
+            EdgeCollector collector = new EdgeCollector(from.getOwner());
+            entry.getKey().block.accept(collector);
+            edges.put(from, collector.targets);
+        }
+
+        return new DependencyGraph(new LinkedHashSet<>(nodes.values()), edges);
+    }
+
+    private DependencyNode nodeFor(ClassOrInterface owner, Method m) {
+        return nodes.computeIfAbsent(m, mm -> new DependencyNode(owner, mm));
+    }
+
+    private ClassOrInterface resolve(JavaClassName name) {
+        return compiler.getClass(name);
+    }
+
+    private ClassOrInterface typeToClass(RefTypeOrTPHOrWildcardOrGeneric type) {
+        return type instanceof RefType rt ? resolve(rt.getName()) : null;
+    }
+
+    private ClassOrInterface superClassOf(ClassOrInterface cl) {
+        return cl.getSuperClass() == null ? null : resolve(cl.getSuperClass().getName());
+    }
+
+    private List<ClassOrInterface> hierarchyOf(ClassOrInterface start) {
+        List<ClassOrInterface> result = new ArrayList<>();
+        Set<JavaClassName> visited = new HashSet<>();
+        Deque<ClassOrInterface> queue = new ArrayDeque<>();
+        queue.add(start);
+        while (!queue.isEmpty()) {
+            ClassOrInterface cl = queue.poll();
+            if (cl == null || !visited.add(cl.getClassName())) continue;
+            result.add(cl);
+            if (cl.getSuperClass() != null) queue.add(resolve(cl.getSuperClass().getName()));
+            for (RefType parent : cl.getSuperInterfaces()) {
+                queue.add(resolve(parent.getName()));
+            }
+        }
+        return result;
+    }
+
+    private boolean matches(Method m, String name, int arity) {
+        return m.getName().equals(name) && m.getParameterList().getFormalparalist().size() == arity;
+    }
+
+    private boolean hierarchyDeclaresName(ClassOrInterface start, String name) {
+        for (ClassOrInterface cl : hierarchyOf(start)) {
+            for (Method m : cl.getMethods()) {
+                if (!m.isInherited && m.getName().equals(name)) return true;
+            }
+        }
+        return false;
+    }
+
+    private Set<DependencyNode> resolveInHierarchy(ClassOrInterface start, String name, int arity) {
+        Set<DependencyNode> found = new LinkedHashSet<>();
+        for (ClassOrInterface cl : hierarchyOf(start)) {
+            if (!definedClasses.contains(cl)) continue;
+            for (Method m : cl.getMethods()) {
+                if (!m.isInherited && m.block != null && matches(m, name, arity)) found.add(nodeFor(cl, m));
+            }
+        }
+        return found;
+    }
+
+    private Set<DependencyNode> resolveConservatively(String name, int arity) {
+        Set<DependencyNode> found = new LinkedHashSet<>();
+        for (ClassOrInterface cl : definedClasses) {
+            for (Method m : cl.getMethods()) {
+                if (!m.isInherited && m.block != null && matches(m, name, arity)) found.add(nodeFor(cl, m));
+            }
+        }
+        return found;
+    }
+
+    private ClassOrInterface receiverClass(Receiver receiver, ClassOrInterface owner) {
+        if (receiver instanceof StaticClassName scn) {
+            return typeToClass(scn.getType());
+        }
+        if (receiver instanceof ExpressionReceiver er) {
+            Expression inner = er.expr;
+            if (inner instanceof This) return owner;
+            if (inner instanceof Super) return superClassOf(owner);
+            if (inner instanceof NewClass nc) return typeToClass(nc.getType());
+            // Any other expression (local var, field, parameter, ...): only resolvable when its
+            // own declared type is an explicit RefType rather than an omitted/inferred TPH.
+            if (!(inner.getType() instanceof TypePlaceholder)) return typeToClass(inner.getType());
+        }
+        return null;
+    }
+
+    private class EdgeCollector extends AbstractASTWalker {
+        private final ClassOrInterface owner;
+        final Set<DependencyNode> targets = new LinkedHashSet<>();
+
+        EdgeCollector(ClassOrInterface owner) {
+            this.owner = owner;
+        }
+
+        @Override
+        public void visit(MethodCall methodCall) {
+            super.visit(methodCall);
+            int arity = methodCall.getArgumentList().getArguments().size();
+            targets.addAll(resolveCall(methodCall.receiver, methodCall.name, arity));
+        }
+
+        @Override
+        public void visit(BinaryExpr binary) {
+            binary.lexpr.accept(this);
+            binary.rexpr.accept(this);
+        }
+
+        @Override
+        public void visit(BoolExpression logical) {
+            logical.lexpr.accept(this);
+            logical.rexpr.accept(this);
+        }
+
+        @Override
+        public void visit(CastExpr castExpr) {
+            castExpr.expr.accept(this);
+        }
+
+        @Override
+        public void visit(InstanceOf instanceOf) {
+            instanceOf.getExpression().accept(this);
+        }
+
+        @Override
+        public void visit(Throw aThrow) {
+            aThrow.expr.accept(this);
+        }
+
+        @Override
+        public void visit(IfStmt ifStmt) {
+            ifStmt.expr.accept(this);
+            super.visit(ifStmt);
+        }
+
+        @Override
+        public void visit(WhileStmt whileStmt) {
+            whileStmt.expr.accept(this);
+            super.visit(whileStmt);
+        }
+
+        @Override
+        public void visit(DoStmt doStmt) {
+            doStmt.expr.accept(this);
+            super.visit(doStmt);
+        }
+
+        @Override
+        public void visit(ForStmt forStmt) {
+            for (Statement s : forStmt.initializer) s.accept(this);
+            if (forStmt.condition != null) forStmt.condition.accept(this);
+            for (Expression e : forStmt.loopExpr) e.accept(this);
+            super.visit(forStmt);
+        }
+
+        @Override
+        public void visit(ForEachStmt forEachStmt) {
+            forEachStmt.expression.accept(this);
+            super.visit(forEachStmt);
+        }
+
+        @Override
+        public void visit(SuperCall superCall) {
+            superCall.getArgumentList().accept(this);
+            ClassOrInterface parent = superClassOf(owner);
+            if (parent != null && definedClasses.contains(parent)) {
+                int arity = superCall.getArgumentList().getArguments().size();
+                for (Constructor c : parent.getConstructors()) {
+                    if (c.getParameterList().getFormalparalist().size() == arity) targets.add(nodeFor(parent, c));
+                }
+            }
+        }
+
+        @Override
+        public void visit(ThisCall thisCall) {
+            thisCall.getArgumentList().accept(this);
+            int arity = thisCall.getArgumentList().getArguments().size();
+            for (Constructor c : owner.getConstructors()) {
+                if (c.getParameterList().getFormalparalist().size() == arity) targets.add(nodeFor(owner, c));
+            }
+        }
+
+        @Override
+        public void visit(NewClass newClass) {
+            super.visit(newClass);
+            ClassOrInterface target = typeToClass(newClass.getType());
+            if (target != null && definedClasses.contains(target)) {
+                int arity = newClass.getArgumentList().getArguments().size();
+                for (Constructor c : target.getConstructors()) {
+                    if (c.getParameterList().getFormalparalist().size() == arity) targets.add(nodeFor(target, c));
+                }
+            }
+        }
+
+        private Set<DependencyNode> resolveCall(Receiver receiver, String name, int arity) {
+            // Unqualified / this-qualified calls follow JLS 15.12.1: a member always shadows a
+            // same-named import, so search the current class's hierarchy first -- but unlike an
+            // explicitly typed receiver (below), finding nothing there is not a resolved "no
+            // edges", it means falling through to import resolution, approximated conservatively.
+            if (receiver instanceof ExpressionReceiver er && er.expr instanceof This) {
+                if (hierarchyDeclaresName(owner, name)) return resolveInHierarchy(owner, name, arity);
+                return resolveConservatively(name, arity);
+            }
+            ClassOrInterface known = receiverClass(receiver, owner);
+            if (known != null) return resolveInHierarchy(known, name, arity);
+            return resolveConservatively(name, arity);
+        }
+    }
+}

src/main/java/de/dhbwstuttgart/typeinference/dependency/DependencyGraph.java

@@ -0,0 +1,35 @@
+package de.dhbwstuttgart.typeinference.dependency;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A directed graph over DependencyNodes: an edge from A to B means A's body contains a
+ * call that may resolve to B
+ */
+public final class DependencyGraph {
+
+    private final Set<DependencyNode> nodes;
+    private final Map<DependencyNode, Set<DependencyNode>> edges;
+
+    public DependencyGraph(Set<DependencyNode> nodes, Map<DependencyNode, Set<DependencyNode>> edges) {
+        this.nodes = Collections.unmodifiableSet(new LinkedHashSet<>(nodes));
+        Map<DependencyNode, Set<DependencyNode>> copy = new LinkedHashMap<>();
+        for (DependencyNode n : this.nodes) {
+            copy.put(n, Collections.unmodifiableSet(new LinkedHashSet<>(edges.getOrDefault(n, Set.of()))));
+        }
+        this.edges = Collections.unmodifiableMap(copy);
+    }
+
+    public Set<DependencyNode> nodes() {
+        return nodes;
+    }
+
+    /** The nodes {@code node}'s body may call into. */
+    public Set<DependencyNode> callees(DependencyNode node) {
+        return edges.getOrDefault(node, Set.of());
+    }
+}

src/main/java/de/dhbwstuttgart/typeinference/dependency/DependencyNode.java

@@ -0,0 +1,31 @@
+package de.dhbwstuttgart.typeinference.dependency;
+
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.Method;
+
+import java.util.Objects;
+
+public final class DependencyNode {
+
+    private final ClassOrInterface owner;
+    private final Method method;
+
+    DependencyNode(ClassOrInterface owner, Method method) {
+        this.owner = Objects.requireNonNull(owner);
+        this.method = Objects.requireNonNull(method);
+    }
+
+    public ClassOrInterface getOwner() {
+        return owner;
+    }
+
+    public Method getMethod() {
+        return method;
+    }
+
+    @Override
+    public String toString() {
+        return owner.getClassName().getClassName() + "." + method.getName() + "/"
+                + method.getParameterList().getFormalparalist().size();
+    }
+}

src/main/java/de/dhbwstuttgart/typeinference/dependency/GeneralizingBytecodeDemo.java

@@ -0,0 +1,125 @@
+package de.dhbwstuttgart.typeinference.dependency;
+
+import de.dhbwstuttgart.core.JavaTXCompiler;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.Method;
+import de.dhbwstuttgart.syntaxtree.SourceFile;
+import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
+import de.dhbwstuttgart.syntaxtree.visual.ASTTypePrinter;
+import de.dhbwstuttgart.typeinference.result.ResultPair;
+import de.dhbwstuttgart.typeinference.result.ResultSet;
+import de.dhbwstuttgart.typeinference.typeAlgo.TYPE;
+import de.dhbwstuttgart.typeinference.unify.PlaceholderRegistry;
+import de.dhbwstuttgart.typeinference.unify.TypeUnify;
+import de.dhbwstuttgart.typeinference.unify.UnifyContext;
+import de.dhbwstuttgart.typeinference.unify.UnifyResultListenerImpl;
+import de.dhbwstuttgart.typeinference.unify.UnifyResultModel;
+import de.dhbwstuttgart.typeinference.unify.UnifyTaskModel;
+import de.dhbwstuttgart.typeinference.unify.model.FiniteClosure;
+import de.dhbwstuttgart.typeinference.unify.model.PlaceholderType;
+import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+import de.dhbwstuttgart.util.Logger;
+
+import java.io.File;
+import java.util.AbstractMap;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+public class GeneralizingBytecodeDemo {
+
+    public static void main(String[] args) throws Exception {
+        if (args.length == 0) {
+            System.out.println("usage: GeneralizingBytecodeDemo <file1.jav> [file2.jav ...]");
+            return;
+        }
+
+        List<File> files = Arrays.stream(args).map(File::new).toList();
+        JavaTXCompiler compiler = new JavaTXCompiler(files);
+        compiler.parseAll();
+
+        Set<ClassOrInterface> definedClasses = new HashSet<>();
+        Set<ClassOrInterface> allClasses = new HashSet<>();
+        for (File f : files) {
+            SourceFile sf = compiler.sourceFiles.get(f);
+            definedClasses.addAll(sf.KlassenVektor);
+            allClasses.addAll(compiler.getAvailableClasses(f));
+            allClasses.addAll(sf.availableClasses);
+        }
+        allClasses.removeAll(definedClasses);
+        allClasses.addAll(definedClasses);
+
+        DependencyGraph graph = new CallGraphBuilder(compiler, definedClasses).build();
+        List<Set<DependencyNode>> sccs = StronglyConnectedComponents.compute(graph);
+
+        TYPE ty = new TYPE(definedClasses, allClasses);
+        Logger logger = new Logger("GeneralizingBytecodeDemo");
+        PlaceholderRegistry placeholderRegistry = new PlaceholderRegistry();
+        FiniteClosure finiteClosure = UnifyTypeFactory.generateFC(
+                allClasses.stream().toList(), logger, compiler.getClassLoader(), compiler, placeholderRegistry);
+        UnifyTaskModel usedTasks = new UnifyTaskModel();
+
+        Function<UnifyPair, UnifyPair> distributeInnerVars = x -> {
+            var lhs = x.getLhsType();
+            var rhs = x.getRhsType();
+            if (lhs instanceof PlaceholderType lp && rhs instanceof PlaceholderType rp && (lp.isInnerType() || rp.isInnerType())) {
+                lp.setInnerType(true);
+                rp.setInnerType(true);
+            }
+            return x;
+        };
+
+        Set<ResultPair> combined = new LinkedHashSet<>();
+
+        System.out.println("Solving " + sccs.size() + " SCCs independently, materializing each into the AST before the next SCC runs:");
+        for (int i = 0; i < sccs.size(); i++) {
+            Set<DependencyNode> component = sccs.get(i);
+            List<Map.Entry<ClassOrInterface, Method>> group = component.stream()
+                    .<Map.Entry<ClassOrInterface, Method>>map(n -> new AbstractMap.SimpleEntry<>(n.getOwner(), n.getMethod()))
+                    .toList();
+
+            var cons = ty.getConstraintsFor(group);
+            var unifyCons = UnifyTypeFactory.convert(compiler, cons, placeholderRegistry).map(distributeInnerVars);
+
+            UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+            UnifyResultListenerImpl listener = new UnifyResultListenerImpl();
+            urm.addUnifyResultListener(listener);
+            UnifyContext context = new UnifyContext(logger, true, urm, usedTasks, placeholderRegistry);
+            TypeUnify.unifyParallel(unifyCons.getUndConstraints(), unifyCons.getOderConstraints(), finiteClosure, context);
+
+            System.out.println("[" + i + "] " + component);
+            List<ResultSet> results = listener.getResults();
+            if (results.isEmpty()) {
+                System.out.println("    (no results)");
+                continue;
+            }
+            ResultSet sccResult = results.getFirst();
+            System.out.println("    isolated result: " + sccResult.getSortedResults());
+            combined.addAll(sccResult.results);
+
+            for (Map.Entry<ClassOrInterface, Method> entry : group) {
+                GeneralizingSccDemo.materialize(entry.getKey(), entry.getValue(), sccResult);
+            }
+        }
+
+        ResultSet whole = new ResultSet(combined);
+
+        System.out.println();
+        System.out.println("Source after materialization:");
+        for (File f : files) {
+            System.out.println(ASTTypePrinter.print(compiler.sourceFiles.get(f)));
+        }
+
+        System.out.println("Generating bytecode from the union of all SCCs' isolated ResultSets ...");
+        for (File f : files) {
+            SourceFile sf = compiler.sourceFiles.get(f);
+            var classes = compiler.generateBytecode(sf, List.of(whole));
+            compiler.writeClassFile(classes, f);
+            System.out.println("wrote " + classes.keySet());
+        }
+    }
+}

src/main/java/de/dhbwstuttgart/typeinference/dependency/GeneralizingSccDemo.java

@@ -0,0 +1,252 @@
+package de.dhbwstuttgart.typeinference.dependency;
+
+import de.dhbwstuttgart.core.JavaTXCompiler;
+import de.dhbwstuttgart.parser.NullToken;
+import de.dhbwstuttgart.parser.scope.JavaClassName;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.Constructor;
+import de.dhbwstuttgart.syntaxtree.GenericDeclarationList;
+import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
+import de.dhbwstuttgart.syntaxtree.Method;
+import de.dhbwstuttgart.syntaxtree.ParameterList;
+import de.dhbwstuttgart.syntaxtree.Pattern;
+import de.dhbwstuttgart.syntaxtree.SourceFile;
+import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
+import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
+import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.visual.ASTTypePrinter;
+import de.dhbwstuttgart.typeinference.result.ResultPair;
+import de.dhbwstuttgart.typeinference.result.ResultSet;
+import de.dhbwstuttgart.typeinference.typeAlgo.TYPE;
+import de.dhbwstuttgart.typeinference.unify.PlaceholderRegistry;
+import de.dhbwstuttgart.typeinference.unify.TypeUnify;
+import de.dhbwstuttgart.typeinference.unify.UnifyContext;
+import de.dhbwstuttgart.typeinference.unify.UnifyResultListenerImpl;
+import de.dhbwstuttgart.typeinference.unify.UnifyResultModel;
+import de.dhbwstuttgart.typeinference.unify.UnifyTaskModel;
+import de.dhbwstuttgart.typeinference.unify.model.FiniteClosure;
+import de.dhbwstuttgart.typeinference.unify.model.PlaceholderType;
+import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+import de.dhbwstuttgart.util.Logger;
+
+import java.io.File;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+public class GeneralizingSccDemo {
+
+    public static void main(String[] args) throws Exception {
+        if (args.length == 0) {
+            System.out.println("usage: GeneralizingSccDemo <file1.jav> [file2.jav ...]");
+            return;
+        }
+
+        List<File> files = Arrays.stream(args).map(File::new).toList();
+        JavaTXCompiler compiler = new JavaTXCompiler(files);
+        compiler.parseAll();
+
+        Set<ClassOrInterface> definedClasses = new HashSet<>();
+        Set<ClassOrInterface> allClasses = new HashSet<>();
+        for (File f : files) {
+            SourceFile sf = compiler.sourceFiles.get(f);
+            definedClasses.addAll(sf.KlassenVektor);
+            allClasses.addAll(compiler.getAvailableClasses(f));
+            allClasses.addAll(sf.availableClasses);
+        }
+        allClasses.removeAll(definedClasses);
+        allClasses.addAll(definedClasses);
+
+        System.out.println("Source with TPH names (unresolved type slots only):");
+        for (File f : files) {
+            System.out.println(ASTTypePrinter.print(compiler.sourceFiles.get(f)));
+        }
+
+        DependencyGraph graph = new CallGraphBuilder(compiler, definedClasses).build();
+        List<Set<DependencyNode>> sccs = StronglyConnectedComponents.compute(graph);
+
+        TYPE ty = new TYPE(definedClasses, allClasses);
+        Logger logger = new Logger("GeneralizingSccDemo");
+        PlaceholderRegistry placeholderRegistry = new PlaceholderRegistry();
+        FiniteClosure finiteClosure = UnifyTypeFactory.generateFC(
+                allClasses.stream().toList(), logger, compiler.getClassLoader(), compiler, placeholderRegistry);
+        UnifyTaskModel usedTasks = new UnifyTaskModel();
+
+        Function<UnifyPair, UnifyPair> distributeInnerVars = x -> {
+            var lhs = x.getLhsType();
+            var rhs = x.getRhsType();
+            if (lhs instanceof PlaceholderType lp && rhs instanceof PlaceholderType rp && (lp.isInnerType() || rp.isInnerType())) {
+                lp.setInnerType(true);
+                rp.setInnerType(true);
+            }
+            return x;
+        };
+
+        System.out.println("Solving " + sccs.size() + " SCCs independently, materializing each into the AST before the next SCC runs:");
+        for (int i = 0; i < sccs.size(); i++) {
+            Set<DependencyNode> component = sccs.get(i);
+            List<Map.Entry<ClassOrInterface, Method>> group = component.stream()
+                    .<Map.Entry<ClassOrInterface, Method>>map(n -> new AbstractMap.SimpleEntry<>(n.getOwner(), n.getMethod()))
+                    .toList();
+
+            var cons = ty.getConstraintsFor(group);
+            var unifyCons = UnifyTypeFactory.convert(compiler, cons, placeholderRegistry).map(distributeInnerVars);
+
+            UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+            UnifyResultListenerImpl listener = new UnifyResultListenerImpl();
+            urm.addUnifyResultListener(listener);
+            UnifyContext context = new UnifyContext(logger, true, urm, usedTasks, placeholderRegistry);
+            TypeUnify.unifyParallel(unifyCons.getUndConstraints(), unifyCons.getOderConstraints(), finiteClosure, context);
+
+            System.out.println("[" + i + "] " + component + (component.size() > 1 ? "  <- mutually recursive, solved jointly" : ""));
+            System.out.println("    raw constraints (pre-unify, AST-level types): " + cons);
+            System.out.println("    unify constraints (UnifyPair, and-constraints only): " + unifyCons.getUndConstraints());
+            if (!unifyCons.getOderConstraints().isEmpty()) {
+                System.out.println("    unify constraints (or-constraints): " + unifyCons.getOderConstraints());
+            }
+            List<ResultSet> results = listener.getResults();
+            if (results.isEmpty()) {
+                System.out.println("    (no results)");
+                continue;
+            }
+            ResultSet sccResult = results.getFirst();
+            System.out.println("    isolated result: " + sccResult.getSortedResults());
+
+            for (Map.Entry<ClassOrInterface, Method> entry : group) {
+                Method materialized = materialize(entry.getKey(), entry.getValue(), sccResult);
+                System.out.println("    materialized " + entry.getKey().getClassName().getClassName() + "." + materialized.getName()
+                        + ": generics=" + describeGenerics(materialized) + " params=" + describeParams(materialized)
+                        + " returns=" + describe(materialized.getReturnType()));
+            }
+        }
+
+        System.out.println();
+        System.out.println("Source after materialization (still prints TPH names for anything left, e.g. method bodies -- only signatures were rewritten):");
+        for (File f : files) {
+            System.out.println(ASTTypePrinter.print(compiler.sourceFiles.get(f)));
+        }
+    }
+
+    static Method materialize(ClassOrInterface owner, Method method, ResultSet sccResult) {
+        Set<TypePlaceholder> used = new LinkedHashSet<>();
+        for (Pattern p : method.getParameterList().getFormalparalist()) collectTPHs(p.getType(), used);
+        collectTPHs(method.getReturnType(), used);
+        if (used.isEmpty()) return method;
+
+        Set<TypePlaceholder> free = new LinkedHashSet<>();
+        for (TypePlaceholder tph : used) {
+            if (sccResult.resolveType(tph).resolvedType instanceof TypePlaceholder) free.add(tph);
+        }
+
+        UnionFind uf = new UnionFind();
+        for (ResultPair rp : sccResult.results) {
+            if (rp.getLeft() instanceof TypePlaceholder l && rp.getRight() instanceof TypePlaceholder r
+                    && free.contains(l) && free.contains(r)) {
+                uf.union(l, r);
+            }
+        }
+
+        Map<TypePlaceholder, List<TypePlaceholder>> groups = new LinkedHashMap<>();
+        for (TypePlaceholder tph : free) groups.computeIfAbsent(uf.find(tph), k -> new ArrayList<>()).add(tph);
+
+        Map<TypePlaceholder, RefTypeOrTPHOrWildcardOrGeneric> substitution = new HashMap<>();
+        List<GenericTypeVar> newGenerics = new ArrayList<>();
+        RefType objectBound = new RefType(new JavaClassName("java.lang.Object"), new NullToken());
+        for (List<TypePlaceholder> members : groups.values()) {
+            String genName = members.get(0).getName();
+            newGenerics.add(new GenericTypeVar(genName, List.of(objectBound), new NullToken(), new NullToken()));
+            for (TypePlaceholder member : members) substitution.put(member, new GenericRefType(genName, new NullToken()));
+        }
+        for (TypePlaceholder tph : used) {
+            if (!free.contains(tph)) substitution.put(tph, sccResult.resolveType(tph).resolvedType);
+        }
+        if (substitution.isEmpty()) return method;
+
+        List<Pattern> newParams = new ArrayList<>();
+        for (Pattern p : method.getParameterList().getFormalparalist()) {
+            newParams.add(p.withType(substitute(p.getType(), substitution)));
+        }
+        ParameterList newParamList = new ParameterList(newParams, method.getParameterList().getOffset());
+        RefTypeOrTPHOrWildcardOrGeneric newReturnType = substitute(method.getReturnType(), substitution);
+        GenericDeclarationList newGenericDecl = new GenericDeclarationList(newGenerics, new NullToken());
+
+        Method rewritten = method instanceof Constructor
+                ? new Constructor(method.modifier, method.name, newReturnType, newParamList, method.block, newGenericDecl, method.getOffset())
+                : new Method(method.modifier, method.name, newReturnType, newParamList, method.block, newGenericDecl, method.getOffset());
+
+        replaceMethod(owner, method, rewritten);
+        return rewritten;
+    }
+
+    private static void collectTPHs(RefTypeOrTPHOrWildcardOrGeneric type, Set<TypePlaceholder> out) {
+        if (type instanceof TypePlaceholder tph) out.add(tph);
+        else if (type instanceof RefType rt) for (var p : rt.getParaList()) collectTPHs(p, out);
+        else if (type instanceof ExtendsWildcardType w) collectTPHs(w.getInnerType(), out);
+        else if (type instanceof SuperWildcardType w) collectTPHs(w.getInnerType(), out);
+    }
+
+    private static RefTypeOrTPHOrWildcardOrGeneric substitute(RefTypeOrTPHOrWildcardOrGeneric type, Map<TypePlaceholder, RefTypeOrTPHOrWildcardOrGeneric> sub) {
+        if (type instanceof TypePlaceholder tph) return sub.getOrDefault(tph, tph);
+        if (type instanceof RefType rt) return new RefType(rt.getName(), rt.getParaList().stream().map(p -> substitute(p, sub)).toList(), rt.getOffset());
+        if (type instanceof ExtendsWildcardType w) return new ExtendsWildcardType(substitute(w.getInnerType(), sub), w.getOffset());
+        if (type instanceof SuperWildcardType w) return new SuperWildcardType(substitute(w.getInnerType(), sub), w.getOffset());
+        return type;
+    }
+
+    private static void replaceMethod(ClassOrInterface owner, Method original, Method replacement) {
+        if (original instanceof Constructor) {
+            var list = owner.getConstructors();
+            for (int i = 0; i < list.size(); i++) if (list.get(i) == original) { list.set(i, (Constructor) replacement); return; }
+        } else {
+            var list = owner.getMethods();
+            for (int i = 0; i < list.size(); i++) if (list.get(i) == original) { list.set(i, replacement); return; }
+        }
+        throw new IllegalStateException("method not found in owner's own list: " + original);
+    }
+
+    private static String describeGenerics(Method m) {
+        List<String> names = new ArrayList<>();
+        m.getGenerics().forEach(gtv -> names.add(gtv.getName()));
+        return names.toString();
+    }
+
+    private static String describeParams(Method m) {
+        List<String> params = new ArrayList<>();
+        m.getParameterList().getFormalparalist().forEach(p -> params.add(describe(p.getType())));
+        return params.toString();
+    }
+
+    private static String describe(RefTypeOrTPHOrWildcardOrGeneric type) {
+        if (type instanceof GenericRefType g) return g.getParsedName().toString();
+        if (type instanceof TypePlaceholder tph) return "TPH " + tph.getName();
+        return type.toString();
+    }
+
+    private static final class UnionFind {
+        private final Map<TypePlaceholder, TypePlaceholder> parent = new HashMap<>();
+
+        TypePlaceholder find(TypePlaceholder x) {
+            parent.putIfAbsent(x, x);
+            TypePlaceholder p = parent.get(x);
+            if (p != x) { p = find(p); parent.put(x, p); }
+            return p;
+        }
+
+        void union(TypePlaceholder a, TypePlaceholder b) {
+            TypePlaceholder ra = find(a), rb = find(b);
+            if (ra != rb) parent.put(ra, rb);
+        }
+    }
+}

src/main/java/de/dhbwstuttgart/typeinference/dependency/ResolvedSourcePrinter.java

@@ -0,0 +1,40 @@
+package de.dhbwstuttgart.typeinference.dependency;
+
+import de.dhbwstuttgart.syntaxtree.SourceFile;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.visual.OutputGenerator;
+import de.dhbwstuttgart.typeinference.result.ResultSet;
+
+/**
+ * Prints a SourceFile the same way ASTTypePrinter/OutputGenerator do, except every TypePlaceholder
+ * the given ResultSet resolves is printed as its inferred type instead of "TPH <name>". Falls back
+ * to "TPH <name>" for any TPH the ResultSet doesn't cover (e.g. one that belongs to an SCC whose
+ * result wasn't merged in -- see SccUnifyDemo).
+ */
+public class ResolvedSourcePrinter extends OutputGenerator {
+
+    private final ResultSet resultSet;
+
+    private ResolvedSourcePrinter(StringBuilder out, ResultSet resultSet) {
+        super(out);
+        this.resultSet = resultSet;
+    }
+
+    public static String print(SourceFile sourceFile, ResultSet resultSet) {
+        StringBuilder out = new StringBuilder();
+        new ResolvedSourcePrinter(out, resultSet).visit(sourceFile);
+        return out.toString();
+    }
+
+    @Override
+    public void visit(TypePlaceholder typePlaceholder) {
+        var resolved = resultSet.resolveType(typePlaceholder).resolvedType;
+        if (resolved instanceof TypePlaceholder) {
+            out.append("TPH ").append(typePlaceholder.getName());
+        } else {
+            // resolved type may itself contain nested TPHs (e.g. a generic parameter) --
+            // recurse through the same visitor so those get resolved too, not just the outer type.
+            resolved.accept(this);
+        }
+    }
+}

src/main/java/de/dhbwstuttgart/typeinference/dependency/StronglyConnectedComponents.java

@@ -0,0 +1,82 @@
+package de.dhbwstuttgart.typeinference.dependency;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * --- Comment AI generated ---
+ * Computes the strongly connected components of a {@link DependencyGraph} via Tarjan's
+ * algorithm, returning them in the order the SCC-scoped inference driver needs to process them:
+ * for every edge u -> v (u calls v) with u and v in different components, the component
+ * containing v appears BEFORE the component containing u -- i.e. a method's callees are always
+ * fully processed (and, in the inference driver, generalized) before the method itself.
+ *
+ * This is not a separate reversal step: it falls directly out of Tarjan's algorithm, since a
+ * component is only popped off the stack (and appended to the result) once the DFS has finished
+ * exploring all of its outgoing edges, which means every component it points to has already been
+ * popped.
+ *
+ * Implementation is recursive, so its stack depth is bounded by the depth of the call graph
+ * among the classes being compiled together, not by the size of the program. That is fine for
+ * realistic programs; a pathologically deep call chain could still overflow the JVM stack, same
+ * tradeoff most textbook Tarjan implementations make.
+ */
+public final class StronglyConnectedComponents {
+
+    private final DependencyGraph graph;
+    private final Map<DependencyNode, Integer> index = new HashMap<>();
+    private final Map<DependencyNode, Integer> lowlink = new HashMap<>();
+    private final Set<DependencyNode> onStack = new HashSet<>();
+    private final Deque<DependencyNode> stack = new ArrayDeque<>();
+    private final List<Set<DependencyNode>> result = new ArrayList<>();
+    private int counter = 0;
+
+    private StronglyConnectedComponents(DependencyGraph graph) {
+        this.graph = graph;
+    }
+
+    public static List<Set<DependencyNode>> compute(DependencyGraph graph) {
+        StronglyConnectedComponents scc = new StronglyConnectedComponents(graph);
+        for (DependencyNode node : graph.nodes()) {
+            if (!scc.index.containsKey(node)) {
+                scc.strongConnect(node);
+            }
+        }
+        return scc.result;
+    }
+
+    private void strongConnect(DependencyNode v) {
+        index.put(v, counter);
+        lowlink.put(v, counter);
+        counter++;
+        stack.push(v);
+        onStack.add(v);
+
+        for (DependencyNode w : graph.callees(v)) {
+            if (!index.containsKey(w)) {
+                strongConnect(w);
+                lowlink.put(v, Math.min(lowlink.get(v), lowlink.get(w)));
+            } else if (onStack.contains(w)) {
+                lowlink.put(v, Math.min(lowlink.get(v), index.get(w)));
+            }
+        }
+
+        if (lowlink.get(v).equals(index.get(v))) {
+            Set<DependencyNode> component = new LinkedHashSet<>();
+            DependencyNode w;
+            do {
+                w = stack.pop();
+                onStack.remove(w);
+                component.add(w);
+            } while (w != v);
+            result.add(component);
+        }
+    }
+}

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

@@ -45,6 +45,26 @@ public class TYPE {
         return ret;
     }
 
+    /**
+     * Generates constraints for an explicit subset of methods/constructors (e.g. one strongly
+     * connected component of the call graph) instead of every method of every defined class.
+     * Uses the same TypeInferenceInformation (the whole program's classes, same as
+     * {@link #getConstraints()}) -- this does not change what a method's constraints can refer
+     * to, only which methods' constraints get generated and later unified together.
+     */
+    public ConstraintSet<Pair> getConstraintsFor(Collection<Map.Entry<ClassOrInterface, Method>> group) {
+        ConstraintSet<Pair> ret = new ConstraintSet<>();
+        Set<ClassOrInterface> allClasses = TypeUnifyTaskHelper.getPresizedHashSet(allAvailableClasses.size());
+        allClasses.addAll(allAvailableClasses);
+        TypeInferenceInformation info = new TypeInferenceInformation(allClasses);
+        for (Map.Entry<ClassOrInterface, Method> entry : group) {
+            ClassOrInterface cl = entry.getKey();
+            Method m = entry.getValue();
+            ret.addAll(m instanceof Constructor c ? getConstraintsConstructor(c, info, cl) : getConstraintsMethod(m, info, cl));
+        }
+        return ret;
+    }
+
     private ConstraintSet getConstraintsClass(ClassOrInterface cl, TypeInferenceInformation info) {
         ConstraintSet ret = new ConstraintSet();
         ConstraintSet methConstrains;

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

@@ -392,9 +392,8 @@ public class TYPEStmt implements StatementVisitor {
 
     @Override
     public void visit(BoolExpression expr) {
-        expr.lexpr.accept(this);
         expr.rexpr.accept(this);
-
+        expr.lexpr.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())));
         constraintsSet.addUndConstraint(new Pair(bool, expr.rexpr.getType(), PairOperator.EQUALSDOT, loc(expr.getOffset())));

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

@@ -33,11 +33,13 @@ public class Logger {
   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 {

src/test/java/TestComplete.java

@@ -3,12 +3,9 @@ import de.dhbwstuttgart.core.ConsoleInterface;
 import de.dhbwstuttgart.util.Logger;
 import de.dhbwstuttgart.util.Logger.LogLevel;
 
-import org.apache.commons.io.FileUtils;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
 import java.lang.reflect.*;
 import java.util.Arrays;
 import java.util.List;
@@ -22,14 +19,8 @@ import static org.junit.jupiter.api.Assertions.*;
 import static targetast.TestCodegen.createClassLoader;
 import static targetast.TestCodegen.generateClassFiles;
 
+@Execution(ExecutionMode.CONCURRENT)
 public class TestComplete {
-
-    @BeforeAll
-    public static void setup() throws IOException {
-        TestCodegen.outputPath.toFile().mkdirs();
-        FileUtils.cleanDirectory(TestCodegen.outputPath.toFile());
-    }
-
     @Test
     public void applyLambdaTest() throws Exception {
         var classFiles = generateClassFiles(createClassLoader(), "applyLambda.jav");
@@ -329,17 +320,9 @@ public class TestComplete {
     }
 
     @Test
-    public void sortingTest() throws Exception {
+    public void overloadingSortingTest() throws Exception {
         var classFiles = generateClassFiles(createClassLoader(), "Sorting.jav");
-        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);
+        var instance = classFiles.get("Sorting").getDeclaredConstructor().newInstance();
     }
 
     @Test
@@ -1050,7 +1033,6 @@ public class TestComplete {
         var instance = clazz.getDeclaredConstructor().newInstance();
     }
 
-    @Disabled("Feature nicht implementiert")
     @Test
     public void testOverloadSwitch() throws Exception {
         var classFiles = generateClassFiles(createClassLoader(), "SwitchOverload.jav");
@@ -1552,9 +1534,7 @@ public class TestComplete {
         var m = clazz.getDeclaredMethod("ex1");
         assertEquals("ABC", m.invoke(instance));
         var ex2 = clazz.getDeclaredMethod("ex2");
-        assertEquals("CBA", ex2.invoke(instance));
-        var ex3 = clazz.getDeclaredMethod("ex3");
-        assertEquals("BA", ex3.invoke(instance));
+        assertEquals("BAC", ex2.invoke(instance));
     }
     @Test
     public void testBug366() throws Exception {
@@ -1620,7 +1600,7 @@ public class TestComplete {
 
     @Test
     public void testBug389() throws Exception {
-        var classFiles = generateClassFiles(createClassLoader(), true, "Bug389.jav", "Bug389Main.jav");
+        var classFiles = generateClassFiles(createClassLoader(), false, "Bug389.jav", "Bug389Main.jav");
         var clazz = classFiles.get("Bug389Main");
         clazz.getDeclaredMethod("main", List.class).invoke(null, List.of());
     }
@@ -1632,4 +1612,10 @@ public class TestComplete {
         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/targetast/TestCodegen.java

@@ -5,7 +5,6 @@ import de.dhbwstuttgart.bytecode.Codegen;
 import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.environment.IByteArrayClassLoader;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
 import de.dhbwstuttgart.target.generate.ASTToTargetAST;
 import de.dhbwstuttgart.target.tree.MethodParameter;
 import de.dhbwstuttgart.target.tree.TargetClass;
@@ -31,7 +30,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 public class TestCodegen {
-    public static final Path outputPath = Path.of(System.getProperty("user.dir"), "/targetTest");
+    static final Path outputPath = Path.of(System.getProperty("user.dir"), "/targetTest");
 
     private static void writeClassFile(String name, byte[] code) throws IOException {
         Files.createDirectories(outputPath);
@@ -57,8 +56,7 @@ public class TestCodegen {
         try(var newClassLoader = new DirectoryClassLoader(List.of(outputPath.toFile()), (ClassLoader)classLoader)) {
             var result = new HashMap<String, Class<?>>();
             for (var file : filenames) {
-                var sf = compiler.sourceFiles.get(file);
-                var classes = sf.getClasses();
+                var classes = compiler.sourceFiles.get(file).getClasses();
 
                 result.putAll(classes.stream().map(cli -> {
                     try {
@@ -274,7 +272,7 @@ public class TestCodegen {
     public void testLambda() throws Exception {
         var classLoader = createClassLoader();
         // var fun = classLoader.loadClass(Path.of(System.getProperty("user.dir"), "src/test/java/targetast/Fun1$$.class"));
-        var interfaceType = TargetFunNType.fromParams(List.of(TargetType.Integer), 1, false);
+        var interfaceType = TargetFunNType.fromParams(List.of(TargetType.Integer), 1);
 
         var targetClass = new TargetClass(Opcodes.ACC_PUBLIC, new JavaClassName("CGLambda"));
         targetClass.addConstructor(Opcodes.ACC_PUBLIC, List.of(), new TargetBlock(List.of(new TargetMethodCall(null, new TargetSuper(TargetType.Object), List.of(), TargetType.Object, "<init>", false, false, false))));