AS3: better imports

AS3: Types with same name shown with namespace
This commit is contained in:
Jindra Pet��k
2012-12-30 19:54:09 +01:00
parent 56f083fdb8
commit 30337c38c8
254 changed files with 770 additions and 661 deletions
@@ -146,12 +146,12 @@ public class AVM2Instruction {
return s;
}
public String getParams(ConstantPool constants) {
public String getParams(ConstantPool constants, List<String> fullyQualifiedNames) {
String s = "";
for (int i = 0; i < definition.operands.length; i++) {
switch (definition.operands[i]) {
case AVM2Code.DAT_MULTINAME_INDEX:
s += " m[" + operands[i] + "]\"" + Helper.escapeString(constants.constant_multiname[operands[i]].toString(constants)) + "\"";
s += " m[" + operands[i] + "]\"" + Helper.escapeString(constants.constant_multiname[operands[i]].toString(constants, fullyQualifiedNames)) + "\"";
break;
case AVM2Code.DAT_STRING_INDEX:
s += " \"" + Helper.escapeString(constants.constant_string[operands[i]]) + "\"";
@@ -207,15 +207,15 @@ public class AVM2Instruction {
return " ;" + comment;
}
public String toString(ConstantPool constants) {
public String toString(ConstantPool constants, List<String> fullyQualifiedNames) {
String s = Helper.formatAddress(offset) + " " + Helper.padSpaceRight(Helper.byteArrToString(getBytes()), 30) + definition.instructionName;
s += getParams(constants) + getComment();
s += getParams(constants, fullyQualifiedNames) + getComment();
return s;
}
public String toStringNoAddress(ConstantPool constants) {
public String toStringNoAddress(ConstantPool constants, List<String> fullyQualifiedNames) {
String s = definition.instructionName;
s += getParams(constants) + getComment();
s += getParams(constants, fullyQualifiedNames) + getComment();
return s;
}
}