diff --git a/target/JavaTXcompiler-0.1-jar-with-dependencies.jar b/target/JavaTXcompiler-0.1-jar-with-dependencies.jar index a79c625f..88d0644c 100644 Binary files a/target/JavaTXcompiler-0.1-jar-with-dependencies.jar and b/target/JavaTXcompiler-0.1-jar-with-dependencies.jar differ diff --git a/test/bytecode/javFiles/Fac.jav b/test/bytecode/javFiles/Fac.jav index d3d1a8d9..baee231b 100644 --- a/test/bytecode/javFiles/Fac.jav +++ b/test/bytecode/javFiles/Fac.jav @@ -2,9 +2,9 @@ import java.lang.Integer; import java.lang.Long; import java.lang.Double; -public class Fac { +public class Fac { - getFac(n){ + java.lang.Long getFac(n){ var res = 1; var i = 1; while(i<=n) { diff --git a/test/bytecode/javFiles/Faculty.jav b/test/bytecode/javFiles/Faculty.jav index 5742d720..cea028c1 100644 --- a/test/bytecode/javFiles/Faculty.jav +++ b/test/bytecode/javFiles/Faculty.jav @@ -1,3 +1,5 @@ +import java.lang.Integer; + class Faculty { Integer mul(Integer x, Integer y) { diff --git a/test/bytecode/javFiles/OL.jav b/test/bytecode/javFiles/OL.jav index dbd746b8..fd2c30a4 100644 --- a/test/bytecode/javFiles/OL.jav +++ b/test/bytecode/javFiles/OL.jav @@ -1,10 +1,10 @@ import java.lang.Integer; import java.lang.Double; -import java.lang.Boolean; -class OL { - m(x) { return x + x; } +class OL { + + m(java.lang.Double x) { return x + x; } //m(x) { return x || x; } diff --git a/test/bytecode/javFiles/While.jav b/test/bytecode/javFiles/While.jav index f4d9d0e9..f0dc7296 100644 --- a/test/bytecode/javFiles/While.jav +++ b/test/bytecode/javFiles/While.jav @@ -5,7 +5,7 @@ import java.lang.Integer; import java.lang.Long; public class While { - m(x) { + Integer m(x) { while(x < 2) { x = x+1; } diff --git a/test/javFiles/AddLong.jav b/test/javFiles/AddLong.jav index ceb31228..d6d47e9f 100644 --- a/test/javFiles/AddLong.jav +++ b/test/javFiles/AddLong.jav @@ -2,7 +2,7 @@ import java.lang.Integer; import java.lang.Long; public class AddLong{ - add(Integer a, Long b) { + Long add(Integer a, Long b) { Long c = a+b; return c; }