diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java index c98f6ba39..c6c042e6a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java @@ -29,6 +29,26 @@ public class AddAVM2Item extends BinaryOpItem { super(instruction, PRECEDENCE_ADDITIVE, leftSide, rightSide, "+"); } + @Override + public String toString(List localData) { + if (rightSide.precedence >= precedence) { //string + vs number + + 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); + } + } + @Override public Object getResult() { if (EcmaScript.type(leftSide.getResult()) == EcmaType.STRING || EcmaScript.type(rightSide.getResult()) == EcmaType.STRING) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java index cf7243be5..ac66084d2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java @@ -34,6 +34,25 @@ public class AddActionItem extends BinaryOpItem { this.version2 = version2; } + @Override + public String toString(List localData) { + if (rightSide.precedence >= precedence) { //string + vs number + + 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); + } + } + @Override public Object getResult() { if (version2) {