Remove --enable-preview from pom.xml

This reverts commit 7650813bb7.

.gitea/workflows/build_and_test.yml

@@ -0,0 +1,25 @@
+name: Build and Test with Maven
+on: [push]
+
+jobs:
+  Build-and-test-with-Maven:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - name: Install maven
+        run: |
+          apt update
+          apt install -y maven
+      - name: Install java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+          cache: 'maven'
+      - name: Compile project
+        run: |
+          mvn compile
+      - name: Run tests
+        run: |
+          mvn test

.gitignore

@@ -19,7 +19,9 @@ bin
 .DS_Store
 .project
 .settings/
+.vscode/
 /target/
+settings.json
 
 #
 manually/

README_aktuelle_Branches

@@ -9,3 +9,6 @@ Stand: 24.5.21
   simplifyRes, Basis fuer Plugin, sollte auf Plugin gemerged werden, noch keine Packages, Michael
   strucTypesNew, Struturelle Typen, alte Basis, arbeite derzeit niemand
 
+Stand 21.2.23
+  unif23: Testbranch fuer Tagungseinrecihung Unif23
+

doc/pluginBau.md

@@ -0,0 +1,24 @@
+## Bau und installation des Eclipse plugins
+
+1. Zunächst muss der JavaTX Compiler gebaut werden. Dafür wird im Rootverzeichnis des JavaTX Compilers
+`mvn install` ausgeführt. Falls die Tests nicht laufen kann das mit `-DskipTests` beseitigt werden.
+
+2. Dann muss das Plugin gebaut werden. Dafür muss ebenfalls `mvn install` ausgeführt werden, im Rootverzeichnis des Plugins.
+Falls es dabei zu Fehlern mit der Java-Version kommen sollte muss man in ~\.mavenrc oder \~.mavenrc_pre.bat die Zeile
+`set JAVA_HOME=<JDK-19-Pfad>` (Windows) oder `JAVA_HOME="<JDK-19-Pfad>"` (Linux) einfügen. Damit sollte maven korrekt konfiguriert sein.
+
+3. Als letzter Schritt muss nun das Plugin in Eclipse geladen werden. Wichtig dabei ist, dass Eclipse selber mit Java 19 startet.
+Dafür kann die Datei `eclipse.ini` angepasst werden die im Installationsverzeichnis von Eclipse vorhanden ist. Hier müssen zwei Zeilen
+eingetragen werden:
+```
+-vm
+<JDK-19-Pfad>/javaw.exe
+```
+Ganz am Anfang der Datei
+und unter -vmargs die Option `--enable-preview`
+
+4. Das gebaute Plugin befindet sich unter `JavaCompilerPlugin\releng\JavaCompilerPlugin.Update\target`
+Um dieses Plugin in Eclipse laden zu können muss den Dialog `Help > Install new Software` öffnen. Oben rechts steht die Option `Add...`
+Im sich öffnenden Dialog muss man `Archive` anklicken und dort das Zip Archiv aus dem Oben genannten Pfad einfügen. Nun mit Add den Dialog schließen.
+Als letztes muss in der Liste oben der Eintrag `JavaCompilerPlugin.Update` ausgewählt werden. Hier sollte nun unten das Plugin angezeigt werden.
+Einfach auswählen und unten Next drücken. Damit sollte der Vorgang abgeschlossen sein.

pom.xml

@@ -29,20 +29,20 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<version>2.6</version>
 		</dependency>
 		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>22.0</version>
+			<groupId>io.github.classgraph</groupId>
+			<artifactId>classgraph</artifactId>
+			<version>4.8.172</version>
 		</dependency>
 		<dependency>
-			<groupId>org.reflections</groupId>
-			<artifactId>reflections</artifactId>
-			<version>0.9.11</version>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>33.2.0-jre</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.ow2.asm/asm -->
 		<dependency>
 			<groupId>org.ow2.asm</groupId>
 			<artifactId>asm</artifactId>
-			<version>7.0</version>
+			<version>9.5</version>
 		</dependency>
 	</dependencies>
 
@@ -51,13 +51,28 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.0</version>
+				<version>3.11.0</version>
 				<configuration>
