Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecode2

src/test/java/bytecode/mathStrucTest.java

@@ -0,0 +1,38 @@
+package bytecode;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import de.dhbwstuttgart.core.JavaTXCompiler;
+
+public class mathStrucTest {
+
+	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 test() throws Exception {
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/mathStruc.jav";
+		fileToTest = new File(path);
+		compiler = new JavaTXCompiler(fileToTest);
+		compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/");
+		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";
+		loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
+		classToTest = loader.loadClass("mathStruc");
+		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
+	}
+
+}

src/test/resources/bytecode/javFiles/Faculty.jav

@@ -3,9 +3,9 @@ import java.lang.Integer;
 //import java.lang.Short;
 
 public class Faculty {
-    public fact;
+    //public fact;
-    Faculty() {
+    //Faculty() {
-        fact = (x) -> {
+        public fact = (x) -> {
             if (x == 1) {
                 return 1;
             }
@@ -13,7 +13,7 @@ public class Faculty {
               return x * (fact.apply(x-1));
             }
         };
-    }
+    
     
     
     public getFact(x) {

src/test/resources/bytecode/javFiles/Tph3.jav

@@ -7,7 +7,8 @@ public class Tph3 {
 //	m2(a,b){
 //		return m(a,b);
 //	}
-	m1(x, y) { m2(x); x = y; }
+	m1(x, y) { m2(x); x = y; 
+	}
 
     m2(y) { m1(y, y); }
 }

src/test/resources/bytecode/javFiles/Tph4.jav

@@ -2,11 +2,11 @@ public class Tph4{
 	m(a,b){
 		var c = m2(b);
 		var d = m2(c);
-		return a;
+		return d;
 	}
 	
 	m2(b){
-		return b
+		return b;
 	}
 	
 }

src/test/resources/bytecode/javFiles/mathStruc.jav

@@ -0,0 +1,11 @@
+class mathStruc { 
+	model; 
+	
+	//Fun1*<Fun2*<A,A,A>, Fun1*<MathStruc <A>,MathStruc <A>>> 
+	innerOp = (o) -> (ms) -> new mathStruc<>(o.apply(model,ms.model));
+
+	mathStruc(m) { 
+		model =m;
+		//innerOp = (o) -> (ms) -> new mathStruc<>(o.apply(this.model,ms.model));
+	}
+}