Exception type not gets resolved with classpath

.gitea/workflows/build_and_test.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '23'
+          java-version: '22'
           cache: 'maven'
       - name: Compile project
         run: |

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

@@ -539,7 +539,7 @@ catchClause
     ;
 
 catchType
-    : qualifiedName ('|' qualifiedName)*
+    : typeType ('|' typeType)*
     ;
 
 finallyBlock

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

@@ -10,6 +10,7 @@ import de.dhbwstuttgart.target.tree.expression.*;
 import de.dhbwstuttgart.target.tree.type.*;
 import org.objectweb.asm.*;
 
+import java.lang.annotation.Target;
 import java.lang.invoke.*;
 import java.lang.reflect.Modifier;
 import java.util.*;
@@ -1158,11 +1159,48 @@ public class Codegen {
             mv.visitLabel(end);
             break;
         }
-        default:
-            throw new CodeGenException("Unexpected value: " + expr);
+            case TargetPattern targetPattern:
+                break;
+            case TargetTryCatchFinally targetTryCatchFinally:
+                generateTryCatchFinally(targetTryCatchFinally, state);
         }
     }
 
+    private void generateTryCatchFinally(TargetTryCatchFinally tryCatchFinally, State state){
+        MethodVisitor mv = state.mv;
+        Label startTry = new Label();
+        Label endTry = new Label();
+        Label endOrFinally = new Label();
+
+        //Try
+        mv.visitLabel(startTry);
+        generate(state, tryCatchFinally.tryBlock());
+        mv.visitLabel(endTry);
+        mv.visitJumpInsn(GOTO, endOrFinally);
+
+        for (var catchClause : tryCatchFinally.catchClauses()){
+            Label startCatch = new Label();
+            Label endCatch = new Label();
+            mv.visitTryCatchBlock(startTry, endOrFinally, startCatch, "java/lang/Exception"); //ignore all exception types except the first
+            mv.visitLabel(startCatch);
+            if (!catchClause.identifier().isEmpty()) {
+                mv.visitFrame(F_SAME1, 0, null, 1, new Object[]{"java/lang/Exception"});
+                LocalVar excep = state.createVariable(catchClause.identifier(), catchClause.exceptionNames().getFirst());
+                mv.visitVarInsn(ASTORE, excep.index());
+            }
+            generate(state, catchClause.catchBlock());
+            mv.visitLabel(endCatch);
+            mv.visitJumpInsn(GOTO, endOrFinally);
+        }
+
+        if (tryCatchFinally.finallyBlock().isPresent()){
+           mv.visitLabel(endOrFinally);
+           generate(state, tryCatchFinally.finallyBlock().get());
+        }
+        else mv.visitLabel(endOrFinally);
+
+    }
+
     private void generateForEach(TargetForEach forEach, State state) {
         state.enterScope();
         TargetVarDecl vd = (TargetVarDecl) forEach.vardecl();

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

@@ -97,7 +97,7 @@ public class JavaTXCompiler {
 			path.add(new File(System.getProperty("user.dir")));
 		}
 		if (outputPath != null) path.add(outputPath);
-		classLoader = new DirectoryClassLoader(path, ClassLoader.getSystemClassLoader());
+		classLoader = new DirectoryClassLoader(path, ClassLoader.getPlatformClassLoader());
 		environment = new CompilationEnvironment(sources, classLoader);
 		classPath = path;
 		this.outputPath = outputPath;
@@ -326,7 +326,7 @@ public class JavaTXCompiler {
 			for (SourceFile f : this.sourceFiles.values()) {
 				logFile.write(ASTTypePrinter.print(f));
 			}
-			// logFile.flush();
+			logFile.flush();
 			Set<PlaceholderType> varianceTPHold;
 			Set<PlaceholderType> varianceTPH = new HashSet<>();
 			varianceTPH = varianceInheritanceConstraintSet(unifyCons);
@@ -392,7 +392,7 @@ public class JavaTXCompiler {
 			logFile.write("FC:\\" + finiteClosure.toString() + "\n");
 			logFile.write(ASTTypePrinter.print(sf));
 			System.out.println(ASTTypePrinter.print(sf));
-			// logFile.flush();
+			logFile.flush();
 			System.out.println("Unify nach Oder-Constraints-Anpassung:" + unifyCons.toString());
 			Set<PlaceholderType> varianceTPHold;
 			Set<PlaceholderType> varianceTPH = new HashSet<>();
@@ -419,7 +419,7 @@ public class JavaTXCompiler {
 				System.out.println("RESULT Final: " + li.getResults());
 				System.out.println("Constraints for Generated Generics: " + " ???");
 				logFile.write("RES_FINAL: " + li.getResults().toString() + "\n");
-				// logFile.flush();
+				logFile.flush();
 				return li.getResults();
 			}
 			/* UnifyResultModel End */
@@ -430,7 +430,7 @@ public class JavaTXCompiler {
 				Set<Set<UnifyPair>> result = unify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure), usedTasks);
 				System.out.println("RESULT: " + result);
 				logFile.write("RES: " + result.toString() + "\n");
-				// logFile.flush();
+				logFile.flush();
 				results.addAll(result);
 
 				results = results.stream().map(x -> {
@@ -447,9 +447,9 @@ public class JavaTXCompiler {
 				System.out.println("RESULT Final: " + results);
 				System.out.println("Constraints for Generated Generics: " + " ???");
 				logFile.write("RES_FINAL: " + results.toString() + "\n");
-				// logFile.flush();
+				logFile.flush();
 				logFile.write("PLACEHOLDERS: " + PlaceholderType.EXISTING_PLACEHOLDERS);
-				// logFile.flush();
+				logFile.flush();
 			}
 		} catch (IOException e) {
 			System.err.println("kein LogFile");

src/main/java/de/dhbwstuttgart/environment/DirectoryClassLoader.java

@@ -16,7 +16,7 @@ public class DirectoryClassLoader extends URLClassLoader implements IByteArrayCl
 //    }
 
     public DirectoryClassLoader(List<File> directory, java.lang.ClassLoader parent) {
-        super(directory.stream().map(DirectoryClassLoader::dirToURL).flatMap(List::stream).collect(Collectors.toList()).toArray(new URL[0]), parent.getParent());
+        super(directory.stream().map(DirectoryClassLoader::dirToURL).flatMap(List::stream).toArray(URL[]::new), parent);
     }
 
     private static URL[] generateURLArray(URL url) {

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

@@ -1,12 +1,7 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 
 import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -16,6 +11,7 @@ import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.type.Void;
 import de.dhbwstuttgart.target.tree.expression.TargetUnaryOp;
 import de.dhbwstuttgart.target.generate.StatementToTargetExpression;
+import org.antlr.v4.runtime.RuleContext;
 import org.antlr.v4.runtime.Token;
 
 import de.dhbwstuttgart.exceptions.NotImplementedException;
@@ -638,8 +634,16 @@ public class StatementGenerator {
     }
 
     private Statement convert(Java17Parser.TrycatchblockContext stmt) {
-        // TODO
-        throw new NotImplementedException();
+        Block tryBlock = convert(stmt.block(), false);
+        List<CatchClause> catchClauses = stmt.catchClause().stream().
+                map(x ->
+                        new CatchClause(x.catchType().typeType().stream().map(y -> TypeGenerator.convert(y, reg, generics)).toList(),
+                        x.identifier().getText(),
+                        convert(x.block(), false)
+                        )).toList();
+
+        Optional<Block> finallyBlock = stmt.finallyBlock() != null ? Optional.of(convert(stmt.finallyBlock().block(), false)) : Optional.empty();
+        return new TryCatchFinally(tryBlock, catchClauses, finallyBlock, stmt.getStart());
     }
 
     private Statement convert(Java17Parser.TrycatchresourceContext stmt) {

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

@@ -39,6 +39,11 @@ public class SyntacticSugar {
         public void visit(LambdaExpression le) {
         	//PL 2024-04-09 Do nothing, as in a LambdaExpression a return could be
         }
+
+        @Override
+        public void visit(TryCatchFinally tryCatchFinally) {
+
+        }
     }
 
     private static boolean hasReturn(Block block) {

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

@@ -1,5 +1,6 @@
 package de.dhbwstuttgart.syntaxtree;
 
+import de.dhbwstuttgart.syntaxtree.statement.TryCatchFinally;
 import de.dhbwstuttgart.syntaxtree.type.*;
 
 public interface ASTVisitor extends StatementVisitor{
@@ -40,4 +41,6 @@ public interface ASTVisitor extends StatementVisitor{
 
     void visit(GuardedPattern aGuardedPattern);
 
+    void visit(TryCatchFinally tryCatchFinally);
+
 }

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

@@ -0,0 +1,19 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import de.dhbwstuttgart.syntaxtree.statement.Block;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+
+import java.util.List;
+
+public class CatchClause {
+    public List<RefTypeOrTPHOrWildcardOrGeneric> exceptionTypes;
+    public String identifier;
+    public Block catchBlock;
+
+    public CatchClause(List<RefTypeOrTPHOrWildcardOrGeneric> exceptionTypes, String identifier, Block catchBlock){
+        this.exceptionTypes = exceptionTypes;
+        this.identifier = identifier;
+        this.catchBlock = catchBlock;
+    }
+}
+

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

@@ -85,4 +85,6 @@ public interface StatementVisitor {
     void visit(Throw aThrow);
 
     void visit(Ternary ternary);
+
+    void visit(TryCatchFinally tryCatchFinally);
 }

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

@@ -0,0 +1,30 @@
+package de.dhbwstuttgart.syntaxtree.statement;
+
+import de.dhbwstuttgart.syntaxtree.CatchClause;
+import de.dhbwstuttgart.syntaxtree.StatementVisitor;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import org.antlr.v4.runtime.Token;
+import de.dhbwstuttgart.syntaxtree.type.Void;
+
+import java.util.List;
+import java.util.Optional;
+
+public class TryCatchFinally extends Statement{
+
+    public Block tryBlock;
+    public List<CatchClause> catchClauses;
+    public Optional<Block> finallyBlock;
+
+    public TryCatchFinally(Block tryBlock, List<CatchClause> catchClauses, Optional<Block> finallyBlock, Token offset){
+        super(new Void(offset), offset);
+        this.tryBlock = tryBlock;
+        this.catchClauses = catchClauses;
+        this.finallyBlock = finallyBlock;
+    }
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+}

src/main/java/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.java

@@ -530,4 +530,9 @@ public class OutputGenerator implements ASTVisitor {
         out.append(" with ");
         aGuardedPattern.getCondition().accept(this);
     }
+
+    @Override
+    public void visit(TryCatchFinally tryCatchFinally) {
+        out.append("");
+    }
 }

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

@@ -434,6 +434,11 @@ public abstract class GenerateGenerics {
                     whileStmt.loopBlock.accept(this);
                 }
 
+                @Override
+                public void visit(TryCatchFinally tryCatchFinally) {
+
+                }
+
                 @Override
                 public void visit(ArgumentList arglist) {
                     for (int i = 0; i < arglist.getArguments().size(); i++) {
@@ -536,6 +541,11 @@ public abstract class GenerateGenerics {
                     super.visit(methodCall);
                     typeVariables.addAll(findTypeVariables(methodCall.getType()));
                 }
+
+                @Override
+                public void visit(TryCatchFinally tryCatchFinally) {
+
+                }
             });
     }
 

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

@@ -76,6 +76,11 @@ public class StatementToTargetExpression implements ASTVisitor {
                 localVariables.add(varDecl.getName());
             }
 
+            @Override
+            public void visit(TryCatchFinally tryCatchFinally) {
+
+            }
+
             @Override
             public void visit(LambdaExpression lambda) {
             } // Don't look at lambda expressions
@@ -591,4 +596,14 @@ public class StatementToTargetExpression implements ASTVisitor {
     public void visit(GuardedPattern aGuardedPattern) {
         result = new TargetGuard((TargetPattern) converter.convert(aGuardedPattern.getNestedPattern()), converter.convert(aGuardedPattern.getCondition()));
     }
+
+    @Override
+    public void visit(TryCatchFinally tryCatchFinally) {
+
+        result = new TargetTryCatchFinally(
+                converter.convert(tryCatchFinally.tryBlock),
+                tryCatchFinally.catchClauses.stream().map(x -> new TargetCatchClause(x.exceptionTypes.stream().map(converter::convert).toList(), x.identifier, converter.convert(x.catchBlock))).toList(),
+                tryCatchFinally.finallyBlock.map(converter::convert)
+        );
+    }
 }

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

@@ -0,0 +1,8 @@
+package de.dhbwstuttgart.target.tree.expression;
+
+import de.dhbwstuttgart.target.tree.type.TargetType;
+
+import java.util.List;
+
+public record TargetCatchClause(List<TargetType> exceptionNames, String identifier, TargetBlock catchBlock) {
+}

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

@@ -3,7 +3,7 @@ package de.dhbwstuttgart.target.tree.expression;
 import de.dhbwstuttgart.target.tree.type.*;
 
 public sealed interface TargetExpression
-        permits TargetBinaryOp, TargetBlock, TargetBreak, TargetCast, TargetClassName, TargetContinue, TargetDo, TargetFieldVar, TargetFor, TargetForEach, TargetIf, TargetInstanceOf, TargetLambdaExpression, TargetLiteral, TargetLocalVar, TargetPattern, TargetReturn, TargetStatementExpression, TargetSuper, TargetSwitch, TargetTernary, TargetThis, TargetThrow, TargetUnaryOp, TargetVarDecl, TargetWhile, TargetYield {
+        permits TargetBinaryOp, TargetBlock, TargetBreak, TargetCast, TargetClassName, TargetContinue, TargetDo, TargetFieldVar, TargetFor, TargetForEach, TargetIf, TargetInstanceOf, TargetLambdaExpression, TargetLiteral, TargetLocalVar, TargetPattern, TargetReturn, TargetStatementExpression, TargetSuper, TargetSwitch, TargetTernary, TargetThis, TargetThrow, TargetTryCatchFinally, TargetUnaryOp, TargetVarDecl, TargetWhile, TargetYield {
 
     default TargetType type() {
         return null;

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

@@ -0,0 +1,7 @@
+package de.dhbwstuttgart.target.tree.expression;
+
+import java.util.List;
+import java.util.Optional;
+
+public record TargetTryCatchFinally(TargetBlock tryBlock, List<TargetCatchClause> catchClauses, Optional<TargetBlock> finallyBlock) implements TargetExpression{
+}

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

@@ -2,6 +2,7 @@ package de.dhbwstuttgart.typedeployment;
 
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
+import de.dhbwstuttgart.syntaxtree.statement.TryCatchFinally;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.target.generate.GenericsResult;
 import de.dhbwstuttgart.target.generate.GenericsResultSet;
@@ -32,6 +33,11 @@ public class TypeInsertPlacer extends AbstractASTWalker {
         TypeInsertPlacerClass cl = new TypeInsertPlacerClass(classOrInterface, withResults, genericsResult);
         this.inserts.addAll(cl.inserts);
     }
+
+    @Override
+    public void visit(TryCatchFinally tryCatchFinally) {
+
+    }
 }
 
 class TypeInsertPlacerClass extends AbstractASTWalker{
@@ -63,6 +69,11 @@ class TypeInsertPlacerClass extends AbstractASTWalker{
         super.visit(method);
     }
 
+    @Override
+    public void visit(TryCatchFinally tryCatchFinally) {
+
+    }
+
     @Override
     public void visit(Field field) {
         if(field.getType() instanceof TypePlaceholder){

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

@@ -500,6 +500,12 @@ public class TYPEStmt implements StatementVisitor {
         constraintsSet.addUndConstraint(new Pair(ternary.iffalse.getType(), ternary.getType(), PairOperator.SMALLERDOT));
     }
 
+    @Override
+    public void visit(TryCatchFinally tryCatchFinally) {
+        tryCatchFinally.tryBlock.accept(this);
+        tryCatchFinally.catchClauses.forEach(c -> c.catchBlock.accept(this));
+    }
+
     @Override
     public void visit(Return returnExpr) {
         returnExpr.retexpr.accept(this);

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

@@ -1,55 +0,0 @@
-package de.dhbwstuttgart.typeinference.unify;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.RecursiveTask;
-
-public class ConcurrentSetMergeTask<T> extends RecursiveTask<Set<T>> {
-
-  public static <E> Set<E> merge(List<Set<E>> list) {
-    if (list.isEmpty()) {
-      return new HashSet<>();
-    }
-    var task = new ConcurrentSetMergeTask<>(list, 0, list.size());
-    return task.compute();
-  }
-
-  private static final int THRESHOLD = 3;
-
-  private final List<Set<T>> list;
-  private final int start;
-  private final int end;
-
-  private ConcurrentSetMergeTask(List<Set<T>> list, int start, int end) {
-    this.list = list;
-    this.start = start;
-    this.end = end;
-  }
-
-  @Override
-  protected Set<T> compute() {
-    int size = end - start;
-
-    // size will always be at least one
-    if (size <= THRESHOLD) {
-      Set<T> result = this.list.get(start);
-      for (int i = start+1; i < end; i++) {
-        result.addAll(list.get(i));
-      }
-      return result;
-    } else {
-      int mid = start + (size / 2);
-      ConcurrentSetMergeTask<T> leftTask = new ConcurrentSetMergeTask<>(list, start, mid);
-      ConcurrentSetMergeTask<T> rightTask = new ConcurrentSetMergeTask<>(list, mid, end);
-
-      leftTask.fork();
-      Set<T> rightResult = rightTask.compute();
-      Set<T> leftResult = leftTask.join();
-
-      // Merge results
-      leftResult.addAll(rightResult);
-      return leftResult;
-    }
-  }
-}

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

@@ -864,7 +864,7 @@ public class RuleSet implements IRuleSet{
 		try {
 			logFile.write("FUNgreater: " + pair + "\n");
 				logFile.write("FUNred: " + result + "\n");
-				// logFile.flush();
+				logFile.flush();
 			}
 		catch (IOException e) {
 			System.out.println("logFile-Error");
@@ -960,7 +960,7 @@ public class RuleSet implements IRuleSet{
 		try {
 			logFile.write("FUNgreater: " + pair + "\n");
 			logFile.write("FUNgreater: " + result + "\n");
-			// logFile.flush();
+			logFile.flush();
 		}
 	catch (IOException e) {
 		System.out.println("lofFile-Error");
@@ -1010,7 +1010,7 @@ public class RuleSet implements IRuleSet{
 		try {
 			logFile.write("FUNgreater: " + pair + "\n");
 			logFile.write("FUNsmaller: " + result + "\n");
-			// logFile.flush();
+			logFile.flush();
 		}
 	catch (IOException e) {
 		System.out.println("lofFile-Error");

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

@@ -1,28 +1,41 @@
 package de.dhbwstuttgart.typeinference.unify;
 
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
 
+import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
+import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
+import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
+import de.dhbwstuttgart.typeinference.unify.model.FiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
 
 public class TypeUnify {
-
+	
 	/**
 	 * unify parallel ohne result modell
+	 * @param undConstrains
+	 * @param oderConstraints
+	 * @param fc
+	 * @param logFile
+	 * @param log
+	 * @param cons
+	 * @return
 	 */
 	public Set<Set<UnifyPair>> unify(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
 		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
-		ForkJoinPool pool = this.createThreadPool();
+		ForkJoinPool pool = new ForkJoinPool();
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
 		try {
 			logFile.write("\nnoShortendElements: " + unifyTask.noShortendElements + "\n");
-			// logFile.flush();
+			logFile.flush();
 		}
 		catch (IOException e) {
 			System.err.println("no log-File");
@@ -32,25 +45,41 @@ public class TypeUnify {
 	
 	/**
 	 * unify asynchron mit Rückgabe UnifyResultModel ohne dass alle results gesammelt sind
+	 * @param undConstrains
+	 * @param oderConstraints
+	 * @param fc
+	 * @param logFile
+	 * @param log
+	 * @param cons
+	 * @param ret
+	 * @return
 	 */
 	public UnifyResultModel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
 		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
-		ForkJoinPool pool = this.createThreadPool();
+		ForkJoinPool pool = new ForkJoinPool();
 		pool.invoke(unifyTask);
 		return ret;
 	}
 	
 	/**
 	 * unify parallel mit Rückgabe UnifyResultModel nachdem alle results gesammelt sind
+	 * @param undConstrains
+	 * @param oderConstraints
+	 * @param fc
+	 * @param logFile
+	 * @param log
+	 * @param cons
+	 * @param ret
+	 * @return
 	 */
 	public UnifyResultModel unifyParallel(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
 		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
-		ForkJoinPool pool = this.createThreadPool();
+		ForkJoinPool pool = new ForkJoinPool();
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
 		try {
 			logFile.write("\nnoShortendElements: " + unifyTask.noShortendElements +"\n");
-			// logFile.flush();
+			logFile.flush();
 		}
 		catch (IOException e) {
 			System.err.println("no log-File");
@@ -68,13 +97,20 @@ public class TypeUnify {
 	
 	/**
 	 * unify sequentiell mit oderconstraints
+	 * @param undConstrains
+	 * @param oderConstraints
+	 * @param fc
+	 * @param logFile
+	 * @param log
+	 * @param cons
+	 * @return
 	 */
 	public Set<Set<UnifyPair>> unifyOderConstraints(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
 		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, logFile, log, 0, ret, usedTasks);
 		Set<Set<UnifyPair>> res = unifyTask.compute();
 		try {
 			logFile.write("\nnoShortendElements: " + unifyTask.noShortendElements +"\n");
-			// logFile.flush();
+			logFile.flush();
 		}
 		catch (IOException e) {
 			System.err.println("no log-File");
@@ -82,13 +118,4 @@ public class TypeUnify {
 		return res;
 	}
 
-	private ForkJoinPool createThreadPool() {
-		return new ForkJoinPool(
-			Runtime.getRuntime().availableProcessors(),
-			ForkJoinPool.defaultForkJoinWorkerThreadFactory,
-			null,
-			true // do not use asyncMode (FIFO), as we want smaller tasks to complete first -> Improves locality and cuts small branches first
-		);
-	}
-
 }

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

@@ -59,7 +59,7 @@ public class TypeUnify2Task extends TypeUnifyTask {
 				logFile.close();
 			}
 			catch (IOException ioE) {
-				System.err.println("no log-File");
+				System.err.println("no log-File" + thNo);
 			}
            
        }

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

@@ -760,7 +760,7 @@ implements IFiniteClosure  {
 		//if (left.getName().equals("Vector") || right.getName().equals("AbstractList")) 
 		{try { 
 			logFile.write("\nsmallerRes: " + smallerRes);//"smallerHash: " + greaterHash.toString());
-			// logFile.flush();
+			logFile.flush();
 		}
 		catch (IOException e) {
 			System.err.println("no LogFile");}}
@@ -774,7 +774,7 @@ implements IFiniteClosure  {
 		long smallerLen = smallerRes.stream().filter(delFun).count();
 		try { 
 			logFile.write("\nsmallerLen: " + smallerLen +"\n");
-			// logFile.flush();
+			logFile.flush();
 		}
 		catch (IOException e) {
 			System.err.println("no LogFile");}
@@ -789,7 +789,7 @@ implements IFiniteClosure  {
 			//if (left.getName().equals("Vector") || right.getName().equals("AbstractList")) 
 			{try { 
 				logFile.write("\ngreaterRes: " + greaterRes);//"smallerHash: " + greaterHash.toString());
-				// logFile.flush();
+				logFile.flush();
 			}
 			catch (IOException e) {
 				System.err.println("no LogFile");}}

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

@@ -47,7 +47,7 @@ public class OrderingUnifyPair extends OrderingExtend<Set<UnifyPair>> {
 		catch (ClassCastException e) {
 			try {
 			((FiniteClosure)fc).logFile.write("ClassCastException: " + left.toString() + " " + left.getGroundBasePair() + "\n\n");
-			 // ((FiniteClosure)fc).logFile.flush();
+			((FiniteClosure)fc).logFile.flush();
 			}
 			catch (IOException ie) {
 			}

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

@@ -1,60 +1,73 @@
 package de.dhbwstuttgart.typeinference.unify.model;
 
-import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
-import de.dhbwstuttgart.typeinference.unify.interfaces.UnifyTypeVisitor;
+import java.io.File;
+import java.io.FileWriter;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Random;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
+
+import de.dhbwstuttgart.typeinference.unify.distributeVariance;
+import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
+import de.dhbwstuttgart.typeinference.unify.interfaces.UnifyTypeVisitor;
 
 /**
  * An unbounded placeholder type.
  * @author Florian Steurer
  */
 public final class PlaceholderType extends UnifyType{
-
+	
 	/**
 	 * Static list containing the names of all existing placeholders.
 	 * Used for generating fresh placeholders.
 	 */
 	public static final ArrayList<String> EXISTING_PLACEHOLDERS = new ArrayList<String>();
-
-
-	private static final AtomicInteger placeholderCount = new AtomicInteger(0);
-
+	
+	/**
+	 * Prefix of auto-generated placeholder names.
+	 */
+	protected static String nextName = "gen_";
+	
+	/**
+	 * Random number generator used to generate fresh placeholder name.
+	 */
+	protected static Random rnd = new Random(43558747548978L);
+	
 	/**
 	 * True if this object was auto-generated, false if this object was user-generated.
 	 */
 	private final boolean IsGenerated;
-
-
+	
+	
 	/**
-	 * isWildcardable gibt an, ob ein Wildcardtyp dem PlaceholderType zugeordnet werden darf
+	 * isWildcardable gibt an, ob ein Wildcardtyp dem PlaceholderType zugeordnet werden darf 
 	 */
-	private boolean wildcardable = true;
-
+	private boolean wildcardable = true;  
+	
 	/**
 	 * is innerType gibt an, ob der Type des PlaceholderType innerhalb eines Typkonstruktorsverwendet wird
 	 */
-	private boolean innerType = false;
-
+	private boolean innerType = false;  
+	
 	/**
-	 * variance shows the variance of the pair
-	 * 1: contravariant
-	 * -1 covariant
-	 * 0 invariant
-	 * PL 2018-03-21
-	 */
-	private int variance = 0;
-
-	/*
-	 * Fuer Oder-Constraints:
-	 * orCons = 1: Receiver
-	 * orCons = 0: Argument oder kein Oder-Constraint
-	 * orCons = -1: RetType
-	 */
-	private byte orCons = 0;
-
+     * variance shows the variance of the pair
+     * 1: contravariant
+     * -1 covariant
+     * 0 invariant
+     * PL 2018-03-21
+     */
+    private int variance = 0;
+    
+    /*
+     * Fuer Oder-Constraints:
+     * orCons = 1: Receiver
+     * orCons = 0: Argument oder kein Oder-Constraint 
+     * orCons = -1: RetType
+     */
+    private byte orCons = 0;
+	
 	/**
 	 * Creates a new placeholder type with the specified name.
 	 */
@@ -63,17 +76,17 @@ public final class PlaceholderType extends UnifyType{
 		EXISTING_PLACEHOLDERS.add(name); // Add to list of existing placeholder names
 		IsGenerated = false; // This type is user generated
 	}
-
-
+	
+	
 	public PlaceholderType(String name, int variance) {
 		super(name, new TypeParams());
 		EXISTING_PLACEHOLDERS.add(name); // Add to list of existing placeholder names
 		IsGenerated = false; // This type is user generated
 		this.variance = variance;
 	}
-
+	
 	/**
-	 * Creates a new placeholdertype
+	 * Creates a new placeholdertype 
 	 * @param isGenerated true if this placeholder is auto-generated, false if it is user-generated.
 	 */
 	protected PlaceholderType(String name, boolean isGenerated) {
@@ -81,42 +94,26 @@ public final class PlaceholderType extends UnifyType{
 		EXISTING_PLACEHOLDERS.add(name); // Add to list of existing placeholder names
 		IsGenerated = isGenerated;
 	}
-
+	
 	public <T> UnifyType accept(UnifyTypeVisitor<T> visitor, T ht) {
 		return visitor.visit(this, ht);
 	}
-
+	
 	/**
-	 * Creates a fresh placeholder type with a name that does so far not exist from the chars A-Z.
+	 * Creates a fresh placeholder type with a name that does so far not exist.
 	 * A user could later instantiate a type using the same name that is equivalent to this type.
 	 * @return A fresh placeholder type.
 	 */
-	public static PlaceholderType freshPlaceholder() {
-		String name;
-
-		int attempts = 1000;
-		while (attempts-- > 0) {
-			int pc = PlaceholderType.placeholderCount.incrementAndGet();
-
-			StringBuilder sb = new StringBuilder();
-			while (pc >= 0) {
-				sb.append((char)(pc % 26 + 97));
-				pc = pc / 26 - 1;
-			}
-			name = sb.toString();
-
-
-			synchronized (EXISTING_PLACEHOLDERS) {
-				if (!EXISTING_PLACEHOLDERS.contains(name)) {
-					return new PlaceholderType(name, true);
-				}
-			}
+	public synchronized static PlaceholderType freshPlaceholder() {
+		String name = nextName + (char) (rnd.nextInt(22) + 97); // Returns random char between 'a' and 'z'
+		// Add random chars while the name is in use.
+		while(EXISTING_PLACEHOLDERS.contains(name)) {
+			name += (char) (rnd.nextInt(22) + 97); // Returns random char between 'a' and 'z'
 		}
-
-		throw new RuntimeException("Failed to generate placeholder name in the allowed number of attempts");
+		return new PlaceholderType(name, true);
 	}
-
-
+	
+	
 	/**
 	 * True if this placeholder is auto-generated, false if it is user-generated.
 	 */
@@ -127,51 +124,51 @@ public final class PlaceholderType extends UnifyType{
 	public void setVariance(int v) {
 		variance = v;
 	}
-
+	
 	public int getVariance() {
 		return variance;
 	}
-
+	
 	public void reversVariance() {
 		if (variance == 1) {
 			setVariance(-1);
 		} else {
-			if (variance == -1) {
-				setVariance(1);
-			}}
+	    if (variance == -1) {
+			setVariance(1);
+		}}
 	}
-
+	
 	public void setOrCons(byte i) {
 		orCons = i;
 	}
-
+	
 	public byte getOrCons() {
 		return orCons;
 	}
-
+	
 	public Boolean isWildcardable() {
 		return wildcardable;
 	}
 	public void disableWildcardtable() {
 		wildcardable = false;
 	}
-
+	
 	public void enableWildcardtable() {
 		wildcardable = true;
 	}
-
+	
 	public void setWildcardtable(Boolean wildcardable) {
 		this.wildcardable = wildcardable;
 	}
-
+	
 	public Boolean isInnerType() {
 		return innerType;
 	}
-
+	
 	public void setInnerType(Boolean innerType) {
 		this.innerType = innerType;
 	}
-
+	
 	@Override
 	Set<UnifyType> smArg(IFiniteClosure fc, Set<UnifyType> fBounded) {
 		return fc.smArg(this, fBounded);
@@ -181,17 +178,17 @@ public final class PlaceholderType extends UnifyType{
 	Set<UnifyType> grArg(IFiniteClosure fc, Set<UnifyType> fBounded) {
 		return fc.grArg(this, fBounded);
 	}
-
+	
 	@Override
 	public UnifyType setTypeParams(TypeParams newTp) {
 		return this; // Placeholders never have params.
 	}
-
+	
 	@Override
 	public int hashCode() {
 		return typeName.hashCode();
 	}
-
+	
 	@Override
 	UnifyType apply(Unifier unif) {
 		if(unif.hasSubstitute(this)) {
@@ -203,15 +200,15 @@ public final class PlaceholderType extends UnifyType{
 		}
 		return this;
 	}
-
+	
 	@Override
 	public boolean equals(Object obj) {
 		if(!(obj instanceof PlaceholderType))
 			return false;
-
+		
 		return ((PlaceholderType) obj).getName().equals(typeName);
 	}
-
+	
 
 	@Override
 	public Collection<PlaceholderType> getInvolvedPlaceholderTypes() {

src/test/java/TestComplete.java

@@ -303,7 +303,7 @@ public class TestComplete {
         var result = mul.invoke(instanceOfClass_s1, instanceOfClass_s2);
         System.out.println(instanceOfClass_s1.toString() + " * " + instanceOfClass_s2.toString() + " = " + result.toString());
 
-        assertEquals(8, result);
+        assertEquals(result, 8);
     }
 
     @Test
@@ -444,8 +444,8 @@ public class TestComplete {
         var O = Arrays.stream(typeParaTypes).filter(t -> t.equals(paraTypes[0])).findFirst().get();
         var N2 = Arrays.stream(typeParaTypes).filter(t -> t.equals(paraTypes[1])).findFirst().get();
         assertEquals(N, N2);
-        assertEquals(Object.class, N.getBounds()[0]);
-        assertEquals(Object.class, O.getBounds()[0]);
+        assertEquals(N.getBounds()[0], Object.class);
+        assertEquals(O.getBounds()[0], Object.class);
 
         var m2 = tph4.getDeclaredMethod("m2", Object.class);
 
@@ -500,8 +500,8 @@ public class TestComplete {
         var P = Arrays.stream(typeParaTypes).filter(t -> t.equals(paraTypes[0])).findFirst().get();
         var O = Arrays.stream(typeParaTypes).filter(t -> t.equals(paraTypes[1])).findFirst().get();
 
-        assertEquals(Object.class, P.getBounds()[0]);
-        assertEquals(Object.class, O.getBounds()[0]);
+        assertEquals(P.getBounds()[0], Object.class);
+        assertEquals(O.getBounds()[0], Object.class);
 
         var m2 = tph5.getDeclaredMethod("m2", Object.class);
 
@@ -605,7 +605,7 @@ public class TestComplete {
         var fac1 = classFiles.get("Fac1");
         var instance = fac1.getDeclaredConstructor().newInstance();
         var fac = fac1.getDeclaredMethod("fac", Integer.class);
-        assertEquals(3628800, fac.invoke(instance, 10));
+        assertEquals(fac.invoke(instance, 10), 3628800);
     }
 
     @Test
@@ -676,16 +676,16 @@ public class TestComplete {
         var r2 = ctor.newInstance(10, 20f);
         var r3 = ctor.newInstance(10, r1);
 
-        assertEquals(30, swtch.invoke(instance, r1));
-        assertEquals(20, swtch.invoke(instance, r2));
-        assertEquals(40, swtch.invoke(instance, r3));
-        assertEquals(50, swtch.invoke(instance, 50));
+        assertEquals(swtch.invoke(instance, r1), 30);
+        assertEquals(swtch.invoke(instance, r2), 20);
+        assertEquals(swtch.invoke(instance, r3), 40);
+        assertEquals(swtch.invoke(instance, 50), 50);
         try {
-            assertEquals(0, swtch.invoke(instance, "Some string"));
+            assertEquals(swtch.invoke(instance, "Some string"), 0);
             fail("No assertion thrown!");
         } catch (InvocationTargetException exception) {
             assertTrue(exception.getCause() instanceof IllegalArgumentException);
-            assertEquals("Unhandled case value", exception.getCause().getMessage());
+            assertEquals(exception.getCause().getMessage(), "Unhandled case value");
         }
     }
 
@@ -702,7 +702,7 @@ public class TestComplete {
         var r1 = ctor.newInstance("asd", "asb");
 
 
-        assertEquals("asd", swtch.invoke(instance, r1));
+        assertEquals(swtch.invoke(instance, r1), "asd");
     }
 
     @Test
@@ -753,8 +753,8 @@ public class TestComplete {
         var r2 = ctor.newInstance(1, clazzNumber.getConstructor().newInstance());
 
 
-        assertEquals("Second Element is a Text", swtch.invoke(instance, r1));
-        assertEquals("Second Element is a Number", swtch.invoke(instance, r2));
+        assertEquals(swtch.invoke(instance, r1), "Second Element is a Text");
+        assertEquals(swtch.invoke(instance, r2), "Second Element is a Number");
     }
     @Test
     public void testSwitchListRecord() throws Exception {
@@ -776,10 +776,10 @@ public class TestComplete {
 
 
         var listWithMoreThanOneElement = constructorLinkedElem.newInstance(5, constructorLinkedElem.newInstance(1, constructorElem.newInstance(5)));
-        assertEquals(11, swtch.invoke(instance, listWithMoreThanOneElement));
+        assertEquals(swtch.invoke(instance, listWithMoreThanOneElement), 11);
 
         var listWithOneElement = constructorLinkedElem.newInstance(5, constructorElem.newInstance(5));
-        assertEquals(10, swtch.invoke(instance, listWithOneElement));
+        assertEquals(swtch.invoke(instance, listWithOneElement), 10);
     }
 
     @Test
@@ -795,9 +795,9 @@ public class TestComplete {
         var r2 = ctor.newInstance(20);
         var r3 = ctor.newInstance(30);
 
-        assertEquals(1, m.invoke(instance, r1));
-        assertEquals(2, m.invoke(instance, r2));
-        assertEquals(3, m.invoke(instance, r3));
+        assertEquals(m.invoke(instance, r1), 1);
+        assertEquals(m.invoke(instance, r2), 2);
+        assertEquals(m.invoke(instance, r3), 3);
     }
 
     @Test
@@ -820,10 +820,10 @@ public class TestComplete {
 
 
         var listWithMoreThanOneElement = constructorLinkedElem.newInstance(5, constructorLinkedElem.newInstance(1, constructorElem.newInstance(5)));
-        assertEquals(5, swtch.invoke(instance, listWithMoreThanOneElement));
+        assertEquals(swtch.invoke(instance, listWithMoreThanOneElement), 5);
 
         var listWithOneElement = constructorLinkedElem.newInstance(5, constructorElem.newInstance(5));
-        assertEquals(5, swtch.invoke(instance, listWithOneElement));
+        assertEquals(swtch.invoke(instance, listWithOneElement), 5);
     }
 
 
@@ -835,7 +835,6 @@ public class TestComplete {
         var instance = clazz.getDeclaredConstructor().newInstance();
     }
 
-    @Ignore("Not implemented")
     @Test
     public void testStringSwitch() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "SwitchString.jav");
@@ -843,11 +842,11 @@ public class TestComplete {
         var instance = clazz.getDeclaredConstructor().newInstance();
         var main = clazz.getDeclaredMethod("main", String.class);
 
-        assertEquals(1, main.invoke(instance, "AaAaAa"));
-        assertEquals(2, main.invoke(instance, "AaAaBB"));
-        assertEquals(3, main.invoke(instance, "test"));
-        assertEquals(3, main.invoke(instance, "TEST"));
-        assertEquals(4, main.invoke(instance, "awawa"));
+        assertEquals(main.invoke(instance, "AaAaAa"), 1);
+        assertEquals(main.invoke(instance, "AaAaBB"), 2);
+        assertEquals(main.invoke(instance, "test"), 3);
+        assertEquals(main.invoke(instance, "TEST"), 3);
+        assertEquals(main.invoke(instance, "awawa"), 4);
     }
 
     @Test
@@ -857,7 +856,6 @@ public class TestComplete {
         var instance = clazz.getDeclaredConstructor().newInstance();
     }
 
-    @Ignore("Not implemented")
     @Test
     public void testOverloadPattern() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "OverloadPattern.jav");
@@ -872,18 +870,17 @@ public class TestComplete {
         var ptInt = rec.getDeclaredConstructor(Number.class, Number.class).newInstance(1, 2);
         var ptFlt = rec.getDeclaredConstructor(Number.class, Number.class).newInstance(1f, 2f);
 
-        assertEquals(1, m1.invoke(instance, ptInt, ptFlt));
-        assertEquals(2, m1.invoke(instance, ptInt, ptInt));
-        assertEquals(3, m1.invoke(instance, ptFlt, ptInt));
-        assertEquals(4, m1.invoke(instance, ptFlt, ptFlt));
+        assertEquals(m1.invoke(instance, ptInt, ptFlt), 1);
+        assertEquals(m1.invoke(instance, ptInt, ptInt), 2);
+        assertEquals(m1.invoke(instance, ptFlt, ptInt), 3);
+        assertEquals(m1.invoke(instance, ptFlt, ptFlt), 4);
 
-        assertEquals(5, m2.invoke(instance, ptInt));
-        assertEquals(6, m2.invoke(instance, ptFlt));
+        assertEquals(m2.invoke(instance, ptInt), 5);
+        assertEquals(m2.invoke(instance, ptFlt), 6);
 
-        assertEquals(10, m3.invoke(instance, 10));
+        assertEquals(m3.invoke(instance, 10), 10);
     }
 
-    @Ignore("Not implemented")
     @Test
     public void testOverloadNestedPattern() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "OverloadNestedPattern.jav");
@@ -896,16 +893,16 @@ public class TestComplete {
         var r2 = ctor.newInstance(r1);
 
         var m = clazz.getDeclaredMethod("m", rec, rec);
-        assertEquals(1, m.invoke(instance, r2, r1));
+        assertEquals(m.invoke(instance, r2, r1), 1);
 
         var r3 = ctor.newInstance(2f);
         var r4 = ctor.newInstance(r3);
-        assertEquals(2, m.invoke(instance, r4, r3));
+        assertEquals(m.invoke(instance, r4, r3), 2);
 
-        assertEquals(3, m.invoke(instance, r1, r1));
+        assertEquals(m.invoke(instance, r1, r1), 3);
     }
 
-    @Ignore("Not implemented")
+    //@Ignore("Not implemented")
     @Test
     public void testPatternMatchingHaskellStyle() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "PatternMatchingHaskellStyle.jav");
@@ -923,12 +920,11 @@ public class TestComplete {
         var x = rctor.newInstance(rctor.newInstance(0, rctor.newInstance(0, r2ctor.newInstance(0))), r2ctor.newInstance(0));
         var y = rctor.newInstance(r2ctor.newInstance(0), r2ctor.newInstance(0));
 
-        assertNull(m.invoke(instance, x, y));
-        assertNull(m.invoke(instance, y, y));
+        assertEquals(m.invoke(instance, x, y), null);
+        assertEquals(m.invoke(instance, y, y), null);
 
     }
 
-    @Ignore("Not implemented")
     @Test
     public void testPatternMatchingListAppend() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "PatternMatchingListAppend.jav");
@@ -963,8 +959,8 @@ public class TestComplete {
         var x = rctor.newInstance(10);
         var d = rctor.newInstance(20.0);
 
-        assertEquals(50, m.invoke(instance, x, 0));
-        assertEquals(40.0, m.invoke(instance, d, 0));
+        assertEquals(m.invoke(instance, x, 0), 50);
+        assertEquals(m.invoke(instance, d, 0), 40.0);
     }
 
     @Test
@@ -979,7 +975,7 @@ public class TestComplete {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Static.jav");
         var clazz = classFiles.get("Static");
         var m = clazz.getDeclaredMethod("m");
-        assertEquals(50, m.invoke(null));
+        assertEquals(m.invoke(null), 50);
     }
 
     @Test
@@ -988,7 +984,7 @@ public class TestComplete {
         var clazz = classFiles.get("For");
         var instance = clazz.getDeclaredConstructor().newInstance();
         var m = clazz.getDeclaredMethod("m", Integer.class);
-        assertEquals(60, m.invoke(instance, 10));
+        assertEquals(m.invoke(instance, 10), 60);
     }
 
     @Test
@@ -997,7 +993,7 @@ public class TestComplete {
         var clazz = classFiles.get("ForEach");
         var instance = clazz.getDeclaredConstructor().newInstance();
         var m = clazz.getDeclaredMethod("m");
-        assertEquals(6, m.invoke(instance));
+        assertEquals(m.invoke(instance), 6);
     }
 
     @Test
@@ -1015,7 +1011,7 @@ public class TestComplete {
         var clazz = classFiles.get("FunctionalInterface");
         var instance = clazz.getDeclaredConstructor().newInstance();
         var m = clazz.getDeclaredMethod("m");
-        assertEquals(200, m.invoke(instance));
+        assertEquals(m.invoke(instance), 200);
     }
 
     @Test
@@ -1024,7 +1020,7 @@ public class TestComplete {
         var clazz = classFiles.get("Chain");
         var instance = clazz.getDeclaredConstructor().newInstance();
         var m = clazz.getDeclaredMethod("m");
-        assertEquals(5, m.invoke(instance));
+        assertEquals(m.invoke(instance), 5);
     }
 
     @Test
@@ -1077,9 +1073,9 @@ public class TestComplete {
         var instance = clazz.getDeclaredConstructor().newInstance();
 
         assertNull(clazz.getDeclaredMethod("m").invoke(instance));
-        assertEquals('C', clazz.getDeclaredMethod("m2").invoke(instance));
-        assertEquals(10L, clazz.getDeclaredMethod("m3").invoke(instance));
-        assertEquals(10.5F, clazz.getDeclaredMethod("m4").invoke(instance));
+        assertEquals(clazz.getDeclaredMethod("m2").invoke(instance), 'C');
+        assertEquals(clazz.getDeclaredMethod("m3").invoke(instance), 10L);
+        assertEquals(clazz.getDeclaredMethod("m4").invoke(instance), 10.5F);
     }
 
     @Test
@@ -1087,7 +1083,7 @@ public class TestComplete {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "OLConstructor.jav");
         var clazz = classFiles.get("Child");
         var instance = clazz.getDeclaredConstructor().newInstance();
-        assertEquals(3, clazz.getSuperclass().getDeclaredField("x").get(instance));
+        assertEquals(clazz.getSuperclass().getDeclaredField("x").get(instance), 3);
     }
 
     @Test
@@ -1095,11 +1091,11 @@ public class TestComplete {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Op1.jav");
         var clazz = classFiles.get("Op1");
         var instance = clazz.getDeclaredConstructor().newInstance();
-        assertEquals(true, clazz.getDeclaredMethod("not").invoke(instance));
-        assertEquals(10 | 20, clazz.getDeclaredMethod("or").invoke(instance));
-        assertEquals(10 & 20, clazz.getDeclaredMethod("and").invoke(instance));
-        assertEquals(10 ^ 20, clazz.getDeclaredMethod("xor").invoke(instance));
-        assertEquals(10 % 2, clazz.getDeclaredMethod("mod").invoke(instance));
+        assertEquals(clazz.getDeclaredMethod("not").invoke(instance), true);
+        assertEquals(clazz.getDeclaredMethod("or").invoke(instance), 10 | 20);
+        assertEquals(clazz.getDeclaredMethod("and").invoke(instance), 10 & 20);
+        assertEquals(clazz.getDeclaredMethod("xor").invoke(instance), 10 ^ 20);
+        assertEquals(clazz.getDeclaredMethod("mod").invoke(instance), 10 % 2);
     }
 
     @Ignore("Not implemented")
@@ -1116,18 +1112,18 @@ public class TestComplete {
         var clazzPublic = classFiles.get("Access");
         var clazzDefault = classFiles.get("AccessDefault");
 
-        assertEquals(Modifier.PUBLIC, clazzPublic.getModifiers());
-        assertEquals(0, clazzDefault.getModifiers());
+        assertEquals(clazzPublic.getModifiers(), Modifier.PUBLIC);
+        assertEquals(clazzDefault.getModifiers(), 0);
 
-        assertEquals(Modifier.PUBLIC, clazzPublic.getDeclaredMethod("mPublic").getModifiers());
-        assertEquals(Modifier.PROTECTED, clazzPublic.getDeclaredMethod("mProtected").getModifiers());
-        assertEquals(0, clazzPublic.getDeclaredMethod("mDefault").getModifiers());
-        assertEquals(Modifier.PRIVATE, clazzPublic.getDeclaredMethod("mPrivate").getModifiers());
+        assertEquals(clazzPublic.getDeclaredMethod("mPublic").getModifiers(), Modifier.PUBLIC);
+        assertEquals(clazzPublic.getDeclaredMethod("mProtected").getModifiers(), Modifier.PROTECTED);
+        assertEquals(clazzPublic.getDeclaredMethod("mDefault").getModifiers(), 0);
+        assertEquals(clazzPublic.getDeclaredMethod("mPrivate").getModifiers(), Modifier.PRIVATE);
 
-        assertEquals(Modifier.PUBLIC, clazzPublic.getDeclaredField("fPublic").getModifiers());
-        assertEquals(Modifier.PROTECTED, clazzPublic.getDeclaredField("fProtected").getModifiers());
-        assertEquals(0, clazzPublic.getDeclaredField("fDefault").getModifiers());
-        assertEquals(Modifier.PRIVATE, clazzPublic.getDeclaredField("fPrivate").getModifiers());
+        assertEquals(clazzPublic.getDeclaredField("fPublic").getModifiers(), Modifier.PUBLIC);
+        assertEquals(clazzPublic.getDeclaredField("fProtected").getModifiers(), Modifier.PROTECTED);
+        assertEquals(clazzPublic.getDeclaredField("fDefault").getModifiers(), 0);
+        assertEquals(clazzPublic.getDeclaredField("fPrivate").getModifiers(), Modifier.PRIVATE);
     }
 
     @Test
@@ -1165,7 +1161,7 @@ public class TestComplete {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Ternary.jav");
         var clazz = classFiles.get("Ternary");
         var instance = clazz.getDeclaredConstructor().newInstance();
-        assertEquals("small", clazz.getDeclaredMethod("main", Integer.class).invoke(instance, 5));
+        assertEquals(clazz.getDeclaredMethod("main", Integer.class).invoke(instance, 5), "small");
     }
 
     @Test
@@ -1173,8 +1169,8 @@ public class TestComplete {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "While.jav");
         var clazz = classFiles.get("While");
         var instance = clazz.getDeclaredConstructor().newInstance();
-        assertEquals(5, clazz.getDeclaredMethod("m", Integer.class).invoke(instance, 5));
-        assertEquals(10, clazz.getDeclaredMethod("m2").invoke(instance));
+        assertEquals(clazz.getDeclaredMethod("m", Integer.class).invoke(instance, 5), 5);
+        assertEquals(clazz.getDeclaredMethod("m2").invoke(instance), 10);
     }
 
     @Test
@@ -1190,7 +1186,7 @@ public class TestComplete {
         var clazz = classFiles.get("Assign");
         var instance = clazz.getDeclaredConstructor().newInstance();
         var m = clazz.getDeclaredMethod("m");
-        assertEquals(20, m.invoke(instance));
+        assertEquals(m.invoke(instance), 20);
     }
 
     @Test
@@ -1247,9 +1243,9 @@ public class TestComplete {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug295.jav");
         var clazz = classFiles.get("Bug295");
         var instance = clazz.getDeclaredConstructor(Integer.class, Integer.class, Integer.class).newInstance(1, 2, 3);
-        assertEquals(1, clazz.getDeclaredField("a").get(instance));
-        assertEquals(2, clazz.getDeclaredField("b").get(instance));
-        assertEquals(3, clazz.getDeclaredField("c").get(instance));
+        assertEquals(clazz.getDeclaredField("a").get(instance), 1);
+        assertEquals(clazz.getDeclaredField("b").get(instance), 2);
+        assertEquals(clazz.getDeclaredField("c").get(instance), 3);
     }
 
     @Test
@@ -1279,7 +1275,7 @@ public class TestComplete {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug300.jav");
         var clazz = classFiles.get("Bug300");
         var instance = clazz.getDeclaredConstructor().newInstance();
-        assertEquals("Base", clazz.getDeclaredMethod("m").invoke(instance));
+        assertEquals(clazz.getDeclaredMethod("m").invoke(instance), "Base");
     }
 
     @Test
@@ -1324,7 +1320,7 @@ public class TestComplete {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug310.jav");
         var clazz = classFiles.get("Bug310");
         var instance = clazz.getDeclaredConstructor().newInstance();
-        assertEquals("3", clazz.getDeclaredMethod("toString").invoke(instance));
+        assertEquals(clazz.getDeclaredMethod("toString").invoke(instance), "3");
     }
 
     @Test