From 7cd3f79dd1a04e378077a887bb50b19c317796f7 Mon Sep 17 00:00:00 2001 From: Honfika Date: Sun, 13 Oct 2013 13:59:44 +0200 Subject: [PATCH] localdata fixes --- trunk/build.xml | 3 ++- .../decompiler/flash/abc/avm2/AVM2Code.java | 4 ++-- .../decompiler/flash/abc/avm2/CodeStats.java | 3 ++- .../avm2/instructions/AVM2Instruction.java | 5 ++-- .../flash/abc/avm2/model/AVM2Item.java | 8 +++++-- .../avm2/model/clauses/ForEachInAVM2Item.java | 2 +- .../abc/avm2/model/clauses/ForInAVM2Item.java | 2 +- .../abc/avm2/model/clauses/TryAVM2Item.java | 6 ++--- .../flash/action/model/ActionItem.java | 11 +++------ .../action/model/AsciiToCharActionItem.java | 5 ++-- .../flash/action/model/CallActionItem.java | 5 ++-- .../action/model/CallFunctionActionItem.java | 6 ++--- .../action/model/CallMethodActionItem.java | 12 +++++----- .../flash/action/model/CastOpActionItem.java | 6 ++--- .../action/model/CharToAsciiActionItem.java | 5 ++-- .../action/model/CloneSpriteActionItem.java | 9 ++++---- .../action/model/DecrementActionItem.java | 5 ++-- .../action/model/DefineLocalActionItem.java | 7 +++--- .../model/DefineRegisterActionItem.java | 3 ++- .../flash/action/model/DeleteActionItem.java | 9 ++++---- .../action/model/DirectValueActionItem.java | 5 ++-- .../action/model/EnumerateActionItem.java | 4 ++-- .../flash/action/model/EvalActionItem.java | 5 ++-- .../flash/action/model/ExtendsActionItem.java | 6 ++--- .../action/model/FSCommand2ActionItem.java | 7 +++--- .../action/model/FSCommandActionItem.java | 3 ++- .../action/model/FunctionActionItem.java | 6 ++--- .../action/model/GetMemberActionItem.java | 11 +++++---- .../action/model/GetPropertyActionItem.java | 5 ++-- .../flash/action/model/GetTimeActionItem.java | 3 ++- .../flash/action/model/GetURL2ActionItem.java | 7 +++--- .../flash/action/model/GetURLActionItem.java | 3 ++- .../action/model/GetVariableActionItem.java | 5 ++-- .../action/model/GetVersionActionItem.java | 3 ++- .../action/model/GotoFrame2ActionItem.java | 5 ++-- .../action/model/GotoFrameActionItem.java | 3 ++- .../action/model/GotoLabelActionItem.java | 3 ++- .../action/model/ImplementsOpActionItem.java | 6 ++--- .../action/model/IncrementActionItem.java | 5 ++-- .../action/model/InitArrayActionItem.java | 5 ++-- .../action/model/InitObjectActionItem.java | 9 ++++---- .../action/model/LoadMovieActionItem.java | 7 +++--- .../action/model/LoadMovieNumActionItem.java | 7 +++--- .../action/model/LoadVariablesActionItem.java | 7 +++--- .../model/LoadVariablesNumActionItem.java | 7 +++--- .../action/model/MBAsciiToCharActionItem.java | 5 ++-- .../action/model/MBCharToAsciiActionItem.java | 5 ++-- .../model/MBStringExtractActionItem.java | 9 ++++---- .../model/MBStringLengthActionItem.java | 7 +++--- .../action/model/NewMethodActionItem.java | 13 ++++++----- .../action/model/NewObjectActionItem.java | 7 +++--- .../action/model/NextFrameActionItem.java | 3 ++- .../flash/action/model/PlayActionItem.java | 3 ++- .../flash/action/model/PopActionItem.java | 3 ++- .../action/model/PostDecrementActionItem.java | 5 ++-- .../action/model/PostIncrementActionItem.java | 5 ++-- .../action/model/PrevFrameActionItem.java | 3 ++- .../flash/action/model/PrintActionItem.java | 7 +++--- .../action/model/PrintAsBitmapActionItem.java | 7 +++--- .../model/PrintAsBitmapNumActionItem.java | 13 ++++++++--- .../action/model/PrintNumActionItem.java | 7 +++--- .../action/model/RandomNumberActionItem.java | 5 ++-- .../action/model/RemoveSpriteActionItem.java | 5 ++-- .../flash/action/model/ReturnActionItem.java | 5 ++-- .../action/model/SetMemberActionItem.java | 15 ++++++------ .../action/model/SetPropertyActionItem.java | 9 ++++---- .../action/model/SetTarget2ActionItem.java | 5 ++-- .../action/model/SetTargetActionItem.java | 3 ++- .../action/model/SetVariableActionItem.java | 11 +++++---- .../action/model/StartDragActionItem.java | 15 ++++++------ .../flash/action/model/StopActionItem.java | 3 ++- .../action/model/StopAllSoundsActionItem.java | 3 ++- .../action/model/StopDragActionItem.java | 3 ++- .../action/model/StoreRegisterActionItem.java | 7 +++--- .../action/model/StrictModeActionItem.java | 3 ++- .../action/model/StringExtractActionItem.java | 9 ++++---- .../action/model/StringLengthActionItem.java | 5 ++-- .../action/model/TargetPathActionItem.java | 5 ++-- .../flash/action/model/ThrowActionItem.java | 4 ++-- .../action/model/ToIntegerActionItem.java | 5 ++-- .../action/model/ToNumberActionItem.java | 4 ++-- .../action/model/ToStringActionItem.java | 4 ++-- .../model/ToggleHighQualityActionItem.java | 3 ++- .../flash/action/model/TraceActionItem.java | 5 ++-- .../flash/action/model/TypeOfActionItem.java | 4 ++-- .../action/model/UnLoadMovieActionItem.java | 5 ++-- .../model/UnLoadMovieNumActionItem.java | 5 ++-- .../action/model/UnsupportedActionItem.java | 3 ++- .../action/model/clauses/ClassActionItem.java | 23 ++++++++++--------- .../action/model/clauses/ForInActionItem.java | 9 ++++---- .../clauses/IfFrameLoadedActionItem.java | 6 ++--- .../model/clauses/InterfaceActionItem.java | 7 +++--- .../model/clauses/TellTargetActionItem.java | 7 +++--- .../action/model/clauses/TryActionItem.java | 13 ++++++----- .../action/model/clauses/WithActionItem.java | 3 +-- .../parser/script/ActionScriptParser.java | 5 ++-- .../flash/action/swf4/ActionGetVariable.java | 4 ++-- .../flash/action/swf4/ActionSetVariable.java | 5 ++-- .../flash/action/swf5/ActionCallFunction.java | 4 ++-- .../flash/action/swf5/ActionDefineLocal.java | 4 ++-- .../src/com/jpexs/decompiler/graph/Graph.java | 2 +- .../decompiler/graph/GraphTargetItem.java | 18 +++++---------- .../decompiler/graph/model/DoWhileItem.java | 2 +- .../jpexs/decompiler/graph/model/ForItem.java | 2 +- .../jpexs/decompiler/graph/model/IfItem.java | 4 ++-- .../decompiler/graph/model/SwitchItem.java | 4 ++-- .../graph/model/UniversalLoopItem.java | 2 +- .../decompiler/graph/model/WhileItem.java | 2 +- 108 files changed, 355 insertions(+), 279 deletions(-) diff --git a/trunk/build.xml b/trunk/build.xml index 877c0ad0f..7cd5b881f 100644 --- a/trunk/build.xml +++ b/trunk/build.xml @@ -47,7 +47,8 @@ - + + diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java index 25d0654a8..d1d1fbc61 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java @@ -707,12 +707,12 @@ public class AVM2Code implements Serializable { return s.toString(); } - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { int i = 0; for (AVM2Instruction instruction : code) { writer.appendNoHilight(Helper.formatAddress(i)); writer.appendNoHilight(" "); - instruction.toString(writer, constants, new ArrayList()).appendNewLine(); + instruction.toString(writer, localData).appendNewLine(); i++; } return writer; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/CodeStats.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/CodeStats.java index a8860a804..0a65f6a1b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/CodeStats.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/CodeStats.java @@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.abc.avm2; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.List; /** @@ -42,7 +43,7 @@ public class CodeStats { if (stats.stackpos > ms) { ms = stats.stackpos; } - writer.appendNoHilight(i + ":" + stats.stackpos + (deltastack >= 0 ? "+" + deltastack : deltastack) + "," + stats.scopepos + " " + stats.ins.toString(writer, abc.constants, fullyQualifiedNames)).appendNewLine(); + writer.appendNoHilight(i + ":" + stats.stackpos + (deltastack >= 0 ? "+" + deltastack : deltastack) + "," + stats.scopepos + " " + stats.ins.toString(writer, LocalData.create(abc.constants, null, fullyQualifiedNames))).appendNewLine(); i++; } return writer; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java index 13bf3965e..1212a55ee 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java @@ -31,6 +31,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSource; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LocalData; import com.jpexs.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -264,9 +265,9 @@ public class AVM2Instruction implements Serializable, GraphSourceItem { return ignored; } - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants, List fullyQualifiedNames) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { writer.appendNoHilight(Helper.formatAddress(offset) + " " + Helper.padSpaceRight(Helper.byteArrToString(getBytes()), 30) + definition.instructionName); - writer.appendNoHilight(getParams(constants, fullyQualifiedNames) + getComment()); + writer.appendNoHilight(getParams(localData.constantsAvm2, localData.fullyQualifiedNames) + getComment()); return writer; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java index 5300f3554..b1f726942 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java @@ -41,8 +41,12 @@ public abstract class AVM2Item extends GraphTargetItem { return writer.toString(); } - public String toStringSemicoloned(HilightedTextWriter writer, LocalData localData) { - return toString(writer, localData) + (needsSemicolon() ? ";" : ""); + public HilightedTextWriter toStringSemicoloned(HilightedTextWriter writer, LocalData localData) { + toString(writer, localData); + if (needsSemicolon()) { + hilight(";", writer); + }; + return writer; } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java index f5c7a280b..0d29c282a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java @@ -79,7 +79,7 @@ public class ForEachInAVM2Item extends LoopItem implements Block { hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData.constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java index db918a03d..775cd56c9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java @@ -79,7 +79,7 @@ public class ForInAVM2Item extends LoopItem implements Block { hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData.constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java index 5ee1d6061..3d1c62bd8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java @@ -58,7 +58,7 @@ public class TryAVM2Item extends AVM2Item implements Block { hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (GraphTargetItem ti : tryCommands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData.constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); @@ -72,7 +72,7 @@ public class TryAVM2Item extends AVM2Item implements Block { List commands = catchCommands.get(e); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData.constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); @@ -85,7 +85,7 @@ public class TryAVM2Item extends AVM2Item implements Block { hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (GraphTargetItem ti : finallyCommands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData.constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ActionItem.java index 0d3bc1029..27a31cb36 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ActionItem.java @@ -37,7 +37,7 @@ public abstract class ActionItem extends GraphTargetItem implements Serializable super(instruction, precedence); } - public abstract HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants); + public abstract HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData); protected boolean isEmptyString(GraphTargetItem target) { if (target instanceof DirectValueActionItem) { @@ -51,7 +51,7 @@ public abstract class ActionItem extends GraphTargetItem implements Serializable return false; } - protected HilightedTextWriter stripQuotes(GraphTargetItem target, ConstantPool constants, HilightedTextWriter writer) { + protected HilightedTextWriter stripQuotes(GraphTargetItem target, LocalData localData, HilightedTextWriter writer) { if (target instanceof DirectValueActionItem) { if (((DirectValueActionItem) target).value instanceof String) { return ((DirectValueActionItem) target).hilight((String) ((DirectValueActionItem) target).value, writer); @@ -60,15 +60,10 @@ public abstract class ActionItem extends GraphTargetItem implements Serializable if (target == null) { return writer; } else { - return target.toString(writer, constants); + return target.toString(writer, localData); } } - @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { - return toString(writer, localData.constants); - } - protected List toSourceCall(List localData, SourceGenerator gen, List list) { List ret = new ArrayList<>(); for (int i = 0; i < list.size(); i++) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java index 800a872a1..4f1eb0808 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java @@ -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 java.util.List; public class AsciiToCharActionItem extends ActionItem { @@ -32,9 +33,9 @@ public class AsciiToCharActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("chr(", writer); - value.toString(writer, constants); + value.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java index 1cc224881..88a9a8061 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java @@ -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 java.util.List; public class CallActionItem extends ActionItem { @@ -32,9 +33,9 @@ public class CallActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("call(", writer); - stripQuotes(value, constants, writer); + stripQuotes(value, localData, writer); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java index cee4d0647..a6b8dccb6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java @@ -43,15 +43,15 @@ public class CallFunctionActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { String paramStr = ""; - stripQuotes(functionName, constants, writer); + stripQuotes(functionName, localData, writer); hilight("(", writer); for (int t = 0; t < arguments.size(); t++) { if (t > 0) { hilight(",", writer); } - arguments.get(t).toStringNL(writer, LocalData.create(constants)); + arguments.get(t).toStringNL(writer, localData); } return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java index 0a250d68c..e168315af 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java @@ -49,7 +49,7 @@ public class CallMethodActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { boolean blankMethod = false; if (methodName instanceof DirectValueActionItem) { if (((DirectValueActionItem) methodName).value instanceof Undefined) { @@ -64,15 +64,15 @@ public class CallMethodActionItem extends ActionItem { if (!blankMethod) { if (scriptObject.precedence > this.precedence) { hilight("(", writer); - scriptObject.toString(writer, constants); + scriptObject.toString(writer, localData); hilight(")", writer); } else { - scriptObject.toString(writer, constants); + scriptObject.toString(writer, localData); } hilight(".", writer); - stripQuotes(methodName, constants, writer); + stripQuotes(methodName, localData, writer); } else { - scriptObject.toString(writer, constants); + scriptObject.toString(writer, localData); } hilight("(", writer); @@ -80,7 +80,7 @@ public class CallMethodActionItem extends ActionItem { if (t > 0) { hilight(",", writer); } - arguments.get(t).toStringNL(writer, LocalData.create(constants)); + arguments.get(t).toStringNL(writer, localData); } return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java index 9112eb024..c46c71930 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java @@ -46,11 +46,11 @@ public class CastOpActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("(", writer); - stripQuotes(constructor, constants, writer); + stripQuotes(constructor, localData, writer); hilight(")", writer); - return object.toString(writer, LocalData.create(constants)); + return object.toString(writer, localData); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java index 3c936507f..f186f1bbc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java @@ -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 java.util.List; public class CharToAsciiActionItem extends ActionItem { @@ -32,9 +33,9 @@ public class CharToAsciiActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("ord(", writer); - value.toString(writer, constants); + value.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java index 701e91f62..3c36fdc50 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java @@ -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 java.util.ArrayList; import java.util.List; @@ -48,13 +49,13 @@ public class CloneSpriteActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("duplicateMovieClip(", writer); - target.toString(writer, constants); + target.toString(writer, localData); hilight(",", writer); - source.toString(writer, constants); + source.toString(writer, localData); hilight(",", writer); - depth.toString(writer, constants); + depth.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/DecrementActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/DecrementActionItem.java index c352ceaee..062bad8e4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DecrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DecrementActionItem.java @@ -23,6 +23,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 java.util.ArrayList; import java.util.List; @@ -43,8 +44,8 @@ public class DecrementActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { - object.toString(writer, constants); + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + object.toString(writer, localData); return hilight(" - 1", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/DefineLocalActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/DefineLocalActionItem.java index fa2b9555f..a32248cb9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DefineLocalActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DefineLocalActionItem.java @@ -23,6 +23,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 java.util.ArrayList; import java.util.List; @@ -69,14 +70,14 @@ public class DefineLocalActionItem extends ActionItem implements SetTypeActionIt } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("var ", writer); - stripQuotes(name, constants, writer); + stripQuotes(name, localData, writer); if (value == null) { return writer; } hilight(" = ", writer); - return value.toString(writer, constants); + return value.toString(writer, localData); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/DefineRegisterActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/DefineRegisterActionItem.java index 052aa591a..fc7db8d94 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DefineRegisterActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DefineRegisterActionItem.java @@ -17,6 +17,7 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; +import com.jpexs.decompiler.graph.model.LocalData; /** * @@ -34,7 +35,7 @@ public class DefineRegisterActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { return hilight("var " + identifier, writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/DeleteActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/DeleteActionItem.java index e18b6eea8..3d9027507 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DeleteActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DeleteActionItem.java @@ -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 java.util.ArrayList; import java.util.List; @@ -45,14 +46,14 @@ public class DeleteActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("delete ", writer); if (object == null) { - return propertyName.toString(writer, constants); + return propertyName.toString(writer, localData); } - object.toString(writer, constants); + object.toString(writer, localData); hilight(".", writer); - return stripQuotes(propertyName, constants, writer); + return stripQuotes(propertyName, localData, writer); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java index 16a3b946a..a732b2f90 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java @@ -25,6 +25,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import com.jpexs.helpers.Helper; import java.util.ArrayList; import java.util.List; @@ -86,7 +87,7 @@ public class DirectValueActionItem extends ActionItem { } @Override - public HilightedTextWriter toStringNoQuotes(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toStringNoQuotes(HilightedTextWriter writer, LocalData localData) { if (value instanceof Double) { if (Double.compare((double) (Double) value, 0) == 0) { return hilight("0", writer); @@ -127,7 +128,7 @@ public class DirectValueActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { if (value instanceof Double) { if (Double.compare((double) (Double) value, 0) == 0) { return hilight("0", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java index 5b2950541..f14a3f275 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java @@ -41,9 +41,9 @@ public class EnumerateActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("enumerate ", writer); - return object.toString(writer, LocalData.create(constants)); + return object.toString(writer, localData); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java index 7c61eaad3..13d1c688e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java @@ -21,6 +21,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.List; /** @@ -35,9 +36,9 @@ public class EvalActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("eval(", writer); - value.toString(writer, constants); + value.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ExtendsActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ExtendsActionItem.java index a8416f4c3..f71236d31 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ExtendsActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ExtendsActionItem.java @@ -35,10 +35,10 @@ public class ExtendsActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { - subclass.toString(writer, LocalData.create(constants)); + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + subclass.toString(writer, localData); hilight(" extends ", writer); - return stripQuotes(superclass, constants, writer); + return stripQuotes(superclass, localData, writer); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java index 032b3ceec..30b12fd69 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java @@ -23,6 +23,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 java.util.ArrayList; import java.util.List; @@ -47,12 +48,12 @@ public class FSCommand2ActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("FSCommand2(", writer); - command.toString(writer, constants); + command.toString(writer, localData); for (int t = 0; t < arguments.size(); t++) { hilight(",", writer); - arguments.get(t).toString(writer, constants); + arguments.get(t).toString(writer, localData); } return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java index 5b4ed7984..c8018e4cd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java @@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.action.swf3.ActionGetURL; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import com.jpexs.helpers.Helper; import java.util.List; @@ -37,7 +38,7 @@ public class FSCommandActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("fscommand(\"", writer); hilight(Helper.escapeString(command), writer); return hilight("\")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java index 4adbfba0d..e569d179b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java @@ -73,14 +73,14 @@ public class FunctionActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { if (true) { //return writer.appendNoHilight("") } hilight("function", writer); if (calculatedFunctionName != null) { hilight(" ", writer); - calculatedFunctionName.toStringNoQuotes(writer, constants); + calculatedFunctionName.toStringNoQuotes(writer, localData); } else if (!functionName.equals("")) { hilight(" ", writer); hilight(functionName, writer); @@ -99,7 +99,7 @@ public class FunctionActionItem extends ActionItem { hilight(")", writer).appendNewLine(); hilight("{", writer).appendNewLine(); hilight(Graph.INDENTOPEN, writer).appendNewLine(); - writer.appendNoHilight(Graph.graphToString(actions, writer.getIsHighlighted(), false, LocalData.create(constants))); + writer.appendNoHilight(Graph.graphToString(actions, writer.getIsHighlighted(), false, localData)); hilight(Graph.INDENTCLOSE, writer).appendNewLine(); return hilight("}", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetMemberActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetMemberActionItem.java index c88003b82..6911b1a26 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetMemberActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetMemberActionItem.java @@ -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 java.util.ArrayList; import java.util.List; @@ -44,17 +45,17 @@ public class GetMemberActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { if (!((memberName instanceof DirectValueActionItem) && (((DirectValueActionItem) memberName).value instanceof String))) { //if(!(functionName instanceof GetVariableActionItem)) - object.toString(writer, constants); + object.toString(writer, localData); hilight("[", writer); - stripQuotes(memberName, constants, writer); + stripQuotes(memberName, localData, writer); return hilight("]", writer); } - object.toString(writer, constants); + object.toString(writer, localData); hilight(".", writer); - return stripQuotes(memberName, constants, writer); + return stripQuotes(memberName, localData, writer); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java index 3e9d106cd..cb517d363 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java @@ -24,6 +24,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 java.util.ArrayList; import java.util.List; @@ -46,11 +47,11 @@ public class GetPropertyActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { if (isEmptyString(target)) { return hilight(Action.propertyNames[propertyIndex], writer); } - target.toString(writer, constants); + target.toString(writer, localData); return hilight("." + Action.propertyNames[propertyIndex], writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java index afbabce10..48ac1dfb5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java @@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.action.swf4.ActionGetTime; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.List; import java.util.Random; @@ -30,7 +31,7 @@ public class GetTimeActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { return hilight("getTimer()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java index c70645303..9161ef04c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java @@ -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 java.util.ArrayList; import java.util.List; @@ -40,7 +41,7 @@ public class GetURL2ActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { String methodStr = ""; if (sendVarsMethod == 1) { methodStr = ",\"GET\""; @@ -50,9 +51,9 @@ public class GetURL2ActionItem extends ActionItem { } hilight("getURL(", writer); - urlString.toString(writer, constants); + urlString.toString(writer, localData); hilight(",", writer); - targetString.toString(writer, constants); + targetString.toString(writer, localData); return hilight(methodStr + ")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java index d43219c3d..1c2870649 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java @@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.action.swf3.ActionGetURL; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import com.jpexs.helpers.Helper; import java.util.List; @@ -29,7 +30,7 @@ public class GetURLActionItem extends ActionItem { public String targetString; @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("getUrl(\"", writer); hilight(Helper.escapeString(urlString) + "\", \"" + Helper.escapeString(targetString), writer); return hilight("\")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java index a3855d525..db7ca8303 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java @@ -23,6 +23,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 java.util.ArrayList; import java.util.List; @@ -47,8 +48,8 @@ public class GetVariableActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { - return stripQuotes(name, constants, writer); + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + return stripQuotes(name, localData, writer); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java index 83854d92c..7e67a449c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java @@ -21,6 +21,7 @@ import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.List; /** @@ -34,7 +35,7 @@ public class GetVersionActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { return hilight("getVersion()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java index d956f249a..d40b95894 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java @@ -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 java.util.ArrayList; import java.util.List; @@ -48,13 +49,13 @@ public class GotoFrame2ActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { String prefix = "gotoAndStop"; if (playFlag) { prefix = "gotoAndPlay"; } hilight(prefix + "(", writer); - frame.toString(writer, constants); + frame.toString(writer, localData); hilight((sceneBiasFlag ? "," + sceneBias : ""), writer); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java index 89447697b..a630ab936 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java @@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.action.swf3.ActionGotoFrame; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.List; public class GotoFrameActionItem extends ActionItem { @@ -32,7 +33,7 @@ public class GotoFrameActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("gotoAndStop(", writer); hilight("" + (frame + 1), writer); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java index f1e1724e2..8b3bd5e2c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java @@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.action.swf3.ActionGoToLabel; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import com.jpexs.helpers.Helper; import java.util.List; @@ -33,7 +34,7 @@ public class GotoLabelActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("gotoAndStop(\"", writer); hilight(Helper.escapeString(label), writer); return hilight("\")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ImplementsOpActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ImplementsOpActionItem.java index 6cd0a09dd..4b89af851 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ImplementsOpActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ImplementsOpActionItem.java @@ -35,14 +35,14 @@ public class ImplementsOpActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { - subclass.toString(writer, LocalData.create(constants)); + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + subclass.toString(writer, localData); hilight(" implements ", writer); for (int i = 0; i < superclasses.size(); i++) { if (i > 0) { hilight(",", writer); } - superclasses.get(i).toString(writer, LocalData.create(constants)); + superclasses.get(i).toString(writer, localData); } return writer; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/IncrementActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/IncrementActionItem.java index f839daf86..81def81f7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/IncrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/IncrementActionItem.java @@ -23,6 +23,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 java.util.ArrayList; import java.util.List; @@ -43,8 +44,8 @@ public class IncrementActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { - object.toString(writer, constants); + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + object.toString(writer, localData); return hilight(" + 1", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/InitArrayActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/InitArrayActionItem.java index 10df4d237..84cc1b6f2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/InitArrayActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/InitArrayActionItem.java @@ -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 java.util.ArrayList; import java.util.List; @@ -42,13 +43,13 @@ public class InitArrayActionItem 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); } - values.get(i).toString(writer, constants); + values.get(i).toString(writer, localData); } return hilight("]", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/InitObjectActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/InitObjectActionItem.java index 4139272b0..32ef99f13 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/InitObjectActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/InitObjectActionItem.java @@ -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); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java index 471be181d..44661d60f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java @@ -21,6 +21,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.List; @@ -50,7 +51,7 @@ public class LoadMovieActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { String methodStr = ""; if (method == 1) { methodStr = ",\"GET\""; @@ -59,9 +60,9 @@ public class LoadMovieActionItem extends ActionItem { methodStr = ",\"POST\""; } hilight("loadMovie(", writer); - urlString.toString(writer, constants); + urlString.toString(writer, localData); hilight(",", writer); - targetString.toString(writer, constants); + targetString.toString(writer, localData); return hilight(methodStr + ")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java index 3c6f7979b..762aaf8af 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java @@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.List; @@ -52,7 +53,7 @@ public class LoadMovieNumActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { String methodStr = ""; if (method == 1) { methodStr = ",\"GET\""; @@ -61,9 +62,9 @@ public class LoadMovieNumActionItem extends ActionItem { methodStr = ",\"POST\""; } hilight("loadMovieNum(", writer); - urlString.toString(writer, constants); + urlString.toString(writer, localData); hilight(",", writer); - num.toString(writer, constants); + num.toString(writer, localData); return hilight(methodStr + ")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java index 591cbb45c..1a4afd8a8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java @@ -21,6 +21,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.List; @@ -50,7 +51,7 @@ public class LoadVariablesActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { String methodStr = ""; if (method == 1) { methodStr = ",\"GET\""; @@ -59,9 +60,9 @@ public class LoadVariablesActionItem extends ActionItem { methodStr = ",\"POST\""; } hilight("loadVariables(", writer); - urlString.toString(writer, constants); + urlString.toString(writer, localData); hilight(",", writer); - targetString.toString(writer, constants); + targetString.toString(writer, localData); return hilight(methodStr + ")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java index d5c7b5976..b8c28f33b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java @@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.List; @@ -52,7 +53,7 @@ public class LoadVariablesNumActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { String methodStr = ""; if (method == 1) { methodStr = ",\"GET\""; @@ -61,9 +62,9 @@ public class LoadVariablesNumActionItem extends ActionItem { methodStr = ",\"POST\""; } hilight("loadVariablesNum(", writer); - urlString.toString(writer, constants); + urlString.toString(writer, localData); hilight(",", writer); - num.toString(writer, constants); + num.toString(writer, localData); return hilight(methodStr + ")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java index 8437365f4..2b5afc70a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java @@ -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 java.util.List; public class MBAsciiToCharActionItem extends ActionItem { @@ -32,9 +33,9 @@ public class MBAsciiToCharActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("mbchr(", writer); - value.toString(writer, constants); + value.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java index dd90e3f07..5d6e46a29 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java @@ -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 java.util.List; public class MBCharToAsciiActionItem extends ActionItem { @@ -32,9 +33,9 @@ public class MBCharToAsciiActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("mbord(", writer); - value.toString(writer, constants); + value.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java index 632f1849c..4f7f9e402 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java @@ -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 java.util.ArrayList; import java.util.List; @@ -48,13 +49,13 @@ public class MBStringExtractActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("mbsubstring(", writer); - value.toString(writer, constants); + value.toString(writer, localData); hilight(",", writer); - index.toString(writer, constants); + index.toString(writer, localData); hilight(",", writer); - count.toString(writer, constants); + count.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java index fe7468db1..ff1e7fb38 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java @@ -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 java.util.List; public class MBStringLengthActionItem extends ActionItem { @@ -33,14 +34,14 @@ public class MBStringLengthActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("mblength(", writer); if (value.precedence > precedence) { hilight("(", writer); - value.toString(writer, constants); + value.toString(writer, localData); hilight(")", writer); } else { - value.toString(writer, constants); + value.toString(writer, localData); } return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java index cab3a5058..5d3bf3193 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java @@ -23,6 +23,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 java.util.ArrayList; import java.util.List; @@ -48,7 +49,7 @@ public class NewMethodActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { boolean blankMethod = false; if (methodName instanceof DirectValueActionItem) { if (((DirectValueActionItem) methodName).value instanceof Undefined) { @@ -62,18 +63,18 @@ public class NewMethodActionItem extends ActionItem { if (!blankMethod) { hilight("new ", writer); } - scriptObject.toString(writer, constants); + scriptObject.toString(writer, localData); if (!blankMethod) { hilight(".", writer); if (methodName instanceof DirectValueActionItem) { if (((DirectValueActionItem) methodName).value instanceof Undefined) { } else if (((DirectValueActionItem) methodName).value instanceof String) { - ((DirectValueActionItem) methodName).toStringNoQuotes(writer, constants); + ((DirectValueActionItem) methodName).toStringNoQuotes(writer, localData); } else { - methodName.toString(writer, constants); + methodName.toString(writer, localData); } } else { - methodName.toString(writer, constants); + methodName.toString(writer, localData); } } hilight("(", writer); @@ -81,7 +82,7 @@ public class NewMethodActionItem extends ActionItem { if (t > 0) { hilight(",", writer); } - arguments.get(t).toString(writer, constants); + arguments.get(t).toString(writer, localData); } return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java index fd315652b..b669370ea 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java @@ -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 java.util.ArrayList; import java.util.List; @@ -45,15 +46,15 @@ public class NewObjectActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("new ", writer); - stripQuotes(objectName, constants, writer); + stripQuotes(objectName, localData, writer); hilight("(", writer); for (int t = 0; t < arguments.size(); t++) { if (t > 0) { hilight(",", writer); } - arguments.get(t).toString(writer, constants); + arguments.get(t).toString(writer, localData); } return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java index 08afc6dfc..94c13fce9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java @@ -20,12 +20,13 @@ import com.jpexs.decompiler.flash.action.swf3.ActionNextFrame; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.List; public class NextFrameActionItem extends ActionItem { @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { return hilight("nextFrame()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java index 1ec03ef2c..229ae828c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java @@ -20,12 +20,13 @@ import com.jpexs.decompiler.flash.action.swf3.ActionPlay; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.List; public class PlayActionItem extends ActionItem { @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { return hilight("play()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PopActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PopActionItem.java index 6014f016e..5eff5e3d9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PopActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PopActionItem.java @@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.action.swf4.ActionPop; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.List; /** @@ -33,7 +34,7 @@ public class PopActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { return writer; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java index a35f2a0e5..f255170e7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java @@ -29,6 +29,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.List; @@ -50,8 +51,8 @@ public class PostDecrementActionItem extends ActionItem implements SetTypeAction } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { - object.toString(writer, constants); + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + object.toString(writer, localData); return hilight("--", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java index 0e7993a0f..591798f47 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java @@ -29,6 +29,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.List; @@ -50,8 +51,8 @@ public class PostIncrementActionItem extends ActionItem implements SetTypeAction } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { - object.toString(writer, constants); + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + object.toString(writer, localData); return hilight("++", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java index 4b4dc691c..c2806a671 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java @@ -20,12 +20,13 @@ import com.jpexs.decompiler.flash.action.swf3.ActionPrevFrame; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.List; public class PrevFrameActionItem extends ActionItem { @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { return hilight("prevFrame()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java index c9a4b21ff..325395d30 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java @@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.List; @@ -50,11 +51,11 @@ public class PrintActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("print(", writer); - target.toString(writer, constants); + target.toString(writer, localData); hilight(",", writer); - boundingBox.toString(writer, constants); + boundingBox.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java index ac24eb05c..4aea4e215 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java @@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.List; @@ -50,11 +51,11 @@ public class PrintAsBitmapActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("printAsBitmap(", writer); - target.toString(writer, constants); + target.toString(writer, localData); hilight(",", writer); - boundingBox.toString(writer, constants); + boundingBox.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java index cbf8ac6fb..0a012b27c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java @@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.List; @@ -49,12 +50,18 @@ public class PrintAsBitmapNumActionItem extends ActionItem { this.boundingBox = boundingBox; } + /** + * + * @param writer + * @param localData + * @return + */ @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("printAsBitmapNum(", writer); - num.toString(writer, constants); + num.toString(writer, localData); hilight(",", writer); - boundingBox.toString(writer, constants); + boundingBox.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java index 6a2be5a10..c8334a8b3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java @@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.List; @@ -50,11 +51,11 @@ public class PrintNumActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("printNum(", writer); - num.toString(writer, constants); + num.toString(writer, localData); hilight(",", writer); - boundingBox.toString(writer, constants); + boundingBox.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java index e0a7b624f..5ae5e6e02 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java @@ -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 java.util.List; public class RandomNumberActionItem extends ActionItem { @@ -32,9 +33,9 @@ public class RandomNumberActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("random(", writer); - value.toString(writer, constants); + value.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java index bacd882b7..52b07b3b9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java @@ -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 java.util.List; public class RemoveSpriteActionItem extends ActionItem { @@ -32,9 +33,9 @@ public class RemoveSpriteActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("removeMovieClip(", writer); - value.toString(writer, constants); + value.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ReturnActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ReturnActionItem.java index ae84a23e0..23fe26456 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ReturnActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ReturnActionItem.java @@ -32,6 +32,7 @@ import com.jpexs.decompiler.graph.GraphSourceItemPos; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.graph.model.ExitItem; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.List; @@ -44,9 +45,9 @@ public class ReturnActionItem extends ActionItem implements ExitItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("return ", writer); - return value.toString(writer, constants); + return value.toString(writer, localData); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/SetMemberActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetMemberActionItem.java index 4c44e585c..ec9a646ab 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetMemberActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetMemberActionItem.java @@ -27,6 +27,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 java.util.ArrayList; import java.util.List; @@ -78,21 +79,21 @@ public class SetMemberActionItem extends ActionItem implements SetTypeActionItem } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { if (!((objectName instanceof DirectValueActionItem) && (((DirectValueActionItem) objectName).value instanceof String))) { //if(!(functionName instanceof GetVariableActionItem)) - object.toString(writer, constants); + object.toString(writer, localData); hilight("[", writer); - stripQuotes(objectName, constants, writer); + stripQuotes(objectName, localData, writer); hilight("]", writer); hilight(" = ", writer); - return value.toString(writer, constants); + return value.toString(writer, localData); } - object.toString(writer, constants); + object.toString(writer, localData); hilight(".", writer); - stripQuotes(objectName, constants, writer); + stripQuotes(objectName, localData, writer); hilight(" = ", writer); - return value.toString(writer, constants); + return value.toString(writer, localData); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java index b630b336b..e2a244b5e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java @@ -28,6 +28,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 java.util.List; public class SetPropertyActionItem extends ActionItem implements SetTypeActionItem { @@ -70,14 +71,14 @@ public class SetPropertyActionItem extends ActionItem implements SetTypeActionIt } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { if (isEmptyString(target)) { hilight(Action.propertyNames[propertyIndex] + " = ", writer); - return value.toString(writer, constants); + return value.toString(writer, localData); } - target.toString(writer, constants); + target.toString(writer, localData); hilight("." + Action.propertyNames[propertyIndex] + " = ", writer); - return value.toString(writer, constants); + return value.toString(writer, localData); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java index 0ae8557a2..2ace40c6b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java @@ -21,6 +21,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 java.util.List; public class SetTarget2ActionItem extends ActionItem { @@ -33,9 +34,9 @@ public class SetTarget2ActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("tellTarget(", writer); - target.toString(writer, constants); + target.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/SetTargetActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTargetActionItem.java index 63af70289..3b30b9bf8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetTargetActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTargetActionItem.java @@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import com.jpexs.helpers.Helper; import java.util.List; @@ -32,7 +33,7 @@ public class SetTargetActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("tellTarget(\"", writer); hilight(Helper.escapeString(target), writer); return hilight("\")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java index 90dd1f37d..41aa221b3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java @@ -27,6 +27,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 java.util.List; public class SetVariableActionItem extends ActionItem implements SetTypeActionItem { @@ -67,16 +68,16 @@ public class SetVariableActionItem extends ActionItem implements SetTypeActionIt } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { if (name instanceof DirectValueActionItem || name instanceof GetVariableActionItem) { - stripQuotes(name, constants, writer); + stripQuotes(name, localData, writer); hilight(" = ", writer); - return value.toString(writer, constants); + return value.toString(writer, localData); } else { hilight("set(", writer); - name.toString(writer, constants); + name.toString(writer, localData); hilight(",", writer); - value.toString(writer, constants); + value.toString(writer, localData); return hilight(")", writer); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java index e0971649c..de03b7d66 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java @@ -23,6 +23,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 java.util.List; public class StartDragActionItem extends ActionItem { @@ -47,7 +48,7 @@ public class StartDragActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { boolean hasConstrains = true; if (constrain instanceof DirectValueActionItem) { if (Double.compare(EcmaScript.toNumber(constrain.getResult()), 0) == 0) { @@ -55,18 +56,18 @@ public class StartDragActionItem extends ActionItem { } } hilight("startDrag(", writer); - target.toString(writer, constants); + target.toString(writer, localData); hilight(",", writer); - lockCenter.toString(writer, constants); + lockCenter.toString(writer, localData); if (hasConstrains) { hilight(",", writer); - x1.toString(writer, constants); + x1.toString(writer, localData); hilight(",", writer); - y1.toString(writer, constants); + y1.toString(writer, localData); hilight(",", writer); - x2.toString(writer, constants); + x2.toString(writer, localData); hilight(",", writer); - y2.toString(writer, constants); + y2.toString(writer, localData); } return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java index 8e664e436..be04d4f94 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java @@ -20,12 +20,13 @@ import com.jpexs.decompiler.flash.action.swf3.ActionStop; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.List; public class StopActionItem extends ActionItem { @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { return hilight("stop()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java index 20bdf8421..0de087f66 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java @@ -20,12 +20,13 @@ import com.jpexs.decompiler.flash.action.swf3.ActionStopSounds; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.List; public class StopAllSoundsActionItem extends ActionItem { @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { return hilight("stopAllSounds()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java index ae0e58606..4008f654a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java @@ -20,12 +20,13 @@ import com.jpexs.decompiler.flash.action.swf4.ActionEndDrag; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.List; public class StopDragActionItem extends ActionItem { @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { return hilight("stopDrag()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StoreRegisterActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StoreRegisterActionItem.java index 15fb538c2..79db9db74 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StoreRegisterActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StoreRegisterActionItem.java @@ -24,6 +24,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 java.util.List; public class StoreRegisterActionItem extends ActionItem implements SetTypeActionItem { @@ -67,15 +68,15 @@ public class StoreRegisterActionItem extends ActionItem implements SetTypeAction } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { if (temporary) { - value.toString(writer, constants); + value.toString(writer, localData); } else { if (define) { hilight("var ", writer); } hilight(register.translate() + " = ", writer); - value.toString(writer, constants); + value.toString(writer, localData); } return writer; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java index 4172fe601..a6ccc5b43 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java @@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.model.LocalData; public class StrictModeActionItem extends ActionItem { @@ -29,7 +30,7 @@ public class StrictModeActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { return hilight("StrictMode(" + mode + ");", writer); //I still don't know how AS source of Strict Mode instruction looks like, assuming this... } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java index e1dee8a6f..bf97d4790 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java @@ -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 java.util.List; public class StringExtractActionItem extends ActionItem { @@ -38,12 +39,12 @@ public class StringExtractActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { - value.toString(writer, constants); + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + value.toString(writer, localData); hilight(".substr(", writer); - index.toString(writer, constants); + index.toString(writer, localData); hilight(",", writer); - count.toString(writer, constants); + count.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java index 5c7acffcb..3f3c09d3e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java @@ -21,6 +21,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.List; public class StringLengthActionItem extends ActionItem { @@ -32,9 +33,9 @@ public class StringLengthActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("length(", writer); - value.toString(writer, constants); + value.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java index d740eb974..e8260b488 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java @@ -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 java.util.List; public class TargetPathActionItem extends ActionItem { @@ -32,9 +33,9 @@ public class TargetPathActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("targetPath(", writer); - value.toString(writer, constants); + value.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java index b49f0a827..db11f5ddf 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java @@ -33,9 +33,9 @@ public class ThrowActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("throw ", writer); - return value.toString(writer, LocalData.create(constants)); + return value.toString(writer, localData); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java index 0ab7fc49f..bf4613848 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java @@ -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 java.util.List; public class ToIntegerActionItem extends ActionItem { @@ -32,9 +33,9 @@ public class ToIntegerActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("int(", writer); - value.toString(writer, constants); + value.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java index d41788dbe..2d582ab2f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java @@ -33,9 +33,9 @@ public class ToNumberActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("Number(", writer); - value.toString(writer, LocalData.create(constants)); + value.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java index 7c4c6a841..6e158c6b9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java @@ -33,9 +33,9 @@ public class ToStringActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("String(", writer); - value.toString(writer, LocalData.create(constants)); + value.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java index d56a6def6..a34f63d92 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java @@ -20,12 +20,13 @@ import com.jpexs.decompiler.flash.action.swf3.ActionToggleQuality; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.List; public class ToggleHighQualityActionItem extends ActionItem { @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { return hilight("toggleHighQuality()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java index 3c9bbe7ca..e90e136f5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java @@ -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 java.util.List; public class TraceActionItem extends ActionItem { @@ -32,9 +33,9 @@ public class TraceActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("trace(", writer); - value.toString(writer, constants); + value.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java index ca07e521e..0e8a62566 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java @@ -35,9 +35,9 @@ public class TypeOfActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("typeof(", writer); - value.toString(writer, LocalData.create(constants)); + value.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java index c824b61ad..7ea3c2099 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java @@ -22,6 +22,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.List; @@ -46,9 +47,9 @@ public class UnLoadMovieActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("unloadMovie(", writer); - targetString.toString(writer, constants); + targetString.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java index 1f9230a09..9f1f085ff 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java @@ -24,6 +24,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.List; @@ -48,9 +49,9 @@ public class UnLoadMovieNumActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("unloadMovieNum(", writer); - num.toString(writer, constants); + num.toString(writer, localData); return hilight(")", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/UnsupportedActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/UnsupportedActionItem.java index 96520e777..527d40de9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/UnsupportedActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/UnsupportedActionItem.java @@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.model.LocalData; public class UnsupportedActionItem extends ActionItem { @@ -29,7 +30,7 @@ public class UnsupportedActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { return hilight("//Unsupported by decompiler:" + value, writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ClassActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ClassActionItem.java index f4c509eda..b4323eb94 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ClassActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ClassActionItem.java @@ -34,6 +34,7 @@ import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.graph.model.ContinueItem; +import com.jpexs.decompiler.graph.model.LocalData; import com.jpexs.helpers.Helper; import java.util.ArrayList; import java.util.HashSet; @@ -156,12 +157,12 @@ public class ClassActionItem extends ActionItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("class ", writer); - className.toStringNoQuotes(writer, constants); + className.toStringNoQuotes(writer, localData); if (extendsOp != null) { hilight(" extends ", writer); - extendsOp.toStringNoQuotes(writer, constants); + extendsOp.toStringNoQuotes(writer, localData); } if (!implementsOp.isEmpty()) { hilight(" implements ", writer); @@ -171,7 +172,7 @@ public class ClassActionItem extends ActionItem implements Block { hilight(", ", writer); } first = false; - Action.getWithoutGlobal(t).toString(writer, constants); + Action.getWithoutGlobal(t).toString(writer, localData); } } writer.appendNewLine(); @@ -179,14 +180,14 @@ public class ClassActionItem extends ActionItem implements Block { hilight(Graph.INDENTOPEN, writer).appendNewLine(); if (constructor != null) { - constructor.toString(writer, constants).appendNewLine(); + constructor.toString(writer, localData).appendNewLine(); } for (MyEntry item : vars) { hilight("var ", writer); - item.key.toStringNoQuotes(writer, constants); + item.key.toStringNoQuotes(writer, localData); hilight(" = ", writer); - item.value.toString(writer, constants); + item.value.toString(writer, localData); hilight(";", writer).appendNewLine(); } for (String v : uninitializedVars) { @@ -196,19 +197,19 @@ public class ClassActionItem extends ActionItem implements Block { } for (MyEntry item : staticVars) { hilight("static var ", writer); - item.key.toStringNoQuotes(writer, constants); + item.key.toStringNoQuotes(writer, localData); hilight(" = ", writer); - item.value.toString(writer, constants); + item.value.toString(writer, localData); hilight(";", writer).appendNewLine(); } for (GraphTargetItem f : functions) { - f.toString(writer, constants).appendNewLine(); + f.toString(writer, localData).appendNewLine(); } for (GraphTargetItem f : staticFunctions) { hilight("static ", writer); - f.toString(writer, constants).appendNewLine(); + f.toString(writer, localData).appendNewLine(); } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java index 39c9f525c..c7cb89730 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java @@ -39,6 +39,7 @@ import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.Loop; import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.graph.model.ContinueItem; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -64,20 +65,20 @@ public class ForInActionItem extends LoopActionItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("loop" + loop.id + ":", writer).appendNewLine(); hilight("for(", writer); if ((variableName instanceof DirectValueActionItem) && (((DirectValueActionItem) variableName).value instanceof RegisterNumber)) { hilight("var ", writer); } - stripQuotes(variableName, constants, writer); + stripQuotes(variableName, localData, writer); hilight(" in ", writer); - enumVariable.toString(writer, constants); + enumVariable.toString(writer, localData); hilight(")", writer).appendNewLine(); hilight("{", writer).appendNewLine(); hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (GraphTargetItem ti : commands) { - ti.toStringSemicoloned(writer, constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); hilight("}", writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java index a8324c563..fee96b0c3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java @@ -46,13 +46,13 @@ public class IfFrameLoadedActionItem extends ActionItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("ifFrameLoaded(", writer); - frame.toString(writer, constants); + frame.toString(writer, localData); hilight(")", writer).appendNewLine(); hilight("{", writer).appendNewLine(); hilight(Graph.INDENTOPEN, writer).appendNewLine(); - writer.appendNoHilight(Graph.graphToString(actions, writer.getIsHighlighted(), false, LocalData.create(constants))); + writer.appendNoHilight(Graph.graphToString(actions, writer.getIsHighlighted(), false, localData)); hilight(Graph.INDENTCLOSE, writer).appendNewLine(); return hilight("}", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/InterfaceActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/InterfaceActionItem.java index 6974e129b..aaf820205 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/InterfaceActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/InterfaceActionItem.java @@ -24,6 +24,7 @@ import com.jpexs.decompiler.flash.helpers.HilightedTextWriter; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.List; @@ -43,9 +44,9 @@ public class InterfaceActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("interface ", writer); - name.toStringNoQuotes(writer, constants); + name.toStringNoQuotes(writer, localData); boolean first = true; if (!superInterfaces.isEmpty()) { hilight(" extends ", writer); @@ -55,7 +56,7 @@ public class InterfaceActionItem extends ActionItem { hilight(", ", writer); } first = false; - Action.getWithoutGlobal(ti).toStringNoQuotes(writer, constants); + Action.getWithoutGlobal(ti).toStringNoQuotes(writer, localData); } writer.appendNewLine(); hilight("{", writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java index 9a601275a..60fcac2c1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java @@ -26,6 +26,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 java.util.ArrayList; import java.util.List; @@ -41,14 +42,14 @@ public class TellTargetActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("tellTarget(", writer); - target.toString(writer, constants); + target.toString(writer, localData); hilight(")", writer).appendNewLine(); hilight("{", writer).appendNewLine(); hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (GraphTargetItem ti : commands) { - ti.toString(writer, constants).appendNewLine(); + ti.toString(writer, localData).appendNewLine(); } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); return hilight("}", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TryActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TryActionItem.java index adfc42ce1..4a116cfbc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TryActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TryActionItem.java @@ -30,6 +30,7 @@ import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.graph.model.ContinueItem; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.List; @@ -58,13 +59,13 @@ public class TryActionItem extends ActionItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { hilight("try", writer).appendNewLine(); hilight("{", writer).appendNewLine(); hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (GraphTargetItem ti : tryCommands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); @@ -72,14 +73,14 @@ public class TryActionItem extends ActionItem implements Block { for (int e = 0; e < catchExceptions.size(); e++) { writer.appendNewLine(); hilight("catch(", writer); - catchExceptions.get(e).toStringNoQuotes(writer, constants); + catchExceptions.get(e).toStringNoQuotes(writer, localData); hilight(")", writer).appendNewLine(); hilight("{", writer).appendNewLine(); hilight(Graph.INDENTOPEN, writer).appendNewLine(); List commands = catchCommands.get(e); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); @@ -92,7 +93,7 @@ public class TryActionItem extends ActionItem implements Block { hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (GraphTargetItem ti : finallyCommands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); @@ -150,7 +151,7 @@ public class TryActionItem extends ActionItem implements Block { String catchName = null; if (catchExceptions != null) { if (!catchExceptions.isEmpty()) { - catchName = catchExceptions.get(0).toStringNoQuotes(false, new ConstantPool(asGenerator.getConstantPool())); + catchName = catchExceptions.get(0).toStringNoQuotes(false, LocalData.create(new ConstantPool(asGenerator.getConstantPool()))); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/WithActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/WithActionItem.java index c5f8e0505..7f9290061 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/WithActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/WithActionItem.java @@ -48,9 +48,8 @@ public class WithActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { String ret; - LocalData localData = LocalData.create(constants); hilight("with(", writer); scope.toString(writer, localData); hilight(")", writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java index 82631f186..330aede8a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java @@ -121,6 +121,7 @@ import com.jpexs.decompiler.graph.model.ContinueItem; import com.jpexs.decompiler.graph.model.DoWhileItem; import com.jpexs.decompiler.graph.model.ForItem; import com.jpexs.decompiler.graph.model.IfItem; +import com.jpexs.decompiler.graph.model.LocalData; import com.jpexs.decompiler.graph.model.NotItem; import com.jpexs.decompiler.graph.model.OrItem; import com.jpexs.decompiler.graph.model.ParenthesisItem; @@ -409,12 +410,12 @@ public class ActionScriptParser { if (nameStr instanceof GetMemberActionItem) { GetMemberActionItem mem = (GetMemberActionItem) nameStr; if (mem.memberName instanceof DirectValueActionItem) { - classNameStr = ((DirectValueActionItem) mem.memberName).toStringNoQuotes(false, new ConstantPool(constantPool)); + classNameStr = ((DirectValueActionItem) mem.memberName).toStringNoQuotes(false, LocalData.create(new ConstantPool(constantPool))); } } else if (nameStr instanceof GetVariableActionItem) { GetVariableActionItem var = (GetVariableActionItem) nameStr; if (var.name instanceof DirectValueActionItem) { - classNameStr = ((DirectValueActionItem) var.name).toStringNoQuotes(false, new ConstantPool(constantPool)); + classNameStr = ((DirectValueActionItem) var.name).toStringNoQuotes(false, LocalData.create(new ConstantPool(constantPool))); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java index 4894a820b..7f9f394ca 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java @@ -17,12 +17,12 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.model.ConstantPool; import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.action.model.EvalActionItem; import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; import com.jpexs.decompiler.flash.action.model.GetVersionActionItem; 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; @@ -41,7 +41,7 @@ public class ActionGetVariable extends Action { @Override public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem name = stack.pop(); - GraphTargetItem computedVal = variables.get(name.toStringNoQuotes(false, (ConstantPool) null)); + GraphTargetItem computedVal = variables.get(name.toStringNoQuotes(false, LocalData.create(null))); if (name instanceof DirectValueActionItem && ((DirectValueActionItem) name).value.equals("/:$version")) { stack.push(new GetVersionActionItem(this)); } else if (!(name instanceof DirectValueActionItem) && !(name instanceof GetVariableActionItem)) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java index 231756f6a..a5016a6f2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java @@ -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 stack, List output, java.util.HashMap regNames, HashMap variables, HashMap 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)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java index 906bb2bd4..e2b7d55b3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.model.CallFunctionActionItem; -import com.jpexs.decompiler.flash.action.model.ConstantPool; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.LocalData; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -45,7 +45,7 @@ public class ActionCallFunction extends Action { args.add(stack.pop()); } CallFunctionActionItem cft = new CallFunctionActionItem(this, functionName, args); - cft.calculatedFunction = functions.get(functionName.toStringNoQuotes(false, (ConstantPool) null)); + cft.calculatedFunction = functions.get(functionName.toStringNoQuotes(false, LocalData.create(null))); stack.push(cft); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java index a412882a9..d97b9b064 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.model.ConstantPool; import com.jpexs.decompiler.flash.action.model.DefineLocalActionItem; 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; @@ -39,7 +39,7 @@ public class ActionDefineLocal extends Action { public void translate(Stack stack, List output, java.util.HashMap regNames, HashMap variables, HashMap functions, int staticOperation, String path) { GraphTargetItem value = stack.pop(); GraphTargetItem name = stack.pop(); - variables.put(name.toStringNoQuotes(false, (ConstantPool) null), value); + variables.put(name.toStringNoQuotes(false, LocalData.create(null)), value); output.add(new DefineLocalActionItem(this, name, value)); } } diff --git a/trunk/src/com/jpexs/decompiler/graph/Graph.java b/trunk/src/com/jpexs/decompiler/graph/Graph.java index bc7504346..587723ef6 100644 --- a/trunk/src/com/jpexs/decompiler/graph/Graph.java +++ b/trunk/src/com/jpexs/decompiler/graph/Graph.java @@ -2160,7 +2160,7 @@ public class Graph { HilightedTextWriter writer = new HilightedTextWriter(highlight); for (GraphTargetItem ti : tree) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData.constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } String[] parts = writer.toString().split("\r\n"); diff --git a/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java b/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java index 01a626958..06bb94652 100644 --- a/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java @@ -88,8 +88,8 @@ public abstract class GraphTargetItem implements Serializable { return writer.append(str, src, pos); } - public HilightedTextWriter toStringSemicoloned(HilightedTextWriter writer, ConstantPool constants) { - toString(writer, constants); + public HilightedTextWriter toStringSemicoloned(HilightedTextWriter writer, LocalData localData) { + toString(writer, localData); if (needsSemicolon()) { hilight(";", writer); } @@ -107,12 +107,6 @@ public abstract class GraphTargetItem implements Serializable { public abstract HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData); - public HilightedTextWriter toString(HilightedTextWriter writer, ConstantPool constants) { - LocalData localData = new LocalData(); - localData.constants = constants; - return toString(writer, localData); - } - public String toString(boolean highlight, LocalData localData) { HilightedTextWriter writer = new HilightedTextWriter(highlight); toString(writer, localData); @@ -146,14 +140,14 @@ public abstract class GraphTargetItem implements Serializable { return null; } - public String toStringNoQuotes(boolean highlight, ConstantPool constants) { + public String toStringNoQuotes(boolean highlight, LocalData localData) { HilightedTextWriter writer = new HilightedTextWriter(highlight); - toStringNoQuotes(writer, constants); + toStringNoQuotes(writer, localData); return writer.toString(); } - public HilightedTextWriter toStringNoQuotes(HilightedTextWriter writer, ConstantPool constants) { - return toString(writer, constants); + public HilightedTextWriter toStringNoQuotes(HilightedTextWriter writer, LocalData localData) { + return toString(writer, localData); } public GraphTargetItem getNotCoerced() { diff --git a/trunk/src/com/jpexs/decompiler/graph/model/DoWhileItem.java b/trunk/src/com/jpexs/decompiler/graph/model/DoWhileItem.java index 1cbb808fc..06f89d4da 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/DoWhileItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/DoWhileItem.java @@ -57,7 +57,7 @@ public class DoWhileItem extends LoopItem implements Block { hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData.constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/graph/model/ForItem.java b/trunk/src/com/jpexs/decompiler/graph/model/ForItem.java index ad2298af3..f1f8af1ba 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/ForItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/ForItem.java @@ -87,7 +87,7 @@ public class ForItem extends LoopItem implements Block { hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData.constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java b/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java index 9ee23ef16..e19073f4d 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java @@ -78,7 +78,7 @@ public class IfItem extends GraphTargetItem implements Block { hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (GraphTargetItem ti : ifBranch) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData.constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); @@ -90,7 +90,7 @@ public class IfItem extends GraphTargetItem implements Block { hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (GraphTargetItem ti : elseBranch) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData.constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/graph/model/SwitchItem.java b/trunk/src/com/jpexs/decompiler/graph/model/SwitchItem.java index 22a89affc..9ba9d1b74 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/SwitchItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/SwitchItem.java @@ -70,7 +70,7 @@ public class SwitchItem extends LoopItem implements Block { hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (int j = 0; j < caseCommands.get(i).size(); j++) { if (!caseCommands.get(i).get(j).isEmpty()) { - caseCommands.get(i).get(j).toStringSemicoloned(writer, localData.constants).appendNewLine(); + caseCommands.get(i).get(j).toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); @@ -82,7 +82,7 @@ public class SwitchItem extends LoopItem implements Block { hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (int j = 0; j < defaultCommands.size(); j++) { if (!defaultCommands.get(j).isEmpty()) { - defaultCommands.get(j).toStringSemicoloned(writer, localData.constants).appendNewLine(); + defaultCommands.get(j).toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/graph/model/UniversalLoopItem.java b/trunk/src/com/jpexs/decompiler/graph/model/UniversalLoopItem.java index 91035ce63..b7acdd5b5 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/UniversalLoopItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/UniversalLoopItem.java @@ -45,7 +45,7 @@ public class UniversalLoopItem extends LoopItem implements Block { hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData.constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/graph/model/WhileItem.java b/trunk/src/com/jpexs/decompiler/graph/model/WhileItem.java index 535dfedfd..0ad451a3c 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/WhileItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/WhileItem.java @@ -62,7 +62,7 @@ public class WhileItem extends LoopItem implements Block { hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData.constants).appendNewLine(); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } hilight(Graph.INDENTCLOSE, writer).appendNewLine();