-					<compilerArgs>--enable-preview</compilerArgs>
-                    <source>19</source>
-                    <target>19</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<redirectTestOutputToFile>true</redirectTestOutputToFile>
+					<reportsDirectory>${project.build.directory}/test-reports</reportsDirectory>
+					<argLine>--enable-preview</argLine>
+					<trimStackTrace>false</trimStackTrace>
+					<excludes>
+						<exclude>**/JavaTXCompilerTest.java</exclude>
+						<exclude>**/AllgemeinTest.java</exclude>
+						<exclude>**/syntaxtreegenerator/*.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.antlr</groupId>
 				<artifactId>antlr4-maven-plugin</artifactId>
@@ -74,6 +89,7 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.3.0</version>
 				<configuration>
 					<archive>
 						<manifest>
@@ -112,8 +128,6 @@ 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>
 	</properties>
 	<distributionManagement>

resources/AllgemeinTest/Assign.jav

@@ -1,10 +0,0 @@
-class Assign {
-
-      assign(x, y) {
-          x = y;
-      }
-
-      assign2(x, y) {
-          assign(x,y);
-      }
-}

resources/AllgemeinTest/Box.jav

@@ -1,13 +0,0 @@
-class Box<A>{
-void m(A a){}
-}
-
-class B { }
-
-class Box_Main extends B {
-
-    m(b) {
-       b.m(new Box_Main());
-       b.m(new B());
-    }
-}

resources/AllgemeinTest/Box_Main.jav

@@ -1,13 +0,0 @@
-class Box<A>{
-	A f;
-}
-
-class B { }
-
-class Box_Main extends B {//Fehler Bugzilla Bug 230
-
-    m(b) {
-    	b.f = new Box_Main();
-    	b.f = new B();
-    }
-}

resources/AllgemeinTest/CaptureConversion.jav

@@ -1,18 +0,0 @@
-import java.lang.Object;
-import java.util.Vector;
-
-class CaptureConversion {
-
-    <X> void assign(Vector<X> v1, Vector<X> v2) {
-		v1 = v2;
-    }
-
-    void main() {
-		Vector<?> v1;
-		v1 = new Vector<Object>();
-		Vector<? extends Object> v2;
-		v2 = new Vector<Object>();
-		v1 = v2;
-		assign(v1, v2);
-    }
-}

resources/AllgemeinTest/FCTest1.jav

@@ -1,12 +0,0 @@
-import java.util.Vector;
-import java.util.List;
-import java.lang.Integer;
-
-class FCTest1 extends Vector<Vector<Integer>> {
-	fc1() {
-		var y;
-		var z;
-		y.add(z);
-		return y;
-	}
-}

resources/AllgemeinTest/FCTest2.jav

@@ -1,11 +0,0 @@
-import java.util.Vector;
-import java.util.List;
-import java.lang.Integer;
-
-class FCTest2 extends Vector<Vector<Integer>> {
-	fc2(y) {
-		var z;
-		y.add(z);
-		return y;
-	}
-}

resources/AllgemeinTest/FCTest3.jav

@@ -1,19 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-
-class FCTest3 extends Pair<Vector<Integer>, Vector<Integer>> {
-
-	
-	fc2(x) {
-		x.snd().addElement(2);
-	}
-	
-	
-	
-	fc2a() {
-		var y;
-		y.snd().addElement(2);
-		return y;
-	}
-	
-}

resources/AllgemeinTest/GenTest.jav

@@ -1,10 +0,0 @@
-import java.lang.Integer;
-import java.util.Vector;
-
-public class GenTest {
-
-    main(x) {
-		var v = new Vector();
-		return 1 + v.elementAt(0);
-    }
-}

resources/AllgemeinTest/Generics.jav

@@ -1,9 +0,0 @@
-class Generics {
-    a;
-    id(b) { return b; }
-    setA(x) {
-        a = x;
-        return a;
-    }
-    m(x,y) { x = id(y); }
-}

resources/AllgemeinTest/M.jav

@@ -1,7 +0,0 @@
-import java.util.List;
-class M {
-void m(p, p2){
-
-  new addList().addLists(p, p2);
-}
-}

resources/AllgemeinTest/OverloadingMain.jav

@@ -1,9 +0,0 @@
-import java.util.Stack;
-import java.util.Vector;
-
-class OverloadingMain {
-
-    mmMain(x) { var y; return new O1().mm(y); }
-      
-}
-	   

resources/AllgemeinTest/Overloading_Generics.jav

@@ -1,20 +0,0 @@
-import java.lang.Integer;
-
-
-public class Overloading_Generics {
-
-    id1 (x) { return x; }
-
-    //Integer id (Integer x) { return x; }
-}
-
-
-class Overloading_Generics1 {
-    main(x) {
-		var olg = new Overloading_Generics();
-		return olg.id1(1);
-    }
-}
-
-
-

resources/AllgemeinTest/OverrideMain.jav

@@ -1,25 +0,0 @@
-import java.util.Vector;
-import java.util.Stack;
-
-class OverrideMain {
-    ovrMain(x) {
-	var overide;
-	overide.ovr(x);
-    }
-}
-
-/*
- [
-  [(TPH L = java.util.Stack<TPH FTM>), (TPH N = java.lang.String), (TPH M = ? extends Override2), (TPH FTN, TPH FTM), (TPH K = void)], 
-[(TPH FTO, TPH FTP), (TPH M = ? extends Override2), (TPH N = java.lang.String), (TPH L = java.util.Stack<TPH FTP>), (TPH K = void)], 
-[(TPH M = ? extends Override2), (TPH N = java.lang.String), (TPH K = void), (TPH FTR, TPH FTQ), (TPH L = java.util.Vector<TPH FTQ>)], 
-[(TPH FTT, TPH FTS), (TPH M = ? extends Override2), (TPH L = java.util.Vector<TPH FTS>), (TPH K = void), (TPH N = java.lang.String)], 
-[(TPH L = java.util.Vector<TPH FTV>), (TPH M = ? extends Override2), (TPH N = java.lang.String), (TPH FTU, TPH FTV), (TPH K = void)], 
-[(TPH FTX, TPH FTW), (TPH M = ? extends Override2), (TPH L = java.util.Vector<TPH FTW>), (TPH K = void), (TPH N = java.lang.String)], 
-[(TPH M = ? extends Override2), (TPH L = java.util.Stack<TPH FTZ>), (TPH K = void), (TPH FTY, TPH FTZ), (TPH N = java.lang.String)], 
-[(TPH FUB, TPH FUA), (TPH K = void), (TPH M = ? extends Override2), (TPH N = java.lang.String), (TPH L = java.util.Vector<TPH FUA>)], 
-[(TPH N = java.lang.String), (TPH L = java.util.Vector<TPH FUC>), (TPH FUD, TPH FUC), (TPH M = ? extends Override2), (TPH K = void)], 
-[(TPH N = java.lang.String), (TPH FUF, TPH FUE), (TPH M = ? extends Override2), (TPH K = void), (TPH L = java.util.Vector<TPH FUE>)]]
-
- [[(TPH M = ? extends Override2), (TPH MNX, TPH MNY), (TPH N = java.lang.String), (TPH K = void), (TPH L = java.util.Stack<TPH MNY>)], [(TPH L = java.util.Stack<TPH MOC>), (TPH N = java.lang.String), (TPH M = ? extends Override2), (TPH K = void), (TPH MOB, TPH MOC)], [(TPH M = ? extends Override2), (TPH N = java.lang.String), (TPH MNZ, TPH MOA), (TPH L = java.util.Vector<TPH MOA>), (TPH K = void)], [(TPH L = java.util.Vector<TPH MOE>), (TPH K = void), (TPH M = ? extends Override2), (TPH MOD, TPH MOE), (TPH N = java.lang.String)], [(TPH M = ? extends Override2), (TPH K = void), (TPH N = java.lang.String), (TPH MOF, TPH MOG), (TPH L = java.util.Stack<TPH MOG>)], [(TPH L = java.util.Vector<TPH MOI>), (TPH K = void), (TPH MOH, TPH MOI), (TPH M = ? extends Override2), (TPH N = java.lang.String)], [(TPH L = java.util.Vector<TPH MOK>), (TPH MOJ, TPH MOK), (TPH K = void), (TPH M = ? extends Override2), (TPH N = java.lang.String)], [(TPH MOL, TPH MOM), (TPH L = java.util.Stack<TPH MOM>), (TPH M = ? extends Override2), (TPH K = void), (TPH N = java.lang.String)], [(TPH L = java.util.Vector<TPH MOO>), (TPH MON, TPH MOO), (TPH N = java.lang.String), (TPH K = void), (TPH M = ? extends Override2)], [(TPH L = java.util.Stack<TPH MOP>), (TPH N = java.lang.String), (TPH M = ? extends Override2), (TPH MOQ, TPH MOP), (TPH K = void)]]
-*/

