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

Variance für Attribute/Fields eingefuegt

	new file:   ../FacultyTest.java
	new file:   ../MatrixOpTest.java
	new file:   ../SortingTest.java
	new file:   MatrixOP.jav
	modified:   Sorting.jav

src/de/dhbwstuttgart/core/JavaTXCompiler.java

@@ -134,6 +134,10 @@ public class JavaTXCompiler {
 				Set<String> returnTypeVarNames = allClasses.stream().map(x -> x.getMethods().stream().filter(y -> y.getReturnType() instanceof TypePlaceholder)
 						.map(z -> ((TypePlaceholder)z.getReturnType()).getName()).collect(Collectors.toCollection(HashSet::new))).reduce((a,b) -> { a.addAll(b); return a;} ).get();
 				
+				Set<String> fieldTypeVarNames = allClasses.stream().map(x -> x.getFieldDecl().stream().filter(y -> y.getReturnType() instanceof TypePlaceholder)
+						.map(z -> ((TypePlaceholder)z.getReturnType()).getName()).collect(Collectors.toCollection(HashSet::new))).reduce((a,b) -> { a.addAll(b); return a;} ).get();
+
+				returnTypeVarNames.addAll(fieldTypeVarNames);
 				
 				xConsSet = xConsSet.stream().map(x -> { 
 					//Hier muss ueberlegt werden, ob

test/bytecode/FacultyTest.java

@@ -0,0 +1,50 @@
+package bytecode;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import org.junit.Test;
+
+import de.dhbwstuttgart.core.JavaTXCompiler;
+
+public class FacultyTest {
+	private static String path;
+	private static File fileToTest;
+	private static JavaTXCompiler compiler;
+	private static ClassLoader loader;
+	private static Class<?> classToTest;
+	private static String pathToClassFile;
+	private static Object instanceOfClass;
+	
+	@Test
+	public void generateBC() throws Exception {
+		path = System.getProperty("user.dir")+"/test/bytecode/javFiles/Faculty.jav";
+		fileToTest = new File(path);
+		compiler = new JavaTXCompiler(fileToTest);
+		compiler.generateBytecode(System.getProperty("user.dir")+"/testBytecode/generatedBC/");
+		pathToClassFile = System.getProperty("user.dir")+"/testBytecode/generatedBC/";
+		loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
+		classToTest = loader.loadClass("Faculty");
+		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
+
+		Method m = classToTest.getDeclaredMethod("m");
+		Class<?> lambda = m.invoke(instanceOfClass).getClass();
+		Method apply = lambda.getMethod("apply", Object.class);
+
+		// Damit man auf die Methode zugreifen kann
+		apply.setAccessible(true);
+
+		Integer i = 3;
+		
+		Integer result = (Integer) apply.invoke(m.invoke(instanceOfClass), i); 
+
+		assertEquals(6, result);
+	}
+
+
+}

test/bytecode/MatrixOpTest.java

@@ -0,0 +1,91 @@
+package bytecode;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Vector;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import de.dhbwstuttgart.core.JavaTXCompiler;
+
+public class MatrixOpTest {
+	private static String path;
+	private static File fileToTest;
+	private static JavaTXCompiler compiler;
+	private static ClassLoader loader;
+	private static Class<?> classToTest;
+	private static String pathToClassFile;
+	private static Object instanceOfClass_m1;
+	private static Object instanceOfClass_m2;
+	private static Object instanceOfClass_m3;
+
+	@Test
+	public void test() throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, ClassNotFoundException, IOException, InstantiationException {	
+		path = System.getProperty("user.dir")+"/test/bytecode/javFiles/MatrixOP.jav";
+		fileToTest = new File(path);
+		compiler = new JavaTXCompiler(fileToTest);
+		pathToClassFile = System.getProperty("user.dir")+"/testBytecode/generatedBC/";
+		compiler.generateBytecode(pathToClassFile);
+		loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
+		classToTest = loader.loadClass("MatrixOP"); 
+/*		
+		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);
+		 //Matrix m1 = new Matrix();
+		 //m1.addElement(v1);
+		 //m1.addElement(v2);
+		 vv.addElement(v1);
+		 vv.addElement(v2);
+		 instanceOfClass_m1 = classToTest.getDeclaredConstructor(Vector.class).newInstance(vv);  //Matrix m1 = new Matrix(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);
+		 //Matrix m2 = new Matrix();
+		 //m2.addElement(v3);
+		 //m2.addElement(v4);
+		 vv1.addElement(v3);
+		 vv1.addElement(v4);
+		 instanceOfClass_m2 = classToTest.getDeclaredConstructor(Vector.class).newInstance(vv1);//Matrix m2 = new Matrix(vv1);
+		 
+		 
+
+		 //Matrix m3 = m1.mul(vv1);
+		 Method mul = classToTest.getDeclaredMethod("mul", Vector.class);
+		 Object result = mul.invoke(instanceOfClass_m1, instanceOfClass_m2);
+		 System.out.println(instanceOfClass_m1.toString() + " * " + instanceOfClass_m2.toString() + " = " + result.toString());
+		
+		 Vector<Vector<Integer>> res = new Vector<Vector<Integer>>();
+		 Vector<Integer> v5 = new Vector<Integer> ();
+		 v5.addElement(10);
+		 v5.addElement(10);
+		 Vector<Integer> v6 = new Vector<Integer> ();
+		 v6.addElement(15);
+		 v6.addElement(15);
+		 //Matrix m2 = new Matrix();
+		 //m2.addElement(v3);
+		 //m2.addElement(v4);
+		 res.addElement(v5);
+		 res.addElement(v6);
+		 instanceOfClass_m3 = classToTest.getDeclaredConstructor(Vector.class).newInstance(res);
+		 assertEquals(result, instanceOfClass_m3);
+*/		
+	}
+
+}

test/bytecode/SortingTest.java

@@ -0,0 +1,52 @@
+package bytecode;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import org.junit.Test;
+
+import de.dhbwstuttgart.core.JavaTXCompiler;
+
+public class SortingTest {
+	private static String path;
+	private static File fileToTest;
+	private static JavaTXCompiler compiler;
+	private static ClassLoader loader;
+	private static Class<?> classToTest;
+	private static String pathToClassFile;
+	private static Object instanceOfClass;
+	
+	@Test
+	public void generateBC() throws Exception {
+		path = System.getProperty("user.dir")+"/test/bytecode/javFiles/Sorting.jav";
+		fileToTest = new File(path);
+		compiler = new JavaTXCompiler(fileToTest);
+		compiler.generateBytecode(System.getProperty("user.dir")+"/testBytecode/generatedBC/");
+		pathToClassFile = System.getProperty("user.dir")+"/testBytecode/generatedBC/";
+		loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
+		classToTest = loader.loadClass("Sorting");
+		/*
+		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
+
+		Method m = classToTest.getDeclaredMethod("m");
+		Class<?> lambda = m.invoke(instanceOfClass).getClass();
+		Method apply = lambda.getMethod("apply", Object.class);
+
+		// Damit man auf die Methode zugreifen kann
+		apply.setAccessible(true);
+
+		Integer i = 77;
+		
+		Integer result = (Integer) apply.invoke(m.invoke(instanceOfClass), i); 
+
+		assertEquals(77, result);
+		*/
+	}
+
+
+}

test/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 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 = (m1, m2) -> {
+        var ret = new Matrix();
+        var i = 0;
+        while(i < 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;
+    };
+}

test/bytecode/javFiles/Sorting.jav

@@ -1,9 +1,17 @@
 import java.util.List;
-import java.util.Collection;
+import java.util.ArrayList;
+import java.lang.String;
 
 class Sorting{
     merge(a, b){
         a.addAll(b);
         return a;
     }
-}
+
+/*
+	
+	void sort(ArrayList<String> a){
+		a = merge(a,a);
+	}
+*/	
+}