Issue #304 Direct AS1/2 editing DefineFunction vs DefineFunction2 fix

merge

trunk/src/com/jpexs/decompiler/flash/SWF.java

@@ -2316,6 +2316,7 @@ public final class SWF implements TreeItem {
             Matrix mat = new Matrix(layer.matrix);
             mat = mat.preConcatenate(transformation);
 
+            boolean showPlaceholder = false;
             if (character instanceof DrawableTag) {
                 DrawableTag drawable = (DrawableTag) character;
                 SerializableImage img;
@@ -2332,12 +2333,9 @@ public final class SWF implements TreeItem {
                     drawMatrix.translate(rect.xMin, rect.yMin);
                     drawable.toImage(layer.ratio < 0 ? 0 : layer.ratio/*layer.duration*/, allTags, characters, visited, img, m);
                 } else {
+                    // only DefineFont tags
                     img = drawable.toImage(layer.ratio < 0 ? 0 : layer.ratio/*layer.duration*/, allTags, characters, visited, transformation);
                 }
-                /*if (character instanceof BoundedTag) {
-                 BoundedTag bounded = (BoundedTag) character;
-                 RECT rect = bounded.getRect(characters, visited);
-                 }*/
                 if (layer.filters != null) {
                     for (FILTER filter : layer.filters) {
                         img = filter.apply(img);
@@ -2404,6 +2402,10 @@ public final class SWF implements TreeItem {
                 g.setTransform(drawMatrix.toTransform());
                 g.drawImage(img.getBufferedImage(), 0, 0, null);
             } else if (character instanceof BoundedTag) {
+                showPlaceholder = true;
+            }
+
+            if (showPlaceholder) {
                 mat.translateX /= unzoom;
                 mat.translateY /= unzoom;
                 AffineTransform trans = mat.toTransform();
@@ -2418,17 +2420,9 @@ public final class SWF implements TreeItem {
                 g.drawLine(r.Xmin / div, r.Ymin / div, r.Xmax / div, r.Ymax / div);
                 g.drawLine(r.Xmax / div, r.Ymin / div, r.Xmin / div, r.Ymax / div);
                 g.setComposite(AlphaComposite.Dst);
-            }
+            }            
         }
         g.setTransform(AffineTransform.getScaleInstance(1, 1));
-        /*g.setPaint(Color.yellow);
-         g.draw(new ExportRectangle(ret.getWidth()-1,ret.getHeight()-1));*/
-
-        /*try {
-         ImageIO.write(ret, "png", new File("tst_id_" + containerId + "_time_" + System.currentTimeMillis() + ".png"));
-         } catch (IOException ex) {
-         Logger.getLogger(SWF.class.getName()).log(Level.SEVERE, null, ex);
-         }*/
     }
 
     public static void frameToImage(int containerId, int frame, List<Tag> allTags, List<Tag> controlTags, RECT displayRect, int totalFrameCount, Stack<Integer> visited, SerializableImage image, Matrix transformation) {

trunk/src/com/jpexs/decompiler/flash/SourceGeneratorLocalData.java

@@ -26,11 +26,12 @@ import java.util.HashMap;
 public class SourceGeneratorLocalData implements Serializable {
 
     public HashMap<String, Integer> registerVars;
-    public Boolean inFunction;
+    public Integer inFunction;
     public Boolean inMethod;
     public Integer forInLevel;
+    
 
-    public SourceGeneratorLocalData(HashMap<String, Integer> registerVars, Boolean inFunction, Boolean inMethod, Integer forInLevel) {
+    public SourceGeneratorLocalData(HashMap<String, Integer> registerVars, Integer inFunction, Boolean inMethod, Integer forInLevel) {
         this.registerVars = registerVars;
         this.inFunction = inFunction;
         this.inMethod = inMethod;

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyLoadAVM2Item.java

@@ -37,7 +37,7 @@ public class AlchemyLoadAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("op_" + name + "(");
         ofs.toString(writer, localData);
         return writer.append(") /*Alchemy*/");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemySignExtendAVM2Item.java

@@ -36,7 +36,7 @@ public class AlchemySignExtendAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("op_" + name + "(");
         value.toString(writer, localData);
         return writer.append(") /*Alchemy*/");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyStoreAVM2Item.java

@@ -38,7 +38,7 @@ public class AlchemyStoreAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("op_" + name + "(");
         ofs.toString(writer, localData);
         writer.append(",");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ApplyTypeAVM2Item.java

@@ -34,7 +34,7 @@ public class ApplyTypeAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         object.toString(writer, localData);
         if (!params.isEmpty()) {
             writer.append(".<");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/BooleanAVM2Item.java

@@ -32,7 +32,7 @@ public class BooleanAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append(value ? "true" : "false");
     }
 

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java

@@ -36,7 +36,7 @@ public class CallAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         /*String recPart = ""; receiver.toString(constants, localRegNames) + writer.append(".");
          if (receiver instanceof NewActivationAVM2Item) {
          recPart = "";

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallMethodAVM2Item.java

@@ -36,7 +36,7 @@ public class CallMethodAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         receiver.toString(writer, localData);
         writer.append(".");
         writer.append(methodName);

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallPropertyAVM2Item.java

@@ -38,7 +38,7 @@ public class CallPropertyAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         formatProperty(writer, receiver, propertyName, localData);
         writer.append("(");
         for (int a = 0; a < arguments.size(); a++) {

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallStaticAVM2Item.java

@@ -36,7 +36,7 @@ public class CallStaticAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         receiver.toString(writer, localData);
         writer.append(".");
         writer.append(methodName);

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallSuperAVM2Item.java

@@ -38,7 +38,7 @@ public class CallSuperAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         if (!receiver.toString().equals("this")) {
             receiver.toString(writer, localData);
             writer.append(".");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ClassAVM2Item.java

@@ -30,7 +30,7 @@ public class ClassAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append(className.getName(localData.constantsAvm2, localData.fullyQualifiedNames));
     }
 }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CoerceAVM2Item.java

@@ -36,7 +36,7 @@ public class CoerceAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         //return hilight("("+type+")", highlight)+
         return value.toString(writer, localData);
     }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructAVM2Item.java

@@ -34,7 +34,7 @@ public class ConstructAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         if (object instanceof NewFunctionAVM2Item) {
             writer.append("new ");
             return object.toString(writer, localData);

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructPropAVM2Item.java

@@ -36,7 +36,7 @@ public class ConstructPropAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("new ");
         int idx = writer.getLength();
         object.toString(writer, localData);

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java

@@ -34,7 +34,7 @@ public class ConstructSuperAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         if (!object.toString().equals("this")) {
             object.toString(writer, localData);
             writer.append(".");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConvertAVM2Item.java

@@ -35,7 +35,7 @@ public class ConvertAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         return value.toString(writer, localData);
     }
 

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecLocalAVM2Item.java

@@ -30,7 +30,7 @@ public class DecLocalAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         writer.append(localRegName(localData.localRegNames, regIndex));
         return writer.append("--");
     }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecrementAVM2Item.java

@@ -31,7 +31,7 @@ public class DecrementAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         value.toString(writer, localData);
         return writer.append("-1");
     }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DefaultXMLNamespace.java

@@ -35,7 +35,7 @@ public class DefaultXMLNamespace extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("default xml namespace = ");
         return ns.toString(writer, localData);
     }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXAttrAVM2Item.java

@@ -33,7 +33,7 @@ public class EscapeXAttrAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("{");
         value.toString(writer, localData);
         return writer.append("}");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXElemAVM2Item.java

@@ -35,7 +35,7 @@ public class EscapeXElemAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("{");
         expression.toString(writer, localData);
         return writer.append("}");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FilteredCheckAVM2Item.java

@@ -35,7 +35,7 @@ public class FilteredCheckAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         return object.toString(writer, localData);
     }
 }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FindDefAVM2Item.java

@@ -31,7 +31,7 @@ public class FindDefAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append(propertyName.getNamespace(localData.constantsAvm2).getName(localData.constantsAvm2));
     }
 }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FindPropertyAVM2Item.java

@@ -30,7 +30,7 @@ public class FindPropertyAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer;
     }
 }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FloatValueAVM2Item.java

@@ -32,7 +32,7 @@ public class FloatValueAVM2Item extends NumberValueAVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append("" + value);
     }
 

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FullMultinameAVM2Item.java

@@ -76,7 +76,7 @@ public class FullMultinameAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         if (namespace != null) {
             namespace.toString(writer, localData);
             writer.append("::");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetDescendantsAVM2Item.java

@@ -33,7 +33,7 @@ public class GetDescendantsAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         object.toString(writer, localData);
         writer.append("..");
         return multiname.toString(writer, localData);

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetLexAVM2Item.java

@@ -31,7 +31,7 @@ public class GetLexAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append(propertyName.getName(localData.constantsAvm2, localData.fullyQualifiedNames));
     }
 }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetPropertyAVM2Item.java

@@ -33,7 +33,7 @@ public class GetPropertyAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         return formatProperty(writer, object, propertyName, localData);
     }
 }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSlotAVM2Item.java

@@ -34,7 +34,7 @@ public class GetSlotAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         if (slotName == null) {
             return writer.append("/*UnknownSlot*/");
         }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSuperAVM2Item.java

@@ -33,7 +33,7 @@ public class GetSuperAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         if (!object.toString().equals("this")) {
             object.toString(writer, localData);
             writer.append(".");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/HasNextAVM2Item.java

@@ -37,7 +37,7 @@ public class HasNextAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         collection.toString(writer, localData);
         writer.append(" hasNext ");
         return object.toString(writer, localData);

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InAVM2Item.java

@@ -33,7 +33,7 @@ public class InAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         object.toString(writer, localData);
         writer.append(" in ");
         return collection.toString(writer, localData);

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncLocalAVM2Item.java

@@ -30,7 +30,7 @@ public class IncLocalAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         writer.append(localRegName(localData.localRegNames, regIndex));
         return writer.append("++");
     }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncrementAVM2Item.java

@@ -31,7 +31,7 @@ public class IncrementAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         value.toString(writer, localData);
         return writer.append("+1");
     }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InitPropertyAVM2Item.java

@@ -36,7 +36,7 @@ public class InitPropertyAVM2Item extends AVM2Item implements SetTypeAVM2Item, A
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         formatProperty(writer, object, propertyName, localData);
         writer.append(" = ");
         return value.toString(writer, localData);

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IntegerValueAVM2Item.java

@@ -32,7 +32,7 @@ public class IntegerValueAVM2Item extends NumberValueAVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append("" + value);
     }
 

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/LocalRegAVM2Item.java

@@ -48,7 +48,7 @@ public class LocalRegAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         if (computedValue instanceof FilterAVM2Item) {
             return computedValue.toString(writer, localData);
         }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameSpaceAVM2Item.java

@@ -31,7 +31,7 @@ public class NameSpaceAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         if (namespaceIndex == 0) {
             return writer.append("*");
         }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameValuePair.java

@@ -33,7 +33,7 @@ public class NameValuePair extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         name.toString(writer, localData);
         writer.append(":");
         if (value instanceof TernarOpItem) { //Ternar operator contains ":"

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NanAVM2Item.java

@@ -27,7 +27,7 @@ public class NanAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append("NaN");
     }
 }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewActivationAVM2Item.java

@@ -31,7 +31,7 @@ public class NewActivationAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append("newactivation()");
     }
 }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewArrayAVM2Item.java

