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

Fixed AS3 incorrect private modifier on internal namespaced traits of private class inside script

Browse Source
This commit is contained in:
Jindra Petřík
2023-10-06 18:45:33 +02:00
parent ca0dc86cf3
commit a4fd485c47
11 changed files with 101 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
View File

@@ -26,6 +26,7 @@ import com.jpexs.decompiler.flash.abc.avm2.parser.script.AbcIndexing;
import com.jpexs.decompiler.flash.abc.types.ConvertData;
import com.jpexs.decompiler.flash.abc.types.Multiname;
import com.jpexs.decompiler.flash.abc.types.Namespace;
import com.jpexs.decompiler.flash.abc.types.NamespaceSet;
import com.jpexs.decompiler.flash.abc.types.ScriptInfo;
import com.jpexs.decompiler.flash.configuration.Configuration;
import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
@@ -47,6 +48,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -402,7 +404,7 @@ public abstract class Trait implements Cloneable, Serializable {
return writer;
}
public final GraphTextWriter getModifiers(ABC abc, boolean isStatic, boolean insideInterface, GraphTextWriter writer) {
public final GraphTextWriter getModifiers(ABC abc, boolean isStatic, boolean insideInterface, GraphTextWriter writer, int classIndex) {
if ((kindFlags & ATTR_Final) > 0) {
if (!isStatic) {
writer.appendNoHilight("final ");
@@ -430,10 +432,41 @@ public abstract class Trait implements Cloneable, Serializable {
writer.appendNoHilight(identifier).appendNoHilight(" ");
}
} else if (nskind != 0) {
//Traits of private classes inside script have same namespace as the class
if (nskind == Namespace.KIND_PRIVATE) {
Set<Integer> namespaceIdsThis = new HashSet<>();
if (m.isApiVersioned(abc.constants)) {
NamespaceSet nss = m.getNamespaceSet(abc.constants);
for (int n:nss.namespaces) {
namespaceIdsThis.add(n);
}
} else {
namespaceIdsThis.add(m.namespace_index);
}
Set<Integer> namespaceIdsClass = new HashSet<>();
Multiname mc = abc.instance_info.get(classIndex).getName(abc.constants);
if (mc.isApiVersioned(abc.constants)) {
NamespaceSet nss = mc.getNamespaceSet(abc.constants);
for (int n:nss.namespaces) {
namespaceIdsClass.add(n);
}
} else {
namespaceIdsClass.add(mc.namespace_index);
}
for (int ns:namespaceIdsThis) {
if (namespaceIdsClass.contains(ns)) {
nskind = Namespace.KIND_PACKAGE_INTERNAL;
break;
}
}
}
String nsPrefix = Namespace.getPrefix(nskind);
if (nsPrefix != null && !nsPrefix.isEmpty()) {
writer.appendNoHilight(nsPrefix).appendNoHilight(" ");
}
}
}
}
if (isStatic) {

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java
View File

@@ -68,7 +68,7 @@ public class TraitFunction extends Trait implements TraitWithSlot {
if (body == null) {
writer.appendNoHilight("native ");
}
getModifiers(abc, isStatic, insideInterface, writer);
getModifiers(abc, isStatic, insideInterface, writer, classIndex);
writer.hilightSpecial("function ", HighlightSpecialType.TRAIT_TYPE);
writer.hilightSpecial(abc.constants.getMultiname(name_index).getName(abc.constants, fullyQualifiedNames, false, true), HighlightSpecialType.TRAIT_NAME);
writer.appendNoHilight("(");

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java
View File

@@ -96,7 +96,7 @@ public class TraitMethodGetterSetter extends Trait {
}
MethodBody body = abc.findBody(method_info);
getModifiers(abc, isStatic, insideInterface, writer);
getModifiers(abc, isStatic, insideInterface, writer, classIndex);
if (abc.method_info.get(method_info).flagNative()) {
writer.appendNoHilight("native ");

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java
View File

@@ -174,7 +174,7 @@ public class TraitSlotConst extends Trait implements TraitWithSlot {
}
}
if (showModifier) {
getModifiers(abc, isStatic, insideInterface, writer);
getModifiers(abc, isStatic, insideInterface, writer, classIndex);
}
if (convertData.assignedValues.containsKey(this)) {
GraphTargetItem val = convertData.assignedValues.get(this).value;