localdata fixes

This commit is contained in:
Honfika
2013-10-13 13:59:44 +02:00
parent 407598ee28
commit 7cd3f79dd1
108 changed files with 355 additions and 279 deletions
@@ -22,6 +22,7 @@ import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.SourceGenerator;
import com.jpexs.decompiler.graph.model.LocalData;
import com.jpexs.decompiler.graph.model.TernarOpItem;
import java.util.ArrayList;
import java.util.List;
@@ -46,20 +47,20 @@ public class InitObjectActionItem extends ActionItem {
}
@Override
public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) {
public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) {
hilight("{", writer);
for (int i = 0; i < values.size(); i++) {
if (i > 0) {
hilight(",", writer);
}
names.get(i).toStringNoQuotes(writer, constants); //AS1/2 do not allow quotes in name here
names.get(i).toStringNoQuotes(writer, localData); //AS1/2 do not allow quotes in name here
hilight(":", writer);
if (values.get(i) instanceof TernarOpItem) { //Ternar operator contains ":"
hilight("(", writer);
values.get(i).toString(writer, constants);
values.get(i).toString(writer, localData);
hilight(")", writer);
} else {
values.get(i).toString(writer, constants);
values.get(i).toString(writer, localData);
}
}
return hilight("}", writer);