i21023/JavaTXCompilerInJavaTX
2
0
Fork 0
forked from JavaTX/JavaCompilerCore
Code Pull Requests Activity

Bug 77 gefixt

Browse Source
This commit is contained in:
Fayez Abu Alia 2018-05-08 17:42:58 +02:00
parent 22ca2cbd4a
commit 521a1cbf3b
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
View File

@ -772,7 +772,19 @@ public class BytecodeGenMethod implements StatementVisitor {
@Override
public void visit(Return aReturn) {
if(aReturn.retexpr instanceof BinaryExpr)
isBinaryExp = true;
aReturn.retexpr.accept(this);
if (isBinaryExp) {
BinaryExpr binary = (BinaryExpr) aReturn.retexpr;
String lexpType = getResolvedType(binary.lexpr.getType());
String rexpType = getResolvedType(binary.rexpr.getType());
getValueOfIns(getLargerType(lexpType, rexpType));
isBinaryExp = false;
}
mv.visitInsn(Opcodes.ARETURN);
}

2
test/bytecode/OpTest.java
View File

@ -29,7 +29,7 @@ public class OpTest {
fileToTest = new File(path);
compiler = new JavaTXCompiler(fileToTest);
compiler.generateBytecode();
pathToClassFile = System.getProperty("user.dir")+"/testBytecode/generatedBC/examples/";
pathToClassFile = System.getProperty("user.dir")+"/testBytecode/generatedBC/";
loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
classToTest = loader.loadClass("Op");
instanceOfClass = classToTest.getDeclaredConstructor().newInstance();

6
test/bytecode/javFiles/Op.jav
View File

@ -9,8 +9,8 @@ import java.lang.Byte;
public class Op {
m(a,b) {
var c = a+b;
return c;
Integer m(Integer a, Integer b) {
//var c = a+b;
return a+b;
}
}