LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-26 20:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not parse imports from class ancestors.

Browse Source 
Fixed tests.
This commit is contained in:
Jindra Petřík
2024-08-27 09:43:40 +02:00
parent 4e89376174
commit 45512d29a0
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/DependencyParser.java
+28 -1
View File
@@ -21,8 +21,12 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
import com.jpexs.decompiler.flash.abc.avm2.AVM2Deobfuscation;
import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
import com.jpexs.decompiler.flash.abc.avm2.instructions.alchemy.AlchemyTypeIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.construction.NewClassIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.construction.NewFunctionIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.other.GetLexIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.other.GetOuterScopeIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.stack.PopScopeIns;
import com.jpexs.decompiler.flash.abc.avm2.instructions.stack.PushScopeIns;
import com.jpexs.decompiler.flash.abc.avm2.model.InitVectorAVM2Item;
import com.jpexs.decompiler.flash.abc.avm2.parser.script.AbcIndexing;
import com.jpexs.decompiler.flash.abc.types.ABCException;
@@ -180,7 +184,30 @@ public class DependencyParser {
for (ABCException ex : body.exceptions) {
parseDependenciesFromMultiname(abcIndex, ignoredCustom, abc, dependencies, abc.constants.getMultiname(ex.type_index), ignorePackage, fullyQualifiedNames, DependencyType.EXPRESSION /* or signature?*/, uses);
}
for (AVM2Instruction ins : body.getCode().code) {
for (int i = 0; i < body.getCode().code.size(); i++) {
AVM2Instruction ins = body.getCode().code.get(i);
//Ignore class parents in script initializer
if (ins.definition instanceof GetLexIns) {
boolean foundNewClass = false;
for (int j = i + 1; j < body.getCode().code.size(); j++) {
AVM2Instruction insJ = body.getCode().code.get(j);
if (insJ.definition instanceof NewClassIns) {
foundNewClass = true;
break;
} else if (ins.definition instanceof GetLexIns) {
//continue
} else if (ins.definition instanceof PushScopeIns) {
//continue
} else {
break;
}
}
if (foundNewClass) {
continue;
}
}
if (ins.definition instanceof AlchemyTypeIns) {
DottedChain nimport = AlchemyTypeIns.ALCHEMY_PACKAGE.addWithSuffix(ins.definition.instructionName);
Dependency depExp = new Dependency(nimport, DependencyType.EXPRESSION);