resources/AllgemeinTest/OverrideMainRet.jav

@@ -1,11 +0,0 @@
-import java.util.Vector;
-import java.util.Stack;
-
-class OverrideMainRet {
-    ovrMain() {
-	var overide;
-	var x;
-	overide.ovr(x);
-	return x;
-    }
-}

resources/AllgemeinTest/Pair.jav

@@ -1,36 +0,0 @@
-import java.util.Vector;
-import java.lang.Boolean;
-import java.lang.Object;
-
-class Pair<U, T> {
-    U a;
-    T b;
-    
-    make(x) {
-		var ret = new Pair<>();
-		ret.a = x.elementAt(0);
-		ret.b = x.elementAt(1);
-		return ret;
-    }
-
-
-    eq(a, b) {
-    	b = a;
-    	return a == b;
-    }
-
-
-    compare( p) {
-		return  eq(p.a, p.b);
-		//return p.a == p.b;
-    }
-
-
-/*
-    void m(Pair<?, ?> p, Vector<?> b)
-    {
-	//this.compare(p); //1, type incorrect
-	this.compare(this.make(b)); //2, OK
-    }
-*/
-}

resources/AllgemeinTest/Pair.java

@@ -1,18 +0,0 @@
-class Pair<T, U> {
-	T x;
-	U y;
-	
-	public Pair() { }
-	public Pair(T x, U y) {
-		this.x = x;
-		this.y = y;
-	}
-	
-	public T fst () {
-		return x;
-	}
-	
-	public U snd () { 
-		return y;
-    }
-}

