Bug fixes für Tests in 'parser'

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

@@ -96,7 +96,7 @@ public class CompilationEnvironment {
 		File dir = new File(forSourceFile.getAbsoluteFile().getParent());
 		String dirPath = dir.toString() + "/";
 		if (packageName.length() > 0)
-			dirPath = dirPath.substring(0, dirPath.length() - packageName.length());
+			dirPath = dirPath.substring(0, dirPath.length() - packageName.length() - 1);
 		String path = dirPath;
 		ArrayList<File> defaultPath = Lists.newArrayList(new File(path));
 		classLoader = new DirectoryClassLoader(defaultPath, classLoader);

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

@@ -51,7 +51,6 @@ import de.dhbwstuttgart.parser.antlr.Java17Parser.PrefixexpressionContext;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.PrimaryClassrefContext;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.PrimaryExpressionContext;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.PrimaryIdentifierContext;
-import de.dhbwstuttgart.parser.antlr.Java17Parser.PrimaryInvocationContext;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.PrimaryLiteralContext;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.PrimarySuperContext;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.PrimaryThisContext;
@@ -65,7 +64,6 @@ import de.dhbwstuttgart.parser.antlr.Java17Parser.StringLiteralContext;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.SwitchexpressionstmtContext;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.SwitchstmtContext;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.SynchronizedstmtContext;
-import de.dhbwstuttgart.parser.antlr.Java17Parser.TextBlockContext;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.ThrowstmtContext;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.TrycatchblockContext;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.TrycatchresourceContext;
@@ -394,7 +392,13 @@ public class StatementGenerator {
         } else {
             type = TypeGenerator.convert(declaration.typeType(), reg, generics);
         }
+        if (Objects.isNull(declaration.variableDeclarators())) {
+            Token offset = declaration.identifier().getStart();
+            ret.add(new Assign(new AssignToLocal(new LocalVar(declaration.identifier().getText(), type, offset)),
+                    convert(declaration.expression()), offset));
+        } else {
             ret.addAll(generateLocalVariableAssignments(declaration.variableDeclarators().variableDeclarator(), type));
+        }
         return ret;
     }
 
@@ -824,20 +828,11 @@ public class StatementGenerator {
 
     private Expression convert(Java17Parser.CastexpressionContext castexpr) {
         ExpressionContext expr = castexpr.expression();
-        Expression exprast = null;
+        if (expr instanceof PrefixexpressionContext pfe) {
-        if (expr instanceof LambdaexpressionContext) {
-            exprast = convert(expr);
-        } else if (expr instanceof PrefixexpressionContext pfe) {
-            if (!pfe.prefix.equals("~") && !pfe.prefix.equals("!")) {
-                throw new NotImplementedException();
-            } else {
-                exprast = convert(expr);
-            }
-        } else {
             throw new NotImplementedException();
         }
-        return new CastExpr(TypeGenerator.convert(castexpr.typeType(0), reg, generics), exprast,
+        return new CastExpr(TypeGenerator.convert(castexpr.typeType(0), reg, generics), convert(expr),
-                castexpr.getStart());
+                expr.getStart());
     }
 
     private Expression convert(Java17Parser.PrimaryContext primary) {

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

@@ -172,7 +172,7 @@ 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.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(

src/test/java/parser/CastTest.jav

@@ -1,3 +1,5 @@
+import java.lang.Object;
+import java.lang.String;
 
 class CastTest{
 void methode(){

src/test/java/parser/FieldInitializationTest.jav

@@ -1,3 +1,5 @@
+import java.lang.String;
+
 class FieldInitializationTest{
     f;
 	void m(){

src/test/java/parser/FieldVarTest.jav

@@ -1,4 +1,4 @@
-package test;
+package parser;
 
 class Test<Typ>{
 Typ a;

src/test/java/parser/GeneralParserTest.java

@@ -41,12 +41,14 @@ public class GeneralParserTest {
 		filenames.add("ExtendsTest.jav");
 		filenames.add("PackageNameTest.jav");
 		filenames.add("AntlrTest.jav");
+		filenames.add("Java17Rules.jav");
 		try {
 			for (String filename : filenames) {
 				System.out.println(filename);
 				new JavaTXCompiler(new File(rootDirectory + filename));
 			}
-			//new JavaTXCompiler(filenames.stream().map(s -> new File(rootDirectory + s)).collect(Collectors.toList()));
+			// new JavaTXCompiler(filenames.stream().map(s -> new File(rootDirectory +
+			// s)).collect(Collectors.toList()));
 		} catch (Exception exc) {
 			exc.printStackTrace();
 			fail();