LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-25 11:10:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #237 Substract parentheses Fix

Browse Source
This commit is contained in:
Jindra Pet��k
2013-07-16 13:24:37 +02:00
parent 38bb6513d8
commit 0085aedca0
4 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java
-17
View File
@@ -29,23 +29,6 @@ public class AddAVM2Item extends BinaryOpItem {
super(instruction, PRECEDENCE_ADDITIVE, leftSide, rightSide, "+");
}
@Override
public String toString(List<Object> localData) {
if (rightSide.precedence >= precedence) {
String ret = "";
if (leftSide.precedence > precedence) {
ret += "(" + leftSide.toString(localData) + ")";
} else {
ret += leftSide.toString(localData);
}
ret += hilight(operator);
ret += "(" + rightSide.toString(localData) + ")";
return ret;
} else {
return super.toString(localData);
}
}
@Override
public Object getResult() {
if (EcmaScript.type(leftSide.getResult()) == EcmaType.STRING || EcmaScript.type(rightSide.getResult()) == EcmaType.STRING) {
trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/SubtractAVM2Item.java
+14 -10
View File
@@ -35,17 +35,21 @@ public class SubtractAVM2Item extends BinaryOpItem {
@Override
public String toString(List<Object> localData) {
if (!(getLeftMostItem(rightSide) instanceof NegAVM2Item)) { // a - (-b*c*d)
if (rightSide.precedence >= precedence) { // >= add or subtract too
String ret = "";
if (leftSide.precedence > precedence) {
ret += "(" + leftSide.toString(localData) + ")";
} else {
ret += leftSide.toString(localData);
}
ret += " ";
ret += hilight(operator);
ret += " ";
ret += "(" + rightSide.toString(localData) + ")";
return ret;
} else {
return super.toString(localData);
}
String ret = "";
if (leftSide.getPrecedence() > precedence) {
ret += "(" + leftSide.toString(localData) + ")";
} else {
ret += leftSide.toString(localData);
}
ret += hilight(operator);
ret += "(" + rightSide.toString(localData) + ")";
return ret;
}
}
trunk/src/com/jpexs/decompiler/flash/action/model/operations/SubtractActionItem.java
+14 -10
View File
@@ -38,18 +38,22 @@ public class SubtractActionItem extends BinaryOpItem {
@Override
public String toString(List<Object> localData) {
if (rightSide instanceof DirectValueActionItem) {
if (rightSide.precedence >= precedence) { // >= add or subtract too
String ret = "";
if (leftSide.precedence > precedence) {
ret += "(" + leftSide.toString(localData) + ")";
} else {
ret += leftSide.toString(localData);
}
ret += " ";
ret += hilight(operator);
ret += " ";
ret += "(" + rightSide.toString(localData) + ")";
return ret;
} else {
return super.toString(localData);
}
String ret = "";
if (leftSide.getPrecedence() > precedence) {
ret += "(" + leftSide.toString(localData) + ")";
} else {
ret += leftSide.toString(localData);
}
ret += hilight(operator);
ret += "(" + rightSide.toString(localData) + ")";
return ret;
}
@Override
trunk/src/com/jpexs/decompiler/graph/model/BinaryOpItem.java
+3
View File
@@ -52,7 +52,10 @@ public abstract class BinaryOpItem extends GraphTargetItem implements BinaryOp {
} else {
ret += leftSide.toString(localData);
}
ret += " ";
ret += hilight(operator);
ret += " ";
if (rightSide.getPrecedence() > precedence) {
ret += "(" + rightSide.toString(localData) + ")";