resources/AllgemeinTest/Put.jav

@@ -1,19 +0,0 @@
-import java.util.Vector;
-import java.util.Stack;
-
-class Put {
-
-    putElement(ele, v) {
-	    v.addElement(ele);
-    }
-
-    putElement(ele, s) {
-	    s.push(ele);
-    }
-
-
-    main(ele, x) { 
-        putElement(ele, x);
-    }
-
-}

resources/AllgemeinTest/Test.jav

@@ -1,4 +0,0 @@
-class Test {
-	a;
-	Test b;
-}

resources/AllgemeinTest/TestSubTypless.jav

@@ -1,12 +0,0 @@
-import java.util.ArrayList;
-
-class TestSubTypless {
-        m(a){
-                var l = new ArrayList<>();
-                l.add(a);
-                return m2(l).get(0);
-        }
-        m2(a){
-                return m(a);
-        }
-}

resources/AllgemeinTest/Twice.jav

@@ -1,3 +0,0 @@
-class Twice {
-    twice = f -> x -> f.apply(f.apply(x));
-}

resources/AllgemeinTest/UseWildcardPair.jav

@@ -1,12 +0,0 @@
-import java.util.Vector;
-import java.lang.Boolean;
-
-class UseWildcardPair{
-
-    void m(Pair<?, ?> p, Vector<?> b)
-    {
-    	p.compare(p); //1, type incorrect
-		p.compare(p.make(b)); //2, OK
-    }
-
-}

resources/AllgemeinTest/Var.jav

@@ -1,5 +0,0 @@
-class Var {
-
-    var(x) { var y;  }
-      
-}

resources/AllgemeinTest/VectorConstAdd.jav

@@ -1,15 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-
-
-public class VectorConstAdd {
-	vectorAdd(v1) {
-		var i = 0;
-		var erg = new Vector<>();
-		while (i < v1.size()) {
-			erg.addElement(v1.elementAt(i) + 1);
-			i++;
-		} 
-		return erg; 
-	}
-}

resources/AllgemeinTest/VectorNotObject.jav

@@ -1,9 +0,0 @@
-import java.util.Vector;
-
-class VectorNotObject {
- 
- vectorAddAll(v1, v2) {
-        v1.addAll(v2);
- 	    return v1;
- 	}
- }

resources/AllgemeinTest/WildcardCaptureConversionTest.jav

@@ -1,16 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-import java.lang.String;
-
-class WildcardCaptureConversionTest {
-
-	m(x, y ,z) {
-		x = new Vector<Integer>();
-		y = new Vector<String>();
-		x.add(1);
-		y.add("2");
-		//Integer i = x.elementAt(0);
-		//String s = y.elementAt(0);
-	    return 	z.vectorAddAll(x, y);
-	}
-} 

resources/AllgemeinTest/Wildcard_Andi.jav

@@ -1,8 +0,0 @@
-class Wildcard_Andi {
-
-    Test<? extends A> ex = new Test<>();
-
-    Test<? super A> sup = new Test<>();
-}
-
-

resources/AllgemeinTest/addList.jav

@@ -1,8 +0,0 @@
-import java.util.List;
-
-class addList {
- addLists(a, b){
-a.add(b.get(0));
-b.add(a.get(0));
-}
-}

resources/AllgemeinTest/wildcardPair.jav

@@ -1,22 +0,0 @@
-import java.util.List;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Boolean;
-
-class wildcardPair {
-
-	make(l) { 
-		var p = new Pair(l.get(0), l.get(1));
-		return p; 
-	}
-	//<X>Boolean compare(Pair<X, X> x) { return true; }
-	void m(l) {
-		Object o = l.get(0);
-		
-		//Pair<? extends Object, ? extends Object> p;
-		//List<?> b;
-		//this.compare(p);             //1, type incorrect
-		make(l);
-		//this.compare(this.make(b));  //2, OK
-	} 
-}

resources/bytecode/javFiles/AA.jav

