Bug fixes für GeneralParserTest und Mehrfachaufrufe des Parsers entfernt

pom.xml

@@ -53,22 +53,11 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.0</version>
 				<configuration>
-					<release>19</release>
+					<compilerArgs>--enable-preview</compilerArgs>
-					<compilerArgs>
-						--enable-preview
-					</compilerArgs>
                     <source>19</source>
                     <target>19</target>
                 </configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.22.2</version>
-				<configuration>
-					<argLine>--enable-preview</argLine>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.antlr</groupId>
 				<artifactId>antlr4-maven-plugin</artifactId>
@@ -123,8 +112,9 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 		</repository>
 	</repositories>
 	<properties>
+		<maven.compiler.source>19</maven.compiler.source>
+		<maven.compiler.target>19</maven.compiler.target>
 		<mainClass>de.dhbwstuttgart.core.ConsoleInterface</mainClass>
-		<release>17</release>
 	</properties>
 	<distributionManagement>
 		<repository>

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

@@ -543,7 +543,7 @@ statement
     ;
 
 catchClause
-    : CATCH '(' variableModifier* catchType identifier ')' block
+    : CATCH '(' variableModifier* catchType? identifier ')' block
     ;
 
 catchType
@@ -652,7 +652,7 @@ expression
 
 // Java17
 pattern
-    : variableModifier* typeType annotation* identifier
+    : variableModifier* typeType? annotation* identifier
     ;
 
 // Java8

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

