Oder Documentation and Delete unnecessary

.gitignore

@@ -78,7 +78,7 @@ fabric.properties
 
 /target
 src/main/resources/logs/miniCompilerLog.log
-src/main/resources/output/CompilerInput.class
+src/test/java/main/CompilerInput.class
 src/test/resources/output/javac/CompilerInput$Test.class
 src/test/resources/output/javac/CompilerInput.class
 src/test/resources/output/miniCompiler/CompilerInput.class

.lib/Kurzdokumentation.md

@@ -1,58 +0,0 @@
-# Kurzdokumentation
-
-## Aufgabenverteilung
-
-### Maximilian Stahl und Jannik Rombach:
-- **Scanner**
-- **Parser**
-- **AST**
-- **AstBuilder**
-    - **Modul: ast**
-        - Alle
-    - **Modul: parser**
-        - Alle
-    - **Modul: visitor**
-        - Alle
-    - **Testmodul: parser**
-        - AstBuildertest.java
-        - Helper.java
-    - **Testfiles: singleFeatureTests**
-        - Alle
-
-### Johannes Ehlert:
-- **Semantische Analyse**
-    - **Modul: semantic**
-    - **Modul: typecheck**
-    - **Testmodul: parser**
-        - AstBuildertest.java
-    - **Testfiles: typedAstFeatureTests**
-        - Großteil
-    - **Testfiles: typedAstExceptionsTests**
-        - Großteil
-
-### David Große:
-- **Bytecodegenerator**
-    - **Modul: bytecode**
-        - Alle
-
-### Lucas Janker:
-- **Tests**
-    - **Modul: main**
-        - Alle
-    - **Testmodul: main**
-        - Alle
-    - **Testmodul: parser**
-        - ScannerTest.java
-        - ParserTest.java
-    - **Testmodul: semantic**
-    - **Testfiles: combinedFeatureTests**
-        - Alle
-    - **Testfiles: failureTests**
-        - Alle
-    - **Testfiles: Alle**
-        - Refactoring
-    - **Ordnerstrukturen**
-        - Großteil
-    - **Build**
-    - **Makefile**
-    - **Dokumentation**

README.md

@@ -15,7 +15,6 @@ This project aims to provide a simplified version of the Java compiler, focusing
     - `while` ... ;
     - `do` ... `while`;
     - `for`;
-    - `switch` ... `case` ... ;
 - **Comments**:
     - Single line: `// comment`
     - Multi-line: `/* comment */`
@@ -56,6 +55,9 @@ test/
 ## Distribution of the realisation
 
 ### i22030 & i22035
+Ausführliche Beschreibung der Parser Umsetzung:
+
+![Parserumsetzung](Parser_Dokumentation.pdf)
 
 Parser:
 - Grammar -> (src/main/java/parser/grammar)
