Add Gradle Wrapper

.gitattributes

@@ -0,0 +1,9 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+

.gitignore

@@ -29,3 +29,12 @@ logFiles/**
 
 src/main/java/de/dhbwstuttgart/parser/antlr/
 src/main/java/de/dhbwstuttgart/sat/asp/parser/antlr/
+
+#GRADLE
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build
+
+

Makefile

@@ -1,3 +0,0 @@
-NoOptParallel:
-	mvn -DskipTests package
-	cp target/JavaTXcompiler-0.1-jar-with-dependencies.jar target/JavaTXcompiler-0.1-jar-with-dependencies_NoOptParallel.jar

README_aktuelle_Branches

@@ -1,11 +0,0 @@
-Stand: 24.5.21
-  bigRefactoring: Master-Brach
-  targetBytecode: Neuer Codegenerator mit generated generics Daniel
-  bigRefactoringUnifyComment: Dokumentation Unify, Martin
-  bytecodeGenericsSecond: Generated Generics, Ali, Martin
-  inferWildcards, Wildcards, Till
-  master, derzeit nicht genutzt
-  plugin, eigemntlicher Branch fuer Plugin-Basis, derzeit nicht aktuelle (aktuelle Version in simplifyRes
-  simplifyRes, Basis fuer Plugin, sollte auf Plugin gemerged werden, noch keine Packages, Michael
-  strucTypesNew, Struturelle Typen, alte Basis, arbeite derzeit niemand
-

app/build.gradle.kts

@@ -0,0 +1,53 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This generated file contains a sample Java application project to get you started.
+ * For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle
+ * User Manual available at https://docs.gradle.org/7.6/userguide/building_java_projects.html
+ */
+
+plugins {
+    // Apply the application plugin to add support for building a CLI application in Java.
+    antlr
+    application
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(19))
+    }
+}
+
+repositories {
+    // Use Maven Central for resolving dependencies.
+    mavenCentral()
+}
+
+dependencies {
+    // Use JUnit test framework.
+    testImplementation("junit:junit:4.13.2")
+
+    // This dependency is used by the application.
+    implementation("com.google.guava:guava:31.1-jre")
+    implementation("commons-io:commons-io:2.6")
+    implementation("org.reflections:reflections:0.9.11")
+    implementation("org.ow2.asm:asm:7.0")
+    //implementation("org.antlr:antlr4:4.11.1")
+    antlr("org.antlr:antlr4:4.8-1")
+}
+
+
+tasks.withType<JavaCompile> {
+    options.compilerArgs.add("--enable-preview")
+}
+tasks.withType<Test> {
+    jvmArgs("--enable-preview")
+}
+tasks.withType<JavaExec> {
+    jvmArgs("--enable-preview")
+}
+
+application {
+    // Define the main class for the application.
+    mainClass.set("de.dhbwstuttgart.App")
+}

app/resources/bytecode/javFiles/Generics2.jav

@@ -1,6 +1,3 @@
-import java.lang.String;
-import java.lang.Integer;
-
 class Generics2<B extends String>{
 	<B extends Integer> B m1(B b){
 		return b;

app/resources/bytecode/javFiles/Inf.jav

@@ -10,10 +10,6 @@ public class Inf {
 		w=y;
 		y=a;
 		b=a;
-		var c;
-		var d;
-		c = v;
-		d = v;
 	}
 }
 
@@ -29,27 +25,21 @@ TPH M m(TPH N x, TPH O y, TPH P a)({
     (w)::TPH S = (y)::TPH O;
     (y)::TPH O = (a)::TPH P;
     (b)::TPH T = (a)::TPH P;
-    TPH U c;
-    TPH V d;
-    (c)::TPH U = (v)::TPH R;
-    (d)::TPH V = (v)::TPH R;
     return;
-})::TPH W
+  })::TPH U
 
   Inf()({
     super(());
-  })::TPH Z
+  })::TPH X
 
 }
-// c::U d::V
-//   \  /
-//   v::R    w::S
+//    v::R w::S
 //       \  /
 //  z::Q y::O  b::T
 //    \ /   \  /
 //   x::N  a::P
 
-RESULT Final: [[(TPH N < TPH O), (TPH R < TPH V), (TPH N < TPH Q), (TPH P < TPH O), (TPH R < TPH U), (TPH M = void), (TPH O < TPH S), (TPH O < TPH R), (TPH P < TPH T)]]
+RESULT Final: [[(TPH O < TPH S), (TPH P < TPH O), (TPH O < TPH R), (TPH P < TPH T), (TPH M = void), (TPH N < TPH O), (TPH N < TPH Q)]]
 Simplified constraints: [(TPH O < TPH S), (TPH P < TPH O), (TPH O < TPH R), (TPH P < TPH T), (TPH N < TPH O), (TPH N < TPH Q)]
 m: [(TPH DDV = java.lang.Object), (TPH DDX = java.lang.Object), (TPH DDX < TPH DDV), (TPH N < TPH DDX), (TPH P < TPH DDX)]
 Class Inf: []

app/resources/bytecode/javFiles/Matrix.jav

@@ -1,6 +1,6 @@
 import java.util.Vector;
 import java.lang.Integer;
-//import java.lang.Float;
+import java.lang.Float;
 //import java.lang.Byte;
 //import java.lang.Boolean;
 

app/resources/bytecode/javFiles/OLFun.jav

@@ -9,11 +9,5 @@ public class OLFun    {
 	//f = x -> {return x + x;};
 	m(f, x) {
 	    x = f.apply(x+x);
-	    return x;
-	}
-
-	m2(y) {
-	   m(x -> x * 2, y);
-	   return;
 	}
 }

app/resources/bytecode/javFiles/OLFun2.jav

@@ -8,6 +8,6 @@ public class OLFun2 {
 
     x;
 	m(f){
-	    x = f.apply(x + x);
+	    x = f.apply(x + x)
 	}
 }

app/resources/bytecode/javFiles/SimpleCycle.jav

@@ -1,6 +1,6 @@
 public class SimpleCycle {
 	
-	m(){
+	m(a,b,d){
 		var g;
 		var h;
 		g = h;