@@ -58,6 +58,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.*;
+import java.util.Map.Entry;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -105,28 +106,22 @@ public class JavaTXCompiler {
 	public ConstraintSet<Pair> getConstraints() throws ClassNotFoundException, IOException {
 		List<ClassOrInterface> allClasses = new ArrayList<>();// environment.getAllAvailableClasses();
 		List<ClassOrInterface> importedClasses = new ArrayList<>();
-		ClassOrInterface objectClass = ASTFactory.createClass(
+		ClassOrInterface objectClass = ASTFactory.createClass(classLoader.loadClass(new JavaClassName("java.lang.Object").toString()));
-				classLoader.loadClass(new JavaClassName("java.lang.Object").toString()));
 		// Alle Importierten Klassen in allen geparsten Sourcefiles kommen ins FC
-		for (File forSourceFile : sourceFiles.keySet()) {
+		for (Entry<File, SourceFile> source : sourceFiles.entrySet()) {
-			for (JavaClassName name : sourceFiles.get(forSourceFile).getImports()) {
+			for (JavaClassName name : source.getValue().getImports()) {
 				// TODO: Hier werden imports von eigenen (.jav) Klassen nicht beachtet
-				ClassOrInterface importedClass = ASTFactory.createClass(
+				ClassOrInterface importedClass = ASTFactory.createClass(classLoader.loadClass(name.toString()));
-						classLoader.loadClass(name.toString()));
 				importedClasses.add(importedClass);
 			}
-			for (Class c : CompilationEnvironment.loadDefaultPackageClasses(forSourceFile, classLoader)) {
+			for (Class c : CompilationEnvironment.loadDefaultPackageClasses(source.getValue().getPkgName(), source.getKey(), classLoader)) {
 				ClassOrInterface importedClass = ASTFactory.createClass(c);
 				importedClasses.add(importedClass);
 			}
 		}
 		for (File f : this.sourceFiles.keySet()) {
 			SourceFile sf = sourceFiles.get(f);
-			sf = new SourceFile(sf.getPkgName(),
+			sf = new SourceFile(sf.getPkgName(), sf.KlassenVektor.stream().map(cl -> new ClassOrInterface(cl)).collect(Collectors.toCollection(ArrayList::new)), sf.imports);
-					sf.KlassenVektor.stream()
-							.map(cl -> new ClassOrInterface(cl))
-							.collect(Collectors.toCollection(ArrayList::new)),
-					sf.imports);
 			// sf enthaelt neues Source-File, neue Klassen-Objekte und neue
 			// ArrayListen-Objekte fuer Fields, Construktoren und Methoden
 			// Alle anderen Objekte werden nur kopiert.
@@ -139,20 +134,17 @@ public class JavaTXCompiler {
 		return ty.getConstraints();
 	}
 
-	void addMethods(SourceFile sf, ClassOrInterface cl, List<ClassOrInterface> importedClasses,
+	void addMethods(SourceFile sf, ClassOrInterface cl, List<ClassOrInterface> importedClasses, ClassOrInterface objectClass) {
-			ClassOrInterface objectClass) {
 		if (!cl.areMethodsAdded()) {
 			ClassOrInterface superclass = null;
 			if (cl.getSuperClass().getName().equals(new JavaClassName("java.lang.Object"))) {
 				superclass = objectClass;
 			} else {
-				Optional<ClassOrInterface> optSuperclass = importedClasses.stream().filter(x -> x.getClassName().equals(
+				Optional<ClassOrInterface> optSuperclass = importedClasses.stream().filter(x -> x.getClassName().equals(cl.getSuperClass().getName())).findFirst();
-						cl.getSuperClass().getName())).findFirst();
 				if (optSuperclass.isPresent()) {
 					superclass = optSuperclass.get();
 				} else {
-					optSuperclass = sf.KlassenVektor.stream().filter(x -> x.getClassName().equals(
+					optSuperclass = sf.KlassenVektor.stream().filter(x -> x.getClassName().equals(cl.getSuperClass().getName())).findFirst();
-							cl.getSuperClass().getName())).findFirst();
 					if (optSuperclass.isPresent()) {
 						superclass = optSuperclass.get();
 						addMethods(sf, superclass, importedClasses, objectClass);
@@ -173,21 +165,11 @@ public class JavaTXCompiler {
 			// werden
 			while (methodIt.hasNext()) {
 				Method m = methodIt.next();
-				ParameterList newParaList = new ParameterList(
+				ParameterList newParaList = new ParameterList(m.getParameterList().getFormalparalist().stream().map(fp -> new FormalParameter(fp.getName(), fp.getType().acceptTV(new TypeExchanger(gtvs)), fp.getOffset())).collect(Collectors.toCollection(ArrayList::new)), m.getParameterList().getOffset());
-						m.getParameterList()
+				cl.getMethods().add(new Method(m.modifier, m.name, m.getReturnType().acceptTV(new TypeExchanger(gtvs)), newParaList, m.block,
-								.getFormalparalist()
-								.stream()
-								.map(fp -> new FormalParameter(fp.getName(), fp.getType().acceptTV(new TypeExchanger(gtvs)),
-										fp.getOffset()))
-								.collect(Collectors.toCollection(ArrayList::new)),
-						m.getParameterList().getOffset());
-				cl.getMethods()
-						.add(new Method(m.modifier, m.name, m.getReturnType().acceptTV(new TypeExchanger(gtvs)), newParaList,
-								m.block,
 						// new GenericDeclarationList(newGenericsList,
 						// ((GenericDeclarationList)m.getGenerics()).getOffset()),
-								(GenericDeclarationList) m.getGenerics(),
+						(GenericDeclarationList) m.getGenerics(), m.getOffset(), true));
-								m.getOffset(), true));
 			}
 
 		}
@@ -202,23 +184,18 @@ public class JavaTXCompiler {
 		Set<ClassOrInterface> allClasses = new HashSet<>();
 
 		/*
-		 * PL 2018-09-19 geloescht werden bereits in typeInference hinzugefuegt
+		 * PL 2018-09-19 geloescht werden bereits in typeInference hinzugefuegt }
-		 * }
 		 * allClasses.addAll(importedClasses);
 		 * 
-		 * return new TYPE(sourceFiles.values(), allClasses).getConstraints();
+		 * return new TYPE(sourceFiles.values(), allClasses).getConstraints(); }
-		 * }
 		 * 
 		 * public List<ClassOrInterface> getAvailableClasses(SourceFile forSourceFile)
-		 * throws ClassNotFoundException {
+		 * throws ClassNotFoundException { // PL 2018-09-18: List durch Set ersetzt,
-		 * // PL 2018-09-18: List durch Set ersetzt, damit die Klassen nur einmal
+		 * damit die Klassen nur einmal // hinzugefuegt werden // List<ClassOrInterface>
-		 * // hinzugefuegt werden
+		 * allClasses = new // ArrayList<>();//environment.getAllAvailableClasses();
-		 * // List<ClassOrInterface> allClasses = new
-		 * // ArrayList<>();//environment.getAllAvailableClasses();
 		 * Set<ClassOrInterface> allClasses = new HashSet<>();
 		 * 
-		 * /*
+		 * /* PL 2018-09-19 geloescht werden bereits in typeInference hinzugefuegt for
-		 * PL 2018-09-19 geloescht werden bereits in typeInference hinzugefuegt for
 		 * (SourceFile sf : sourceFiles.values()) { allClasses.addAll(sf.getClasses());
 		 * }
 		 */
@@ -226,8 +203,7 @@ public class JavaTXCompiler {
 		List<ClassOrInterface> importedClasses = new ArrayList<>();
 		for (JavaClassName name : forSourceFile.getImports()) {
 			// TODO: Hier werden imports von eigenen (.jav) Klassen nicht beachtet
-			ClassOrInterface importedClass = ASTFactory
+			ClassOrInterface importedClass = ASTFactory.createClass(classLoader.loadClass(name.toString()));
-					.createClass(classLoader.loadClass(name.toString()));
 			importedClasses.add(importedClass);
 			allClasses.addAll(importedClasses);
 		}
@@ -379,16 +355,14 @@ public class JavaTXCompiler {
 	 * }
 	 */
 
-	public UnifyResultModel typeInferenceAsync(UnifyResultListener resultListener, Writer logFile)
+	public UnifyResultModel typeInferenceAsync(UnifyResultListener resultListener, Writer logFile) throws ClassNotFoundException, IOException {
-			throws ClassNotFoundException, IOException {
 		List<ClassOrInterface> allClasses = new ArrayList<>();// environment.getAllAvailableClasses();
 		// Alle Importierten Klassen in allen geparsten Sourcefiles kommen ins FC
-		for (File f : this.sourceFiles.keySet()) {
+		for (Entry<File, SourceFile> source : this.sourceFiles.entrySet()) {
-			SourceFile sf = sourceFiles.get(f);
+			SourceFile sf = source.getValue();
 			allClasses.addAll(getAvailableClasses(sf));
 			allClasses.addAll(sf.getClasses());
-			allClasses.addAll(CompilationEnvironment.loadDefaultPackageClasses(f, classLoader).stream()
+			allClasses.addAll(CompilationEnvironment.loadDefaultPackageClasses(sf.getPkgName(), source.getKey(), classLoader).stream().map(ASTFactory::createClass).collect(Collectors.toList()));
-					.map(ASTFactory::createClass).collect(Collectors.toList()));
 		}
 
 		final ConstraintSet<Pair> cons = getConstraints();
@@ -396,9 +370,7 @@ public class JavaTXCompiler {
 		UnifyResultModel urm = null;
 		// urm.addUnifyResultListener(resultListener);
 		try {
-			logFile = logFile == null
+			logFile = logFile == null ? new FileWriter(new File("log_" + sourceFiles.keySet().iterator().next().getName())) : logFile;
-					? new FileWriter(new File("log_" + sourceFiles.keySet().iterator().next().getName()))
-					: logFile;
 			IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses, logFile, classLoader);
 			System.out.println(finiteClosure);
 			urm = new UnifyResultModel(cons, finiteClosure);
@@ -407,9 +379,7 @@ public class JavaTXCompiler {
 
 			Function<UnifyPair, UnifyPair> distributeInnerVars = x -> {
 				UnifyType lhs, rhs;
-				if (((lhs = x.getLhsType()) instanceof PlaceholderType)
+				if (((lhs = x.getLhsType()) instanceof PlaceholderType) && ((rhs = x.getRhsType()) instanceof PlaceholderType) && (((PlaceholderType) lhs).isInnerType() || ((PlaceholderType) rhs).isInnerType())) {
-						&& ((rhs = x.getRhsType()) instanceof PlaceholderType)
-						&& (((PlaceholderType) lhs).isInnerType() || ((PlaceholderType) rhs).isInnerType())) {
 					((PlaceholderType) lhs).setInnerType(true);
 					((PlaceholderType) rhs).setInnerType(true);
 				}
@@ -427,12 +397,7 @@ public class JavaTXCompiler {
 			}
 			logFile.flush();
 
-			Set<String> methodParaTypeVarNames = allClasses.stream().map(x -> x.getMethods().stream()
+			Set<String> methodParaTypeVarNames = allClasses.stream().map(x -> x.getMethods().stream().map(y -> y.getParameterList().getFormalparalist().stream().filter(z -> z.getType() instanceof TypePlaceholder).map(z -> ((TypePlaceholder) z.getType()).getName()).collect(Collectors.toCollection(HashSet::new))).reduce(new HashSet<String>(), (a, b) -> {
-					.map(y -> y.getParameterList().getFormalparalist().stream()
-							.filter(z -> z.getType() instanceof TypePlaceholder)
-							.map(z -> ((TypePlaceholder) z.getType()).getName())
-							.collect(Collectors.toCollection(HashSet::new)))
-					.reduce(new HashSet<String>(), (a, b) -> {
 				a.addAll(b);
 				return a;
 			}, (a, b) -> {
@@ -443,12 +408,7 @@ public class JavaTXCompiler {
 				return a;
 			});
 
-			Set<String> constructorParaTypeVarNames = allClasses.stream().map(x -> x.getConstructors().stream()
+			Set<String> constructorParaTypeVarNames = allClasses.stream().map(x -> x.getConstructors().stream().map(y -> y.getParameterList().getFormalparalist().stream().filter(z -> z.getType() instanceof TypePlaceholder).map(z -> ((TypePlaceholder) z.getType()).getName()).collect(Collectors.toCollection(HashSet::new))).reduce(new HashSet<String>(), (a, b) -> {
-					.map(y -> y.getParameterList().getFormalparalist().stream()
-							.filter(z -> z.getType() instanceof TypePlaceholder)
-							.map(z -> ((TypePlaceholder) z.getType()).getName())
-							.collect(Collectors.toCollection(HashSet::new)))
-					.reduce(new HashSet<String>(), (a, b) -> {
 				a.addAll(b);
 				return a;
 			}, (a, b) -> {
@@ -462,20 +422,12 @@ public class JavaTXCompiler {
 			Set<String> paraTypeVarNames = methodParaTypeVarNames;
 			paraTypeVarNames.addAll(constructorParaTypeVarNames);
 
-			Set<String> returnTypeVarNames = allClasses.stream()
+			Set<String> returnTypeVarNames = allClasses.stream().map(x -> x.getMethods().stream().filter(y -> y.getReturnType() instanceof TypePlaceholder).map(z -> ((TypePlaceholder) z.getReturnType()).getName()).collect(Collectors.toCollection(HashSet::new))).reduce((a, b) -> {
-					.map(x -> x.getMethods().stream().filter(y -> y.getReturnType() instanceof TypePlaceholder)
-							.map(z -> ((TypePlaceholder) z.getReturnType()).getName())
-							.collect(Collectors.toCollection(HashSet::new)))
-					.reduce((a, b) -> {
 				a.addAll(b);
 				return a;
 			}).get();
 
-			Set<String> fieldTypeVarNames = allClasses.stream()
+			Set<String> fieldTypeVarNames = allClasses.stream().map(x -> x.getFieldDecl().stream().filter(y -> y.getReturnType() instanceof TypePlaceholder).map(z -> ((TypePlaceholder) z.getReturnType()).getName()).collect(Collectors.toCollection(HashSet::new))).reduce((a, b) -> {
-					.map(x -> x.getFieldDecl().stream().filter(y -> y.getReturnType() instanceof TypePlaceholder)
-							.map(z -> ((TypePlaceholder) z.getReturnType()).getName())
-							.collect(Collectors.toCollection(HashSet::new)))
-					.reduce((a, b) -> {
 				a.addAll(b);
 				return a;
 			}).get();
@@ -537,19 +489,11 @@ public class JavaTXCompiler {
 			// logFile, log);
 			// Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
 			List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints()/*
-																																												 * .stream().map(x -> {
+																																												 * .stream().map(x -> { Set<Set<UnifyPair>> ret = new HashSet<>(); for
-																																												 * Set<Set<UnifyPair>> ret = new
+																																												 * (Constraint<UnifyPair> y : x) { ret.add(new HashSet<>(y)); } return ret;
-																																												 * HashSet<>();
+																																												 * }).collect(Collectors. toCollection(ArrayList::new))
-																																												 * for (Constraint<UnifyPair> y
-																																												 * : x) {
-																																												 * ret.add(new HashSet<>(y));
-																																												 * }
-																																												 * return ret;
-																																												 * }).collect(Collectors.
-																																												 * toCollection(ArrayList::new))
 																																												 */;
-			unify.unifyAsync(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm,
+			unify.unifyAsync(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm, usedTasks);
-					usedTasks);
 		} catch (IOException e) {
 			System.err.println("kein LogFile");
 		}
@@ -559,12 +503,11 @@ public class JavaTXCompiler {
 	public List<ResultSet> typeInference() throws ClassNotFoundException, IOException {
 		List<ClassOrInterface> allClasses = new ArrayList<>();// environment.getAllAvailableClasses();
 		// Alle Importierten Klassen in allen geparsten Sourcefiles kommen ins FC
-		for (File f : this.sourceFiles.keySet()) {
+		for (Entry<File, SourceFile> source : this.sourceFiles.entrySet()) {
-			SourceFile sf = sourceFiles.get(f);
+			SourceFile sf = source.getValue();
 			allClasses.addAll(getAvailableClasses(sf));
 			allClasses.addAll(sf.getClasses());
-			allClasses.addAll(CompilationEnvironment.loadDefaultPackageClasses(f, classLoader).stream()
+			allClasses.addAll(CompilationEnvironment.loadDefaultPackageClasses(sf.getPkgName(), source.getKey(), classLoader).stream().map(ASTFactory::createClass).collect(Collectors.toList()));
-					.map(ASTFactory::createClass).collect(Collectors.toList()));
 		}
 
 		final ConstraintSet<Pair> cons = getConstraints();
@@ -573,17 +516,14 @@ public class JavaTXCompiler {
 			Writer logFile = // new OutputStreamWriter(new NullOutputStream());
 					// new FileWriter(new
 					// File(System.getProperty("user.dir")+"/resources/logFiles/"+"log_"+sourceFiles.keySet().iterator().next().getName()));
-					new FileWriter(new File(System.getProperty("user.dir") + "/logFiles/" + "log_"
+					new FileWriter(new File(System.getProperty("user.dir") + "/logFiles/" + "log_" + sourceFiles.keySet().iterator().next().getName()));
-							+ sourceFiles.keySet().iterator().next().getName()));
 			IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses, logFile, classLoader);
 			System.out.println(finiteClosure);
 			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(cons);
 			System.out.println("xxx1");
 			Function<UnifyPair, UnifyPair> distributeInnerVars = x -> {
 				UnifyType lhs, rhs;
-				if (((lhs = x.getLhsType()) instanceof PlaceholderType)
+				if (((lhs = x.getLhsType()) instanceof PlaceholderType) && ((rhs = x.getRhsType()) instanceof PlaceholderType) && (((PlaceholderType) lhs).isInnerType() || ((PlaceholderType) rhs).isInnerType())) {
-						&& ((rhs = x.getRhsType()) instanceof PlaceholderType)
-						&& (((PlaceholderType) lhs).isInnerType() || ((PlaceholderType) rhs).isInnerType())) {
 					((PlaceholderType) lhs).setInnerType(true);
 					((PlaceholderType) rhs).setInnerType(true);
 				}
@@ -604,12 +544,7 @@ public class JavaTXCompiler {
 			}
 			logFile.flush();
 
-			Set<String> methodParaTypeVarNames = allClasses.stream().map(x -> x.getMethods().stream()
+			Set<String> methodParaTypeVarNames = allClasses.stream().map(x -> x.getMethods().stream().map(y -> y.getParameterList().getFormalparalist().stream().filter(z -> z.getType() instanceof TypePlaceholder).map(z -> ((TypePlaceholder) z.getType()).getName()).collect(Collectors.toCollection(HashSet::new))).reduce(new HashSet<String>(), (a, b) -> {
-					.map(y -> y.getParameterList().getFormalparalist().stream()
-							.filter(z -> z.getType() instanceof TypePlaceholder)
-							.map(z -> ((TypePlaceholder) z.getType()).getName())
-							.collect(Collectors.toCollection(HashSet::new)))
-					.reduce(new HashSet<String>(), (a, b) -> {
 				a.addAll(b);
 				return a;
 			}, (a, b) -> {
@@ -620,12 +555,7 @@ public class JavaTXCompiler {
 				return a;
 			});
 
-			Set<String> constructorParaTypeVarNames = allClasses.stream().map(x -> x.getConstructors().stream()
+			Set<String> constructorParaTypeVarNames = allClasses.stream().map(x -> x.getConstructors().stream().map(y -> y.getParameterList().getFormalparalist().stream().filter(z -> z.getType() instanceof TypePlaceholder).map(z -> ((TypePlaceholder) z.getType()).getName()).collect(Collectors.toCollection(HashSet::new))).reduce(new HashSet<String>(), (a, b) -> {
-					.map(y -> y.getParameterList().getFormalparalist().stream()
-							.filter(z -> z.getType() instanceof TypePlaceholder)
-							.map(z -> ((TypePlaceholder) z.getType()).getName())
-							.collect(Collectors.toCollection(HashSet::new)))
-					.reduce(new HashSet<String>(), (a, b) -> {
 				a.addAll(b);
 				return a;
 			}, (a, b) -> {
@@ -639,20 +569,12 @@ public class JavaTXCompiler {
 			Set<String> paraTypeVarNames = methodParaTypeVarNames;
 			paraTypeVarNames.addAll(constructorParaTypeVarNames);
 
-			Set<String> returnTypeVarNames = allClasses.stream()
+			Set<String> returnTypeVarNames = allClasses.stream().map(x -> x.getMethods().stream().filter(y -> y.getReturnType() instanceof TypePlaceholder).map(z -> ((TypePlaceholder) z.getReturnType()).getName()).collect(Collectors.toCollection(HashSet::new))).reduce((a, b) -> {
-					.map(x -> x.getMethods().stream().filter(y -> y.getReturnType() instanceof TypePlaceholder)
-							.map(z -> ((TypePlaceholder) z.getReturnType()).getName())
-							.collect(Collectors.toCollection(HashSet::new)))
-					.reduce((a, b) -> {
 				a.addAll(b);
 				return a;
 			}).get();
 
-			Set<String> fieldTypeVarNames = allClasses.stream()
+			Set<String> fieldTypeVarNames = allClasses.stream().map(x -> x.getFieldDecl().stream().filter(y -> y.getReturnType() instanceof TypePlaceholder).map(z -> ((TypePlaceholder) z.getReturnType()).getName()).collect(Collectors.toCollection(HashSet::new))).reduce((a, b) -> {
-					.map(x -> x.getFieldDecl().stream().filter(y -> y.getReturnType() instanceof TypePlaceholder)
-							.map(z -> ((TypePlaceholder) z.getReturnType()).getName())
-							.collect(Collectors.toCollection(HashSet::new)))
-					.reduce((a, b) -> {
 				a.addAll(b);
 				return a;
 			}).get();
@@ -699,14 +621,10 @@ public class JavaTXCompiler {
 			/*
 			 * unifyCons.getOderConstraints().forEach(z -> z.forEach(y -> y.forEach(x -> {
 			 * if ((x.getLhsType() instanceof PlaceholderType) &&
-			 * x.getPairOp().compareTo(PairOperator.SMALLERDOT) == 0) {
+			 * x.getPairOp().compareTo(PairOperator.SMALLERDOT) == 0) { ((PlaceholderType)
-			 * ((PlaceholderType) x.getLhsType()).setVariance((byte)1);
+			 * x.getLhsType()).setVariance((byte)1); } else if ((x.getRhsType() instanceof
-			 * }
+			 * PlaceholderType) && x.getPairOp().compareTo(PairOperator.EQUALSDOT) == 0) {
-			 * else if ((x.getRhsType() instanceof PlaceholderType) &&
+			 * ((PlaceholderType) x.getRhsType()).setVariance((byte)-1); } })));
-			 * x.getPairOp().compareTo(PairOperator.EQUALSDOT) == 0) {
-			 * ((PlaceholderType) x.getRhsType()).setVariance((byte)-1);
-			 * }
-			 * })));
 			 */
 
 			System.out.println("Unify nach Oder-Constraints-Anpassung:" + unifyCons.toString());
@@ -736,11 +654,8 @@ public class JavaTXCompiler {
 			// Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
 			List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints()// .stream().map(x -> {
 			/*
-			 * Set<Set<UnifyPair>> ret = new HashSet<>();
+			 * Set<Set<UnifyPair>> ret = new HashSet<>(); for (Constraint<UnifyPair> y : x)
-			 * for (Constraint<UnifyPair> y : x) {
+			 * { ret.add(new HashSet<>(y)); } return ret;
-			 * ret.add(new HashSet<>(y));
-			 * }
-			 * return ret;
 			 * }).collect(Collectors.toCollection(ArrayList::new))
 			 */;
 			if (resultmodel) {
@@ -748,8 +663,7 @@ public class JavaTXCompiler {
 				UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
 				UnifyResultListenerImpl li = new UnifyResultListenerImpl();
 				urm.addUnifyResultListener(li);
-				unify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm,
+				unify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm, usedTasks);
-						usedTasks);
 				System.out.println("RESULT Final: " + li.getResults());
 				System.out.println("Constraints for Generated Generics: " + " ???");
 				logFile.write("RES_FINAL: " + li.getResults().toString() + "\n");
@@ -761,8 +675,7 @@ public class JavaTXCompiler {
 				// Set<Set<UnifyPair>> result = unify.unify(unifyCons.getUndConstraints(),
 				// oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons,
 				// finiteClosure));
-				Set<Set<UnifyPair>> result = unify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints,
+				Set<Set<UnifyPair>> result = unify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure), usedTasks);
-						finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure), usedTasks);
 				System.out.println("RESULT: " + result);
 				logFile.write("RES: " + result.toString() + "\n");
 				logFile.flush();
@@ -789,9 +702,7 @@ public class JavaTXCompiler {
 		} catch (IOException e) {
 			System.err.println("kein LogFile");
 		}
-		return results.stream()
+		return results.stream().map((unifyPairs -> new ResultSet(UnifyTypeFactory.convert(unifyPairs, Pair.generateTPHMap(cons))))).collect(Collectors.toList());
-				.map((unifyPairs -> new ResultSet(UnifyTypeFactory.convert(unifyPairs, Pair.generateTPHMap(cons)))))
-				.collect(Collectors.toList());
 	}
 
 	/**
@@ -852,8 +763,7 @@ public class JavaTXCompiler {
 
 	private SourceFile parse(File sourceFile) throws IOException, java.lang.ClassNotFoundException {
 		SourceFileContext tree = JavaTXParser.parse(sourceFile);
-		SyntaxTreeGenerator generator = new SyntaxTreeGenerator(environment.getRegistry(sourceFile, classLoader),
+		SyntaxTreeGenerator generator = new SyntaxTreeGenerator(environment.getRegistry(tree, sourceFile, classLoader), new GenericsRegistry(null));
-				new GenericsRegistry(null));
 		SourceFile ret = generator.convert(tree, environment.packageCrawler, classLoader);
 		return ret;
 	}
@@ -891,9 +801,8 @@ public class JavaTXCompiler {
 	}
 
 	/**
-	 * @param outputPath          - can be null, then class file output
+	 * @param outputPath          - can be null, then class file output is in the
-	 *                            is in the same directory as the
+	 *                            same directory as the parsed source files
-	 *                            parsed source files
 	 * @param typeinferenceResult
 	 * @throws IOException
 	 */
@@ -969,8 +878,7 @@ public class JavaTXCompiler {
 
 		@Override
 		public RefTypeOrTPHOrWildcardOrGeneric visit(SuperWildcardType superWildcardType) {
-			SuperWildcardType ret = new SuperWildcardType(superWildcardType.getInnerType().acceptTV(this),
+			SuperWildcardType ret = new SuperWildcardType(superWildcardType.getInnerType().acceptTV(this), superWildcardType.getOffset());
-					superWildcardType.getOffset());
 			return ret;
 		}
 
@@ -982,8 +890,7 @@ public class JavaTXCompiler {
 
 		@Override
 		public RefTypeOrTPHOrWildcardOrGeneric visit(ExtendsWildcardType extendsWildcardType) {
-			ExtendsWildcardType ret = new ExtendsWildcardType(extendsWildcardType.getInnerType().acceptTV(this),
+			ExtendsWildcardType ret = new ExtendsWildcardType(extendsWildcardType.getInnerType().acceptTV(this), extendsWildcardType.getOffset());
-					extendsWildcardType.getOffset());
 			return ret;
 		}
 

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

@@ -20,8 +20,8 @@ import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 
 /**
  * Stellt die Java-Environment dar und speichert alle Binarys, Librarys und
- * Sourcefiles im zu kompilierenden Projekt
+ * Sourcefiles im zu kompilierenden Projekt Sie erstellt anhand dieser
- * Sie erstellt anhand dieser Informationen die JavaClassNameRegistry
+ * Informationen die JavaClassNameRegistry
  * 
  * TODO: Zur Initialisierung der CompilationEnvironment sollten alle SourceFiles
  * mit ANTLR geparst werden und alle Klassen Generics und Typen herausgefunden
@@ -34,16 +34,14 @@ public class CompilationEnvironment {
 
 	/**
 	 * Imitiert die Environment beim Aufruf des JavaCompilers auf einer Menge von
-	 * java-Dateien
+	 * java-Dateien Die Environment enth<EFBFBD>lt automatisch die Java Standard Library
-	 * Die Environment enth<EFBFBD>lt automatisch die Java Standard Library
 	 * 
 	 * @param sourceFiles die zu kompilierenden Dateien
 	 */
 	public CompilationEnvironment(List<File> sourceFiles) {
 		/**
-		 * Java 9 bringt einige Änderungen am Classloader
+		 * Java 9 bringt einige Änderungen am Classloader So funktioniert der
-		 * So funktioniert der BootClassLoader nicht mehr.
+		 * BootClassLoader nicht mehr. hier gibts ein paar Quellen zum nachlesen:
-		 * hier gibts ein paar Quellen zum nachlesen:
 		 * http://java9.wtf/class-loading/
 		 * https://stackoverflow.com/questions/46494112/classloaders-hierarchy-in-java-9
 		 *
@@ -66,13 +64,11 @@ public class CompilationEnvironment {
 		this.packageCrawler = new PackageCrawler(librarys);
 	}
 
-	public JavaClassRegistry getRegistry(File forSourceFile, ClassLoader classLoader)
+	public JavaClassRegistry getRegistry(SourceFileContext tree, File sourceFile, ClassLoader classLoader) throws ClassNotFoundException, IOException {
-			throws ClassNotFoundException, IOException {
 		Map<String, Integer> allNames;
-		SourceFileContext tree = JavaTXParser.parse(forSourceFile);
 		if (tree instanceof SrcfileContext srcfile) {
 			allNames = GatherNames.getNames((SrcfileContext) tree, packageCrawler, classLoader);
-			for (Class c : loadDefaultPackageClasses(forSourceFile, classLoader)) {
+			for (Class c : loadDefaultPackageClasses(getPackageName(srcfile), sourceFile, classLoader)) {
 				allNames.put(c.getName(), c.getTypeParameters().length);
 			}
 			return new JavaClassRegistry(allNames);
@@ -82,18 +78,10 @@ public class CompilationEnvironment {
 
 	}
 
-	public static List<Class> loadDefaultPackageClasses(File forSourceFile, ClassLoader classLoader)
+	public static List<Class> loadDefaultPackageClasses(String packageName, File sourceFile, ClassLoader classLoader) throws IOException, ClassNotFoundException {
-			throws IOException, ClassNotFoundException {
 		List<Class> ret = new ArrayList<>();
-		SourceFileContext srcfilectx = JavaTXParser.parse(forSourceFile);
-		String packageName;
-		if (srcfilectx instanceof SrcfileContext) {
-			packageName = getPackageName((SrcfileContext) srcfilectx);
-		} else {
-			packageName = "";
-		}
 		// Set classLoader to include default package for this specific source file
-		File dir = new File(forSourceFile.getAbsoluteFile().getParent());
+		File dir = sourceFile.getParentFile();
 		String dirPath = dir.toString() + "/";
 		if (packageName.length() > 0)
 			dirPath = dirPath.substring(0, dirPath.length() - packageName.length() - 1);

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

@@ -51,6 +51,7 @@ import de.dhbwstuttgart.parser.antlr.Java17Parser.ModifierContext;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.NoclassorinterfaceContext;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.ReftypeContext;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.SrcfileContext;
+import de.dhbwstuttgart.parser.antlr.Java17Parser.TypeArgumentsContext;
 import de.dhbwstuttgart.parser.scope.GatherNames;
 import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
@@ -112,18 +113,15 @@ public class SyntaxTreeGenerator {
   }
 
   public String convertQualifiedName(Java17Parser.QualifiedNameContext ctx) {
-    String ret = "";
+    /*
-    for (Java17Parser.IdentifierContext ident : ctx.identifier()) {
+     * String ret = ""; for (Java17Parser.IdentifierContext ident :
-      ret += ident.getText();
+     * ctx.identifier()) { ret += ident.getText(); if
-      if (ctx.identifier().iterator().hasNext()) {
+     * (ctx.identifier().iterator().hasNext()) { ret += '.'; } }
-        ret += '.';
+     */
-      }
+    return ctx.getText();
-    }
-    return ret;
   }
 
-  public SourceFile convert(Java17Parser.SourceFileContext ctx, PackageCrawler packageCrawler, ClassLoader classLoader)
+  public SourceFile convert(Java17Parser.SourceFileContext ctx, PackageCrawler packageCrawler, ClassLoader classLoader) throws ClassNotFoundException, NotImplementedException {
-      throws ClassNotFoundException, NotImplementedException {
     SrcfileContext srcfile;
     List<ClassOrInterface> classes = new ArrayList<>();
     if (ctx instanceof Java17Parser.SrcfileContext) {
@@ -172,14 +170,12 @@ public class SyntaxTreeGenerator {
   }
 
   private ClassOrInterface convertClass(Java17Parser.ClassDeclarationContext ctx, int modifiers) {
-    String className = this.pkgName.length() > 0 ? this.pkgName + "." : ctx.identifier().getText();
+    String className = this.pkgName + (this.pkgName.length() > 0 ? "." : "") + ctx.identifier().getText();
     JavaClassName name = reg.getName(className); // Holt den Package Namen mit dazu
     if (!name.toString().equals(className)) { // Kommt die Klasse schon in einem anderen Package vor?
-      throw new TypeinferenceException(
+      throw new TypeinferenceException("Name " + className + " bereits vorhanden in " + reg.getName(className).toString(), ctx.getStart());
-          "Name " + className + " bereits vorhanden in " + reg.getName(className).toString(), ctx.getStart());
     }
-    GenericsRegistry generics = createGenerics(ctx.genericDeclarationList(), name, "", reg,
+    GenericsRegistry generics = createGenerics(ctx.genericDeclarationList(), name, "", reg, new GenericsRegistry(globalGenerics));
-        new GenericsRegistry(globalGenerics));
     Token offset = ctx.getStart();
     GenericDeclarationList genericClassParameters;
     if (ctx.genericDeclarationList() == null) {
@@ -231,8 +227,7 @@ public class SyntaxTreeGenerator {
         continue;
       }
       if (constructors.isEmpty()) {
-        constructors.add(generateStandardConstructor(
+        constructors.add(generateStandardConstructor(ctx.identifier().getText(), name, superClass, genericClassParameters, offset));
-            ctx.identifier().getText(), name, superClass, genericClassParameters, offset));
       }
       if (ctx.IMPLEMENTS() != null) {
         implementedInterfaces.addAll(convert(ctx.typeList(0), generics));
@@ -254,24 +249,19 @@ public class SyntaxTreeGenerator {
         }
       }
     }
-    return new ClassOrInterface(modifiers, name, fielddecl,
+    return new ClassOrInterface(modifiers, name, fielddecl, Optional.of(this.generatePseudoConstructor(ctx.identifier().getText(), name, superClass, genericClassParameters, offset)), methods, constructors, genericClassParameters, superClass, isInterface, implementedInterfaces, offset);
-        Optional.of(this.generatePseudoConstructor(ctx.identifier().getText(), name, superClass, genericClassParameters,
-            offset)),
-        methods, constructors, genericClassParameters, superClass, isInterface, implementedInterfaces, offset);
   }
 
   private ClassOrInterface convertInterface(Java17Parser.InterfaceDeclarationContext ctx, int modifiers) {
     String className = this.pkgName.length() > 0 ? this.pkgName + "." : "" + ctx.identifier().getText();
     JavaClassName name = reg.getName(className); // Holt den Package Namen mit dazu
     if (!name.toString().equals(className)) { // Kommt die Klasse schon in einem anderen Package vor?
-      throw new TypeinferenceException(
+      throw new TypeinferenceException("Name " + className + " bereits vorhanden in " + reg.getName(className).toString(), ctx.getStart());
-          "Name " + className + " bereits vorhanden in " + reg.getName(className).toString(), ctx.getStart());
     }
     if (!Modifier.isInterface(modifiers))
       modifiers += Modifier.INTERFACE;
 
-    GenericsRegistry generics = createGenerics(ctx.genericDeclarationList(), name, "", reg,
+    GenericsRegistry generics = createGenerics(ctx.genericDeclarationList(), name, "", reg, new GenericsRegistry(globalGenerics));
-        new GenericsRegistry(globalGenerics));
 
     GenericDeclarationList genericParams;
     if (!Objects.isNull(ctx.genericDeclarationList())) {
@@ -303,19 +293,16 @@ public class SyntaxTreeGenerator {
             methodmodifiers += allmodifiers.get(mod.getText());
           }
           InterfaceCommonBodyDeclarationContext commonbody = declaration.interfaceCommonBodyDeclaration();
-            methods.add(convert(methodmodifiers, commonbody, new GenericDeclarationList(new ArrayList<>(),
+          methods.add(convert(methodmodifiers, commonbody, new GenericDeclarationList(new ArrayList<>(), commonbody.getStart()), generics));
-                commonbody.getStart()), generics));
           break;
         case GenericinterfacemethodContext genericmethod:
-            GenericInterfaceMethodDeclarationContext genericdeclaration = genericmethod
+          GenericInterfaceMethodDeclarationContext genericdeclaration = genericmethod.genericInterfaceMethodDeclaration();
-                .genericInterfaceMethodDeclaration();
           int genericmethodmodifiers = 0;
           for (InterfaceMethodModifierContext mod : genericdeclaration.interfaceMethodModifier()) {
             genericmethodmodifiers += allmodifiers.get(mod.getText());
           }
           commonbody = genericdeclaration.interfaceCommonBodyDeclaration();
-            GenericDeclarationList gtv = TypeGenerator.convert(genericdeclaration.genericDeclarationList(), name,
+          GenericDeclarationList gtv = TypeGenerator.convert(genericdeclaration.genericDeclarationList(), name, commonbody.identifier().getText(), reg, generics);
-                commonbody.identifier().getText(), reg, generics);
           methods.add(convert(genericmethodmodifiers, commonbody, gtv, generics));
           break;
         default:
@@ -327,8 +314,7 @@ public class SyntaxTreeGenerator {
     if (!Objects.isNull(ctx.EXTENDS())) {
       extendedInterfaces.addAll(convert(ctx.typeList(0), generics));
     }
-    return new ClassOrInterface(modifiers, name, fields, Optional.empty(), methods, new ArrayList<>(),
+    return new ClassOrInterface(modifiers, name, fields, Optional.empty(), methods, new ArrayList<>(), genericParams, superClass, true, extendedInterfaces, ctx.getStart());
-        genericParams, superClass, true, extendedInterfaces, ctx.getStart());
   }
 
   private GenericDeclarationList createEmptyGenericDeclarationList(Token classNameIdentifier) {
@@ -343,9 +329,7 @@ public class SyntaxTreeGenerator {
     throw new NotImplementedException();
   }
 
-  private Method convert(int modifiers, InterfaceCommonBodyDeclarationContext bodydeclaration,
+  private Method convert(int modifiers, InterfaceCommonBodyDeclarationContext bodydeclaration, GenericDeclarationList gtvDeclarations, GenericsRegistry generics) {
-      GenericDeclarationList gtvDeclarations,
-      GenericsRegistry generics) {
     String name = bodydeclaration.identifier().getText();
 
     RefTypeOrTPHOrWildcardOrGeneric retType;
@@ -372,8 +356,7 @@ public class SyntaxTreeGenerator {
   /**
    * http://docs.oracle.com/javase/specs/jls/se7/html/jls-8.html#jls-8.8.9
    */
-  private Constructor generateStandardConstructor(String className, JavaClassName parentClass, RefType superClass,
+  private Constructor generateStandardConstructor(String className, JavaClassName parentClass, RefType superClass, GenericDeclarationList classGenerics, Token offset) {
-      GenericDeclarationList classGenerics, Token offset) {
     RefType classType = ClassOrInterface.generateTypeOfClass(reg.getName(className), classGenerics, offset);
     ParameterList params = new ParameterList(new ArrayList<>(), offset);
     Block block = new Block(new ArrayList<>(), offset);
@@ -388,15 +371,12 @@ public class SyntaxTreeGenerator {
    * fieldInitializations werden in einem Psedokonstruktor in der abstrakten
    * Syntax gespeichert
    */
-  private Constructor generatePseudoConstructor(String className, JavaClassName parentClass, RefType superClass,
+  private Constructor generatePseudoConstructor(String className, JavaClassName parentClass, RefType superClass, GenericDeclarationList classGenerics, Token offset) {
-      GenericDeclarationList classGenerics, Token offset) {
     RefType classType = ClassOrInterface.generateTypeOfClass(reg.getName(className), classGenerics, offset);
     ParameterList params = new ParameterList(new ArrayList<>(), offset);
     Block block = new Block(new ArrayList<>(fieldInitializations), offset);
     return new Constructor(Modifier.PUBLIC, className, classType, params, block, classGenerics, offset /*
-                                                                                                        * fieldInitializations
+                                                                                                        * fieldInitializations geloescht PL 2018-11-24
-                                                                                                        * geloescht PL
-                                                                                                        * 2018-11-24
                                                                                                         */);
   }
 
@@ -405,11 +385,8 @@ public class SyntaxTreeGenerator {
     if (supertypecontext != null && supertypecontext.DOT().size() > 0) {
       throw new NotImplementedException();
     } else {
-      RefTypeOrTPHOrWildcardOrGeneric ret = TypeGenerator.convertTypeName(
+      TypeArgumentsContext typeArguments = (typeType.classOrInterfaceType().typeArguments().size() > 0) ? typeType.classOrInterfaceType().typeArguments().get(typeType.classOrInterfaceType().typeArguments().size() - 1) : null;
-          typeType.classOrInterfaceType().typeIdentifier().getText(),
+      RefTypeOrTPHOrWildcardOrGeneric ret = TypeGenerator.convertTypeName(typeType.classOrInterfaceType().typeIdentifier().getText(), typeArguments, typeType.getStart(), reg, globalGenerics);
-          typeType.classOrInterfaceType().typeArguments()
-              .get(typeType.classOrInterfaceType().typeArguments().size() - 1),
-          typeType.getStart(), reg, globalGenerics);
       if (ret instanceof RefType) {
         return (RefType) ret;
       } else {
@@ -426,8 +403,7 @@ public class SyntaxTreeGenerator {
     return ret;
   }
 
-  public Method convert(int modifiers, Java17Parser.MethodContext methodContext, JavaClassName parentClass,
+  public Method convert(int modifiers, Java17Parser.MethodContext methodContext, JavaClassName parentClass, RefType superClass, GenericsRegistry generics) {
-      RefType superClass, GenericsRegistry generics) {
     GenericsRegistry localgenerics = generics;
     MethodDeclarationContext methoddeclaration;
     GenericDeclarationListContext genericdeclarations;
@@ -475,9 +451,7 @@ public class SyntaxTreeGenerator {
     return new Method(modifiers, name, retType, paramlist, block, gtvDeclarations, header.getStart());
   }
 
-  public Constructor convert(int modifiers, Java17Parser.ConstructorContext constructorContext,
+  public Constructor convert(int modifiers, Java17Parser.ConstructorContext constructorContext, JavaClassName parentClass, RefType superClass, GenericsRegistry generics) {
-      JavaClassName parentClass,
-      RefType superClass, GenericsRegistry generics) {
     GenericsRegistry localgenerics = generics;
     GenericDeclarationListContext genericdeclarations;
     GenericDeclarationList gtvDeclarations;
@@ -497,17 +471,14 @@ public class SyntaxTreeGenerator {
       name = constructordeclaration.identifier().getText();
       gtvDeclarations = new GenericDeclarationList(new ArrayList<>(), constructordeclaration.getStart());
     }
-    RefTypeOrTPHOrWildcardOrGeneric retType = TypeGenerator.convertTypeName(name, constructordeclaration.getStart(),
+    RefTypeOrTPHOrWildcardOrGeneric retType = TypeGenerator.convertTypeName(name, constructordeclaration.getStart(), reg, localgenerics);
-        reg, localgenerics);
     StatementGenerator stmtgen = new StatementGenerator(reg, localgenerics, fields, new HashMap<>());
     ParameterList paramlist = stmtgen.convert(constructordeclaration.formalParameters().formalParameterList());
     Block block = stmtgen.convert(constructordeclaration.constructorBody, true);
-    return new Constructor(modifiers, name, retType, paramlist, block, gtvDeclarations,
+    return new Constructor(modifiers, name, retType, paramlist, block, gtvDeclarations, constructordeclaration.getStart());
-        constructordeclaration.getStart());
   }
 
-  private List<? extends Field> convert(Java17Parser.FieldDeclarationContext fieldDeclContext, int modifiers,
+  private List<? extends Field> convert(Java17Parser.FieldDeclarationContext fieldDeclContext, int modifiers, GenericsRegistry generics) {
-      GenericsRegistry generics) {
     List<Field> ret = new ArrayList<>();
     RefTypeOrTPHOrWildcardOrGeneric fieldType;
     if (fieldDeclContext.typeType() != null) {
@@ -533,8 +504,7 @@ public class SyntaxTreeGenerator {
   }
 
   // Initialize a field by creating implicit constructor.
-  private void initializeField(Java17Parser.VariableDeclaratorContext ctx, RefTypeOrTPHOrWildcardOrGeneric typeOfField,
+  private void initializeField(Java17Parser.VariableDeclaratorContext ctx, RefTypeOrTPHOrWildcardOrGeneric typeOfField, GenericsRegistry generics) {
-      GenericsRegistry generics) {
     StatementGenerator statementGenerator = new StatementGenerator(reg, generics, fields, new HashMap<>());
     fieldInitializations.add(statementGenerator.generateFieldAssignment(ctx, typeOfField));
   }
@@ -543,8 +513,7 @@ public class SyntaxTreeGenerator {
     return allmodifiers.get(modifier);
   }
 
-  private GenericsRegistry createGenerics(Java17Parser.GenericDeclarationListContext ctx, JavaClassName parentClass,
+  private GenericsRegistry createGenerics(Java17Parser.GenericDeclarationListContext ctx, JavaClassName parentClass, String parentMethod, JavaClassRegistry reg, GenericsRegistry generics) {
-      String parentMethod, JavaClassRegistry reg, GenericsRegistry generics) {
     GenericsRegistry ret = new GenericsRegistry(this.globalGenerics);
     ret.putAll(generics);
     if (ctx == null)

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

@@ -29,23 +29,19 @@ import java.util.regex.Pattern;
 
 public class TypeGenerator {
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convert(
+    public static RefTypeOrTPHOrWildcardOrGeneric convert(Java17Parser.ClassOrInterfaceTypeContext classOrInterfaceTypeContext, JavaClassRegistry reg, GenericsRegistry generics) {
-            Java17Parser.ClassOrInterfaceTypeContext classOrInterfaceTypeContext, JavaClassRegistry reg,
-            GenericsRegistry generics) {
         Java17Parser.TypeArgumentsContext arguments = null;
         /*
-         * PL 2019-03-19 auskommentiert ANFANG
+         * PL 2019-03-19 auskommentiert ANFANG if(unannClassOrInterfaceTypeContext.
+         * unannClassType_lfno_unannClassOrInterfaceType() != null){ arguments =
+         * unannClassOrInterfaceTypeContext.
+         * unannClassType_lfno_unannClassOrInterfaceType().typeArguments(); }else{//
          * if(unannClassOrInterfaceTypeContext.
-         * unannClassType_lfno_unannClassOrInterfaceType() != null){
+         * unannInterfaceType_lfno_unannClassOrInterfaceType() != null){ arguments =
-         * arguments = unannClassOrInterfaceTypeContext.
+         * unannClassOrInterfaceTypeContext.
-         * unannClassType_lfno_unannClassOrInterfaceType().typeArguments();
-         * }else{// if(unannClassOrInterfaceTypeContext.
-         * unannInterfaceType_lfno_unannClassOrInterfaceType() != null){
-         * arguments = unannClassOrInterfaceTypeContext.
          * unannInterfaceType_lfno_unannClassOrInterfaceType().
-         * unannClassType_lfno_unannClassOrInterfaceType().typeArguments();
+         * unannClassType_lfno_unannClassOrInterfaceType().typeArguments(); } PL
-         * }
+         * 2019-03-19 auskommentiert ENDE
-         * PL 2019-03-19 auskommentiert ENDE
          */
         /**
          * Problem sind hier die verschachtelten Typen mit verschachtelten Typargumenten
@@ -56,13 +52,12 @@ public class TypeGenerator {
 
         String name = "";
         for (IdentifierContext id : classOrInterfaceTypeContext.identifier()) {
-            name += id.getText();
+            name += id.getText() + '.';
         }
-        name += classOrInterfaceTypeContext.typeIdentifier();
+        name += classOrInterfaceTypeContext.typeIdentifier().getText();
         if (classOrInterfaceTypeContext.getStop().getText().equals(">")) {
             /*
-             * Fuer Debug-Zwecke
+             * Fuer Debug-Zwecke unannClassOrInterfaceTypeContext.
-             * unannClassOrInterfaceTypeContext.
              * unannInterfaceType_lfno_unannClassOrInterfaceType();
              * unannClassOrInterfaceTypeContext.
              * unannClassType_lfno_unannClassOrInterfaceType().getText();
@@ -77,8 +72,7 @@ public class TypeGenerator {
              * unannClassOrInterfaceTypeContext.unannClassType_lf_unannClassOrInterfaceType(
              * 1);
              * unannClassOrInterfaceTypeContext.unannClassType_lf_unannClassOrInterfaceType(
-             * 1).getText();
+             * 1).getText(); unannClassOrInterfaceTypeContext.
-             * unannClassOrInterfaceTypeContext.
              * unannClassType_lfno_unannClassOrInterfaceType().getText();
              * //unannClassOrInterfaceTypeContext.
              * unannInterfaceType_lf_unannClassOrInterfaceType();
@@ -95,8 +89,7 @@ public class TypeGenerator {
         return convertTypeName(name, arguments, classOrInterfaceTypeContext.getStart(), reg, generics);
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convert(Java17Parser.TypeTypeContext typeContext,
+    public static RefTypeOrTPHOrWildcardOrGeneric convert(Java17Parser.TypeTypeContext typeContext, JavaClassRegistry reg, GenericsRegistry genericsRegistry) {
-            JavaClassRegistry reg, GenericsRegistry genericsRegistry) {
         if (typeContext.primitiveType() != null) {
             if (typeContext.primitiveType().getText().equals("boolean")) {
                 return new RefType(ASTFactory.createClass(Boolean.class).getClassName(), typeContext.getStart());
@@ -111,17 +104,16 @@ public class TypeGenerator {
         } else if (!typeContext.LBRACK().isEmpty()) { // ArrayType über eckige Klammer prüfen
             // System.out.println(unannTypeContext.getText());
             throw new NotImplementedException();
-        } else if (typeContext.classOrInterfaceType() != null) {
-            JavaClassName name = reg
-                    .getName(typeContext.classOrInterfaceType().typeIdentifier().getText());
-            return new RefType(name, typeContext.getStart());
         }
-        return TypeGenerator.convert(typeContext.classOrInterfaceType(), reg,
+        /*
-                genericsRegistry);
+         * else if (typeContext.classOrInterfaceType() != null) { JavaClassName name =
+         * reg .getName(typeContext.classOrInterfaceType().typeIdentifier().getText());
+         * return new RefType(name, typeContext.getStart()); }
+         */
+        return TypeGenerator.convert(typeContext.classOrInterfaceType(), reg, genericsRegistry);
     }
 
-    public static GenericDeclarationList convert(Java17Parser.GenericDeclarationListContext typeParametersContext,
+    public static GenericDeclarationList convert(Java17Parser.GenericDeclarationListContext typeParametersContext, JavaClassName parentClass, String parentMethod, JavaClassRegistry reg, GenericsRegistry generics) {
-            JavaClassName parentClass, String parentMethod, JavaClassRegistry reg, GenericsRegistry generics) {
         Token endOffset = typeParametersContext.getStop();
         List<GenericTypeVar> typeVars = new ArrayList<>();
         for (Java17Parser.GenericTypeVarContext typeParameter : typeParametersContext.genericTypeVar()) {
@@ -131,8 +123,7 @@ public class TypeGenerator {
         return new GenericDeclarationList(typeVars, endOffset);
     }
 
-    public static GenericTypeVar convert(Java17Parser.GenericTypeVarContext typeVar, JavaClassName parentClass,
+    public static GenericTypeVar convert(Java17Parser.GenericTypeVarContext typeVar, JavaClassName parentClass, String parentMethod, JavaClassRegistry reg, GenericsRegistry generics) {
-            String parentMethod, JavaClassRegistry reg, GenericsRegistry generics) {
         String name = typeVar.identifier().getText();
         // TODO: Es müssen erst alle GenericTypeVars generiert werden, dann können die
         // bounds dieser Generics ermittelt werden
@@ -144,8 +135,7 @@ public class TypeGenerator {
         return ret;
     }
 
-    public static List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java17Parser.TypeBoundContext typeBoundContext,
+    public static List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java17Parser.TypeBoundContext typeBoundContext, JavaClassRegistry reg, GenericsRegistry generics) {
-            JavaClassRegistry reg, GenericsRegistry generics) {
         List<RefTypeOrTPHOrWildcardOrGeneric> ret = new ArrayList<>();
         if (Objects.isNull(typeBoundContext)) {
             ret.add(ASTFactory.createObjectType());
@@ -160,29 +150,23 @@ public class TypeGenerator {
         throw new NotImplementedException();
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convert(Java17Parser.WildcardTypeContext wildcardContext,
+    public static RefTypeOrTPHOrWildcardOrGeneric convert(Java17Parser.WildcardTypeContext wildcardContext, JavaClassRegistry reg, GenericsRegistry generics) {
-            JavaClassRegistry reg, GenericsRegistry generics) {
         if (wildcardContext.getChildCount() < 3) {
             if (!Objects.isNull(wildcardContext.extendsWildcardType())) {
-                return new ExtendsWildcardType(convert(wildcardContext.extendsWildcardType().typeType(), reg, generics),
+                return new ExtendsWildcardType(convert(wildcardContext.extendsWildcardType().typeType(), reg, generics), wildcardContext.getStart());
-                        wildcardContext.getStart());
             } else {
-                return new SuperWildcardType(convert(wildcardContext.superWildcardType().typeType(), reg, generics),
+                return new SuperWildcardType(convert(wildcardContext.superWildcardType().typeType(), reg, generics), wildcardContext.getStart());
-                        wildcardContext.getStart());
             }
         } else {
             throw new NotImplementedException(); // Wildcard ohne Bound
         }
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convertTypeName(String name, Token offset, JavaClassRegistry reg,
+    public static RefTypeOrTPHOrWildcardOrGeneric convertTypeName(String name, Token offset, JavaClassRegistry reg, GenericsRegistry generics) {
-            GenericsRegistry generics) {
         return convertTypeName(name, (Java17Parser.TypeArgumentsContext) null, offset, reg, generics);
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convertTypeName(
+    public static RefTypeOrTPHOrWildcardOrGeneric convertTypeName(String name, Java17Parser.TypeArgumentsContext typeArguments, Token offset, JavaClassRegistry reg, GenericsRegistry generics) {
-            String name, Java17Parser.TypeArgumentsContext typeArguments, Token offset, JavaClassRegistry reg,
-            GenericsRegistry generics) {
         if (!reg.contains(name)) { // Dann könnte es ein generischer Type oder ein FunN$$-Type sein
             if (generics.contains(name)) {
                 return new GenericRefType(name, offset);
@@ -207,10 +191,7 @@ public class TypeGenerator {
         }
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convertTypeName(
+    public static RefTypeOrTPHOrWildcardOrGeneric convertTypeName(String name, Java17Parser.NonWildcardTypeArgumentsContext typeArguments, Token offset, JavaClassRegistry reg, GenericsRegistry generics) {
-            String name, Java17Parser.NonWildcardTypeArgumentsContext typeArguments, Token offset,
-            JavaClassRegistry reg,
-            GenericsRegistry generics) {
         if (!reg.contains(name)) { // Dann könnte es ein generischer Type oder ein FunN$$-Type sein
             if (generics.contains(name)) {
                 return new GenericRefType(name, offset);
@@ -235,8 +216,7 @@ public class TypeGenerator {
         }
     }
 
-    public static List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java17Parser.TypeArgumentsContext typeArguments,
+    public static List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java17Parser.TypeArgumentsContext typeArguments, JavaClassRegistry reg, GenericsRegistry generics) {
-            JavaClassRegistry reg, GenericsRegistry generics) {
         List<RefTypeOrTPHOrWildcardOrGeneric> ret = new ArrayList<>();
         for (Java17Parser.TypeArgumentContext arg : typeArguments.typeArgument()) {
             WildcardTypeContext wc = arg.wildcardType();
@@ -249,9 +229,7 @@ public class TypeGenerator {
         return ret;
     }
 
-    public static List<RefTypeOrTPHOrWildcardOrGeneric> convert(
+    public static List<RefTypeOrTPHOrWildcardOrGeneric> convert(Java17Parser.NonWildcardTypeArgumentsContext typeArguments, JavaClassRegistry reg, GenericsRegistry generics) {
-            Java17Parser.NonWildcardTypeArgumentsContext typeArguments,
-            JavaClassRegistry reg, GenericsRegistry generics) {
         List<RefTypeOrTPHOrWildcardOrGeneric> ret = new ArrayList<>();
         for (Java17Parser.TypeTypeContext arg : typeArguments.typeList().typeType()) {
             ret.add(convert(arg, reg, generics));

src/main/java/de/dhbwstuttgart/parser/scope/GatherNames.java

@@ -10,8 +10,7 @@ import de.dhbwstuttgart.parser.antlr.Java17Parser;
 
 public class GatherNames {
 
-	public static Map<String, Integer> getNames(SrcfileContext ctx, PackageCrawler packages,
+	public static Map<String, Integer> getNames(SrcfileContext ctx, PackageCrawler packages, ClassLoader classLoader) throws ClassNotFoundException {
-			ClassLoader classLoader) throws ClassNotFoundException {
 		Map<String, Integer> ret = new HashMap<>();
 		String pkgName = getPackageName(ctx);
 		String nameString = "";
@@ -22,27 +21,20 @@ public class GatherNames {
 			ClassorinterfacedeclContext clsoif = (ClassorinterfacedeclContext) member;
 			if (clsoif.interfaceDeclaration() != null) {
 				if (pkgName != "") {
-					nameString = pkgName + "."
+					nameString = pkgName + "." + clsoif.interfaceDeclaration().identifier().getText();
-							+ clsoif.interfaceDeclaration().identifier().getText();
 				} else {
 					nameString = clsoif.interfaceDeclaration().identifier().getText();
 				}
-				int numGenerics = clsoif.interfaceDeclaration().genericDeclarationList() != null
+				int numGenerics = clsoif.interfaceDeclaration().genericDeclarationList() != null ? clsoif.interfaceDeclaration().genericDeclarationList().genericTypeVar().size() : 0;
-						? clsoif.interfaceDeclaration().genericDeclarationList().genericTypeVar().size()
-						: 0;
 				// Die Generic TypeParameter Definitionen Nicht! an die JavaClassName-Registry
 				// anfügen:
 				/*
 				 * //Diese gelängen dadurch in den globalen Scope, was sie schließlich nicht
-				 * sind
+				 * sind if(clsoif.classDeclaration().normalClassDeclaration().typeParameters()
-				 * if(clsoif.classDeclaration().normalClassDeclaration().typeParameters() !=
+				 * != null){ for(Java17Parser.TypeParameterContext tp :
-				 * null){
-				 * for(Java17Parser.TypeParameterContext tp :
 				 * clsoif.classDeclaration().normalClassDeclaration().typeParameters().
 				 * typeParameterList().typeParameter()){
-				 * //this.reg.add(tp.Identifier().toString());
+				 * //this.reg.add(tp.Identifier().toString()); } }
-				 * }
-				 * }
 				 */
 				ret.put(nameString, numGenerics);
 			} else {
@@ -55,19 +47,13 @@ public class GatherNames {
 				// anfügen:
 				/*
 				 * //Diese gelängen dadurch in den globalen Scope, was sie schließlich nicht
-				 * sind
+				 * sind if(clsoif.classDeclaration().normalClassDeclaration().typeParameters()
-				 * if(clsoif.classDeclaration().normalClassDeclaration().typeParameters() !=
+				 * != null){ for(Java17Parser.TypeParameterContext tp :
-				 * null){
-				 * for(Java17Parser.TypeParameterContext tp :
 				 * clsoif.classDeclaration().normalClassDeclaration().typeParameters().
 				 * typeParameterList().typeParameter()){
-				 * this.reg.add(tp.Identifier().toString());
+				 * this.reg.add(tp.Identifier().toString()); } }
-				 * }
-				 * }
 				 */
-				int numGenerics = clsoif.classDeclaration().genericDeclarationList() != null
+				int numGenerics = clsoif.classDeclaration().genericDeclarationList() != null ? clsoif.classDeclaration().genericDeclarationList().genericTypeVar().size() : 0;
-						? clsoif.classDeclaration().genericDeclarationList().genericTypeVar().size()
-						: 0;
 
 				ret.put(nameString, numGenerics);
 			}
@@ -76,8 +62,7 @@ public class GatherNames {
 		return ret;
 	}
 
-	public static Map<String, Integer> getImports(Java17Parser.SrcfileContext ctx, PackageCrawler packages,
+	public static Map<String, Integer> getImports(Java17Parser.SrcfileContext ctx, PackageCrawler packages, ClassLoader classLoader) throws ClassNotFoundException {
-			ClassLoader classLoader) throws ClassNotFoundException {
 		Map<String, Integer> ret = new HashMap<>();
 		// ret.putAll(packages.getClassNames("java.lang"));
 		for (Java17Parser.ImportDeclarationContext importDeclCtx : ctx.importDeclaration()) {

src/main/java/de/dhbwstuttgart/parser/scope/JavaClassName.java

@@ -1,12 +1,12 @@
 package de.dhbwstuttgart.parser.scope;
 
-
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Stellt den Namen einer Java Klasse dar.
- * Dieser kann auch den Packagenamen mit beinhalten: de.dhbwstuttgart.typeinference.Menge
+ * Dieser kann auch den Packagenamen mit beinhalten:
+ * de.dhbwstuttgart.typeinference.Menge
  * 
  * @author Andreas Stadelmeier
  */
@@ -17,7 +17,8 @@ public class JavaClassName {
 	private PackageName packageName;
 
 	public JavaClassName(String name) {
-		if(name == null)throw new NullPointerException();
+		if (name == null)
+			throw new NullPointerException();
 
 		String[] names = name.split("[.]");
 		boolean match = true;
@@ -50,14 +51,16 @@ public class JavaClassName {
 		int result = 1;
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
 		/*
-		result = prime * result
+		 * result = prime * result
-				+ ((packageName == null) ? 0 : packageName.hashCode()); //PackageName does not infect hashCode
+		 * + ((packageName == null) ? 0 : packageName.hashCode()); //PackageName does
+		 * not infect hashCode
 		 */
 		return result;
 	}
 
 	/**
-	 * Namen sind nur gleich, wenn bei den beiden zu vergleichenden JavaClassNames auch das Package angegeben ist
+	 * Namen sind nur gleich, wenn bei den beiden zu vergleichenden JavaClassNames
+	 * auch das Package angegeben ist
 	 */
 	@Override
 	public boolean equals(Object obj) {
@@ -66,7 +69,10 @@ public class JavaClassName {
 		if (obj == null)
 			return false;
 		if (obj instanceof String)
-			return this.toString().equals(obj) || (this.name != null && this.name.equals(obj)); //Auch mit Strings als Klassennamen kompatibel TODO: sollte bald obsolet sein
+			return this.toString().equals(obj) || (this.name != null && this.name.equals(obj)); // Auch mit Strings als
+																																													// Klassennamen kompatibel
+																																													// TODO: sollte bald obsolet
+																																													// sein
 		if (getClass() != obj.getClass())
 			return false;
 		JavaClassName other = (JavaClassName) obj;
@@ -77,7 +83,8 @@ public class JavaClassName {
 			return false;
 		if (packageName != null && other.packageName != null) {
 			if (!packageName.equals(other.packageName))
-				return false;//Spezialfall, nicht beide Typen müssen eindeutig mit Packagenamen angegeben werden
+				return false;// Spezialfall, nicht beide Typen müssen eindeutig mit Packagenamen angegeben
+											// werden
 		}
 		return true;
 	}
@@ -136,8 +143,10 @@ class PackageName{
 	@Override
 	public String toString() {
 		String ret = "";
-		if(names == null)return "";
+		if (names == null)
-		for(String n : names)ret+=n+".";
+			return "";
+		for (String n : names)
+			ret += n + ".";
 		if (ret != null && ret.length() > 0 && ret.charAt(ret.length() - 1) == '.') {
 			ret = ret.substring(0, ret.length() - 1);
 		}

src/test/java/packages/LoadDefaultPackageClassesTest.java

@@ -15,14 +15,11 @@ public class LoadDefaultPackageClassesTest extends TestCase {
 
     public static final String rootDirectory = System.getProperty("user.dir") + "/resources/javFiles/packageTest/";
 
-
     public LoadDefaultPackageClassesTest() throws ClassNotFoundException, IOException {
         /*
-        Generate ToImport class in rootDirectory and in output-Directory
+         * Generate ToImport class in rootDirectory and in output-Directory
          */
-    	JavaTXCompiler compiler = new JavaTXCompiler(
+        JavaTXCompiler compiler = new JavaTXCompiler(Lists.newArrayList(new File(rootDirectory + "Gen.jav")), Lists.newArrayList(new File(rootDirectory + "/de/test/output/")));
-				Lists.newArrayList(new File(rootDirectory+"Gen.jav")),
-                Lists.newArrayList(new File(rootDirectory+"/de/test/output/")));
         compiler.typeInference();
         compiler.generateBytecode();
         File f = new File(rootDirectory + "Gen.class");
@@ -30,7 +27,7 @@ public class LoadDefaultPackageClassesTest extends TestCase {
     }
 
     public void testLoadGenClass() throws IOException, ClassNotFoundException {
-        CompilationEnvironment.loadDefaultPackageClasses(new File( rootDirectory + "Test.jav"), ClassLoader.getSystemClassLoader());
+        CompilationEnvironment.loadDefaultPackageClasses("", new File(rootDirectory + "Test.jav"), ClassLoader.getSystemClassLoader());
     }
 
     public void testURLClassLoader() throws IOException, ClassNotFoundException {
@@ -38,18 +35,14 @@ public class LoadDefaultPackageClassesTest extends TestCase {
         cl.loadClass("Gen");
     }
     /*
-    public void testE2E() throws IOException, ClassNotFoundException {
+     * public void testE2E() throws IOException, ClassNotFoundException {
-        JavaTXCompiler compiler = new JavaTXCompiler(new File(rootDirectory+"OL.jav"));
+     * JavaTXCompiler compiler = new JavaTXCompiler(new
-        compiler.typeInference();
+     * File(rootDirectory+"OL.jav")); compiler.typeInference();
-        compiler.generateBytecode();
+     * compiler.generateBytecode(); File f = new File(rootDirectory + "OL.class");
-        File f = new File(rootDirectory + "OL.class");
+     * assertTrue(f.exists());
-        assertTrue(f.exists());
+     * 
-
+     * compiler = new JavaTXCompiler(new File(rootDirectory+"OLMain.jav"));
-        compiler = new JavaTXCompiler(new File(rootDirectory+"OLMain.jav"));
+     * compiler.typeInference(); compiler.generateBytecode(); f = new
-        compiler.typeInference();
+     * File(rootDirectory + "OLMain.class"); assertTrue(f.exists()); }
-        compiler.generateBytecode();
-        f = new File(rootDirectory + "OLMain.class");
-        assertTrue(f.exists());
-    }
      */
 }

src/test/java/parser/ExtendsTest.jav

@@ -1,3 +1,5 @@
+import java.lang.Object;
+
 class C1 extends Object
 {
     m(para) { return para; }

src/test/java/parser/GeneralParserTest.java

@@ -33,7 +33,6 @@ public class GeneralParserTest {
 		filenames.add("StatementsTest.jav");
 		// filenames.add("Methods.jav");
 		filenames.add("ImportTestGeneric.jav");
-		filenames.add("CastTest.jav");
 		// filenames.add("BoundedParameter.jav");
 		// filenames.add("GenericFieldVarTest.jav");
 		filenames.add("FieldVarTest.jav");

src/test/java/parser/Java17Rules.jav

@@ -353,7 +353,7 @@ class Records {
 
     }
 
-    final record R1(@Dummy2 @Dummy x) {
+    final record R1(x) {
 
         R1(x) {
             this.x = x;