@@ -32,7 +32,7 @@ public class NewArrayAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("[");
         for (int a = 0; a < values.size(); a++) {
             if (a > 0) {

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java

@@ -57,7 +57,7 @@ public class NewFunctionAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         MethodBody body = abc.findBody(methodIndex);
         writer.append("function" + (!functionName.isEmpty() ? " " + functionName : ""));
         writer.startMethod(methodIndex);

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewObjectAVM2Item.java

@@ -31,7 +31,7 @@ public class NewObjectAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         boolean singleLine = pairs.size() < 2;
         if (!singleLine) {
             writer.newLine();

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextNameAVM2Item.java

@@ -37,7 +37,7 @@ public class NextNameAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("nextName(");
         index.toString(writer, localData);
         writer.append(",");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextValueAVM2Item.java

@@ -37,7 +37,7 @@ public class NextValueAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("nextValue(");
         index.toString(writer, localData);
         writer.append(",");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NullAVM2Item.java

@@ -30,7 +30,7 @@ public class NullAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append("null");
     }
 

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostDecrementAVM2Item.java

@@ -32,7 +32,7 @@ public class PostDecrementAVM2Item extends AVM2Item implements AssignmentAVM2Ite
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         object.toString(writer, localData);
         return writer.append("--");
     }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostIncrementAVM2Item.java

@@ -32,7 +32,7 @@ public class PostIncrementAVM2Item extends AVM2Item implements AssignmentAVM2Ite
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         object.toString(writer, localData);
         return writer.append("++");
     }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnValueAVM2Item.java