@@ -1,8 +0,0 @@
-import java.lang.Integer;
-import java.lang.String;
-
-public class AA {
-	m(Integer i) { return "AA"; }
-	
-	m2(AA x) { return "AA"; }
-}

resources/bytecode/javFiles/AssignToLit.jav

@@ -1,30 +0,0 @@
-import java.lang.Integer;
-import java.lang.Boolean;
-import java.lang.String;
-import java.lang.Byte;
-import java.lang.Short;
-import java.lang.Long;
-import java.lang.Float;
-import java.lang.Double;
-import java.lang.Character;
-
-class AssignToLit {
-	void m(){
-//		String s = "Test";
-//		Boolean b = false;
-//		Byte byte1 = 5;
-//		Byte byte2 = 55;
-//		Short short1 = 5;
-//		Short short2 = 55;
-//		Integer int1 = 5;
-//		Integer int2 = 8888888;
-//		Long long1 = 1;
-//		Long long2 = 5;
-//		Long long3 = 89989898;
-//		Float float1 = 1;
-//		Float float2 = 55;
-//		Double d1 = 1;
-//		Double d2 = 55;
-		Character c = 'A';
-	}
-}

resources/bytecode/javFiles/BB.jav

@@ -1,3 +0,0 @@
-import java.lang.Integer;
-
-public class BB extends AA { }

resources/bytecode/javFiles/BinaryInMeth.jav

@@ -1,17 +0,0 @@
-import java.lang.Integer;
-import java.lang.Double;
-
-public class BinaryInMeth {
-	
-	m(a){
-		return ++a;
-	}
-	
-	m2(a,b){
-		return m(a+b);
-	}
-	
-	m3(a) {
-		return m(++a);
-	}
-}

resources/bytecode/javFiles/Box.jav

@@ -1,7 +0,0 @@
-class B { }
-class Box_Main extends B {
-    m(b) {
-       b.m(new Box_Main());
-       b.m(new B());
-    }
-}

resources/bytecode/javFiles/Box.java

@@ -1,3 +0,0 @@
-class Box<A> {
-    void m(A a) { }
-}

resources/bytecode/javFiles/CC.jav

@@ -1,11 +0,0 @@
-import java.lang.Integer;
-import java.lang.String;
-
-
-public class CC extends BB {
-	m(Integer i) { 
-	   return "CC"; 
-	}
-	
-	m2(CC x) { return "CC"; }
-}	

resources/bytecode/javFiles/ClassGenLam.jav

@@ -1,8 +0,0 @@
-import java.lang.Integer;
-
-public class ClassGenLam {
-	lam = x-> x;
-//	public ClassGenLam() {
-//		lam = x->x; 
-//	}
-}

resources/bytecode/javFiles/Cycle.jav

@@ -1,6 +0,0 @@
-class Cycle {
-    m(x, y) {
-        y = x;
-        x = y;
-    }
-}

resources/bytecode/javFiles/DD.jav

@@ -1,4 +0,0 @@
-import java.lang.Integer;
-
-public class DD extends CC { }
-

resources/bytecode/javFiles/DuMethod.jav

@@ -1,11 +0,0 @@
-public class DuMethod{
-	
-	method(a){
-		return a+a;
-	}
-	
-	method(a){
-		return a;
-	}
-	
-}

resources/bytecode/javFiles/EmptyMethod.jav

@@ -1,8 +0,0 @@
-public class EmptyMethod{
-	
-	public void m1(){
-		System.out.println("test");
-	}
-	
-	public void m2(){}
-}

resources/bytecode/javFiles/Example.jav

@@ -1,9 +0,0 @@
-import java.lang.String;
-
-public class Example {
-	
-	public m() {
-		String x = "X";
-		return x;
-	}
-}

resources/bytecode/javFiles/Exceptions.jav

@@ -1,3 +0,0 @@
-public class Exceptions {
-//	m(Integer i) throws 
-}

resources/bytecode/javFiles/Fac.jav

@@ -1,15 +0,0 @@
-import java.lang.Integer;
-//import java.lang.Double;
-
-public class Fac  {
-	
-	getFac(n){
-		var res = 1;
-		var i = 1;
-		while(i<=n) {
-			res = res * i;
-			i++;
-		}
-		return res;
-	}
-}

resources/bytecode/javFiles/Faculty.jav

