Eliminate transitive children, add missing object bounds

- Remove referenced check from Infima
- Correctly identify contra & covariance for chains for tphs

.gitignore

@@ -23,3 +23,9 @@ bin
 
 #
 manually/
+
+logFiles/**
+!logFiles/.gitkeep
+
+src/main/java/de/dhbwstuttgart/parser/antlr/
+src/main/java/de/dhbwstuttgart/sat/asp/parser/antlr/

README.md

@@ -1,19 +0,0 @@
-
-
-# plugin site erstellen
-* die JAvaTXCOmpiler DAtei in ein plugin umwandeln und deployen.
-* siehe: http://www.vogella.com/tutorials/EclipseJarToPlugin/article.html#convert-jar-files-to-osgi-bundles-with-the-p2-maven-plugin
-* AUsführung:
-	* mvn deploy #erstellt die JAR-Datei und steckt sie in ein lokales Repo (maven-repository)
-	* mvn p2:site
-	* mvn package # hier wird die ZIP-Filf zum Einbinden in Eclipse erstellt
-
-# Einbinden in Eclipse
-* In Eclipse kann die Zip-FIle wie ein Plugin installiert werden
-* Hier tritt FEhler auf. Reflections-Library kann nicht installiert werden. Möglicherweise wird sie auch nicht gebraucht
-* Nach dem installieren de.dhbwstuttagrt.JavaTXcompiler zu den DEpendencies des plugins hinzufügen
-* Anschließend unter "Overview" auf "Updata Classpath" klicken
-
-# Windows
-* JAVA_HOME setzen:
-	* export JAVA_HOME=/c/Program\ Files/Java/jdk1.8.0_102/

README_aktuelle_Branches

@@ -0,0 +1,11 @@
+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
+

doc/Generics/generics.tex

@@ -0,0 +1,25 @@
+\documentclass{article}
+
+\begin{document}
+
+\section{Generics sind notwendig}
+Generics können nicht ignoriert werden.
+Folgender Fall ist Typisierbar:
+
+\begin{program}
+<T> T m1(T x){
+	return m2(x);
+}
+
+m2(x){
+	m1(1);
+	m2("Test");
+	return m1(x);
+}
+\end{program}
+
+Beim weglassen des Generics T wäre es aber nicht mehr möglich.
+Dann erhält jeder Constraint, welcher in Verbindung mit der Methode m1 steht
+den selben TPH.
+
+\end{document}

doc/parser.md

@@ -0,0 +1,24 @@
+# Dateien
+* sämtliche Datein im Ordner de.dhbwstuttgart.parser gehören zum Parser
+* Auch zu beachten: pom.xml
+	* Ein Teil der pom.xml instruiert maven zur Kompilierung der Java8.g4 Datei
+	* VORSICHT! Wird nicht zwangsläufig von der IDE ausgeführt
+	* siehe Kapitel "Grammatik -> Parser"
+
+
+## Unterordner antlr
+* Java8.g4
+	* die eigentliche Java Grammatik
+	* hier wurden Anpassungen vorgenommen, damit sie auch typloses Java annimmt
+* alle anderen Dateien in diesem Ordner sind vom ANTLR-Parsergenerator autogeneriert
+
+## Unterordner SyntaxTreeGenerator
+* SyntaxTreeGenerator
+* TODO
+
+# Grammatik -> Parser
+* Die Antlr-Grammatik (Java8.g4) wandelt 
+* Folgende Stellen sind relevant
+	* TODO
+
+

pom.xml

@@ -1,4 +1,3 @@
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
@@ -15,13 +14,14 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-      <version>4.0</version>
+			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.antlr/antlr4 -->
 		<dependency>
 			<groupId>org.antlr</groupId>
 			<artifactId>antlr4</artifactId>
-   	 <version>4.7</version>
+			<version>4.11.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
@@ -38,60 +38,50 @@
 			<artifactId>reflections</artifactId>
 			<version>0.9.11</version>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.ow2.asm/asm -->
 		<dependency>
 			<groupId>org.ow2.asm</groupId>
-    <artifactId>asm-all</artifactId>
-    <version>[4.0.0,)</version>
+			<artifactId>asm</artifactId>
+			<version>7.0</version>
 		</dependency>
-<!--
-<dependency>
-    <groupId>org.bitbucket.mstrobel</groupId>
-    <artifactId>procyon-reflection</artifactId>
-    <version>[0.5.32,)</version>
-</dependency> -->
 	</dependencies>
 
 	<build>
-    <directory>target</directory>
-    <outputDirectory>target/classes</outputDirectory>
-    <finalName>${project.artifactId}-${project.version}</finalName>
-    <testOutputDirectory>target/test-classes</testOutputDirectory>
-    <sourceDirectory>src/</sourceDirectory>
-    <testSourceDirectory>test/</testSourceDirectory>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.0</version>
+				<configuration>
+					<compilerArgs>--enable-preview</compilerArgs>
+                    <source>19</source>
+                    <target>19</target>
+                </configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.antlr</groupId>
 				<artifactId>antlr4-maven-plugin</artifactId>
-        <version>4.7</version>
+				<version>4.11.1</version>
 				<executions>
 					<execution>
 						<id>antlr</id>
 						<goals>
 							<goal>antlr4</goal>
 						</goals>
-	    <configuration>
-		    <sourceDirectory>src/de/dhbwstuttgart/parser/antlr/</sourceDirectory>
-		    <outputDirectory>src/de/dhbwstuttgart/parser/antlr/</outputDirectory>
-		    <arguments> <argument>-package</argument> <argument>de.dhbwstuttgart.parser.antlr</argument> </arguments>
-	    </configuration>
 					</execution>
-	    <execution>
-            <id>aspParser</id>
-            <goals>
-		    <goal>antlr4</goal>
-	    </goals>
-	    <configuration>
-		    <sourceDirectory>src/de/dhbwstuttgart/sat/asp/parser/antlr/</sourceDirectory>
-		    <outputDirectory>src/de/dhbwstuttgart/sat/asp/parser/antlr/</outputDirectory>
-		    <arguments>
-			    <argument>-package</argument>
-			   <argument>de.dhbwstuttgart.sat.asp.parser.antlr</argument>
-	  	    </arguments>
-	    </configuration>
-          </execution>
-
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>de.dhbwstuttgart.core.ConsoleInterface</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<executions>
@@ -103,63 +93,18 @@
 					</execution>
 				</executions>
 				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>de.dhbwstuttgart.core.ConsoleInterface</mainClass>
+						</manifest>
+					</archive>
 					<descriptorRefs>
 						<descriptorRef>jar-with-dependencies</descriptorRef>
 					</descriptorRefs>
 				</configuration>
 			</plugin>
-<plugin>
-    <groupId>org.reficio</groupId>
-    <artifactId>p2-maven-plugin</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
-    <executions>
-     <execution>
-      <id>default-cli</id>
-      <configuration>
-       <artifacts>
-        <!-- specify your depencies here -->
-	<!-- groupId:artifactId:version -->
-        <artifact>
-		<id>de.dhbwstuttgart:JavaTXcompiler:0.1</id>
-        </artifact>
-		<artifact><id>org.reflections:reflections:0.9.11</id></artifact>
-		<artifact><id>com.google.guava:guava:22.0</id></artifact>
-		<artifact><id>javax.annotation:javax.annotation-api:1.3.1</id></artifact>
-		<artifact><id>org.glassfish:javax.annotation:3.1.1</id></artifact>
-       </artifacts>
-      </configuration>
-     </execution>
-    </executions>
-   </plugin>
-   <plugin>
-    <groupId>org.eclipse.tycho</groupId>
-    <artifactId>tycho-p2-repository-plugin</artifactId>
-    <version>${tycho.version}</version>
-    <executions>
-     <execution>
-      <phase>package</phase>
-      <goals>
-       <goal>archive-repository</goal>
-      </goals>
-     </execution>
-    </executions>
-   </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-                <source>9</source>
-                <target>9</target>
-            </configuration>
-        </plugin>
 		</plugins>
 	</build>
-        <pluginRepositories>
-  <pluginRepository>
-   <id>reficio</id>
-   <url>http://repo.reficio.org/maven/</url>
-  </pluginRepository>
- </pluginRepositories>
 	<repositories>
 		<repository>
 			<id>maven-repository</id>
@@ -167,9 +112,9 @@
 		</repository>
 	</repositories>
 	<properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <tycho.version>0.23.0</tycho.version>
+		<maven.compiler.source>19</maven.compiler.source>
+		<maven.compiler.target>19</maven.compiler.target>
+		<mainClass>de.dhbwstuttgart.core.ConsoleInterface</mainClass>
 	</properties>
 	<distributionManagement>
 		<repository>

resources/AllgemeinTest/Assign.jav

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

resources/AllgemeinTest/Box.jav

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,10 @@
+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

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

resources/AllgemeinTest/M.jav

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

resources/AllgemeinTest/OverloadingMain.jav

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

resources/AllgemeinTest/Overloading_Generics.jav

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,25 @@
+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

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

resources/AllgemeinTest/Pair.jav

@@ -0,0 +1,36 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,19 @@
+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

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

resources/AllgemeinTest/TestSubTypless.jav

@@ -0,0 +1,12 @@
+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

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

resources/AllgemeinTest/UseWildcardPair.jav

@@ -0,0 +1,12 @@
+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

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

resources/AllgemeinTest/VectorConstAdd.jav

@@ -0,0 +1,15 @@
+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

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

resources/AllgemeinTest/WildcardCaptureConversionTest.jav

@@ -0,0 +1,16 @@
+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

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

resources/AllgemeinTest/addList.jav

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

resources/AllgemeinTest/wildcardPair.jav

@@ -0,0 +1,22 @@
+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

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

resources/bytecode/javFiles/BB.jav

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

resources/bytecode/javFiles/BinaryInMeth.jav

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

resources/bytecode/javFiles/Box.jav

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

resources/bytecode/javFiles/Box.java

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

resources/bytecode/javFiles/CC.jav

@@ -0,0 +1,11 @@
+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

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

resources/bytecode/javFiles/Cycle.jav

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

resources/bytecode/javFiles/DD.jav

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

resources/bytecode/javFiles/Fac.jav

@@ -1,6 +1,5 @@
 import java.lang.Integer;
-import java.lang.Long;
-import java.lang.Double;
+//import java.lang.Double;
 
 public class Fac  {
 	

resources/bytecode/javFiles/Faculty.jav

@@ -0,0 +1,52 @@
+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/Field.jav

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

resources/bytecode/javFiles/FieldTph.jav

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

resources/bytecode/javFiles/FieldTph2.jav

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

resources/bytecode/javFiles/FieldTphConsMeth.jav

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,27 @@
+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/FunOL.jav

@@ -0,0 +1,12 @@
+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/Generics2.jav

@@ -1,3 +1,6 @@
+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

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

resources/bytecode/javFiles/Generics4.jav

@@ -0,0 +1,12 @@
+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/Id.jav

@@ -0,0 +1,20 @@
+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,13 +1,15 @@
 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; 
-		}
-		
-		return i;
+		}else{
+		    return b;
+		}
 	}
 }

resources/bytecode/javFiles/Inf.jav

@@ -0,0 +1,65 @@
+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

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

resources/bytecode/javFiles/Inherit.jav

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,17 @@
+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/KompTph.jav

@@ -0,0 +1,13 @@
+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/Lambda.jav

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

resources/bytecode/javFiles/LambdaCapture.jav

@@ -0,0 +1,12 @@
+import java.lang.Integer;
+public class LambdaCapture {
+	Integer i = 8;
+	f;
+	public LambdaCapture(){
+		Integer w = 7;
+		f = j ->{
+			return w+i;};
+
+	}
+
+}

resources/bytecode/javFiles/LambdaVoid.jav

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

resources/bytecode/javFiles/Matrix.jav

@@ -0,0 +1,44 @@
+import java.util.Vector;
+import java.lang.Integer;
+//import java.lang.Float;
+//import java.lang.Byte;
+//import java.lang.Boolean;
+
+public class Matrix    extends Vector<Vector<Integer>> {
+   
+	Matrix () {
+    }
+
+	Matrix(vv) {
+    	Integer i;
+    	i = 0;
+	  while(i < vv.size()) {
+//	    	Boolean a = this.add(vv.elementAt(i));
+		  this.add(vv.elementAt(i));
+		  i=i+1;
+	  } 
+    }
+
+    mul(m) {
+        var ret = new Matrix();
+        var i = 0;
+        while(i < size()) {
+            var v1 = this.elementAt(i);
+            var v2 = new Vector<Integer>();
+            var j = 0;
+            while(j < v1.size()) {
+                var erg = 0;
+                var k = 0;
+                while(k < v1.size()) {
+                    erg = erg + v1.elementAt(k)
+                             * m.elementAt(k).elementAt(j);
+                    k++; }
+//                v2.addElement(new Integer(erg));
+                v2.addElement(erg);
+                j++; }
+            ret.addElement(v2);
+            i++; 
+         }
+        return ret;
+    }
+}

resources/bytecode/javFiles/MatrixOP.jav

@@ -0,0 +1,43 @@
+import java.util.Vector;
+import java.lang.Integer;
+//import java.lang.Byte;
+import java.lang.Boolean;
+
+public class MatrixOP    extends Vector<Vector<Integer>> {
+   
+	MatrixOP () {
+    }
+
+	MatrixOP(vv) {
+    	Integer i;
+    	i = 0;
+	  while(i < vv.size()) {
+//	    	Boolean a = this.add(vv.elementAt(i));
+		  this.add(vv.elementAt(i));
+		  i=i+1;
+	  }
+    }
+
+	public mul = (m1, m2) -> {
+        var ret = new MatrixOP();
+        var i = 0;
+        while(i < m1.size()) {
+            var v1 = m1.elementAt(i);
+            var v2 = new Vector<Integer>();
+            var j = 0;
+            while(j < v1.size()) {
+                var erg = 0;
+                var k = 0;
+                while(k < v1.size()) {
+                    erg = erg + v1.elementAt(k)
+                             * m2.elementAt(k).elementAt(j);
+                    k++; }
+//                v2.addElement(new Integer(erg));
+                v2.addElement(erg);
+                j++; }
+            ret.addElement(v2);
+            i++; 
+         }
+        return ret;
+    };
+}

resources/bytecode/javFiles/Merge.jav

@@ -0,0 +1,20 @@
+import java.util.List;
+import java.lang.Integer;
+//import java.util.Collection;
+
+class Merge  {
+
+	merge(a, b) {
+     	a.addAll(b);
+		return a;
+	}
+
+
+
+  	sort(in){
+		var firstHalf = in.subList(1,2);
+    	var secondHalf = in.subList(1,2);
+    	return merge(sort(firstHalf), sort(secondHalf));
+    }
+    
+}

resources/bytecode/javFiles/OL.jav

@@ -0,0 +1,32 @@
+import java.lang.String;
+import java.lang.Integer;
+import java.lang.Double; 
+import java.lang.Boolean;
+//import java.util.Vector;
+
+
+public class OL     {
+
+     java.lang.Double m(java.lang.Double x) { return x + x; }
+     java.lang.Integer m(java.lang.Integer x) { return x + x; }
+     java.lang.String m(java.lang.String x) { return x + x; }
+     java.lang.Boolean m(Boolean x) { return x; } 
+     
+// if the class contains just this method, then correct BC will be generated.
+// But if another methods are contained then the generated BC is not correct
+//	m(x) {
+//		//x.add(1);
+//		x.addAll(x);
+//		return x;
+// 	}
+	
+}
+
+public class OLMain   {
+
+	main(x) { 
+		var ol;
+		ol = new OL(); 
+		return ol.m(x); 
+	}  
+}

resources/bytecode/javFiles/OLFun.jav

@@ -0,0 +1,19 @@
+import java.lang.String;
+import java.lang.Integer;
+import java.lang.Double;
+import java.util.Vector;
+import java.lang.Boolean; 
+
+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;
+	}
+}

resources/bytecode/javFiles/OLFun2.jav

@@ -0,0 +1,13 @@
+import java.lang.String;
+import java.lang.Integer;
+import java.lang.Double;
+import java.util.Vector;
+import java.lang.Boolean;
+
+public class OLFun2 {
+
+    x;
+	m(f){
+	    x = f.apply(x + x);
+	}
+}

resources/bytecode/javFiles/Pair.jav

@@ -0,0 +1,32 @@
+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, List<? extends Eq> b)
+    {
+	//this.compare(p); //1, type incorrect
+	this.compare(this.make(b)); //2, OK
+    }
+*/
+}

resources/bytecode/javFiles/Plus.jav

@@ -1,4 +1,5 @@
 import java.lang.Integer;
+import java.lang.String;
 
 public class Plus {