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

Fixed #1762 AS3 - Auto adding returnvoid/return undefined

Browse Source
This commit is contained in:
Jindra Petřík
2021-12-01 20:09:13 +01:00
parent 1928962d6f
commit 47347e7a0e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/AVM2SourceGenerator.java
View File

@@ -1916,8 +1916,13 @@ public class AVM2SourceGenerator implements SourceGenerator {
declarations.add(d);
}
}
boolean addRet = false;
if (body != null) {
body.addAll(0, declarations);
if (body.isEmpty() || (!((body.get(body.size() - 1) instanceof ReturnValueAVM2Item)
|| (body.get(body.size() - 1) instanceof ReturnVoidAVM2Item)))) {
addRet = true;
}
}
localData.exceptions = new ArrayList<>();
@@ -2002,15 +2007,14 @@ public class AVM2SourceGenerator implements SourceGenerator {
mbodyCode.add(0, new AVM2Instruction(0, AVM2Instructions.GetLocal0, null));
mbodyCode.add(1, new AVM2Instruction(0, AVM2Instructions.PushScope, null));
}
boolean addRet = false;
if (!mbodyCode.isEmpty()) {
/*if (!mbodyCode.isEmpty()) {
InstructionDefinition lastDef = mbodyCode.get(mbodyCode.size() - 1).definition;
if (!((lastDef instanceof ReturnVoidIns) || (lastDef instanceof ReturnValueIns))) {
addRet = true;
}
} else {
addRet = true;
}
}*/
if (addRet) {
if (retType.toString().equals("*") || retType.toString().equals("void") || constructor) {
mbodyCode.add(new AVM2Instruction(0, AVM2Instructions.ReturnVoid, null));