modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java

Conflicts:
	src/test/java/targetast/TestComplete.java

Makefile

@@ -0,0 +1,11 @@
+full:
+	mvn -DskipTests package
+	cp target/JavaTXcompiler-0.1-jar-with-dependencies.jar target/JavaTXcompiler-0.1-jar-with-dependencies_full.jar
+
+NoMinMax:
+	mvn -DskipTests package
+	cp target/JavaTXcompiler-0.1-jar-with-dependencies.jar target/JavaTXcompiler-0.1-jar-with-dependencies_NoMinMax.jar
+
+NoOpt:
+	mvn -DskipTests package
+	cp target/JavaTXcompiler-0.1-jar-with-dependencies.jar target/JavaTXcompiler-0.1-jar-with-dependencies_NoOpt.jar

README_aktuelle_Branches

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

pom.xml

@@ -17,10 +17,11 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<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.8-1</version>
+			<version>4.11.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
@@ -43,60 +44,44 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<artifactId>asm</artifactId>
 			<version>7.0</version>
 		</dependency>
-		<!-- <dependency> <groupId>org.ow2.asm</groupId> <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>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M3</version>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.0</version>
 				<configuration>
-					<skipTests>true</skipTests>
-				</configuration>
+					<compilerArgs>--enable-preview</compilerArgs>
+                    <source>19</source>
+                    <target>19</target>
+                </configuration>
 			</plugin>
-			<!-- plugin>
-		        <groupId>org.apache.maven.plugins</groupId>
-		        <artifactId>maven-compiler-plugin</artifactId>
-		        <version>3.8.1</version>
-		        <configuration>
-		          <verbose>true</verbose>
-		          <fork>true</fork>
-		          <executable>/home/michael/programs/jdk/jdk8u232-b09/bin/javac</executable>
-		          <compilerVersion>1.8</compilerVersion>
-		          <source>1.8</source>
-		          <target>1.8</target>
-		        </configuration>
-		    </plugin -->	
 			<plugin>
 				<groupId>org.antlr</groupId>
 				<artifactId>antlr4-maven-plugin</artifactId>
-				<version>4.8-1</version>
+				<version>4.11.1</version>
 				<executions>
 					<execution>
 						<id>antlr</id>
 						<goals>
 							<goal>antlr4</goal>
 						</goals>
-						<configuration>
-							<sourceDirectory>src/main/antlr4/java8</sourceDirectory>
-							<outputDirectory>${project.basedir}/src/main/java/de/dhbwstuttgart/parser/antlr</outputDirectory>
-							<arguments>
-								<argument>-package</argument>
-								<argument>de.dhbwstuttgart.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>
@@ -127,11 +112,8 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 		</repository>
 	</repositories>
 	<properties>
-	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<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>

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/M.jav

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

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

@@ -2,6 +2,12 @@ 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;
 	}

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/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/Cycle.jav

@@ -0,0 +1,6 @@
+class Cycle {
+    m(x, y) {
+        y = x;
+        x = 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/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/Matrix.jav

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

resources/bytecode/javFiles/OLFun.jav

@@ -4,14 +4,16 @@ 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);
+	    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
+    }
+*/
+}