LegacyConsole/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-22 06:27:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get property fix, preincrement air test fix

Browse Source
This commit is contained in:
Jindra Petřík
2025-08-31 15:59:08 +02:00
parent 867e76dff3
commit c8a8ff2fea
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetPropertyIns.java
View File

@@ -47,6 +47,8 @@ import com.jpexs.decompiler.graph.TranslateStack;
import com.jpexs.decompiler.graph.TypeItem;
import com.jpexs.decompiler.graph.model.DuplicateItem;
import com.jpexs.decompiler.graph.model.DuplicateSourceItem;
import com.jpexs.decompiler.graph.model.HasTempIndex;
import com.jpexs.decompiler.graph.model.SetTemporaryItem;
import com.jpexs.helpers.Reference;
import java.util.ArrayList;
import java.util.List;
@@ -116,9 +118,18 @@ public class GetPropertyIns extends InstructionDefinition {
}
if (findPropName.name instanceof DuplicateItem || findPropName.name instanceof DuplicateSourceItem) {
if (findPropName.name.getThroughDuplicate() == multiname.name.getThroughDuplicate()) {
int tempIndex = ((HasTempIndex) findPropName.name).getTempIndex();
findPropName.name = findPropName.name.value;
multiname.name = multiname.name.getThroughDuplicate();
if (!output.isEmpty() && output.get(output.size() - 1) instanceof SetTemporaryItem) {
SetTemporaryItem st = (SetTemporaryItem) output.get(output.size() - 1);
if (st.tempIndex == tempIndex) {
output.remove(output.size() - 1);
}
}
}
}
if (findPropName.namespace instanceof SetLocalAVM2Item) {
SetLocalAVM2Item setLocal = (SetLocalAVM2Item) findPropName.namespace;
@@ -134,8 +145,17 @@ public class GetPropertyIns extends InstructionDefinition {
}
if (findPropName.namespace instanceof DuplicateItem || findPropName.namespace instanceof DuplicateSourceItem) {
if (findPropName.namespace.getThroughDuplicate() == multiname.namespace.getThroughDuplicate()) {
int tempIndex = ((HasTempIndex) findPropName.namespace).getTempIndex();
findPropName.namespace = findPropName.namespace.getThroughDuplicate();
multiname.namespace = multiname.namespace.getThroughDuplicate();
if (!output.isEmpty() && output.get(output.size() - 1) instanceof SetTemporaryItem) {
SetTemporaryItem st = (SetTemporaryItem) output.get(output.size() - 1);
if (st.tempIndex == tempIndex) {
output.remove(output.size() - 1);
}
}
}
}
}

3
libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/as3decompile/ActionScript3ClassicAirDecompileTest.java
View File

@@ -1777,8 +1777,7 @@ public class ActionScript3ClassicAirDecompileTest extends ActionScript3Decompile
+ "r = -n1;\r\n"
+ "r = ~n1;\r\n"
+ "br = !b1;\r\n"
+ "n1++;\r\n"
+ "r = n1;\r\n"
+ "r = ++n1;\r\n"
+ "r = n1++;\r\n"
+ "cr = c as MyClass;\r\n"
+ "br = \"hello\" in d;\r\n"