@@ -1,52 +0,0 @@
-import java.lang.Integer;
-//import java.lang.Long;
-//import java.lang.Short;
-
-public class Faculty {
-    public fact;
-    Faculty() {
-        fact = (x) -> {
-            if (x == 1) {
-                return 1;
-            }
-            else {
-              return x * (fact.apply(x-1));
-            }
-        };
-    }
-    
-    
-    
-    public getFact(x) {
-        return fact.apply(x);
-    }
-}
-//  m (x) {
-//	  
-////   var fact = (x) -> {
-////   	  if (x == 1) {
-////        return x;
-////      }
-////      else {
-////        return x * (fact.apply(x-1));
-////      }
-////   };
-////   return fact;
-////	  var x = 13;
-////	  if(x>22) {
-////			return 0;
-////		}else if(x <1){
-////			return x;
-////		}else {
-////			return 1;
-////		}
-//	  
-//	  if (x < 0) {
-//	        return 0;
-//	  }else if(x<2) {
-//		  return x;
-//	  } else {
-//		  return x * m(x-1);
-//	  }
-//  }
-//}

resources/bytecode/javFiles/Faculty2.jav

@@ -1,10 +0,0 @@
-class Faculty2 {
-
-  m () {
-	  
-   var fact = (Integer x) -> {
-        return x;
-   };
-   return fact;
-  }
-}

resources/bytecode/javFiles/Field.jav

@@ -1,9 +0,0 @@
-import java.lang.Integer;
-
-public class Field {
-	public x = 5;
-	
-	m(){
-		return x;
-	}
-}

resources/bytecode/javFiles/FieldTph.jav

@@ -1,4 +0,0 @@
-public class FieldTph {
-	a;
-	
-}

resources/bytecode/javFiles/FieldTph2.jav

@@ -1,12 +0,0 @@
-public class FieldTph2 {
-	a;
-	
-	m(b){
-		b = a;
-		return b;
-	}
-	
-	m2(c){
-		a = c;
-	}
-}

resources/bytecode/javFiles/FieldTphConsMeth.jav

@@ -1,26 +0,0 @@
-public class FieldTphConsMeth {
-	
-	a;
-	public FieldTphConsMeth(c) {
-		a = id(c);
-	}
-	
-	id(b) {
-		return b;
-	}
-
-	setA(x) {
-	    a = x;
-	    return a;
-	}
-
-	m(x,y) {
-	    x = id(y);
-	}
-
-	/*m2(x,y) {
-    	    x = setA(y);
-    	    return x;
-    	}*/
-
-}

resources/bytecode/javFiles/FieldTphMMeth.jav

@@ -1,27 +0,0 @@
-import java.lang.Boolean;
-
-public class FieldTphMMeth {
-	a;
-	
-	public FieldTphMMeth(c,d,e) {
-		a = m(c,d,e);
-	}
-	
-	m(b,d,e) {
-		if(e) {
-			return m3(b);
-		} else{
-			return m3(d);
-		}
-		
-	}
-	
-	m2(b) {
-		a = m3(b);
-	}
-	
-	m3(b){
-		return b;
-	}
-	
-}

resources/bytecode/javFiles/For.jav

@@ -1,30 +0,0 @@
-import java.lang.Integer;
-import java.lang.Boolean;
-
-class For{
-	Integer m(Integer x){
-		var c = x + 2;
-//		Boolean b = true;
-//		c = 5;
-//		c++;
-//		++c;
-//		c--;
-//		--c;
-//		while(x<2){
-//			x = x +1;
-//			b = false;
-//		}
-		return c;
-//		for(int i = 0;i<10;i++) {
-//			x = x + 5;
-//		}
-	}
-	
-//	m2(Integer x){
-//		if(x<2) {
-//			return 1;
-//		}else {
-//			return 2;
-//		}
-//	}
-}

resources/bytecode/javFiles/FunOL.jav

@@ -1,12 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-import java.lang.String;
-//import java.lang.Byte;
-//import java.lang.Boolean;
-
-public class FunOL   {
-
-	add(f, y) {
-        return f.apply() + y;
-    }
-}

resources/bytecode/javFiles/Gen.jav

@@ -1,8 +0,0 @@
-import java.lang.Integer;
-import java.util.Vector;
-
-public class Gen{
-	Vector<Integer> m(Vector<Integer> v){
-		return v;
-	}
-}

resources/bytecode/javFiles/Generics.jav

@@ -1,17 +0,0 @@
-
-class Generics<B> {
-	Generics(B b){
-    }
-    B mt1(B b){
-        return mt1(b);
-    }
-}
-
-
-/*
-Problem:
-auto test = new List<String>();
-auto test2 = new List<Integer>();
-... //code, welcher möglicherweise test und test2 vertauscht
-test.add("hallo");
-*/

resources/bytecode/javFiles/Generics2.jav

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

resources/bytecode/javFiles/Generics3.jav

@@ -1,7 +0,0 @@
-import java.lang.String;
-import java.lang.Integer;
-import java.util.List;
-
-class Generics3<B extends String & List<Integer>> {
-
-}

