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

Fixed #1888 Resolving types on XML and XMLList

Browse Source
This commit is contained in:
Jindra Petřík
2022-11-30 20:20:53 +01:00
parent e588cbda3a
commit 9ddda2a8f8
6 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,7 +244,16 @@ public class GetPropertyIns extends InstructionDefinition {
//TODO: handle method calls to return proper param type results
}
}
if (receiverType.equals(new TypeItem("XMLList"))) {
if (multiname.name != null && multiname.name.returnType().equals(TypeItem.INT)) {
type.setVal(new TypeItem("XML"));
return;
}
}
localData.abcIndex.findPropertyTypeOrCallType(localData.abc, receiverType, multiname.resolvedMultinameName, localData.abc.constants.getMultiname(multiname.multinameIndex).namespace_index, parentStatic, !parentStatic, false, type, callType);
if (receiverType.equals(new TypeItem("XML")) && !type.getVal().equals(new TypeItem("Function"))) {
type.setVal(new TypeItem("XMLList"));
}
}
}
}

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

@@ -252,7 +252,17 @@ public class ActionScript3ClassicAirDecompileTest extends ActionScript3Decompile
+ "i = int(v.join(\"x\"));\r\n"
+ "i = int(prot);\r\n"
+ "s = prot;\r\n"
+ "s = String(getTimer());\r\n",
+ "s = String(getTimer());\r\n"
+ "var x:XML;\r\n"
+ "s = x = <list>\r\n"
+ "<item id=\"1\">1</item>\r\n"
+ "<item id=\"2\">2</item>\r\n"
+ "<item id=\"3\">3</item>\r\n"
+ "</list>;\r\n"
+ "trace(\"a\");\r\n"
+ "var xlist:XMLList = x.item;\r\n"
+ "trace(\"b\");\r\n"
+ "i = int(xlist[i].@id);\r\n",
false);
}

12
libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/as3decompile/ActionScript3ClassicDecompileTest.java
View File

@@ -251,7 +251,17 @@ public class ActionScript3ClassicDecompileTest extends ActionScript3DecompileTes
+ "i = int(v.join(\"x\"));\r\n"
+ "i = int(prot);\r\n"
+ "s = prot;\r\n"
+ "s = String(getTimer());\r\n",
+ "s = String(getTimer());\r\n"
+ "var x:XML = <list>\r\n"
+ "<item id=\"1\">1</item>\r\n"
+ "<item id=\"2\">2</item>\r\n"
+ "<item id=\"3\">3</item>\r\n"
+ "</list>;\r\n"
+ "s = x;\r\n"
+ "trace(\"a\");\r\n"
+ "var xlist:XMLList = x.item;\r\n"
+ "trace(\"b\");\r\n"
+ "i = int(xlist[i].@id);\r\n",
false);
}

BIN
libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf vendored
View File

Binary file not shown.

BIN
libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf vendored
View File

Binary file not shown.

13
libsrc/ffdec_lib/testdata/as3_new/src/tests/TestConvert.as vendored
View File

@@ -53,6 +53,19 @@ package tests
s = prot;
s = String(getTimer());
var x:XML = <list>
<item id="1">1</item>
<item id="2">2</item>
<item id="3">3</item>
</list>;
s = x;
trace("a");
var xlist:XMLList = x.item;
trace("b");
i = int(xlist[i].@id);
}
}
}