diff --git a/src/test/java/bytecode/BinaryTest.java b/src/test/java/bytecode/BinaryTest.java
index b47841ed..aad81def 100644
--- a/src/test/java/bytecode/BinaryTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/FacTest.java b/src/test/java/bytecode/FacTest.java
index 8152452d..fcc45ee2 100644
--- a/src/test/java/bytecode/FacTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/FacultyTest.java b/src/test/java/bytecode/FacultyTest.java
index 07b099e5..44a0e1c5 100644
--- a/src/test/java/bytecode/FacultyTest.java
+++ b/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/");
diff --git a/src/test/java/bytecode/FieldTest.java b/src/test/java/bytecode/FieldTest.java
index 2d710fac..ed1a562f 100644
--- a/src/test/java/bytecode/FieldTest.java
+++ b/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/");
diff --git a/src/test/java/bytecode/FieldTph.java b/src/test/java/bytecode/FieldTph.java
index abc1a3fc..65c7f291 100644
--- a/src/test/java/bytecode/FieldTph.java
+++ b/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/");
diff --git a/src/test/java/bytecode/FieldTph2Test.java b/src/test/java/bytecode/FieldTph2Test.java
index 6da35b7b..f2b4d413 100644
--- a/src/test/java/bytecode/FieldTph2Test.java
+++ b/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/");
diff --git a/src/test/java/bytecode/FieldTphConsMethTest.java b/src/test/java/bytecode/FieldTphConsMethTest.java
index 8748d535..ecf992d0 100644
--- a/src/test/java/bytecode/FieldTphConsMethTest.java
+++ b/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/");
diff --git a/src/test/java/bytecode/FunOLTest.java b/src/test/java/bytecode/FunOLTest.java
index 863b3118..e46f074a 100644
--- a/src/test/java/bytecode/FunOLTest.java
+++ b/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/");
diff --git a/src/test/java/bytecode/GenTest.java b/src/test/java/bytecode/GenTest.java
index 0dfcba7f..09d283a3 100644
--- a/src/test/java/bytecode/GenTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/GreaterEqualTest.java b/src/test/java/bytecode/GreaterEqualTest.java
index 33f716c4..890dea9e 100644
--- a/src/test/java/bytecode/GreaterEqualTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/GreaterThanTest.java b/src/test/java/bytecode/GreaterThanTest.java
index 595c67ae..472daa49 100644
--- a/src/test/java/bytecode/GreaterThanTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/IdTest.java b/src/test/java/bytecode/IdTest.java
index e60e6990..d8392e55 100644
--- a/src/test/java/bytecode/IdTest.java
+++ b/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/");
diff --git a/src/test/java/bytecode/LambdaCapturetest.java b/src/test/java/bytecode/LambdaCapturetest.java
index c957e64e..24baaf7a 100644
--- a/src/test/java/bytecode/LambdaCapturetest.java
+++ b/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/");
diff --git a/src/test/java/bytecode/LambdaTest.java b/src/test/java/bytecode/LambdaTest.java
index c7553c2d..5428b333 100644
--- a/src/test/java/bytecode/LambdaTest.java
+++ b/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/");
diff --git a/src/test/java/bytecode/LambdaVoidTest.java b/src/test/java/bytecode/LambdaVoidTest.java
index 6d0a9024..1a737bd3 100644
--- a/src/test/java/bytecode/LambdaVoidTest.java
+++ b/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/");
diff --git a/src/test/java/bytecode/LessEqualTest.java b/src/test/java/bytecode/LessEqualTest.java
index 217ec4b1..2e39e072 100644
--- a/src/test/java/bytecode/LessEqualTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/LessThanTest.java b/src/test/java/bytecode/LessThanTest.java
index 192291a1..98830542 100644
--- a/src/test/java/bytecode/LessThanTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/MatrixOpTest.java b/src/test/java/bytecode/MatrixOpTest.java
index 8e876467..11018701 100644
--- a/src/test/java/bytecode/MatrixOpTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/MatrixTest.java b/src/test/java/bytecode/MatrixTest.java
index 146e771a..c5dae3df 100644
--- a/src/test/java/bytecode/MatrixTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/MergeTest.java b/src/test/java/bytecode/MergeTest.java
index 1edac3e4..d259ee2c 100644
--- a/src/test/java/bytecode/MergeTest.java
+++ b/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/");
diff --git a/src/test/java/bytecode/OLTest.java b/src/test/java/bytecode/OLTest.java
index 0eac154c..e438e7f9 100644
--- a/src/test/java/bytecode/OLTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/OpTest.java b/src/test/java/bytecode/OpTest.java
index 138701d1..eeef179b 100644
--- a/src/test/java/bytecode/OpTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/OverloadingSortingTest.java b/src/test/java/bytecode/OverloadingSortingTest.java
index e9751062..bb174d7d 100644
--- a/src/test/java/bytecode/OverloadingSortingTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/OverloadingTest.java b/src/test/java/bytecode/OverloadingTest.java
index d1f0187d..4645110e 100644
--- a/src/test/java/bytecode/OverloadingTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/PlusTest.java b/src/test/java/bytecode/PlusTest.java
index b7c1298a..ac20360f 100644
--- a/src/test/java/bytecode/PlusTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/PostIncTest.java b/src/test/java/bytecode/PostIncTest.java
index 96af2177..902fe221 100644
--- a/src/test/java/bytecode/PostIncTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/PreIncTest.java b/src/test/java/bytecode/PreIncTest.java
index 9eb9acc2..ac4e2b55 100644
--- a/src/test/java/bytecode/PreIncTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/RelOpsTest.java b/src/test/java/bytecode/RelOpsTest.java
index ef5b7579..9ffeeca2 100644
--- a/src/test/java/bytecode/RelOpsTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/SortingTest.java b/src/test/java/bytecode/SortingTest.java
index 47c7c949..4b8abb61 100644
--- a/src/test/java/bytecode/SortingTest.java
+++ b/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/");
diff --git a/src/test/java/bytecode/SubMatTest.java b/src/test/java/bytecode/SubMatTest.java
index 876c3f7c..000f7569 100644
--- a/src/test/java/bytecode/SubMatTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/Tph2Test.java b/src/test/java/bytecode/Tph2Test.java
index ca587e0d..ad9c06f0 100644
--- a/src/test/java/bytecode/Tph2Test.java
+++ b/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/";
diff --git a/src/test/java/bytecode/Tph3Test.java b/src/test/java/bytecode/Tph3Test.java
index 8aba473d..bc680e7e 100644
--- a/src/test/java/bytecode/Tph3Test.java
+++ b/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/";
diff --git a/src/test/java/bytecode/Tph5Test.java b/src/test/java/bytecode/Tph5Test.java
index 9a07a7a5..78b2c400 100644
--- a/src/test/java/bytecode/Tph5Test.java
+++ b/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/";
diff --git a/src/test/java/bytecode/TphTest.java b/src/test/java/bytecode/TphTest.java
index 2a7e395e..45bb698a 100644
--- a/src/test/java/bytecode/TphTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/WhileTest.java b/src/test/java/bytecode/WhileTest.java
index 5cebf8a3..f18577d7 100644
--- a/src/test/java/bytecode/WhileTest.java
+++ b/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/";
diff --git a/src/test/java/bytecode/YTest.java b/src/test/java/bytecode/YTest.java
index 396b1584..2a63a3ed 100644
--- a/src/test/java/bytecode/YTest.java
+++ b/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/");
diff --git a/src/test/java/bytecode/applyLambdaTest.java b/src/test/java/bytecode/applyLambdaTest.java
index 26b004f5..3c7ea452 100644
--- a/src/test/java/bytecode/applyLambdaTest.java
+++ b/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/");
diff --git a/src/test/resources/bytecodeJavFiles/AssignToLit.jav b/src/test/resources/bytecode/javFiles/AssignToLit.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/AssignToLit.jav
rename to src/test/resources/bytecode/javFiles/AssignToLit.jav
diff --git a/src/test/resources/bytecodeJavFiles/BinaryInMeth.jav b/src/test/resources/bytecode/javFiles/BinaryInMeth.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/BinaryInMeth.jav
rename to src/test/resources/bytecode/javFiles/BinaryInMeth.jav
diff --git a/src/test/resources/bytecodeJavFiles/DuMethod.jav b/src/test/resources/bytecode/javFiles/DuMethod.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/DuMethod.jav
rename to src/test/resources/bytecode/javFiles/DuMethod.jav
diff --git a/src/test/resources/bytecodeJavFiles/EmptyMethod.jav b/src/test/resources/bytecode/javFiles/EmptyMethod.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/EmptyMethod.jav
rename to src/test/resources/bytecode/javFiles/EmptyMethod.jav
diff --git a/src/test/resources/bytecodeJavFiles/Example.jav b/src/test/resources/bytecode/javFiles/Example.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Example.jav
rename to src/test/resources/bytecode/javFiles/Example.jav
diff --git a/src/test/resources/bytecodeJavFiles/Exceptions.jav b/src/test/resources/bytecode/javFiles/Exceptions.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Exceptions.jav
rename to src/test/resources/bytecode/javFiles/Exceptions.jav
diff --git a/src/test/resources/bytecodeJavFiles/Fac.jav b/src/test/resources/bytecode/javFiles/Fac.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Fac.jav
rename to src/test/resources/bytecode/javFiles/Fac.jav
diff --git a/src/test/resources/bytecodeJavFiles/Faculty.jav b/src/test/resources/bytecode/javFiles/Faculty.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Faculty.jav
rename to src/test/resources/bytecode/javFiles/Faculty.jav
diff --git a/src/test/resources/bytecodeJavFiles/Faculty2.jav b/src/test/resources/bytecode/javFiles/Faculty2.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Faculty2.jav
rename to src/test/resources/bytecode/javFiles/Faculty2.jav
diff --git a/src/test/resources/bytecodeJavFiles/Field.jav b/src/test/resources/bytecode/javFiles/Field.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Field.jav
rename to src/test/resources/bytecode/javFiles/Field.jav
diff --git a/src/test/resources/bytecodeJavFiles/FieldTph.jav b/src/test/resources/bytecode/javFiles/FieldTph.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/FieldTph.jav
rename to src/test/resources/bytecode/javFiles/FieldTph.jav
diff --git a/src/test/resources/bytecodeJavFiles/FieldTph2.jav b/src/test/resources/bytecode/javFiles/FieldTph2.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/FieldTph2.jav
rename to src/test/resources/bytecode/javFiles/FieldTph2.jav
diff --git a/src/test/resources/bytecodeJavFiles/FieldTphConsMeth.jav b/src/test/resources/bytecode/javFiles/FieldTphConsMeth.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/FieldTphConsMeth.jav
rename to src/test/resources/bytecode/javFiles/FieldTphConsMeth.jav
diff --git a/src/test/resources/bytecodeJavFiles/For.jav b/src/test/resources/bytecode/javFiles/For.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/For.jav
rename to src/test/resources/bytecode/javFiles/For.jav
diff --git a/src/test/resources/bytecodeJavFiles/FunOL.jav b/src/test/resources/bytecode/javFiles/FunOL.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/FunOL.jav
rename to src/test/resources/bytecode/javFiles/FunOL.jav
diff --git a/src/test/resources/bytecodeJavFiles/Gen.jav b/src/test/resources/bytecode/javFiles/Gen.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Gen.jav
rename to src/test/resources/bytecode/javFiles/Gen.jav
diff --git a/src/test/resources/bytecodeJavFiles/Generics.jav b/src/test/resources/bytecode/javFiles/Generics.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Generics.jav
rename to src/test/resources/bytecode/javFiles/Generics.jav
diff --git a/src/test/resources/bytecodeJavFiles/Generics2.jav b/src/test/resources/bytecode/javFiles/Generics2.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Generics2.jav
rename to src/test/resources/bytecode/javFiles/Generics2.jav
diff --git a/src/test/resources/bytecodeJavFiles/GreaterEqual.jav b/src/test/resources/bytecode/javFiles/GreaterEqual.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/GreaterEqual.jav
rename to src/test/resources/bytecode/javFiles/GreaterEqual.jav
diff --git a/src/test/resources/bytecodeJavFiles/GreaterThan.jav b/src/test/resources/bytecode/javFiles/GreaterThan.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/GreaterThan.jav
rename to src/test/resources/bytecode/javFiles/GreaterThan.jav
diff --git a/src/test/resources/bytecodeJavFiles/Id.jav b/src/test/resources/bytecode/javFiles/Id.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Id.jav
rename to src/test/resources/bytecode/javFiles/Id.jav
diff --git a/src/test/resources/bytecodeJavFiles/IfTest.jav b/src/test/resources/bytecode/javFiles/IfTest.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/IfTest.jav
rename to src/test/resources/bytecode/javFiles/IfTest.jav
diff --git a/src/test/resources/bytecodeJavFiles/Import.jav b/src/test/resources/bytecode/javFiles/Import.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Import.jav
rename to src/test/resources/bytecode/javFiles/Import.jav
diff --git a/src/test/resources/bytecodeJavFiles/Interface1.jav b/src/test/resources/bytecode/javFiles/Interface1.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Interface1.jav
rename to src/test/resources/bytecode/javFiles/Interface1.jav
diff --git a/src/test/resources/bytecodeJavFiles/LamRunnable.jav b/src/test/resources/bytecode/javFiles/LamRunnable.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/LamRunnable.jav
rename to src/test/resources/bytecode/javFiles/LamRunnable.jav
diff --git a/src/test/resources/bytecodeJavFiles/Lambda.jav b/src/test/resources/bytecode/javFiles/Lambda.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Lambda.jav
rename to src/test/resources/bytecode/javFiles/Lambda.jav
diff --git a/src/test/resources/bytecodeJavFiles/Lambda2.jav b/src/test/resources/bytecode/javFiles/Lambda2.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Lambda2.jav
rename to src/test/resources/bytecode/javFiles/Lambda2.jav
diff --git a/src/test/resources/bytecodeJavFiles/Lambda3.jav b/src/test/resources/bytecode/javFiles/Lambda3.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Lambda3.jav
rename to src/test/resources/bytecode/javFiles/Lambda3.jav
diff --git a/src/test/resources/bytecodeJavFiles/Lambda4.jav b/src/test/resources/bytecode/javFiles/Lambda4.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Lambda4.jav
rename to src/test/resources/bytecode/javFiles/Lambda4.jav
diff --git a/src/test/resources/bytecodeJavFiles/LambdaCapture.jav b/src/test/resources/bytecode/javFiles/LambdaCapture.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/LambdaCapture.jav
rename to src/test/resources/bytecode/javFiles/LambdaCapture.jav
diff --git a/src/test/resources/bytecodeJavFiles/LambdaVoid.jav b/src/test/resources/bytecode/javFiles/LambdaVoid.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/LambdaVoid.jav
rename to src/test/resources/bytecode/javFiles/LambdaVoid.jav
diff --git a/src/test/resources/bytecodeJavFiles/LessEqual.jav b/src/test/resources/bytecode/javFiles/LessEqual.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/LessEqual.jav
rename to src/test/resources/bytecode/javFiles/LessEqual.jav
diff --git a/src/test/resources/bytecodeJavFiles/LessThan.jav b/src/test/resources/bytecode/javFiles/LessThan.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/LessThan.jav
rename to src/test/resources/bytecode/javFiles/LessThan.jav
diff --git a/src/test/resources/bytecodeJavFiles/Matrix.jav b/src/test/resources/bytecode/javFiles/Matrix.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Matrix.jav
rename to src/test/resources/bytecode/javFiles/Matrix.jav
diff --git a/src/test/resources/bytecodeJavFiles/MatrixOP.jav b/src/test/resources/bytecode/javFiles/MatrixOP.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/MatrixOP.jav
rename to src/test/resources/bytecode/javFiles/MatrixOP.jav
diff --git a/src/test/resources/bytecodeJavFiles/Merge.jav b/src/test/resources/bytecode/javFiles/Merge.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Merge.jav
rename to src/test/resources/bytecode/javFiles/Merge.jav
diff --git a/src/test/resources/bytecodeJavFiles/Methods.jav b/src/test/resources/bytecode/javFiles/Methods.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Methods.jav
rename to src/test/resources/bytecode/javFiles/Methods.jav
diff --git a/src/test/resources/bytecodeJavFiles/OL.jav b/src/test/resources/bytecode/javFiles/OL.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/OL.jav
rename to src/test/resources/bytecode/javFiles/OL.jav
diff --git a/src/test/resources/bytecodeJavFiles/Op.jav b/src/test/resources/bytecode/javFiles/Op.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Op.jav
rename to src/test/resources/bytecode/javFiles/Op.jav
diff --git a/src/test/resources/bytecodeJavFiles/Op2.jav b/src/test/resources/bytecode/javFiles/Op2.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Op2.jav
rename to src/test/resources/bytecode/javFiles/Op2.jav
diff --git a/src/test/resources/bytecodeJavFiles/OverlaodGen.jav b/src/test/resources/bytecode/javFiles/OverlaodGen.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/OverlaodGen.jav
rename to src/test/resources/bytecode/javFiles/OverlaodGen.jav
diff --git a/src/test/resources/bytecodeJavFiles/Overloading.jav b/src/test/resources/bytecode/javFiles/Overloading.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Overloading.jav
rename to src/test/resources/bytecode/javFiles/Overloading.jav
diff --git a/src/test/resources/bytecodeJavFiles/Plus.jav b/src/test/resources/bytecode/javFiles/Plus.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Plus.jav
rename to src/test/resources/bytecode/javFiles/Plus.jav
diff --git a/src/test/resources/bytecodeJavFiles/PostIncDec.jav b/src/test/resources/bytecode/javFiles/PostIncDec.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/PostIncDec.jav
rename to src/test/resources/bytecode/javFiles/PostIncDec.jav
diff --git a/src/test/resources/bytecodeJavFiles/PreInc.jav b/src/test/resources/bytecode/javFiles/PreInc.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/PreInc.jav
rename to src/test/resources/bytecode/javFiles/PreInc.jav
diff --git a/src/test/resources/bytecodeJavFiles/RecursiveMeth.jav b/src/test/resources/bytecode/javFiles/RecursiveMeth.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/RecursiveMeth.jav
rename to src/test/resources/bytecode/javFiles/RecursiveMeth.jav
diff --git a/src/test/resources/bytecodeJavFiles/RelOps.jav b/src/test/resources/bytecode/javFiles/RelOps.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/RelOps.jav
rename to src/test/resources/bytecode/javFiles/RelOps.jav
diff --git a/src/test/resources/bytecodeJavFiles/ReturnMethod.jav b/src/test/resources/bytecode/javFiles/ReturnMethod.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/ReturnMethod.jav
rename to src/test/resources/bytecode/javFiles/ReturnMethod.jav
diff --git a/src/test/resources/bytecodeJavFiles/Sorting.jav b/src/test/resources/bytecode/javFiles/Sorting.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Sorting.jav
rename to src/test/resources/bytecode/javFiles/Sorting.jav
diff --git a/src/test/resources/bytecodeJavFiles/StaticM.jav b/src/test/resources/bytecode/javFiles/StaticM.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/StaticM.jav
rename to src/test/resources/bytecode/javFiles/StaticM.jav
diff --git a/src/test/resources/bytecodeJavFiles/SubMatrix.jav b/src/test/resources/bytecode/javFiles/SubMatrix.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/SubMatrix.jav
rename to src/test/resources/bytecode/javFiles/SubMatrix.jav
diff --git a/src/test/resources/bytecodeJavFiles/Tph.jav b/src/test/resources/bytecode/javFiles/Tph.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Tph.jav
rename to src/test/resources/bytecode/javFiles/Tph.jav
diff --git a/src/test/resources/bytecodeJavFiles/Tph2.jav b/src/test/resources/bytecode/javFiles/Tph2.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Tph2.jav
rename to src/test/resources/bytecode/javFiles/Tph2.jav
diff --git a/src/test/resources/bytecodeJavFiles/Tph3.jav b/src/test/resources/bytecode/javFiles/Tph3.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Tph3.jav
rename to src/test/resources/bytecode/javFiles/Tph3.jav
diff --git a/src/test/resources/bytecodeJavFiles/Tph4.jav b/src/test/resources/bytecode/javFiles/Tph4.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Tph4.jav
rename to src/test/resources/bytecode/javFiles/Tph4.jav
diff --git a/src/test/resources/bytecodeJavFiles/Tph5.jav b/src/test/resources/bytecode/javFiles/Tph5.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Tph5.jav
rename to src/test/resources/bytecode/javFiles/Tph5.jav
diff --git a/src/test/resources/bytecode/javFiles/Tph6.jav b/src/test/resources/bytecode/javFiles/Tph6.jav
new file mode 100644
index 00000000..2f9e4294
--- /dev/null
+++ b/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; }
+}
diff --git a/src/test/resources/bytecodeJavFiles/VectorAdd.jav b/src/test/resources/bytecode/javFiles/VectorAdd.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/VectorAdd.jav
rename to src/test/resources/bytecode/javFiles/VectorAdd.jav
diff --git a/src/test/resources/bytecodeJavFiles/VoidMeth.jav b/src/test/resources/bytecode/javFiles/VoidMeth.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/VoidMeth.jav
rename to src/test/resources/bytecode/javFiles/VoidMeth.jav
diff --git a/src/test/resources/bytecodeJavFiles/WC.jav b/src/test/resources/bytecode/javFiles/WC.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/WC.jav
rename to src/test/resources/bytecode/javFiles/WC.jav
diff --git a/src/test/resources/bytecodeJavFiles/While.jav b/src/test/resources/bytecode/javFiles/While.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/While.jav
rename to src/test/resources/bytecode/javFiles/While.jav
diff --git a/src/test/resources/bytecodeJavFiles/Y.jav b/src/test/resources/bytecode/javFiles/Y.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/Y.jav
rename to src/test/resources/bytecode/javFiles/Y.jav
diff --git a/src/test/resources/bytecodeJavFiles/applyLambda.jav b/src/test/resources/bytecode/javFiles/applyLambda.jav
similarity index 100%
rename from src/test/resources/bytecodeJavFiles/applyLambda.jav
rename to src/test/resources/bytecode/javFiles/applyLambda.jav