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

Fixed #1888 String casts - ConvertS on XML, XMLList

Browse Source
This commit is contained in:
Jindra Petřík
2023-01-27 21:51:05 +01:00
parent 0469170810
commit 7822ec078d
8 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,6 +242,10 @@ public class GetPropertyIns extends InstructionDefinition {
//TODO: handle method calls to return proper param type results
}
}
if (localData.abc.constants.getMultiname(multiname.multinameIndex).isAttribute()) {
type.setVal(new TypeItem("XMLList"));
return;
}
if (receiverType.equals(new TypeItem("XMLList"))) {
if (multiname.name != null && multiname.name.returnType().equals(TypeItem.INT)) {
type.setVal(new TypeItem("XML"));

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/ConvertAVM2Item.java
View File

@@ -77,8 +77,8 @@ public class ConvertAVM2Item extends AVM2Item {
break;
case "String":
displayConvert = !valueReturnType.equals(TypeItem.STRING)
&& !valueReturnType.equals(new TypeItem("XML"))
&& !valueReturnType.equals(new TypeItem("XMLList"))
//&& !valueReturnType.equals(new TypeItem("XML"))
//&& !valueReturnType.equals(new TypeItem("XMLList"))
&& !valueReturnType.equals(new TypeItem("null"))
&& !valueReturnType.equals(TypeItem.UNBOUNDED);
break;