@@ -111,7 +113,7 @@ cd .\src\test\ ; make clean compile-miniCompiler
 ```
 
 ### 2. Start miniCompiler using jar:
-If you do not have the .jar, download it [here](https://gitea.hb.dhbw-stuttgart.de/i22005/NichtHaskell2.0/src/branch/Endabgabe/src) or compile it using mvn package or make first
+If you do not have the .jar, download it [here](https://gitea.hb.dhbw-stuttgart.de/i22005/NichtHaskell2.0/src/branch/main/JavaCompiler-1.0-jar-with-dependencies.jar) or compile it using mvn package or make first
 ```
 java.exe -DgenJar=bool -DgenClass=bool -jar path_to_jar\jarName.jar 'path_to_input_file.java' 'path_to_output_directory'
 ```

src/main/java/bytecode/MethodCodeGen.java

@@ -723,10 +723,6 @@ public class MethodCodeGen implements bytecode.visitor.MethodVisitor {
     @Override
     public void visit(MethodCallNode methodCallNode) {
         List<ParameterNode> parameterNodes = new ArrayList<>();
-        for (IExpressionNode expressionNode : methodCallNode.parameters) {
-            expressionNode.accept(this);
-            parameterNodes.add(new ParameterNode(expressionNode.getType(), ""));
-        }
         int localVarIndex = -1;
         if (methodCallNode.target.memberAccess.identifiers.size() > 1) {
             localVarIndex = localVariables.indexOf(methodCallNode.target.memberAccess.identifiers.get(1));

src/test/Makefile

@@ -5,23 +5,12 @@
 all: compile-javac compile-miniCompiler
 
 compile-javac:
-	javac -d .\resources\output\javac .\resources\input\CompilerInput.java
+	javac -d .\resources\output\javac ..\main\resources\input\CompilerInput.java
 
 compile-miniCompiler:
 	cd ../.. ; mvn -DskipTests install
 	cd ../.. ; mvn exec:java -DgenJar=true -DgenClass=true -Dexec.mainClass="main.Main"  -Dexec.args="'src/main/resources/input/CompilerInput.java' 'src/main/resources/output'"
-
+	cp ..\main\resources\output\CompilerInput.class .\resources\output\miniCompiler
-test: compile-miniCompiler test-miniCompiler
-
-test-miniCompiler:
-	# move the compiled class to the test/main folder
-	mv ../main/resources/output/Compiler.class .java/
-	# compile the test class
-	javac .java/main.EndToEndTester.java
-	# run the test class
-	java .java/main.EndToEndTester
-
-
 
 clean:
 	# clean main output folders

src/test/TestSpecs.md

@@ -1,93 +0,0 @@
-# Scanner
-
-## Scanner Input
-
-### Beispiel 1: Empty Class
-
-    String empty class = "public class Name {}";
-
-### Beispiel 2: Filled Class
-
-    String filled class = 
-            "class javaFileInput.Example {" +
-            "if (x < 5) {" +
-            "for (int i = 0; i < 10; i++) {" +
-            "while (true) {" +
-            "x = 5;" +
-            "}"
-
-## Scanner Output
-
-CommonTokenStream
-
-### Beispiel 1: Empty Class
-
-Token Type; Token Text
-Type gibts nur bei Terminalen, Text bei allen
-
-    [null "public", null "class", IDENTIFIER "Name", null "{", null "}", EOF "<EOF>"]
-
-    Bsp von Ihm mal:
-    [TokPublic,TokClass,TokIdentifier "Name",TokLeftBrace,TokRightBrace]
-
-# Parser
-
-## Parser Input
-
-CommonTokenStream
-(Scanner Output)
-
-## Parser Output (AST)
-
-(program (classDeclaration (accessType public) class Name { }))
-
-ParseTree
-
-### Beispiel 1: Empty Class
-
-# Semantische Analyse / Typcheck
-
-## Typcheck Input
-
-(Parser Output = AST)
-
-## Typcheck Output
-
-### Beispiel 1: Empty Class
-
-# Bytecodegenerierung
-
-## Bytecodegenerierung Input
-
-(Typcheck Output = vom Typcheck eventuell manipulierter AST)
-
-## Bytecodegenerierung Output
-
-### Beispiel 1: Empty Class
-
-Compiled Classfile
-
-    public class javaFileInput.Example {
-    }
-
-## E2E Tests:
-
-- Testdatei mit Main ausführen/kompilieren
-- Testdatei mit "javac -d output .\CompilerInput.java" kompilieren
-- -> Dateien mit javap vergleichen
-
-wenn beides erfolgreich
-
-- Ergebnis vom eigenen Compiler mithilfe von main.EndToEndTester ausführen
-- (Ergebnis von javac mithilfe von main.EndToEndTester ausführen)
-
-### Andis Tipps:
-
-- cp mitgeben
-- makefile
-- java -jar pfadtocompiler.jar EmptyClass.java
-- mvn package
-- javac tester // tester compilen
-- java tester // tester ausführen
-- -> tester ist in unserem Fall main.EndToEndTester.java
-- -> Hab ich alles umgesetzt

src/test/java/main/E2EReflectionsTest.java

@@ -10,6 +10,8 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import javax.tools.JavaCompiler;
 import javax.tools.ToolProvider;
+
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -105,11 +107,6 @@ public class E2EReflectionsTest {
         runTest("MultipleClasses");
     }
 
-    @Test
-    public void SelfReferenceTest() {
-        runTest("SelfReference");
-    }
-
     @Test
     public void ThisDotTest() {
         runTest("ThisDot");

src/test/java/main/EndToEndTester.java

@@ -1,43 +0,0 @@
-package main;
-
-/**
- * This class is used to test the output of the compiler.
- *
- * <p>Im gleichen Ordner wie diese Datei (EndToEndTester.java) muss die selbst kompilierte CompilerInput.class Datei sein.
- * <br><strong>Hinweis:</strong> Diese muss man also vom Ordner <code> main/resources/output </code> in diesen Ordner hier (test/java/main) rein kopieren. (bis es eine bessere Lösung gibt -> bin grad in der Make dran das alles hier automatisch zu machen)</p>
- *
- * <p>Die selbst kompilierte .class Datei wird dann hier drin geladen und eine Instanz von ihr erstellt, es können auch Methoden aufgerufen werden.
- * <p>Diese EndToEndTester.java Datei wird dann in <code> \src\test\java> </code>  mit <code>javac .\main.EndToEndTester.java</code> kompiliert und mit <code>java main.EndToEndTester</code> ausgeführt.
- * Wenn unser Compiler funktioniert, sollten keine Errors kommen (sondern nur die Ausgaben, die wir in der CompilerInput.java Datei gemacht haben,
- * oder Methoden, die wir hier aufrufen).</p>
- *
- */
-public class EndToEndTester {
-    public static void main(String[] args) {
-        try {
-            // Try to load the class named "CompilerInput"
-            Class<?> cls = Class.forName("Compiler");
-            // Print a success message if the class is loaded successfully
-            System.out.println("Class loaded successfully: " + cls.getName());
-
-            // Try to create an instance of the loaded class
-            Object instance = cls.getDeclaredConstructor().newInstance();
-            // Print a success message if the instance is created successfully
-            System.out.println("Instance created: " + instance);
-
-
-            // If the class has a main method, you can invoke it
-            // cls.getMethod("main", String[].class).invoke(null, (Object) new String[]{});
-
-            // If the class has other methods, you can invoke them as well
-            // Example: cls.getMethod("someMethod").invoke(instance);
-
-        } catch (ClassNotFoundException e) {
-            // Print an error message if the class is not found
-            System.err.println("Class not found: " + e.getMessage());
-        } catch (Exception e) {
-            // Print an error message if any other exception occurs during class loading or instance creation
-            System.err.println("Error during class loading or execution: " + e.getMessage());
-        }
-    }
-}

src/test/java/main/InputFilesTest.java

@@ -1,6 +1,5 @@
 package main;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import javax.tools.JavaCompiler;
@@ -32,12 +31,14 @@ public class InputFilesTest {
         File singleFeatureSemanticTests = new File("src/test/resources/input/singleFeatureSemanticTests");
         File singleFeatureTests = new File("src/test/resources/input/singleFeatureTests");
         File typedAstFeatureTests = new File("src/test/resources/input/typedAstFeatureTests");
+        File finalTest = new File("src/test/resources/input/finalTest");
 
         List<File> files = getJavaFilesFromDirectory(combinedFeatureTests);
         // files.addAll(getJavaFilesFromDirectory(endabgabeTests));
         // files.addAll(getJavaFilesFromDirectory(singleFeatureSemanticTests));
         files.addAll(getJavaFilesFromDirectory(singleFeatureTests));
         // files.addAll(getJavaFilesFromDirectory(typedAstFeatureTests));
+        //files.addAll(getJavaFilesFromDirectory(finalTest));
 
         if (!files.isEmpty()) {
             for (File file : files) {
@@ -76,55 +77,6 @@ public class InputFilesTest {
         }
     }
 
-    @Test
-    @Disabled
-    public void areEndabgabeTestsActuallyValid() throws IOException {
-        // Get the system Java compiler
-        JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
-        // Assert that the compiler is available
-        assertNotNull(javac, "Java Compiler is not available");
-
-        File endabgabeTests = new File("src/test/resources/input/endabgabeTests");
-
-        List<File> files = getJavaFilesFromDirectory(endabgabeTests);
-
-        if (!files.isEmpty()) {
-            for (File file : files) {
-                // Try to compile the file and get the result
-                int result = javac.run(null, null, null, file.getPath());
-
-                // Assert that the compilation succeeded (i.e., the result is zero)
-                assertEquals(0, result, "Expected compilation success for " + file.getName());
-            }
-        } else {
-            System.out.println("No files found in the directories.");
-        }
-    }
-
-    @Test
-    @Disabled
-    public void areSingleFeatureSemanticTestsActuallyValid() throws IOException {
-        // Get the system Java compiler
-        JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
-        // Assert that the compiler is available
-        assertNotNull(javac, "Java Compiler is not available");
-
-        File singleFeatureSemanticTests = new File("src/test/resources/input/singleFeatureSemanticTests");
-
-        List<File> files = getJavaFilesFromDirectory(singleFeatureSemanticTests);
-
-        if (!files.isEmpty()) {
-            for (File file : files) {
-                // Try to compile the file and get the result
-                int result = javac.run(null, null, null, file.getPath());
-
-                // Assert that the compilation succeeded (i.e., the result is zero)
-                assertEquals(0, result, "Expected compilation success for " + file.getName());
-            }
-        } else {
-            System.out.println("No files found in the directories.");
-        }
-    }
 
 
     @Test
@@ -152,34 +104,6 @@ public class InputFilesTest {
     }
 
 
-    @Test
-    @Disabled
-    public void areTypedAstFeatureTestsActuallyValid() throws IOException {
-        // Get the system Java compiler
-        JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
-        // Assert that the compiler is available
-        assertNotNull(javac, "Java Compiler is not available");
-
-        File typedAstFeatureTests = new File("src/test/resources/input/typedAstFeatureTests");
-
-        List<File> files = getJavaFilesFromDirectory(typedAstFeatureTests);
-
-        if (!files.isEmpty()) {
-            for (File file : files) {
-                // Try to compile the file and get the result
-                int result = javac.run(null, null, null, file.getPath());
-
-                // Assert that the compilation succeeded (i.e., the result is zero)
-                assertEquals(0, result, "Expected compilation success for " + file.getName());
-            }
-        } else {
-            System.out.println("No files found in the directories.");
-        }
-    }
-
-
-
-
     /**
      * This test method checks if invalid Java files fail to compile as expected.
      * It uses the JavaCompiler from the ToolProvider to compile the files.

src/test/java/main/MainTest.java

@@ -12,9 +12,6 @@ import semantic.SemanticTest;
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-        InputFilesTest.class,
-        SemanticTest.class,
-        EndToTypedAstTest.class
 })
 public class MainTest {
     // This class remains empty, it is used only as a holder for the above annotations

src/test/resources/trees/correctRefType.json

@@ -1,70 +0,0 @@
-{
-  "classes": [
-    {
-      "identifier": "testClass1",
-      "accessType": {
-        "enumAccessTypeNode": "PUBLIC"
-      },
-      "members": [
-        {
-          "@type": "Field",
-          "accessTypeNode": {
-            "enumAccessTypeNode": "PUBLIC"
-          },
-          "type": {
-            "@type": "Base",
-            "enumType": "INT"
-          },
-          "identifier": "testVar1"
-        },
-        {
-          "@type": "Method",
-          "visibility": {
-            "enumAccessTypeNode": "PUBLIC"
-          },
-          "type": {
-            "@type": "Base",
-            "enumType": "INT"
-          },
-          "identifier": "testMethod",
-          "parameters": {
-            "parameters": [
-              {
-                "type": {
-                  "@type": "Base",
-                  "enumType": "INT"
-                },
-                "identifier": "param1"
-              }
-            ]
-          },
-          "statements": [
-            {
-              "@type": "Assignment",
-              "expressionLeft": {
-                "@type": "InstVar",
-                "identifier": "testVar1",
-                "expression": {
-                  "@type": "This",
-                  "type": {
-                    "@type": "Reference",
-                    "identifier": "testClass1"
-                  }
-                },
-                "type": null
-              },
-              "expressionRight": {
-                "@type": "Literal",
-                "type": {
-                  "@type": "Base",
-                  "enumType": "INT"
-                }
-              }
-            }
-          ]
-        }
-      ],
-      "hasConstructor": false
-    }
-  ]
-}

src/test/resources/trees/refTypeMismatch.json

@@ -1,133 +0,0 @@
-{
-  "classes": [
-    {
-      "identifier": "testClass1",
-      "accessType": {
-        "enumAccessTypeNode": "PUBLIC"
-      },
-      "members": [
-        {
-          "@type": "Field",
-          "accessTypeNode": {
-            "enumAccessTypeNode": "PUBLIC"
-          },
-          "type": {
-            "@type": "Base",
-            "enumType": "INT"
-          },
-          "identifier": "testVar1"
-        },
-        {
-          "@type": "Method",
-          "visibility": {
-            "enumAccessTypeNode": "PUBLIC"
-          },
-          "type": {
-            "@type": "Base",
-            "enumType": "INT"
-          },
-          "identifier": "testMethod",
-          "parameters": {
-            "parameters": [
-              {
-                "type": {
-                  "@type": "Base",
-                  "enumType": "INT"
-                },
-                "identifier": "param1"
-              }
-            ]
-          },
-          "statements": [
-            {
-              "@type": "Assignment",
-              "expressionLeft": {
-                "@type": "InstVar",
-                "identifier": "testVar1",
-                "expression": {
-                  "@type": "This",
-                  "type": {
-                    "@type": "Reference",
-                    "identifier": "testClass1"
-                  }
-                },
-                "type": null
-              },
-              "expressionRight": {
-                "@type": "Literal",
-                "type": {
-                  "@type": "Base",
-                  "enumType": "BOOLEAN"
-                }
-              }
-            }
-          ]
-        }
-      ],
-      "hasConstructor": false,
-      "methods": [
-        {
-          "@type": "Method",
-          "visibility": {
-            "enumAccessTypeNode": "PUBLIC"
-          },
-          "type": {
-            "@type": "Base",
-            "enumType": "INT"
-          },
-          "identifier": "testMethod",
-          "parameters": {
-            "parameters": [
-              {
-                "type": {
-                  "@type": "Base",
-                  "enumType": "INT"
-                },
-                "identifier": "param1"
-              }
-            ]
-          },
-          "statements": [
-            {
-              "@type": "Assignment",
-              "expressionLeft": {
-                "@type": "InstVar",
-                "identifier": "testVar",
-                "expression": {
-                  "@type": "InstVar",
-                  "identifier": "testVar",
-                  "expression": {
-                    "@type": "This",
-                    "type": {
-                      "@type": "Reference",
-                      "identifier": "testClass2"
-                    }
-                  },
-                  "type": null
-                },
-                "type": null
-              },
-              "expressionRight": {
-                "@type": "Literal",
-                "type": null
-              },
-              "type": null
-            },
-            {
-              "@type": "VariableDeclaration",
-              "type": {
-                "@type": "Base",
-                "enumType": "CHAR"
-              },
-              "identifier": "objectVar",
-              "expression": {
-                "@type": "Literal",
-                "type": null
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

src/test/resources/trees/test.json

@@ -1 +0,0 @@
-{"classes":[{"identifier":"testClass","accessType":{"enumAccessTypeNode":"PUBLIC"},"members":[{"@type":"Field","accessTypeNode":{"enumAccessTypeNode":"PUBLIC"},"type":{"@type":"Base","enumType":"INT"},"identifier":"testVar1"},{"@type":"Field","accessTypeNode":{"enumAccessTypeNode":"PUBLIC"},"type":{"@type":"Base","enumType":"INT"},"identifier":"objectVar"},{"@type":"Method","visibility":{"enumAccessTypeNode":"PUBLIC"},"type":{"@type":"Base","enumType":"INT"},"identifier":"testVar2","parameters":{"parameters":[{"type":{"@type":"Base","enumType":"INT"},"identifier":"param1"}]},"statements":[{"@type":"Assignment","expressionLeft":{"@type":"InstVar","identifier":"objectVar","expression":{"@type":"This","type":{"@type":"Reference","identifier":"testClass"}},"type":null},"expressionRight":{"@type":"Literal","type":{"@type":"Base","enumType":"INT"}}}]}],"hasConstructor":false,"methods":[{"@type":"Method","visibility":{"enumAccessTypeNode":"PUBLIC"},"type":{"@type":"Base","enumType":"INT"},"identifier":"testVar2","parameters":{"parameters":[{"type":{"@type":"Base","enumType":"INT"},"identifier":"param1"}]},"statements":[{"@type":"Assignment","expressionLeft":{"@type":"InstVar","identifier":"objectVar","expression":{"@type":"This","type":{"@type":"Reference","identifier":"testClass"}},"type":null},"expressionRight":{"@type":"Literal","type":{"@type":"Base","enumType":"INT"}}}]}]}]}