@@ -31,7 +31,7 @@ public class ReturnValueAVM2Item extends AVM2Item implements ExitItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("return ");
         return value.toString(writer, localData);
     }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnVoidAVM2Item.java

@@ -28,7 +28,7 @@ public class ReturnVoidAVM2Item extends AVM2Item implements ExitItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append("return");
     }
 }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ScriptAVM2Item.java

@@ -33,7 +33,7 @@ public class ScriptAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append("script" + scriptIndex);
     }
 }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetGlobalSlotAVM2Item.java

@@ -39,7 +39,7 @@ public class SetGlobalSlotAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("setglobalslot(" + slotId + ",");
         value.toString(writer, localData);
         return writer.append(")");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetLocalAVM2Item.java

@@ -34,7 +34,7 @@ public class SetLocalAVM2Item extends AVM2Item implements SetTypeAVM2Item, Assig
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append(localRegName(localData.localRegNames, regIndex) + " = ");
         return value.toString(writer, localData);
     }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetPropertyAVM2Item.java

@@ -42,7 +42,7 @@ public class SetPropertyAVM2Item extends AVM2Item implements SetTypeAVM2Item, As
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         formatProperty(writer, object, propertyName, localData);
         writer.append(" = ");
         return value.toString(writer, localData);

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSlotAVM2Item.java

