Merge branch 'bytecode2' into plugin

src/test/java/bytecode/BinaryTest.java

@@ -23,7 +23,7 @@ public class BinaryTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/BinaryInMeth.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/BinaryInMeth.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/FacTest.java

@@ -24,7 +24,7 @@ public class FacTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Fac.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Fac.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/FacultyTest.java

@@ -24,7 +24,7 @@ public class FacultyTest {
 	
 	@Test
 	public void generateBC() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Faculty.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Faculty.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/");

src/test/java/bytecode/FieldTest.java

@@ -24,7 +24,7 @@ public class FieldTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Field.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Field.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/");

src/test/java/bytecode/FieldTph.java

@@ -24,7 +24,7 @@ public class FieldTph {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/FieldTph.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/FieldTph.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/");

src/test/java/bytecode/FieldTph2Test.java

@@ -25,7 +25,7 @@ public class FieldTph2Test {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/FieldTph2.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/FieldTph2.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/");

src/test/java/bytecode/FieldTphConsMethTest.java

@@ -25,7 +25,7 @@ public class FieldTphConsMethTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/FieldTphConsMeth.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/FieldTphConsMeth.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/");

src/test/java/bytecode/FunOLTest.java

@@ -23,7 +23,7 @@ public class FunOLTest {
 	
 	@Test
 	public void generateBC() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/FunOL.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/FunOL.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/");

src/test/java/bytecode/GenTest.java

@@ -20,7 +20,7 @@ public class GenTest {
 	
 	@Test
 	public void generateBC() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Gen.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Gen.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/GreaterEqualTest.java

@@ -25,7 +25,7 @@ public class GreaterEqualTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/GreaterEqual.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/GreaterEqual.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/GreaterThanTest.java

@@ -25,7 +25,7 @@ public class GreaterThanTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/GreaterThan.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/GreaterThan.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/IdTest.java

@@ -25,7 +25,7 @@ public class IdTest {
 
 	@Test
 	public void test() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Id.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Id.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/");

src/test/java/bytecode/LambdaCapturetest.java

@@ -30,7 +30,7 @@ public class LambdaCapturetest {
 
 	@Test
 	public void generateBC() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/LambdaCapture.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/LambdaCapture.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/");

src/test/java/bytecode/LambdaTest.java

@@ -23,7 +23,7 @@ public class LambdaTest {
 	
 	@Test
 	public void generateBC() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Lambda.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Lambda.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/");

src/test/java/bytecode/LambdaVoidTest.java

@@ -23,7 +23,7 @@ public class LambdaVoidTest {
 	
 	@Test
 	public void generateBC() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Lambda.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Lambda.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/");

src/test/java/bytecode/LessEqualTest.java

@@ -25,7 +25,7 @@ public class LessEqualTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/LessEqual.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/LessEqual.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/LessThanTest.java

@@ -25,7 +25,7 @@ public class LessThanTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/LessThan.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/LessThan.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/MatrixOpTest.java

@@ -28,7 +28,7 @@ public class MatrixOpTest {
 
 	@Test
 	public void test() throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, ClassNotFoundException, IOException, InstantiationException {	
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/MatrixOP.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/MatrixOP.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/MatrixTest.java

@@ -28,7 +28,7 @@ public class MatrixTest {
 
 	@Test
 	public void test() throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, ClassNotFoundException, IOException, InstantiationException {	
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Matrix.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Matrix.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/MergeTest.java

@@ -24,7 +24,7 @@ public class MergeTest {
 
 	@Test
 	public void generateBC() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Merge.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Merge.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/");

src/test/java/bytecode/OLTest.java

@@ -26,7 +26,7 @@ public class OLTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/OL.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/OL.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/OpTest.java

@@ -25,7 +25,7 @@ public class OpTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Op.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Op.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/OverloadingSortingTest.java

@@ -26,7 +26,7 @@ public class OverloadingSortingTest {
 	
 	@Test
 	public void generateBC() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Sorting.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Sorting.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/OverloadingTest.java

@@ -27,7 +27,7 @@ public class OverloadingTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Overloading.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Overloading.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/PlusTest.java

@@ -24,7 +24,7 @@ public class PlusTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Plus.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Plus.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/PostIncTest.java

@@ -24,7 +24,7 @@ public class PostIncTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/PostIncDec.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/PostIncDec.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/PreIncTest.java

@@ -24,7 +24,7 @@ public class PreIncTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/PreInc.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/PreInc.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/RelOpsTest.java

@@ -24,7 +24,7 @@ public class RelOpsTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/RelOps.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/RelOps.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/SortingTest.java

@@ -23,7 +23,7 @@ public class SortingTest {
 	
 	@Test
 	public void generateBC() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Sorting.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Sorting.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/");

src/test/java/bytecode/SubMatTest.java

@@ -17,7 +17,7 @@ public class SubMatTest {
 	
 	@Test
 	public void test() throws ClassNotFoundException, IOException {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/SubMatrix.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/SubMatrix.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/Tph2Test.java

@@ -24,7 +24,7 @@ public class Tph2Test {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Tph2.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Tph2.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/Tph3Test.java

@@ -21,7 +21,7 @@ public class Tph3Test {
 	
 	@Test
 	public void generateBC() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Tph3.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Tph3.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/Tph5Test.java

@@ -24,7 +24,7 @@ public class Tph5Test {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Tph5.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Tph5.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/TphTest.java

@@ -24,7 +24,7 @@ public class TphTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Tph.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Tph.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/WhileTest.java

@@ -24,7 +24,7 @@ public class WhileTest {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/While.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/While.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";

src/test/java/bytecode/YTest.java

@@ -23,7 +23,7 @@ public class YTest {
 	
 	@Test
 	public void generateBC() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/Y.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/Y.jav";
 		fileToTest = new File(path);
 //		compiler = new JavaTXCompiler(fileToTest);
 //		compiler.generateBytecode(System.getProperty("user.dir")+"/testBytecode/generatedBC/");

src/test/java/bytecode/applyLambdaTest.java

@@ -22,7 +22,7 @@ public class applyLambdaTest {
 	
 	@Test
 	public void generateBC() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecodeJavFiles/applyLambda.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/applyLambda.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/");

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

@@ -0,0 +1,14 @@
+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; }
+}