resources/bytecode/javFiles/Generics4.jav

@@ -1,12 +0,0 @@
-import java.lang.String;
-import java.lang.Integer;
-
-class Generics4<B extends String> {
-	<C extends Integer> C m1(C b){
-		return b;
-	}
-
-    m2(x) {
-        return m1(x);
-    }
-}

resources/bytecode/javFiles/GreaterEqual.jav

@@ -1,57 +0,0 @@
-import java.lang.Integer;
-import java.lang.Long;
-import java.lang.Float;
-import java.lang.Double;
-
-public class GreaterEqual {
-	
-	gE(Integer a, Integer b){
-		var c = a>=b;
-		return c;
-	}
-	
-	gE(Long a, Long b){
-		var c = a>=b;
-		return c;
-	}
-	
-	gE(Float a, Float b){
-		var c = a>=b;
-		return c;
-	}
-	
-	gE(Double a, Double b){
-		var c = a>=b;
-		return c;
-	}
-	
-	gE(Long a, Integer b){
-		var c = a>=b;
-		return c;
-	}
-	
-	gE(Float a, Integer b){
-		var c = a>=b;
-		return c;
-	}
-	
-	gE(Double a, Integer b){
-		var c = a>=b;
-		return c;
-	}
-	
-	gE(Float a, Long b){
-		var c = a>=b;
-		return c;
-	}
-	
-	gE(Double a, Long b){
-		var c = a>=b;
-		return c;
-	}
-	
-	gE(Double a, Float b){
-		var c = a>=b;
-		return c;
-	}
-}

resources/bytecode/javFiles/GreaterThan.jav

@@ -1,56 +0,0 @@
-import java.lang.Integer;
-import java.lang.Long;
-import java.lang.Float;
-import java.lang.Double;
-
-public class GreaterThan {
-	gT(Integer a, Integer b){
-		var c = a>b;
-		return c;
-	}
-	
-	gT(Long a, Long b){
-		var c = a>b;
-		return c;
-	}
-	
-	gT(Float a, Float b){
-		var c = a>b;
-		return c;
-	}
-	
-	gT(Double a, Double b){
-		var c = a>b;
-		return c;
-	}
-	
-	gT(Long a, Integer b){
-		var c = a>b;
-		return c;
-	}
-	
-	gT(Float a, Integer b){
-		var c = a>b;
-		return c;
-	}
-	
-	gT(Double a, Integer b){
-		var c = a>b;
-		return c;
-	}
-	
-	gT(Float a, Long b){
-		var c = a>b;
-		return c;
-	}
-	
-	gT(Double a, Long b){
-		var c = a>b;
-		return c;
-	}
-	
-	gT(Double a, Float b){
-		var c = a>b;
-		return c;
-	}
-}

resources/bytecode/javFiles/Id.jav

@@ -1,20 +0,0 @@
-public class Id {
-//	a;
-//	id(b){
-//		return b;
-//	}
-	id2 = x -> x;
-//	id2 = () -> {
-//		var x = m(a);
-//		var y = x;
-//		var z = y;
-//	};
-//	
-//	m(a){
-//		return a;
-//	}
-	id3 (x) {
-	   	return id2.apply(x);
-	}
-}
-

resources/bytecode/javFiles/IfTest.jav

@@ -1,15 +0,0 @@
-import java.lang.Integer;
-import java.lang.Boolean;
-import java.lang.String;
-
-public class IfTest{
-	Integer m1(Boolean b) {
-		Integer i;
-		String b;
-		if(b) {
-			return i; 
-		}else{
-		    return b;
-		}
-	}
-}

resources/bytecode/javFiles/Import.jav

@@ -1,8 +0,0 @@
-import java.util.Vector;
-
-class Import {
-    void methode(){
-        Vector v = new Vector<>();
-        v.add("X");
-    }
-}

resources/bytecode/javFiles/Inf.jav