@@ -43,7 +43,7 @@ public class SetSlotAVM2Item extends AVM2Item implements SetTypeAVM2Item, Assign
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         getName(writer, localData);
         writer.append(" = ");
         return value.toString(writer, localData);

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSuperAVM2Item.java

@@ -41,7 +41,7 @@ public class SetSuperAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         if (!object.toString().equals("this")) {
             object.toString(writer, localData);
             writer.append(".");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/StringAVM2Item.java

@@ -33,7 +33,7 @@ public class StringAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append("\"" + Helper.escapeString(value) + "\"");
     }
 

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThisAVM2Item.java

@@ -35,7 +35,7 @@ public class ThisAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append("this");
     }
 }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThrowAVM2Item.java

@@ -30,7 +30,7 @@ public class ThrowAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("throw ");
         return value.toString(writer, localData);
     }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UndefinedAVM2Item.java

@@ -30,7 +30,7 @@ public class UndefinedAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append("undefined");
     }
 

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UnparsedAVM2Item.java

@@ -30,7 +30,7 @@ public class UnparsedAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append(value);
     }
 }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithAVM2Item.java

@@ -41,7 +41,7 @@ public class WithAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("with(");
         scope.toString(writer, localData);
         writer.append(")").newLine();

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithEndAVM2Item.java

@@ -31,7 +31,7 @@ public class WithEndAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append("}");
     }
 

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithObjectAVM2Item.java

@@ -31,7 +31,7 @@ public class WithObjectAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer;
     }
 }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/XMLAVM2Item.java

