modified: src/de/dhbwstuttgart/core/JavaTXCompiler.java

modified: src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java Zeilen 606 - 623 eingefuegt, um die parallel berechneten Ergebnisse richtig zu filtern TODO - Fuer Variance -1 muss das gleiche gemacht werden - ab Zeile 550: nextSetasListRest muss nach jedem fork aufruf gefiltert werden.
modified: ../../src/de/dhbwstuttgart/core/JavaTXCompiler.java
2018-08-09 18:41:28 +02:00 · 2018-08-05 15:05:17 +02:00 · 2018-07-29 00:07:00 +02:00 · 2018-07-25 20:15:29 +02:00 · 2018-07-25 00:55:01 +02:00 · 2018-07-25 00:53:40 +02:00
631 changed files with 54067 additions and 35825 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -23,9 +23,3 @@ bin

 #
 manually/
-
-logFiles/**
-!logFiles/.gitkeep
-
-src/main/java/de/dhbwstuttgart/parser/antlr/
-src/main/java/de/dhbwstuttgart/sat/asp/parser/antlr/
--- a/README.md
+++ b/README.md
@@ -0,0 +1,19 @@
+
+
+# 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/
--- a/11
+++ b/11
@@ -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
-
--- a/doc/Generics/generics.tex
+++ b/doc/Generics/generics.tex
@@ -1,25 +0,0 @@
-\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}
--- a/doc/PluginBau.pdf
+++ b/doc/PluginBau.pdf
--- a/doc/Studienarbeiten/S2021_Etienne_Zink.pdf
+++ b/doc/Studienarbeiten/S2021_Etienne_Zink.pdf
--- a/doc/parser.md
+++ b/doc/parser.md
@@ -1,24 +0,0 @@
-# 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
-
-
--- a/logFiles/.gitkeep
+++ b/logFiles/.gitkeep
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+
 <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 
@@ -14,14 +15,13 @@ http://maven.apache.org/maven-v4_0_0.xsd">
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
-			<version>4.11</version>
+      <version>4.0</version>
      <scope>test</scope>
      </dependency>
-		<!-- https://mvnrepository.com/artifact/org.antlr/antlr4 -->
      <dependency>
  	  <groupId>org.antlr</groupId>
   	 <artifactId>antlr4</artifactId>
-			<version>4.11.1</version>
+   	 <version>4.7</version>
 	</dependency>
 <dependency>
    <groupId>commons-io</groupId>
@@ -38,49 +38,59 @@ http://maven.apache.org/maven-v4_0_0.xsd">
    <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</artifactId>
-			<version>7.0</version>
+    <artifactId>asm-all</artifactId>
+    <version>[4.0.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.11.1</version>
+        <version>4.7</version>
        <executions>
          <execution>
            <id>antlr</id>
            <goals>
 		    <goal>antlr4</goal>
 	    </goals>
-					</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>
+		    <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>
        <artifactId>maven-assembly-plugin</artifactId>
@@ -93,18 +103,63 @@ http://maven.apache.org/maven-v4_0_0.xsd">
          </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>
@@ -112,9 +167,9 @@ 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>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <tycho.version>0.23.0</tycho.version>
  </properties>
  <distributionManagement>
    <repository>
--- a/resources/AllgemeinTest/Assign.jav
+++ b/resources/AllgemeinTest/Assign.jav
@@ -1,10 +0,0 @@
-class Assign {
-
-      assign(x, y) {
-          x = y;
-      }
-
-      assign2(x, y) {
-          assign(x,y);
-      }
-}
--- a/resources/AllgemeinTest/Box.jav
+++ b/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());
-    }
-}
--- a/resources/AllgemeinTest/Box_Main.jav
+++ 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();
-    }
-}
--- a/resources/AllgemeinTest/CaptureConversion.jav
+++ 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);
-    }
-}
--- a/resources/AllgemeinTest/FCTest1.jav
+++ b/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;
-	}
-}
--- a/resources/AllgemeinTest/FCTest2.jav
+++ b/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;
-	}
-}
--- a/resources/AllgemeinTest/FCTest3.jav
+++ b/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;
-	}
-	
-}
--- a/resources/AllgemeinTest/GenTest.jav
+++ b/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);
-    }
-}
--- a/resources/AllgemeinTest/Generics.jav
+++ b/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); }
-}
--- a/resources/AllgemeinTest/M.jav
+++ b/resources/AllgemeinTest/M.jav
@@ -1,7 +0,0 @@
-import java.util.List;
-class M {
-void m(p, p2){
-
-  new addList().addLists(p, p2);
-}
-}
--- a/resources/AllgemeinTest/OverloadingMain.jav
+++ b/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); }
-      
-}
-	   
--- a/resources/AllgemeinTest/Overloading_Generics.jav
+++ b/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);
-    }
-}
-
-
-
--- a/resources/AllgemeinTest/OverrideMain.jav
+++ b/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)]]
-*/
--- a/resources/AllgemeinTest/OverrideMainRet.jav
+++ b/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;
-    }
-}
--- a/resources/AllgemeinTest/Pair.jav
+++ b/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
-    }
-*/
-}
--- a/resources/AllgemeinTest/Pair.java
+++ b/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;
-    }
-}
--- a/resources/AllgemeinTest/Put.jav
+++ b/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);
-    }
-
-}
--- a/resources/AllgemeinTest/Test.jav
+++ b/resources/AllgemeinTest/Test.jav
@@ -1,4 +0,0 @@
-class Test {
-	a;
-	Test b;
-}
--- a/resources/AllgemeinTest/TestSubTypless.jav
+++ 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);
-        }
-}
--- a/resources/AllgemeinTest/Twice.jav
+++ b/resources/AllgemeinTest/Twice.jav
@@ -1,3 +0,0 @@
-class Twice {
-    twice = f -> x -> f.apply(f.apply(x));
-}
--- a/resources/AllgemeinTest/UseWildcardPair.jav
+++ b/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
-    }
-
-}
--- a/resources/AllgemeinTest/Var.jav
+++ b/resources/AllgemeinTest/Var.jav
@@ -1,5 +0,0 @@
-class Var {
-
-    var(x) { var y;  }
-      
-}
--- a/resources/AllgemeinTest/VectorConstAdd.jav
+++ b/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; 
-	}
-}
--- a/resources/AllgemeinTest/VectorNotObject.jav
+++ b/resources/AllgemeinTest/VectorNotObject.jav
@@ -1,9 +0,0 @@
-import java.util.Vector;
-
-class VectorNotObject {
- 
- vectorAddAll(v1, v2) {
-        v1.addAll(v2);
- 	    return v1;
- 	}
- }
--- a/resources/AllgemeinTest/WildcardCaptureConversionTest.jav
+++ b/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);
-	}
-} 
--- a/resources/AllgemeinTest/Wildcard_Andi.jav
+++ b/resources/AllgemeinTest/Wildcard_Andi.jav
@@ -1,8 +0,0 @@
-class Wildcard_Andi {
-
-    Test<? extends A> ex = new Test<>();
-
-    Test<? super A> sup = new Test<>();
-}
-
-
--- a/resources/AllgemeinTest/addList.jav
+++ b/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));
-}
-}
--- a/resources/AllgemeinTest/wildcardPair.jav
+++ b/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
-	} 
-}
--- a/resources/bytecode/javFiles/AA.jav
+++ b/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"; }
-}
--- a/resources/bytecode/javFiles/BB.jav
+++ b/resources/bytecode/javFiles/BB.jav
@@ -1,3 +0,0 @@
-import java.lang.Integer;
-
-public class BB extends AA { }
--- a/resources/bytecode/javFiles/Box.jav
+++ b/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());
-    }
-}
--- a/resources/bytecode/javFiles/Box.java
+++ b/resources/bytecode/javFiles/Box.java
@@ -1,3 +0,0 @@
-class Box<A> {
-    void m(A a) { }
-}
--- a/resources/bytecode/javFiles/CC.jav
+++ b/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"; }
-}	
--- a/resources/bytecode/javFiles/ClassGenLam.jav
+++ b/resources/bytecode/javFiles/ClassGenLam.jav
@@ -1,8 +0,0 @@
-import java.lang.Integer;
-
-public class ClassGenLam {
-	lam = x-> x;
-//	public ClassGenLam() {
-//		lam = x->x; 
-//	}
-}
--- a/resources/bytecode/javFiles/Cycle.jav
+++ b/resources/bytecode/javFiles/Cycle.jav
@@ -1,6 +0,0 @@
-class Cycle {
-    m(x, y) {
-        y = x;
-        x = y;
-    }
-}
--- a/resources/bytecode/javFiles/DD.jav
+++ b/resources/bytecode/javFiles/DD.jav
@@ -1,4 +0,0 @@
-import java.lang.Integer;
-
-public class DD extends CC { }
-
--- a/resources/bytecode/javFiles/Faculty.jav
+++ b/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);
-//	  }
-//  }
-//}
--- a/resources/bytecode/javFiles/Field.jav
+++ b/resources/bytecode/javFiles/Field.jav
@@ -1,9 +0,0 @@
-import java.lang.Integer;
-
-public class Field {
-	public x = 5;
-	
-	m(){
-		return x;
-	}
-}
--- a/resources/bytecode/javFiles/FieldTph.jav
+++ b/resources/bytecode/javFiles/FieldTph.jav
@@ -1,4 +0,0 @@
-public class FieldTph {
-	a;
-	
-}
--- a/resources/bytecode/javFiles/FieldTph2.jav
+++ b/resources/bytecode/javFiles/FieldTph2.jav
@@ -1,12 +0,0 @@
-public class FieldTph2 {
-	a;
-	
-	m(b){
-		b = a;
-		return b;
-	}
-	
-	m2(c){
-		a = c;
-	}
-}
--- a/resources/bytecode/javFiles/FieldTphConsMeth.jav
+++ b/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;
-    	}*/
-
-}
--- a/resources/bytecode/javFiles/FieldTphMMeth.jav
+++ b/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;
-	}
-	
-}
--- a/resources/bytecode/javFiles/FunOL.jav
+++ b/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;
-    }
-}
--- a/resources/bytecode/javFiles/Generics3.jav
+++ 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>> {
-
-}
--- a/resources/bytecode/javFiles/Generics4.jav
+++ b/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);
-    }
-}
--- a/resources/bytecode/javFiles/Id.jav
+++ b/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);
-	}
-}
-
--- a/resources/bytecode/javFiles/Inf.jav
+++ b/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:
-*/
-
--- a/resources/bytecode/javFiles/Infimum.jav
+++ b/resources/bytecode/javFiles/Infimum.jav
@@ -1,6 +0,0 @@
-class Infimum {
-    m(x, y, z) {
-        y = x;
-        z = x;
-    }
-}
--- a/resources/bytecode/javFiles/Inherit.jav
+++ b/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);
-	}
-
-}
--- a/resources/bytecode/javFiles/Inherit2.jav
+++ b/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);
-	}
-}
--- a/resources/bytecode/javFiles/KompTph.jav
+++ b/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);
-	}
-}
--- a/resources/bytecode/javFiles/LambdaCapture.jav
+++ b/resources/bytecode/javFiles/LambdaCapture.jav
@@ -1,12 +0,0 @@
-import java.lang.Integer;
-public class LambdaCapture {
-	Integer i = 8;
-	f;
-	public LambdaCapture(){
-		Integer w = 7;
-		f = j ->{
-			return w+i;};
-
-	}
-
-}
--- a/resources/bytecode/javFiles/LambdaVoid.jav
+++ b/resources/bytecode/javFiles/LambdaVoid.jav
@@ -1,9 +0,0 @@
-import java.lang.Integer;
-
-public class Lambda {
-
-  m () {
-   var lam1 = (x) -> { };
-   return lam1;
-  }
-}
--- a/resources/bytecode/javFiles/MatrixOP.jav
+++ b/resources/bytecode/javFiles/MatrixOP.jav
@@ -1,43 +0,0 @@
-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;
-    };
-}
--- a/resources/bytecode/javFiles/Merge.jav
+++ b/resources/bytecode/javFiles/Merge.jav
@@ -1,20 +0,0 @@
-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));
-    }
-    
-}
--- a/resources/bytecode/javFiles/OL.jav
+++ b/resources/bytecode/javFiles/OL.jav
@@ -1,32 +0,0 @@
-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); 
-	}  
-}
--- a/resources/bytecode/javFiles/OLFun.jav
+++ b/resources/bytecode/javFiles/OLFun.jav
@@ -1,19 +0,0 @@
-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;
-	}
-}
--- a/resources/bytecode/javFiles/OLFun2.jav
+++ b/resources/bytecode/javFiles/OLFun2.jav
@@ -1,13 +0,0 @@
-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);
-	}
-}
--- a/resources/bytecode/javFiles/Pair.jav
+++ b/resources/bytecode/javFiles/Pair.jav
@@ -1,32 +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, List<? extends Eq> b)
-    {
-	//this.compare(p); //1, type incorrect
-	this.compare(this.make(b)); //2, OK
-    }
-*/
-}
--- a/resources/bytecode/javFiles/Put.jav
+++ b/resources/bytecode/javFiles/Put.jav
@@ -1,19 +0,0 @@
-import java.util.Vector;
-import java.util.Stack;
-
-public class Put {
-
-    putElement(ele, v) {
-	    v.addElement(ele);
-    }
-
-    putElement(ele, s) {
-	    s.push(ele);
-    }
-
-
-    main(ele, x) { 
-        putElement(ele, x);
-    }
-
-}
--- a/resources/bytecode/javFiles/Scalar.jav
+++ b/resources/bytecode/javFiles/Scalar.jav
@@ -1,27 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-import java.lang.Float;
-//import java.lang.Byte;
-//import java.lang.Boolean;
-
-public class Scalar extends Vector<Integer> {
-
-    Scalar(v) {
-    	Integer i;
-    	i = 0;
-	while(i < v.size()) {
-	  this.add(v.elementAt(i));
-          i=i+1;
-	} 
-    }
-    
-    mul(v) {
-        var ret = 0;
-        var i = 0;
-        while(i < size()) {
-            ret = ret + this.elementAt(i) * v.elementAt(i);
-	    i = i+1;
-         }
-        return ret;
-    }
-}
--- a/resources/bytecode/javFiles/SimpleCycle.jav
+++ b/resources/bytecode/javFiles/SimpleCycle.jav
@@ -1,25 +0,0 @@
-public class SimpleCycle {
-	
-	m(){
-		var g;
-		var h;
-		g = h;
-		h = g;
-		/*
-		var y;
-		var z;
-		y=z;
-		z=y;
-		
-		var j = z;
-		var x;
-		b = a;
-		var c = b;
-		var f = d;
-		b = x;
-		var l = c;
-		a = l;
-		*/
-	}
-	
-}
--- a/resources/bytecode/javFiles/Sorting.jav
+++ b/resources/bytecode/javFiles/Sorting.jav
@@ -1,23 +0,0 @@
-import java.util.List;
-import java.util.ArrayList;
-import java.lang.String;
-
-public class Sorting{
-    merge(a, b){
-        a.addAll(b);
-        return a;
-    }
-
-sort(in){
-	var firstHalf = in;
-	var secondHalf = in; 
-	return merge(sort(firstHalf), sort(secondHalf));
-}
-
-
-	/*
-	void sort(a){
-		a = merge(a,a);
-	}
-	*/
-}
--- a/resources/bytecode/javFiles/TXGenerics.jav
+++ b/resources/bytecode/javFiles/TXGenerics.jav
@@ -1,11 +0,0 @@
-import java.lang.String;
-
-class TXGenerics {
-    a;
-    b;
-
-    test() {
-        var c = new Cycle();
-        c.m(a, b);
-    }
-}
--- a/resources/bytecode/javFiles/Tph3.jav
+++ b/resources/bytecode/javFiles/Tph3.jav
@@ -1,14 +0,0 @@
-public class Tph3 {
-//	m(a,b){
-//		var c = m2(a,b);
-//		return c;
-//	}
-//	
-//	m2(a,b){
-//		return m(a,b);
-//	}
-	m1(x, y) { m2(x); x = y; 
-	}
-
-    m2(y) { m1(y, y); }
-}
--- a/resources/bytecode/javFiles/Tph4.jav
+++ b/resources/bytecode/javFiles/Tph4.jav
@@ -1,12 +0,0 @@
-public class Tph4{
-	m(a,b){
-		var c = m2(b);
-		var d = m2(c);
-		return d;
-	}
-	
-	m2(b){
-		return b;
-	}
-	
-}
--- a/resources/bytecode/javFiles/Tph5.jav
+++ b/resources/bytecode/javFiles/Tph5.jav
@@ -1,13 +0,0 @@
-public class Tph5 {
-//	m(a,b,c){
-//		a = c;
-//		b = c;
-//		return a;
-//	}
-	
-	m(x,y){
-		x = m2(y); 
-	}
-	
-	m2(y) { return y; }
-}
--- a/resources/bytecode/javFiles/Tph6.jav
+++ b/resources/bytecode/javFiles/Tph6.jav
@@ -1,14 +0,0 @@
-public class Tph6 {
-//	m(a,b,c){
-//		a = c;
-//		b = c;
-//		return a;
-//	}
-	
-	m(x,y){
-		var c = m2(y);
-		c = m2(x); 
-	}
-	
-	m2(y) { return y; }
-}
--- a/resources/bytecode/javFiles/Tph7.jav
+++ b/resources/bytecode/javFiles/Tph7.jav
@@ -1,11 +0,0 @@
-public class Tph7 {
-
-	m(a,b){
-		var c = m2(b);
-		return m2(b);
-	}
-
-	m2(b){
-		return b;
-	}
-}
--- a/resources/bytecode/javFiles/TypedID.jav
+++ b/resources/bytecode/javFiles/TypedID.jav
@@ -1,12 +0,0 @@
-public class TypedID/*<L extends K,K> */ {
-	
-	lam = x-> x;
-	
-    id(b){  
-        return b;
-    }
-    
-    m(){
-    	return lam;
-    }
-}
--- a/resources/bytecode/javFiles/VectorAdd.jav
+++ b/resources/bytecode/javFiles/VectorAdd.jav
@@ -1,26 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-import java.lang.String;
-
-public class VectorAdd {
-	vectorAdd(v1, v2) {
-		var i = 0;
-		v1 = new Vector<Integer>();
-		var erg = new Vector<>();
-		while (i < v1.size()) {
-			erg.addElement(v1.elementAt(i) + v2.elementAt(i));
-			i++;
-		} 
-		return erg; 
-	}
-
-    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.addAll(x);
-    }
-}
--- a/resources/bytecode/javFiles/VectorSuper.jav
+++ b/resources/bytecode/javFiles/VectorSuper.jav
@@ -1,11 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-
-public class VectorSuper {
-	
-	m(x){
-		Integer y = 1;
-		x.addElement(y);
-		//return x;
-	}
-}
--- a/resources/bytecode/javFiles/WC.jav
+++ b/resources/bytecode/javFiles/WC.jav
@@ -1,8 +0,0 @@
-import java.lang.Integer;
-import java.util.List;
-public class WC {
-	
-	void m (List<? super Integer> a, List<? extends Integer> b) {
-		
-	}
-}
--- a/resources/bytecode/javFiles/While.jav
+++ b/resources/bytecode/javFiles/While.jav
@@ -1,12 +0,0 @@
-import java.lang.Integer;
-import java.lang.Long;
-import java.lang.Double;
-
-public class While {
-	 m(x) {
-		while(x < 2) {
-			x = x+1;
-		}
-		return x;
-	}
-}
--- a/resources/bytecode/javFiles/Y.jav
+++ b/resources/bytecode/javFiles/Y.jav
@@ -1,42 +0,0 @@
-import java.lang.Integer;
-
-class Y {
-    y;
-    //factorial;
-
-    Y() {
-		y =  f -> t -> f.apply(y.apply(f)).apply(t);
-		//factorial = y.apply(f -> n -> { if (n == 0) return 1; else return n * f.apply(n - 1); });
-    }
-  /*  
-    getY() {
-      return y;
-    }
-    */
-}
-/*
-class fac1 {
-    factorial;
-
-    fac1() {
-      var y;
-	  y = new Y<Integer,Integer,Integer,Integer,Integer>().getY();
-	  factorial = y.apply(f -> n -> { if (n == 0) return 1; else return n * f.apply(n - 1); });
-    }
-}
-
-ergibt Parse-Error
-class fac1 {
-    factorial;
-
-    fac1() {
-    	var y;
-		y = new Y<>().y;
-		factorial = y.apply(f -> n -> { if (n == 0) return 1; else return n * f.apply(n - 1); });
-    }
-     public static void main(String args[]) {
-		System.out.println(new fac1().factorial.apply(3));
-    }
- 
-}
-*/
--- a/resources/bytecode/javFiles/mathStruc.jav
+++ b/resources/bytecode/javFiles/mathStruc.jav
@@ -1,15 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-
-public class mathStruc {
-	model; 
-	
-	//Fun1*<Fun2*<A,A,A>, Fun1*<MathStruc <A>,MathStruc <A>>> 
-	innerOp = (o) -> (ms) -> new mathStruc<>(o.apply(model,ms.model));
-
-	public mathStruc(m) {
-		model =m;
-		//innerOp = (o) -> (ms) -> new mathStruc<>(o.apply(this.model,ms.model));
-	}
-}
-
--- a/resources/bytecode/javFiles/mathStrucInteger.jav
+++ b/resources/bytecode/javFiles/mathStrucInteger.jav
@@ -1,23 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-
-public class mathStrucInteger {
-	model; 
-
-	innerOp = (o) -> (ms) -> new mathStrucInteger<>(o.apply(model,ms.model));
-
-	public mathStrucInteger(m) {
-		model =m;
-	}
-}
-
-class mathStrucIntegerUse {
-
-    main() {
-    	var ms;
-		ms = new mathStrucInteger<>(2);
-		var ms2;
-		ms2 = ms.innerOp.apply((x,y) -> x+y).apply(ms);
-		return ms2;
-	}
-}
--- a/resources/bytecode/javFiles/mathStrucMatrixOP.jav
+++ b/resources/bytecode/javFiles/mathStrucMatrixOP.jav
@@ -1,91 +0,0 @@
-//PL 2019-10-24: laeuft nicht durch, zu gross
-import java.util.Vector;
-import java.lang.Integer;
-import java.lang.Boolean;
-
-public class mathStrucMatrixOP {
-	model; 
-	
-	innerOp = (o) -> (ms) -> new mathStrucMatrixOP<>(o.apply(model,ms.model));
-
-	public mathStrucMatrixOP(m) {
-		model =m;
-	}
-}
-
-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;
-    };
-}
-
-
-class mathStrucUseMatrixOP {
-
-    main() {
-		Vector<Vector<Integer>> vv = new Vector<Vector<Integer>>();
-		Vector<Integer> v1 = new Vector<Integer>();
-		v1.addElement(2);
-		v1.addElement(2);
-		Vector<Integer> v2 = new Vector<Integer>();
-		v2.addElement(3);
-		v2.addElement(3);
-		vv.addElement(v1);
-		vv.addElement(v2);
-
-		MatrixOP m1 = new MatrixOP(vv);
-	
-		Vector<Vector<Integer>> vv1 = new Vector<Vector<Integer>>();
-		Vector<Integer> v3 = new Vector<Integer>();
-		v3.addElement(2);
-		v3.addElement(2);
-		Vector<Integer> v4 = new Vector<Integer>();
-		v4.addElement(3);
-		v4.addElement(3);
-		vv1.addElement(v3);
-		vv1.addElement(v4);
-
-		MatrixOP m2 = new MatrixOP(vv1);
-
-		var mms;
-		mms = new mathStrucMatrixOP<>(m1);
-		var mms2;
-		mms2 = new mathStrucMatrixOP<>(m2);
-		var mms3;
-		mms3 = mms.innerOp.apply(m1.mul).apply(mms2);
-		return mms3;
-    }
-}
--- a/resources/insertGenericsJav/TestAny.jav
+++ b/resources/insertGenericsJav/TestAny.jav
@@ -1,13 +0,0 @@
-class TestAny {
-    a;
-    b = a;
-    anyMethod() {
-        var f;
-        return f;
-    }
-    otherMethod(e) {
-        b = e;
-        e = a;
-        return e;
-    }
-}
--- a/resources/insertGenericsJav/TestAssign.jav
+++ b/resources/insertGenericsJav/TestAssign.jav
@@ -1,9 +0,0 @@
-class TestAssign {
-    assign(x, y) {
-        x = y;
-    }
-
-    assign2(x, y) {
-        assign(x, y);
-    }
-}
--- a/resources/insertGenericsJav/TestClassField.jav
+++ b/resources/insertGenericsJav/TestClassField.jav
@@ -1,6 +0,0 @@
-class Example{
-    f;
-    fReturn(){
-        return f;
-    }
-}
--- a/resources/insertGenericsJav/TestContraVariant.jav
+++ b/resources/insertGenericsJav/TestContraVariant.jav
@@ -1,12 +0,0 @@
-public class TestContraVariant {
-
-    m(x) {
-        var y;
-        x = y;
-        return y;
-    }
-
-    main(x) {
-    	return m(x);
-    }
-}
--- a/resources/insertGenericsJav/TestGGFinder.jav
+++ b/resources/insertGenericsJav/TestGGFinder.jav
@@ -1,17 +0,0 @@
-public class TestGGFinder {
-    a;
-
-    id(b) {
-        var c = b;
-        return c;
-    }
-
-    setA(x) {
-        a = x;
-        return a;
-    }
-
-    m(x,y) {
-        x = id(y);
-    }
-}
--- a/resources/insertGenericsJav/TestLocalVarLambda.jav
+++ b/resources/insertGenericsJav/TestLocalVarLambda.jav
@@ -1,7 +0,0 @@
-public class TestLocalVarLambda {
-
-m(x) {
-  var id = z -> z;
-  return id.apply(x);
-  }
-} 
--- a/resources/insertGenericsJav/TestMutualRecursion.jav
+++ b/resources/insertGenericsJav/TestMutualRecursion.jav
@@ -1,17 +0,0 @@
-public class TestMutualRecursion {
-    a;
-
-    id(b) {
-        var c = b;
-        return main(b,c);
-    }
-
-    m(x,y) {
-        x = id(y);
-        return x;
-    }
-    
-    main(x,y) {
-    	return m(id(x),y);
-    }
-}
--- a/resources/insertGenericsJav/TestMutualRecursionWithField.jav
+++ b/resources/insertGenericsJav/TestMutualRecursionWithField.jav
@@ -1,22 +0,0 @@
-public class TestMutualRecursionWithField {
-    a;
-
-    id(b) {
-        var c = b;
-        return main(b,c);
-    }
-
-    setA(x) {
-        a = x;
-        return a;
-    }
-
-    m(x,y) {
-        x = id(y);
-        return x;
-    }
-    
-    main(x,y) {
-    	return m(id(x),setA(y));
-    }
-}
--- a/resources/insertGenericsJav/TestMutualRecursionWithField2.jav
+++ b/resources/insertGenericsJav/TestMutualRecursionWithField2.jav
@@ -1,22 +0,0 @@
-public class TestMutualRecursionWithField2 {
-    a;
-
-    id(b) {
-        var c = b;
-        return main(b,c);
-    }
-
-    setA(x) {
-        a = x;
-        return a;
-    }
-
-    m(x,y) {
-        x = id(y);
-        return x;
-    }
-    
-    main(x,y) {
-    	return m(setA(x),id(y));
-    }
-}
--- a/resources/insertGenericsJav/TestMutualRecursionWithField3.jav
+++ b/resources/insertGenericsJav/TestMutualRecursionWithField3.jav
@@ -1,23 +0,0 @@
-public class TestMutualRecursionWithField3 {
-    a;
-
-    id(b) {
-        var c = b;
-        return main(b,c);
-    }
-
-    setA(x) {
-        a = x;
-        return a;
-    }
-
-    m(x,y) {
-        x = id(y);
-        return x;
-    }
-    
-    main(x,y) {
-    	var z = m(setA(x),id(y));
-    	return z;
-    }
-}
--- a/resources/insertGenericsJav/TestReturnVar.jav
+++ b/resources/insertGenericsJav/TestReturnVar.jav
@@ -1,6 +0,0 @@
-class VarReturn {
-    anyMethod() {
-        var f;
-        return f;
-    }
-}
--- a/resources/insertGenericsJav/TestSecondLineOfClassConstraints.jav
+++ b/resources/insertGenericsJav/TestSecondLineOfClassConstraints.jav
@@ -1,12 +0,0 @@
-class Example {
-    a;
-    b = a;
-    anyMethod() {
-        var f;
-        return f;
-    }
-    otherMethod(e) {
-        e = a;
-        return e;
-    }
-}
--- a/resources/insertGenericsJav/TestTPHsAndGenerics.jav
+++ b/resources/insertGenericsJav/TestTPHsAndGenerics.jav
@@ -1,13 +0,0 @@
-class TPHsAndGenerics {
-    id = x -> x;
-    id2 (x) {
-        return id.apply(x);
-    }
-    m(a, b){
-        var c = m2(a,b);
-        return a;
-    }
-    m2(a, b){
-        return b;
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Martin Plümicke	2c9f085cca	modified: src/de/dhbwstuttgart/core/JavaTXCompiler.java modified: src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java Zeilen 606 - 623 eingefuegt, um die parallel berechneten Ergebnisse richtig zu filtern TODO - Fuer Variance -1 muss das gleiche gemacht werden - ab Zeile 550: nextSetasListRest muss nach jedem fork aufruf gefiltert werden.	2018-08-09 18:41:28 +02:00
Martin Plümicke	3e4e66d60d	modified: ../../src/de/dhbwstuttgart/core/JavaTXCompiler.java modified: ../../src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java modified: ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java modified: ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java modified: ../../test/bytecode/javFiles/Matrix.jav modified: ../../test/bytecode/javFiles/applyLambda.jav ? extends gen_nv =. ? super gen_nv sind in den RES	2018-08-05 15:05:17 +02:00
Martin Plümicke	883ab50f94	modified: ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnify.java modified: ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java modified: ../bytecode/javFiles/Matrix.jav einige Aenderungen	2018-07-29 00:07:00 +02:00
Martin Plümicke	9d37e8f637	modified: ../../src/de/dhbwstuttgart/core/JavaTXCompiler.java modified: ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java modified: ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java Parallelverarbeitungansatz implementiert Wirft noch ConcurrentModificationException Das Ergebnis der Parallelverarbeit fork.join muss in Ziel 530 muss noch geklaert werden	2018-07-25 20:15:29 +02:00
Martin Plümicke	496842a3bf	new file: test/bytecode/FacultyTest.java	2018-07-25 00:55:01 +02:00
Martin Plümicke	608d73452a	new file: src/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java	2018-07-25 00:53:40 +02:00
Martin Plümicke	421169a72d	modified: src/de/dhbwstuttgart/core/JavaTXCompiler.java modified: src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java modified: test/bytecode/MatrixTest.java src/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java	2018-07-25 00:52:28 +02:00
Martin Plümicke	c43d9ab9f5	Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unifyOptimierung	2018-07-23 17:23:47 +02:00