eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2025-01-09 00:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix https://github.com/konsoletyper/teavm/issues/109

Browse Source
This commit is contained in:
Alexey Andreev 2015-05-14 17:38:07 +04:00
parent bf5af7ef6a
commit 07b65a92c7
3 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
teavm-core/src/main/java/org/teavm/javascript/OptimizingVisitor.java
View File

@ -54,6 +54,11 @@ class OptimizingVisitor implements StatementVisitor, ExprVisitor {
}
expr.getSecondOperand().acceptVisitor(this);
Expr b = resultExpr;
if (b instanceof ConstantExpr && expr.getOperation() == BinaryOperation.SUBTRACT) {
if (tryMakePositive((ConstantExpr)b)) {
expr.setOperation(BinaryOperation.ADD);
}
}
expr.getFirstOperand().acceptVisitor(this);
Expr a = resultExpr;
Expr p = a;
@ -96,10 +101,41 @@ class OptimizingVisitor implements StatementVisitor, ExprVisitor {
public void visit(UnaryExpr expr) {
expr.getOperand().acceptVisitor(this);
Expr operand = resultExpr;
if (expr.getOperation() == UnaryOperation.NEGATE && operand instanceof ConstantExpr) {
ConstantExpr constantExpr = (ConstantExpr)operand;
if (tryMakePositive(constantExpr)) {
resultExpr = expr;
return;
}
}
expr.setOperand(operand);
resultExpr = expr;
}
private boolean tryMakePositive(ConstantExpr constantExpr) {
Object value = constantExpr.getValue();
if (value instanceof Integer && (Integer)value < 0) {
constantExpr.setValue(-(Integer)value);
return true;
} else if (value instanceof Float && (Float)value < 0) {
constantExpr.setValue(-(Float)value);
return true;
} else if (value instanceof Byte && (Byte)value < 0) {
constantExpr.setValue(-(Byte)value);
return true;
} else if (value instanceof Short && (Short)value < 0) {
constantExpr.setValue(-(Short)value);
return true;
} else if (value instanceof Long && (Long)value < 0) {
constantExpr.setValue(-(Long)value);
return true;
} else if (value instanceof Double && (Double)value < 0) {
constantExpr.setValue(-(Double)value);
return true;
}
return false;
}
@Override
public void visit(ConditionalExpr expr) {
expr.getCondition().acceptVisitor(this);

2
teavm-core/src/main/java/org/teavm/javascript/Renderer.java
View File

@ -1532,7 +1532,7 @@ public class Renderer implements ExprVisitor, StatementVisitor, RenderingContext
}
String str = constantToString(expr.getValue());
if (str.startsWith("-")) {
enterPriority(Priority.MULTIPLICATION, Associativity.RIGHT, true);
enterPriority(Priority.MULTIPLICATION, Associativity.NONE, true);
}
writer.append(str);
if (str.startsWith("-")) {

7
teavm-tests/src/test/java/org/teavm/classlib/java/lang/VMTest.java
View File

@ -84,6 +84,13 @@ public class VMTest {
assertEquals(0xDDC2, "a\uDDC2b".charAt(1));
}
@Test
public void subtractingNegativeWorks() {
int a = 23;
int b = a - 0xFFFFFFFF;
assertEquals(24, b);
}
@Test
public void separatesExceptionAndVariable() {
int n = foo();