LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-15 03:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

AS3: Better imports

Browse Source 
AS3: Better interfaces
This commit is contained in:
Jindra Petk
2012-12-29 16:20:59 +01:00
parent 8909338f13
commit 1229b6c82a
5 changed files with 141 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/src/com/jpexs/asdec/Main.java
View File

@@ -495,7 +495,7 @@ public class Main {
} catch (Exception ex) {
exportOK = false;
System.err.print("FAIL: Exporting Failed on Exception - ");
System.err.println(ex.getLocalizedMessage());
Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
System.exit(1);
}
if (exportOK) {

213
trunk/src/com/jpexs/asdec/abc/ABC.java
View File

@@ -255,9 +255,9 @@ public class ABC {
bodyIdxFromMethodIdx[mb.method_info] = i;
}
loadNamespaceMap();
/*for(ScriptInfo si:script_info){
/* for(ScriptInfo si:script_info){
System.out.println("--------------------------------------------");
System.out.println(findBody(si.init_index).toString(true, false, -1, this, constants, method_info,new Stack<TreeItem>()));
System.out.println(findBody(si.init_index).toString(true, false, -1, this, constants, method_info,new Stack<TreeItem>(),false,false));
System.out.println("sitrait:"+si.traits.toString(this));
}*/
}
@@ -371,31 +371,69 @@ public class ABC {
}
}
private void parseImportFromMultiname(List imports, Multiname m, String ignorePackage) {
if (m != null) {
Namespace ns = m.getNamespace(constants);
String name = m.getName(constants);
if (ns != null) {
String newimport = ns.getName(constants);
if (newimport.equals("-")) {
newimport = "";
}
if (!newimport.equals("")) {
newimport += "." + name;
if (newimport.contains(":")) {
return;
}
if (!imports.contains(newimport)) {
String pkg = newimport.substring(0,newimport.lastIndexOf("."));
if (!pkg.equals(ignorePackage)) {
imports.add(newimport);
}
}
private void parseImportFromNS(List imports, Namespace ns, String ignorePackage, String name) {
if(name.equals("")){
name="*";
}
if(ns.kind!=Namespace.KIND_PACKAGE){
return;
}
String newimport = ns.getName(constants);
if (newimport.equals("-")) {
newimport = "";
}
if (!newimport.equals("")) {
newimport += "." + name;
if (newimport.contains(":")) {
return;
}
if (!imports.contains(newimport)) {
String pkg = newimport.substring(0, newimport.lastIndexOf("."));
if (!pkg.equals(ignorePackage)) {
imports.add(newimport);
}
}
}
}
private void parseImportFromMultiname(List imports, Multiname m, String ignorePackage) {
if (m != null) {
Namespace ns = m.getNamespace(constants);
String name = m.getName(constants);
NamespaceSet nss = m.getNamespaceSet(constants);
if (ns != null) {
parseImportFromNS(imports, ns, ignorePackage, name);
}
if (nss != null) {
for (int ni : nss.namespaces) {
parseImportFromNS(imports, constants.constant_namespace[ni], ignorePackage, name);
}
}
}
}
private void parseImportsFromMethodInfo(int method_index,List imports, String ignorePackage){
if(method_info[method_index].ret_type!=0){
parseImportFromMultiname(imports, constants.constant_multiname[method_info[method_index].ret_type], ignorePackage);
}
for(int t:method_info[method_index].param_types){
if(t!=0){
parseImportFromMultiname(imports, constants.constant_multiname[t], ignorePackage);
}
}
MethodBody body = findBody(method_index);
if (body != null) {
for (AVM2Instruction ins : body.code.code) {
for (int k = 0; k < ins.definition.operands.length; k++) {
if (ins.definition.operands[k] == AVM2Code.DAT_MULTINAME_INDEX) {
int multinameIndex = ins.operands[k];
parseImportFromMultiname(imports, constants.constant_multiname[multinameIndex], ignorePackage);
}
}
}
}
}
private List getImports(int instanceIndex) {
List<String> imports = new ArrayList<String>();
@@ -404,62 +442,28 @@ public class ABC {
//parseImportFromMultiname(imports, constants.constant_multiname[instance_info[instanceIndex].name_index]);
String packageName = instance_info[instanceIndex].getName(constants).getNamespace(constants).getName(constants);
if (instance_info[instanceIndex].super_index > 0) {
parseImportFromMultiname(imports, constants.constant_multiname[instance_info[instanceIndex].super_index],packageName);
parseImportFromMultiname(imports, constants.constant_multiname[instance_info[instanceIndex].super_index], packageName);
}
for (int i : instance_info[instanceIndex].interfaces) {
parseImportFromMultiname(imports, constants.constant_multiname[i],packageName);
parseImportFromMultiname(imports, constants.constant_multiname[i], packageName);
}
MethodBody body;
//static
for (Trait t : class_info[instanceIndex].static_traits.traits) {
//parseImportFromMultiname(imports, t.getMultiName(constants));
if (t instanceof TraitMethodGetterSetter) {
TraitMethodGetterSetter tm = (TraitMethodGetterSetter) t;
if (tm.method_info != 0) {
body = findBody(tm.method_info);
if (body != null) {
for (AVM2Instruction ins : body.code.code) {
for (int k = 0; k < ins.definition.operands.length; k++) {
if (ins.definition.operands[k] == AVM2Code.DAT_MULTINAME_INDEX) {
int multinameIndex = ins.operands[k];
parseImportFromMultiname(imports, constants.constant_multiname[multinameIndex],packageName);
}
}
}
}
for (int p = 0; p < method_info[tm.method_info].param_types.length; p++) {
if (method_info[tm.method_info].param_types[p] != 0) {
parseImportFromMultiname(imports, constants.constant_multiname[method_info[tm.method_info].param_types[p]],packageName);
}
if (method_info[tm.method_info].ret_type != 0) {
parseImportFromMultiname(imports, constants.constant_multiname[method_info[tm.method_info].ret_type],packageName);
}
}
TraitMethodGetterSetter tm = (TraitMethodGetterSetter) t;
if (tm.method_info != 0) {
parseImportsFromMethodInfo(tm.method_info,imports,packageName);
}
}
}
//static initializer
body = findBody(class_info[instanceIndex].cinit_index);
if (body != null) {
for (AVM2Instruction ins : body.code.code) {
for (int k = 0; k < ins.definition.operands.length; k++) {
if (ins.definition.operands[k] == AVM2Code.DAT_MULTINAME_INDEX) {
int multinameIndex = ins.operands[k];
parseImportFromMultiname(imports, constants.constant_multiname[multinameIndex],packageName);
}
}
}
}
parseImportsFromMethodInfo(class_info[instanceIndex].cinit_index,imports,packageName);
//instance
for (Trait t : instance_info[instanceIndex].instance_traits.traits) {
@@ -467,42 +471,13 @@ public class ABC {
if (t instanceof TraitMethodGetterSetter) {
TraitMethodGetterSetter tm = (TraitMethodGetterSetter) t;
if (tm.method_info != 0) {
body = findBody(tm.method_info);
if (body != null) {
for (AVM2Instruction ins : body.code.code) {
for (int k = 0; k < ins.definition.operands.length; k++) {
if (ins.definition.operands[k] == AVM2Code.DAT_MULTINAME_INDEX) {
int multinameIndex = ins.operands[k];
parseImportFromMultiname(imports, constants.constant_multiname[multinameIndex],packageName);
}
}
}
}
for (int p = 0; p < method_info[tm.method_info].param_types.length; p++) {
if (method_info[tm.method_info].param_types[p] != 0) {
parseImportFromMultiname(imports, constants.constant_multiname[method_info[tm.method_info].param_types[p]],packageName);
}
if (method_info[tm.method_info].ret_type != 0) {
parseImportFromMultiname(imports, constants.constant_multiname[method_info[tm.method_info].ret_type],packageName);
}
}
parseImportsFromMethodInfo(tm.method_info,imports,packageName);
}
}
}
//instance initializer
body = findBody(instance_info[instanceIndex].iinit_index);
if (body != null) {
for (AVM2Instruction ins : body.code.code) {
for (int k = 0; k < ins.definition.operands.length; k++) {
if (ins.definition.operands[k] == AVM2Code.DAT_MULTINAME_INDEX) {
int multinameIndex = ins.operands[k];
parseImportFromMultiname(imports, constants.constant_multiname[multinameIndex],packageName);
}
}
}
}
parseImportsFromMethodInfo(instance_info[instanceIndex].iinit_index,imports,packageName);
return imports;
}
@@ -736,32 +711,34 @@ public class ABC {
//constructor
//if (instance_info[i].iinit_index != 0) {
String modifier = "";
Multiname m = constants.constant_multiname[instance_info[i].name_index];
if (m != null) {
Namespace ns = m.getNamespace(constants);
if (ns != null) {
modifier = ns.getPrefix(this) + " ";
if (modifier.equals(" ")) {
modifier = "";
if (!instance_info[i].isInterface()) {
String modifier = "";
Multiname m = constants.constant_multiname[instance_info[i].name_index];
if (m != null) {
Namespace ns = m.getNamespace(constants);
if (ns != null) {
modifier = ns.getPrefix(this) + " ";
if (modifier.equals(" ")) {
modifier = "";
}
}
}
}
String constructorParams;
String constructorParams;
bodyStr = "";
bodyIndex = findBodyIndex(instance_info[i].iinit_index);
if (bodyIndex != -1) {
bodyStr = addTabs(bodies[bodyIndex].toString(pcode, false, i, this, constants, method_info, new Stack<TreeItem>(), false, highlight), 3);
constructorParams = method_info[instance_info[i].iinit_index].getParamStr(constants, bodies[bodyIndex], this);
} else {
constructorParams = method_info[instance_info[i].iinit_index].getParamStr(constants, null, this);
bodyStr = "";
bodyIndex = findBodyIndex(instance_info[i].iinit_index);
if (bodyIndex != -1) {
bodyStr = addTabs(bodies[bodyIndex].toString(pcode, false, i, this, constants, method_info, new Stack<TreeItem>(), false, highlight), 3);
constructorParams = method_info[instance_info[i].iinit_index].getParamStr(constants, bodies[bodyIndex], this);
} else {
constructorParams = method_info[instance_info[i].iinit_index].getParamStr(constants, null, this);
}
toPrint = IDENT_STRING + IDENT_STRING + modifier + "function " + constants.constant_multiname[instance_info[i].name_index].getName(constants) + "(" + constructorParams + ") {\r\n" + bodyStr + "\r\n" + IDENT_STRING + IDENT_STRING + "}";
if (highlight) {
toPrint = Highlighting.hilighTrait(toPrint, class_info[i].static_traits.traits.length + instance_info[i].instance_traits.traits.length);
}
outTraits.add(toPrint);
}
toPrint = IDENT_STRING + IDENT_STRING + modifier + "function " + constants.constant_multiname[instance_info[i].name_index].getName(constants) + "(" + constructorParams + ") {\r\n" + bodyStr + "\r\n" + IDENT_STRING + IDENT_STRING + "}";
if (highlight) {
toPrint = Highlighting.hilighTrait(toPrint, class_info[i].static_traits.traits.length + instance_info[i].instance_traits.traits.length);
}
outTraits.add(toPrint);
//}
//static variables,constants & methods
@@ -775,7 +752,7 @@ public class ABC {
if (bodyIndex != -1) {
bodyStr = addTabs(bodies[bodyIndex].toString(pcode, true, i, this, constants, method_info, new Stack<TreeItem>(), false, highlight), 3);
}
toPrint = IDENT_STRING + IDENT_STRING + tm.convert(method_info, this, true) + " {\r\n" + bodyStr + "\r\n" + IDENT_STRING + IDENT_STRING + "}";
toPrint = IDENT_STRING + IDENT_STRING + tm.convert(method_info, this, true) + (instance_info[i].isInterface() ? ";" : " {\r\n" + bodyStr + "\r\n" + IDENT_STRING + IDENT_STRING + "}");
}
if (t instanceof TraitSlotConst) {
TraitSlotConst ts = (TraitSlotConst) t;
@@ -804,7 +781,7 @@ public class ABC {
if (bodyIndex != -1) {
bodyStr = addTabs(bodies[bodyIndex].toString(pcode, false, i, this, constants, method_info, new Stack<TreeItem>(), false, highlight), 3);
}
toPrint = IDENT_STRING + IDENT_STRING + tm.convert(method_info, this, false) + " {\r\n" + bodyStr + "\r\n" + IDENT_STRING + IDENT_STRING + "}";
toPrint = IDENT_STRING + IDENT_STRING + tm.convert(method_info, this, false) + (instance_info[i].isInterface() ? ";" : " {\r\n" + bodyStr + "\r\n" + IDENT_STRING + IDENT_STRING + "}");
}
if (highlight) {
toPrint = Highlighting.hilighTrait(toPrint, class_info[i].static_traits.traits.length + ti);

35
trunk/src/com/jpexs/asdec/abc/types/InstanceInfo.java
View File

@@ -53,6 +53,20 @@ public class InstanceInfo {
if (super_index > 0) {
supIndexStr = " extends " + abc.constants.constant_multiname[super_index].getName(abc.constants);////+" flags="+flags+" protectedNS="+protectedNS+" interfaces="+Helper.intArrToString(interfaces)+" method_index="+iinit_index
}
String implStr = "";
if(interfaces.length>0){
if(isInterface()){
implStr = " extends ";
}else{
implStr = " implements ";
}
for(int i=0;i<interfaces.length;i++){
if(i>0){
implStr += ", ";
}
implStr += abc.constants.constant_multiname[interfaces[i]].getName(abc.constants);
}
}
String modifiers;
Namespace ns = abc.constants.constant_multiname[name_index].getNamespace(abc.constants);
modifiers = ns.getPrefix(abc);
@@ -60,17 +74,17 @@ public class InstanceInfo {
modifiers += " ";
}
if ((flags & CLASS_FINAL) == CLASS_FINAL) {
if (isFinal()) {
modifiers = "final ";
}
if ((flags & CLASS_SEALED) == 0) {
if (isDynamic()) {
modifiers = modifiers + "dynamic ";
}
String objType = "class ";
if ((flags & CLASS_INTERFACE) == CLASS_INTERFACE) {
if (isInterface()) {
objType = "interface ";
}
return modifiers + objType + abc.constants.constant_multiname[name_index].getName(abc.constants) + supIndexStr;
return modifiers + objType + abc.constants.constant_multiname[name_index].getName(abc.constants) + supIndexStr + implStr;
}
public String getInstanceVarsStr(ABC abc) {
@@ -80,4 +94,17 @@ public class InstanceInfo {
public Multiname getName(ConstantPool constants) {
return constants.constant_multiname[name_index];
}
public boolean isInterface(){
return ((flags & CLASS_INTERFACE) == CLASS_INTERFACE);
}
public boolean isDynamic(){
return (flags & CLASS_SEALED) == 0;
}
public boolean isFinal()
{
return (flags & CLASS_FINAL) == CLASS_FINAL;
}
}

4
trunk/src/com/jpexs/asdec/abc/types/Multiname.java
View File

@@ -228,7 +228,9 @@ public class Multiname {
public NamespaceSet getNamespaceSet(ConstantPool constants) {
if (namespace_set_index == 0) {
return null;
} else {
} else if (namespace_set_index == -1) {
return null;
}else {
return constants.constant_namespace_set[namespace_set_index];
}
}

13
trunk/src/com/jpexs/asdec/abc/types/Namespace.java
View File

@@ -21,11 +21,20 @@ import com.jpexs.asdec.abc.avm2.ConstantPool;
public class Namespace {
public static final int nameSpaceKinds[] = new int[]{8, 5, 22, 23, 24, 25, 26};
public static final int KIND_NAMESPACE=8;
public static final int KIND_PRIVATE=5;
public static final int KIND_PACKAGE=22;
public static final int KIND_PACKAGE_INTERNAL=23;
public static final int KIND_PROTECTED=24;
public static final int KIND_EXPLICIT=25;
public static final int KIND_STATIC_PROTECTED=26;
public static final int nameSpaceKinds[] = new int[]{KIND_NAMESPACE, KIND_PRIVATE, KIND_PACKAGE, KIND_PACKAGE_INTERNAL, KIND_PROTECTED, KIND_EXPLICIT, KIND_STATIC_PROTECTED};
public static final String nameSpaceKindNames[] = new String[]{"Namespace", "PrivateNamespace", "PackageNamespace", "PackageInternalNamespace", "ProtectedNamespace", "ExplicitNamespace", "StaticProtectedNamespace"};
public static final String namePrefixes[] = new String[]{"", "private", "public", "", "protected", "explicit", ""};
public int kind;
public int name_index;
public int name_index;
public Namespace(int kind, int name_index) {
this.kind = kind;