fixed few compilation issues

This commit is contained in:
Jindra Pet��k
2013-03-24 11:50:02 +01:00
parent 3ce5ac886e
commit da1793a6af
4 changed files with 8 additions and 4 deletions
@@ -17,6 +17,7 @@
package com.jpexs.decompiler.flash.action.swf4;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.treemodel.ConstantPool;
import com.jpexs.decompiler.flash.action.treemodel.GetVariableTreeItem;
import com.jpexs.decompiler.flash.graph.GraphTargetItem;
import com.jpexs.decompiler.flash.helpers.Highlighting;
@@ -38,7 +39,7 @@ public class ActionGetVariable extends Action {
@Override
public void translate(Stack<GraphTargetItem> stack, List<GraphTargetItem> output, java.util.HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions) {
GraphTargetItem name = stack.pop();
GraphTargetItem computedVal = variables.get(Highlighting.stripHilights(name.toStringNoQuotes(null)));
GraphTargetItem computedVal = variables.get(Highlighting.stripHilights(name.toStringNoQuotes((ConstantPool)null)));
GetVariableTreeItem gvt = new GetVariableTreeItem(this, name);
gvt.setComputedValue(computedVal);
stack.push(gvt);
@@ -17,6 +17,7 @@
package com.jpexs.decompiler.flash.action.swf4;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.treemodel.ConstantPool;
import com.jpexs.decompiler.flash.action.treemodel.SetVariableTreeItem;
import com.jpexs.decompiler.flash.graph.GraphTargetItem;
import com.jpexs.decompiler.flash.helpers.Highlighting;
@@ -40,7 +41,7 @@ public class ActionSetVariable extends Action {
GraphTargetItem value = stack.pop();
GraphTargetItem name = stack.pop();
SetVariableTreeItem svt = new SetVariableTreeItem(this, name, value);
variables.put(Highlighting.stripHilights(name.toStringNoQuotes(null)), value);
variables.put(Highlighting.stripHilights(name.toStringNoQuotes((ConstantPool)null)), value);
output.add(svt);
}
}
@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.swf5;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.treemodel.CallFunctionTreeItem;
import com.jpexs.decompiler.flash.action.treemodel.ConstantPool;
import com.jpexs.decompiler.flash.graph.GraphTargetItem;
import com.jpexs.decompiler.flash.helpers.Highlighting;
import java.util.ArrayList;
@@ -45,7 +46,7 @@ public class ActionCallFunction extends Action {
args.add(stack.pop());
}
CallFunctionTreeItem cft = new CallFunctionTreeItem(this, functionName, args);
cft.calculatedFunction = functions.get(Highlighting.stripHilights(functionName.toStringNoQuotes(null)));
cft.calculatedFunction = functions.get(Highlighting.stripHilights(functionName.toStringNoQuotes((ConstantPool)null)));
stack.push(cft);
}
}
@@ -17,6 +17,7 @@
package com.jpexs.decompiler.flash.action.swf5;
import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.treemodel.ConstantPool;
import com.jpexs.decompiler.flash.action.treemodel.DefineLocalTreeItem;
import com.jpexs.decompiler.flash.graph.GraphTargetItem;
import com.jpexs.decompiler.flash.helpers.Highlighting;
@@ -39,7 +40,7 @@ public class ActionDefineLocal extends Action {
public void translate(Stack<GraphTargetItem> stack, List<GraphTargetItem> output, java.util.HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions) {
GraphTargetItem value = stack.pop();
GraphTargetItem name = stack.pop();
variables.put(Highlighting.stripHilights(name.toStringNoQuotes(null)), value);
variables.put(Highlighting.stripHilights(name.toStringNoQuotes((ConstantPool)null)), value);
output.add(new DefineLocalTreeItem(this, name, value));
}
}