@@ -1,65 +0,0 @@
-public class Inf {
-	m(x,y,a){
-		var z; 
-		var v;
-		var w;
-		var b;
-		y=x;
-		z=x;
-		v=y;
-		w=y;
-		y=a;
-		b=a;
-		var c;
-		var d;
-		c = v;
-		d = v;
-	}
-}
-
-/*
-TPH M m(TPH N x, TPH O y, TPH P a)({
-    TPH Q z;
-    TPH R v;
-    TPH S w;
-    TPH T b;
-    (y)::TPH O = (x)::TPH N;
-    (z)::TPH Q = (x)::TPH N;
-    (v)::TPH R = (y)::TPH O;
-    (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
-
-  Inf()({
-    super(());
-  })::TPH Z
-
-}
-// c::U d::V
-//   \  /
-//   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)]]
-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: []
-Inf: []
-
-Unify nach Oder-Constraints-Anpassung:
-UND:[(void =. M, , -1 WC: false, IT: false), (N <. O, 1 WC: false, IT: false, 1 WC: false, IT: false), (P <. O, 1 WC: false, IT: false, 1 WC: false, IT: false), (N <. Q, 1 WC: false, IT: false, 0 WC: true, IT: false), (O <. S, 1 WC: false, IT: false, 0 WC: true, IT: false), (O <. R, 1 WC: false, IT: false, 0 WC: true, IT: false), (P <. T, 1 WC: false, IT: false, 0 WC: true, IT: false)]
-isInherited = false
-isStatement = false
-
-ODER:
-*/
-

resources/bytecode/javFiles/Infimum.jav

@@ -1,6 +0,0 @@
-class Infimum {
-    m(x, y, z) {
-        y = x;
-        z = x;
-    }
-}

resources/bytecode/javFiles/Inherit.jav

@@ -1,18 +0,0 @@
-import java.util.Vector;
-
-import java.lang.Integer;
-import java.lang.String;
-
-
-public class Inherit {
-	
-	main(d, i) {
-	  return d.m(i);
-	}
-
-	main(v, i) {
-		var aa = v.elementAt(0);
-		return aa.m(i);
-	}
-
-}

resources/bytecode/javFiles/Inherit2.jav

@@ -1,17 +0,0 @@
-import java.util.Vector;
-
-import java.lang.Integer;
-import java.lang.String;
-
-
-public class Inherit2 {
-	
-	main(d) {
-	  return d.m2(d);
-	}
-	
-	main(v) {
-		var aa = v.elementAt(0);
-		return aa.m2(aa);
-	}
-}

resources/bytecode/javFiles/Interface1.jav

@@ -1,3 +0,0 @@
-public interface Interface1{
-	public void test();
-}

resources/bytecode/javFiles/KompTph.jav

@@ -1,13 +0,0 @@
-public class KompTph {
-	public m(a, b, c) {
-		var d = a;
-		var e = a;
-		a = b;
-		c = b;
-		m2(a,c);
-	}
-
-	public m2(a,b){
-		m(a,a,b);
-	}
-}

resources/bytecode/javFiles/LamRunnable.jav

@@ -1,9 +0,0 @@
-public class LamRunnable{
-
-	public LamRunnable(){
-	
-		Runnable lam = () -> {System.out.println("lambda");};
-		lam.run();
-	}
-}
- 

resources/bytecode/javFiles/Lambda.jav

@@ -1,11 +0,0 @@
-import java.lang.Integer;
-
-public class Lambda {
-
-  m () {
-   var lam1 = (x) -> {
-        return x;
-   };
-   return lam1;
-  }
-}

resources/bytecode/javFiles/Lambda2.jav

@@ -1,35 +0,0 @@
-import java.lang.String;
-
-public class Lambda2
-{
-   public static void main(List<String> args){
-       var listOfStrings = new List<String>();
-       var listOfObjects;
-       listOfObjects = map(listOfStrings, (a) -> a);
-}
-
-public map(a , b){
-    b.apply(a);
-    return a;
-}
-
-/*
-public static <I,O> List<O> map(List<I> input, Function<I,O> func) {
-  List<O> output;
-   output = new List<O>();
-    output.add(func.apply(input.get()));
-  return output;
-}
-*/
-}
-
-class List<A>{
- /*   A get();
-    void add(A);
-    */
-}
-/*
-class Function<A,B>{
-    B apply(A a);
-}
-*/

resources/bytecode/javFiles/Lambda3.jav

@@ -1,23 +0,0 @@
-
-public class Lambda2
-{
-    /*
-    public static <A> List<A> map(List<? extends A> input,
-    Function<? super A, ? extends A> func){
-      input.add(func.apply(input.get()));
-    }
-    */
-    public map(input,func){
-       input.add(func.apply(input.get()));
-       return map(new List<String>(), func);
-    }
-}
-
-class List<A>{
-    A get();
-    void add(A);
-}
-
-class Function<A,B>{
-    B apply(A a);
-}

resources/bytecode/javFiles/Lambda4.jav

@@ -1,18 +0,0 @@
-class Lambda{
-
-methode(){
-    return ((f) -> f);
-}
-}
-/*
-interface Fun0<A>{
-    A apply();
-}
-
-interface Fun1<A,B>{
-    A apply(B b);
-}
-*/
-interface Fun2<A,B,C>{
-    A apply(B b, C c);
-}