"this." prefix fixed, big fixed in remove jump

This commit is contained in:
Honfika
2013-10-13 01:34:29 +02:00
parent 0c9ea12f03
commit 19f3a99496
5 changed files with 5 additions and 7 deletions

View File

@@ -41,7 +41,7 @@ public class CallSuperAVM2Item extends AVM2Item {
@Override
public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames) {
if (!receiver.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this.")) {
if (!receiver.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this")) {
receiver.toString(writer, constants, localRegNames, fullyQualifiedNames);
hilight(".", writer);
}

View File

@@ -37,7 +37,7 @@ public class ConstructSuperAVM2Item extends AVM2Item {
@Override
public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames) {
if (!object.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this.")) {
if (!object.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this")) {
object.toString(writer, constants, localRegNames, fullyQualifiedNames);
hilight(".", writer);
}

View File

@@ -37,7 +37,7 @@ public class GetSuperAVM2Item extends AVM2Item {
@Override
public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames) {
if (!object.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this.")) {
if (!object.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this")) {
object.toString(writer, constants, localRegNames, fullyQualifiedNames);
hilight(".", writer);
}

View File

@@ -45,7 +45,7 @@ public class SetSuperAVM2Item extends AVM2Item {
@Override
public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames) {
if (!object.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this.")) {
if (!object.toString(false, constants, localRegNames, fullyQualifiedNames).equals("this")) {
object.toString(writer, constants, localRegNames, fullyQualifiedNames);
hilight(".", writer);
}

View File

@@ -466,9 +466,7 @@ public class ActionListReader {
List<Action> actionMap = new ArrayList<>(lastIdx);
for (int i = 0; i <= lastIdx; i++) {
Action a = new ActionNop();
a.setAddress(i, version);
actionMap.add(a);
actionMap.add(null);
}
for (Action a : actions) {
actionMap.set((int) a.getAddress(), a);