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
@@ -30,6 +30,7 @@ import com.jpexs.decompiler.flash.action.model.TemporaryRegister;
import com.jpexs.decompiler.flash.action.model.operations.PreDecrementActionItem;
import com.jpexs.decompiler.flash.action.model.operations.PreIncrementActionItem;
import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.model.LocalData;
import java.util.HashMap;
import java.util.List;
import java.util.Stack;
@@ -49,7 +50,7 @@ public class ActionSetVariable extends Action implements StoreTypeAction {
public void translate(Stack<GraphTargetItem> stack, List<GraphTargetItem> output, java.util.HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, int staticOperation, String path) {
GraphTargetItem value = stack.pop().getThroughDuplicate();
GraphTargetItem name = stack.pop();
variables.put(name.toStringNoQuotes(false, (ConstantPool) null), value);
variables.put(name.toStringNoQuotes(false, LocalData.create(null)), value);
if (value instanceof IncrementActionItem) {
GraphTargetItem obj = ((IncrementActionItem) value).object;
if (!stack.isEmpty()) {
@@ -125,6 +126,6 @@ public class ActionSetVariable extends Action implements StoreTypeAction {
if (stack.size() < 2) {
return null;
}
return stack.get(stack.size() - 2).toStringNoQuotes(false, cpool);
return stack.get(stack.size() - 2).toStringNoQuotes(false, LocalData.create(cpool));
}
}