LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-18 16:28:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

- AS1/2 Fixed callmethodaction arguments

Browse Source 
- AS1/2 Using brackets instead of §§ syntax in callmethodaction
This commit is contained in:
Jindra Petřík
2018-05-27 17:33:15 +02:00
parent d138c61072
commit 0dea317d9f
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java
View File

@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
* License along with this library.
*/
package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.IdentifiersDeobfuscation;
@@ -58,9 +59,9 @@ public class CallMethodActionItem extends ActionItem {
@Override
public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
boolean blankMethod = false;
boolean dvai = methodName instanceof DirectValueActionItem;
if (methodName instanceof DirectValueActionItem) {
boolean blankMethod = false;
if (((DirectValueActionItem) methodName).value == Undefined.INSTANCE) {
blankMethod = true;
}
@@ -78,25 +79,36 @@ public class CallMethodActionItem extends ActionItem {
} else {
scriptObject.toString(writer, localData);
}
}
writer.append(".");
if (IdentifiersDeobfuscation.isValidName(false, methodName.toStringNoQuotes(localData))) {
writer.append(".");
methodName.toStringNoQuotes(writer, localData);
} else {
writer.append("[");
methodName.toString(writer, localData);
writer.append("]");
}
//writer.append(IdentifiersDeobfuscation.printIdentifier(false, methodName.toStringNoQuotes(localData)));
} else {
scriptObject.toString(writer, localData);
}
} else {
} else {
if (scriptObject.getPrecedence() > this.precedence) {
writer.append("(");
scriptObject.toString(writer, localData);
writer.append(")");
} else {
scriptObject.toString(writer, localData);
}
writer.append("[");
methodName.appendTry(writer, localData);
methodName.appendTry(writer, localData);
writer.append("]");
}
writer.spaceBeforeCallParenthesies(arguments.size());
writer.append("(");
writer.append("(");
if (!dvai) {
writer.append("this");
}
for (int t = 0; t < arguments.size(); t++) {
for (int t = 0; t < arguments.size(); t++) {
if (t > 0) {
writer.append(",");
}
arguments.get(t).toStringNL(writer, localData);