@@ -36,7 +36,7 @@ public class XMLAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         for (GraphTargetItem part : parts) {
             if (part instanceof StringAVM2Item) {
                 writer.append(((StringAVM2Item) part).value);

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/DeclarationAVM2Item.java

@@ -45,7 +45,7 @@ public class DeclarationAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         if (assignment instanceof SetLocalAVM2Item) {
             SetLocalAVM2Item lti = (SetLocalAVM2Item) assignment;
             String type = "*";

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ExceptionAVM2Item.java

@@ -31,7 +31,7 @@ public class ExceptionAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append(exception.getVarName(localData.constantsAvm2, localData.fullyQualifiedNames));
     }
 }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/FilterAVM2Item.java

@@ -38,7 +38,7 @@ public class FilterAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         collection.toString(writer, localData);
         writer.append(".(");
         expression.toString(writer, localData);

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java

@@ -72,7 +72,7 @@ public class ForEachInAVM2Item extends LoopItem implements Block {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         if (writer instanceof NulWriter) {
             ((NulWriter) writer).startLoop(loop.id, LoopWithType.LOOP_TYPE_LOOP);
         }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java

@@ -72,7 +72,7 @@ public class ForInAVM2Item extends LoopItem implements Block {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         if (writer instanceof NulWriter) {
             ((NulWriter) writer).startLoop(loop.id, LoopWithType.LOOP_TYPE_LOOP);
         }

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java

@@ -51,7 +51,7 @@ public class TryAVM2Item extends AVM2Item implements Block {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("try").newLine();
         writer.append("{").newLine();
         writer.indent();

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java

@@ -31,7 +31,7 @@ public class AddAVM2Item extends BinaryOpItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         if (rightSide.getPrecedence() >= precedence) { //string + vs number +
             if (leftSide.getPrecedence() > precedence) {
                 writer.append("(");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DeletePropertyAVM2Item.java

@@ -35,7 +35,7 @@ public class DeletePropertyAVM2Item extends AVM2Item {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("delete ");
         object.toString(writer, localData);
         writer.append("[");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DivideAVM2Item.java

@@ -38,7 +38,7 @@ public class DivideAVM2Item extends BinaryOpItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         if (rightSide.getPrecedence() >= precedence) { // >=  add or subtract too
             if (leftSide.getPrecedence() > precedence) {
                 writer.append("(");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/ModuloAVM2Item.java

@@ -38,7 +38,7 @@ public class ModuloAVM2Item extends BinaryOpItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         if (rightSide.getPrecedence() >= precedence) { // >=  add or subtract too
             if (leftSide.getPrecedence() > precedence) {
                 writer.append("(");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/MultiplyAVM2Item.java

@@ -35,7 +35,7 @@ public class MultiplyAVM2Item extends BinaryOpItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         if (rightSide instanceof ModuloAVM2Item) {
             if (leftSide.getPrecedence() > precedence) {
                 writer.append("(");

trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/SubtractAVM2Item.java

@@ -35,7 +35,7 @@ public class SubtractAVM2Item extends BinaryOpItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         if (rightSide.getPrecedence() >= precedence) { // >=  add or subtract too
             if (leftSide.getPrecedence() > precedence) {
                 writer.append("(");

trunk/src/com/jpexs/decompiler/flash/action/Action.java

@@ -22,6 +22,7 @@ import com.jpexs.decompiler.flash.DisassemblyListener;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
+import com.jpexs.decompiler.flash.action.model.ActionItem;
 import com.jpexs.decompiler.flash.action.model.ConstantPool;
 import com.jpexs.decompiler.flash.action.model.DirectValueActionItem;
 import com.jpexs.decompiler.flash.action.model.ExtendsActionItem;
@@ -43,6 +44,7 @@ import com.jpexs.decompiler.flash.action.parser.ParseException;
 import com.jpexs.decompiler.flash.action.parser.pcode.ASMParsedSymbol;
 import com.jpexs.decompiler.flash.action.parser.pcode.ASMParser;
 import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer;
+import com.jpexs.decompiler.flash.action.parser.script.VariableActionItem;
 import com.jpexs.decompiler.flash.action.special.ActionEnd;
 import com.jpexs.decompiler.flash.action.swf4.ActionEquals;
 import com.jpexs.decompiler.flash.action.swf4.ActionIf;
@@ -1266,8 +1268,13 @@ public class Action implements GraphSourceItem {
         return 0;
     }
 
-    public static GraphTargetItem gettoset(GraphTargetItem get, GraphTargetItem value) {
+    public static GraphTargetItem gettoset(GraphTargetItem get, GraphTargetItem value,List<VariableActionItem> variables) {
         GraphTargetItem ret = get;
+        boolean boxed = false;
+        if(get instanceof VariableActionItem){
+            boxed = true;
+           ret = ((VariableActionItem)ret).getBoxedValue();
+        }
         if (ret instanceof GetVariableActionItem) {
             GetVariableActionItem gv = (GetVariableActionItem) ret;
             ret = new SetVariableActionItem(null, gv.name, value);
@@ -1280,6 +1287,13 @@ public class Action implements GraphSourceItem {
             GetPropertyActionItem gp = (GetPropertyActionItem) ret;
             ret = new SetPropertyActionItem(null, gp.target, gp.propertyIndex, value);
         }
+        if(boxed){
+            GraphTargetItem b=ret;
+            ret = new VariableActionItem(((VariableActionItem)get).getVariableName(), value,((VariableActionItem)get).isDefinition());
+            ((VariableActionItem)ret).setBoxedValue((ActionItem)b);
+            variables.remove((VariableActionItem)get);
+            variables.add((VariableActionItem)ret);
+        }
         return ret;
     }
 

trunk/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java

@@ -34,7 +34,7 @@ public class AsciiToCharActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("chr(");
         value.toString(writer, localData);
         return writer.append(")");

trunk/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java

@@ -34,7 +34,7 @@ public class CallActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("call(");
         stripQuotes(value, localData, writer);
         return writer.append(")");

trunk/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java

@@ -45,7 +45,7 @@ public class CallFunctionActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         String paramStr = "";
         stripQuotes(functionName, localData, writer);
         writer.append("(");

trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java

@@ -50,7 +50,7 @@ public class CallMethodActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         boolean blankMethod = false;
         if (methodName instanceof DirectValueActionItem) {
             if (((DirectValueActionItem) methodName).value instanceof Undefined) {

trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java

@@ -47,7 +47,7 @@ public class CastOpActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("(");
         stripQuotes(constructor, localData, writer);
         writer.append(")");

trunk/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java

@@ -35,7 +35,7 @@ public class CharToAsciiActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("ord(");
         value.toString(writer, localData);
         return writer.append(")");

trunk/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java

@@ -50,7 +50,7 @@ public class CloneSpriteActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("duplicateMovieClip(");
         target.toString(writer, localData);
         writer.append(",");

trunk/src/com/jpexs/decompiler/flash/action/model/DecrementActionItem.java

@@ -46,7 +46,7 @@ public class DecrementActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         object.toString(writer, localData);
         return writer.append(" - 1");
     }

trunk/src/com/jpexs/decompiler/flash/action/model/DefineLocalActionItem.java

@@ -71,7 +71,7 @@ public class DefineLocalActionItem extends ActionItem implements SetTypeActionIt
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("var ");
         stripQuotes(name, localData, writer);
         if (value == null) {

trunk/src/com/jpexs/decompiler/flash/action/model/DefineRegisterActionItem.java

@@ -35,7 +35,7 @@ public class DefineRegisterActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         return writer.append("var " + identifier);
     }
 

trunk/src/com/jpexs/decompiler/flash/action/model/DeleteActionItem.java

@@ -47,7 +47,7 @@ public class DeleteActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("delete ");
         if (object == null) {
             return propertyName.toString(writer, localData);

trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java

@@ -110,7 +110,7 @@ public class DirectValueActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendToNoQuotes(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendToNoQuotes(GraphTextWriter writer, LocalData localData) {
         if (value instanceof Double) {
             if (Double.compare((double) (Double) value, 0) == 0) {
                 return writer.append("0");
@@ -151,7 +151,7 @@ public class DirectValueActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         if (value instanceof Double) {
             if (Double.compare((double) (Double) value, 0) == 0) {
                 return writer.append("0");

trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java

@@ -41,7 +41,7 @@ public class EnumerateActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("enumerate ");
         return object.toString(writer, localData);
     }

trunk/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java

@@ -37,7 +37,7 @@ public class EvalActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("eval(");
         value.toString(writer, localData);
         return writer.append(")");

trunk/src/com/jpexs/decompiler/flash/action/model/ExtendsActionItem.java

@@ -35,7 +35,7 @@ public class ExtendsActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         subclass.toString(writer, localData);
         writer.append(" extends ");
         return stripQuotes(superclass, localData, writer);

trunk/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java

@@ -49,7 +49,7 @@ public class FSCommand2ActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("FSCommand2(");
         command.toString(writer, localData);
         for (int t = 0; t < arguments.size(); t++) {

trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java

@@ -39,7 +39,7 @@ public class FSCommandActionItem extends ActionItem {
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) {
         writer.append("fscommand(\"");
         writer.append(Helper.escapeString(command));
         return writer.append("\")");

trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java

@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator;
+import com.jpexs.decompiler.flash.action.parser.script.VariableActionItem;
 import com.jpexs.decompiler.flash.action.swf4.ActionPush;
 import com.jpexs.decompiler.flash.action.swf4.RegisterNumber;
 import com.jpexs.decompiler.flash.action.swf5.ActionDefineFunction;
@@ -35,6 +36,7 @@ import com.jpexs.decompiler.graph.model.LocalData;
 import com.jpexs.helpers.Helper;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -47,6 +49,8 @@ public class FunctionActionItem extends ActionItem {
     public List<String> paramNames;
     public GraphTargetItem calculatedFunctionName;
     private int regStart;
+    private List<VariableActionItem> variables;
+
     public static final int REGISTER_THIS = 1;
     public static final int REGISTER_ARGUMENTS = 2;
     public static final int REGISTER_SUPER = 3;
@@ -65,20 +69,18 @@ public class FunctionActionItem extends ActionItem {
         super(null, PRECEDENCE_PRIMARY);
     }
 
-    public FunctionActionItem(GraphSourceItem instruction, String functionName, List<String> paramNames, List<GraphTargetItem> actions, List<String> constants, int regStart) {
+    public FunctionActionItem(GraphSourceItem instruction, String functionName, List<String> paramNames, List<GraphTargetItem> actions, List<String> constants, int regStart, List<VariableActionItem> variables) {
         super(instruction, PRECEDENCE_PRIMARY);
         this.actions = actions;
         this.constants = constants;
         this.functionName = functionName;
         this.paramNames = paramNames;
         this.regStart = regStart;
+        this.variables = variables;
     }
 
     @Override
-    protected GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
-        if (true) {
-            //return writer.appendNoHilight("<func>")
-        }
+    public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
         writer.append("function");
         if (calculatedFunctionName != null) {
             writer.append(" ");
@@ -88,6 +90,7 @@ public class FunctionActionItem extends ActionItem {
             writer.append(functionName);
         }
         writer.append("(");
+
         for (int p = 0; p < paramNames.size(); p++) {
             if (p > 0) {
                 writer.append(", ");
@@ -101,6 +104,7 @@ public class FunctionActionItem extends ActionItem {
         writer.append(")").newLine();
         writer.append("{").newLine();
         writer.indent();
+
         Graph.graphToString(actions, writer, localData);
         writer.unindent();
         return writer.append("}");
@@ -152,21 +156,18 @@ public class FunctionActionItem extends ActionItem {
 
     @Override
     public List<GraphSourceItem> toSource(SourceGeneratorLocalData localData, SourceGenerator generator) {
+
+        Set<String> usedNames = new HashSet<>();
+        for (VariableActionItem v : variables) {
+            usedNames.add(v.getVariableName());
+        }
+
         List<GraphSourceItem> ret = new ArrayList<>();
         ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator;
         List<Integer> paramRegs = new ArrayList<>();
         @SuppressWarnings("unchecked")
         SourceGeneratorLocalData localDataCopy = (SourceGeneratorLocalData) Helper.deepCopy(localData);
-        HashMap<String, Integer> registerVars = asGenerator.getRegisterVars(localDataCopy);
-        registerVars.put("_parent", REGISTER_PARENT);
-        registerVars.put("_root", REGISTER_ROOT);
-        registerVars.put("super", REGISTER_SUPER);
-        registerVars.put("arguments", REGISTER_ARGUMENTS);
-        registerVars.put("this", REGISTER_THIS);
-        registerVars.put("_global", REGISTER_GLOBAL);
-        for (int i = 0; i < paramNames.size(); i++) {
-            registerVars.put(paramNames.get(i), (7 + i)); //(paramNames.size() - i)));
-        }
+        localDataCopy.inFunction++;
         boolean preloadParentFlag = false;
         boolean preloadRootFlag = false;
         boolean preloadSuperFlag = false;
@@ -177,135 +178,100 @@ public class FunctionActionItem extends ActionItem {
         boolean suppressParentFlag = false;
         boolean suppressArgumentsFlag = false;
         boolean suppressThisFlag = false;
-        TreeSet<Integer> usedRegisters = new TreeSet<>();
-        if (actions != null && !actions.isEmpty()) {
-            asGenerator.setInFunction(localDataCopy, true);
-            List<Action> body = asGenerator.toActionList(asGenerator.generate(localDataCopy, actions));
-            for (Action a : body) {
-                if (a instanceof ActionStoreRegister) {
-                    usedRegisters.add(((ActionStoreRegister) a).registerNumber);
-                }
-                if (a instanceof ActionPush) {
-                    ActionPush ap = (ActionPush) a;
-                    for (Object o : ap.values) {
-                        if (o instanceof RegisterNumber) {
-                            usedRegisters.add(((RegisterNumber) o).number);
-                        }
-                    }
-                }
-            }
-            if (usedRegisters.contains(REGISTER_PARENT)) {
-                preloadParentFlag = true;
-            } else {
-                suppressParentFlag = true;
-            }
-            if (usedRegisters.contains(REGISTER_ROOT)) {
-                preloadRootFlag = true;
-            }
-            if (usedRegisters.contains(REGISTER_SUPER)) {
-                preloadSuperFlag = true;
-            }
-            if (usedRegisters.contains(REGISTER_ARGUMENTS)) {
-                preloadArgumentsFlag = true;
-            } else {
-                suppressArgumentsFlag = true;
-            }
-            if (usedRegisters.contains(REGISTER_THIS)) {
-                preloadThisFlag = true;
-            } else {
-                suppressThisFlag = true;
-            }
-            if (usedRegisters.contains(REGISTER_GLOBAL)) {
-                preloadGlobalFlag = true;
-            }
 
-            int newpos = 1;
-            HashMap<Integer, Integer> registerMap = new HashMap<>();
-            if (preloadThisFlag) {
-                registerMap.put(REGISTER_THIS, newpos);
-                newpos++;
-            }
-            if (preloadArgumentsFlag) {
-                registerMap.put(REGISTER_ARGUMENTS, newpos);
-                newpos++;
-            }
-            if (preloadSuperFlag) {
-                registerMap.put(REGISTER_SUPER, newpos);
-                newpos++;
-            }
-            if (preloadRootFlag) {
-                registerMap.put(REGISTER_ROOT, newpos);
-                newpos++;
-            }
-            if (preloadParentFlag) {
-                registerMap.put(REGISTER_PARENT, newpos);
-                newpos++;
-            }
-            if (preloadGlobalFlag) {
-                registerMap.put(REGISTER_GLOBAL, newpos);
-                newpos++;
-            }
-            if (newpos < 1) {
-                newpos = 1;
-            }
-            for (int i = 0; i < 256; i++) {
-                if (usedRegisters.contains(7 + i)) {
-                    registerMap.put(7 + i, newpos);
-                    if (i < paramNames.size()) {
-                        paramRegs.add(newpos);
-                    }
-                    newpos++;
-                } else {
-                    if (i < paramNames.size()) {
-                        paramRegs.add(0);
-                    }
-                }
-            }
+        boolean needsFun2 = false;
 
-            TreeSet<Integer> usedRegisters2 = new TreeSet<>();
-            for (int i : usedRegisters) {
-                if (registerMap.get(i) == null) {
-                    usedRegisters2.add(i);
-                } else {
-                    usedRegisters2.add(registerMap.get(i));
-                }
-            }
-            usedRegisters = usedRegisters2;
-
-            for (Action a : body) {
-                if (a instanceof ActionStoreRegister) {
-                    if (registerMap.containsKey(((ActionStoreRegister) a).registerNumber)) {
-                        ((ActionStoreRegister) a).registerNumber = registerMap.get(((ActionStoreRegister) a).registerNumber);
-                    }
-                }
-                if (a instanceof ActionPush) {
-                    ActionPush ap = (ActionPush) a;
-                    for (Object o : ap.values) {
-                        if (o instanceof RegisterNumber) {
-                            if (registerMap.containsKey(((RegisterNumber) o).number)) {
-                                ((RegisterNumber) o).number = registerMap.get(((RegisterNumber) o).number);
-                            }
-                        }
-                    }
-                }
-            }
-            ret.addAll(body);
+        List<String> registerNames = new ArrayList<>();
+        registerNames.add("***** ZERO *****");
+        if (usedNames.contains("this")) {
+            needsFun2 = true;
+            preloadThisFlag = true;
+            registerNames.add("this");
         } else {
+            suppressThisFlag = true;
+        }
+        if (usedNames.contains("arguments")) {
+            preloadArgumentsFlag = true;
+            needsFun2 = true;
+            registerNames.add("arguments");
+        } else {
+            suppressArgumentsFlag = true;
+        }
+        if (usedNames.contains("super")) {
+            preloadSuperFlag = true;
+            needsFun2 = true;
+            registerNames.add("super");
+        }
+        if (usedNames.contains("_root")) {
+            preloadRootFlag = true;
+            needsFun2 = true;
+            registerNames.add("_root");
+        }
+        if (usedNames.contains("_parent")) {
+            preloadParentFlag = true;
+            needsFun2 = true;
+            registerNames.add("_parent");
+        } else {
+            suppressParentFlag = true;
+        }
+        if (usedNames.contains("_global")) {
+            needsFun2 = true;
+            preloadGlobalFlag = true;
+            registerNames.add("_global");
+        }
+
+        int preloadedNumber = registerNames.size();
+        if (!paramNames.isEmpty()) {
+            needsFun2 = true;
+        }
+        if (localData.inMethod) {
+            needsFun2 = true;
+        }
+        if (localData.inFunction > 1) {
+            needsFun2 = true;
+        }
+        if (needsFun2) {
             for (int i = 0; i < paramNames.size(); i++) {
-                paramRegs.add(1 + i);
+                paramRegs.add(registerNames.size());
+                registerNames.add(paramNames.get(i));
             }
         }
+
+        if (actions != null && !actions.isEmpty()) {
+            localDataCopy.inFunction++;
+
+            for (VariableActionItem v : variables) {
+                String varName = v.getVariableName();
+                GraphTargetItem stored = v.getStoreValue();
+                if (needsFun2) {
+                    if (v.isDefinition() && !registerNames.contains(varName)) {
+                        registerNames.add(varName);
+                    }
+                }
+
+                if (registerNames.contains(varName)) {
+                    if (stored != null) {
+                        v.setBoxedValue(new StoreRegisterActionItem(null, new RegisterNumber(registerNames.indexOf(varName), varName), stored, false));
+                    } else {
+                        v.setBoxedValue(new DirectValueActionItem(new RegisterNumber(registerNames.indexOf(varName), varName)));
+                    }
+                } else {
+                    if (v.isDefinition()) {
+                        v.setBoxedValue(new DefineLocalActionItem(null, ((ActionSourceGenerator) generator).pushConstTargetItem(varName), stored));
+                    } else {
+                        if (stored != null) {
+                            v.setBoxedValue(new SetVariableActionItem(null, ((ActionSourceGenerator) generator).pushConstTargetItem(varName), stored));
+                        } else {
+                            v.setBoxedValue(new GetVariableActionItem(null, ((ActionSourceGenerator) generator).pushConstTargetItem(varName)));
+                        }
+                    }
+                }
+
+            }
+            ret.addAll(asGenerator.toActionList(asGenerator.generate(localDataCopy, actions)));
+        }
         int len = Action.actionsToBytes(asGenerator.toActionList(ret), false, SWF.DEFAULT_VERSION).length;
-        if ((!preloadParentFlag)
-                && (!preloadRootFlag)
-                && (!preloadSuperFlag)
-                && (!preloadArgumentsFlag)
-                && (!preloadThisFlag)
-                && (!preloadGlobalFlag)
-                && (suppressArgumentsFlag)
-                && (suppressThisFlag)
-                && (suppressParentFlag)
-                && usedRegisters.isEmpty()) {
+        if (!needsFun2 && paramNames.isEmpty()) {
             ret.add(0, new ActionDefineFunction(functionName, paramNames, len, SWF.DEFAULT_VERSION));
         } else {
             ret.add(0, new ActionDefineFunction2(functionName,
@@ -318,8 +284,9 @@ public class FunctionActionItem extends ActionItem {
                     suppressThisFlag,
                     preloadThisFlag,
                     preloadGlobalFlag,
-                    usedRegisters.isEmpty() ? 0 : (usedRegisters.last() + 1), len, SWF.DEFAULT_VERSION, paramNames, paramRegs));
+                    registerNames.size() - 1, len, SWF.DEFAULT_VERSION, paramNames, paramRegs));
         }
+
         return ret;
     }