From c8951d9522c33b16711b2275b34c757ba5388ac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sun, 31 Jul 2016 15:15:36 +0200
Subject: [PATCH 01/23] Import/Usage parsing separated to one class Class for
 generating linker reports from SWF files (similar to -link-report option in
 Flex) Generating linker report from commandline

---
 .../flash/abc/types/traits/Trait.java         | 172 +-------------
 .../flash/abc/types/traits/TraitClass.java    |  11 +-
 .../flash/abc/types/traits/TraitFunction.java |   3 +-
 .../types/traits/TraitMethodGetterSetter.java |   3 +-
 .../abc/types/traits/TraitSlotConst.java      |   3 +-
 .../exporters/script/ImportsUsagesParser.java | 211 ++++++++++++++++++
 .../exporters/script/LinkReportExporter.java  | 206 +++++++++++++++++
 .../console/CommandLineArgumentParser.java    |  56 ++++-
 8 files changed, 486 insertions(+), 179 deletions(-)
 create mode 100644 libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/ImportsUsagesParser.java
 create mode 100644 libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/LinkReportExporter.java

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
index c161303b6..35b66c090 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
@@ -42,6 +42,7 @@ import com.jpexs.decompiler.flash.abc.types.NamespaceSet;
 import com.jpexs.decompiler.flash.abc.types.ScriptInfo;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
+import com.jpexs.decompiler.flash.exporters.script.ImportsUsagesParser;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
@@ -169,117 +170,6 @@ public abstract class Trait implements Cloneable, Serializable {
         return ret;
     }
 
-    protected void parseImportsUsagesFromMultiname(String ignoredCustom, ABC abc, List<DottedChain> imports, List<String> uses, Multiname m, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
-        if (m != null) {
-            if (m.kind == Multiname.TYPENAME) {
-                if (m.qname_index != 0) {
-                    parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(m.qname_index), ignorePackage, fullyQualifiedNames);
-                }
-                for (Integer i : m.params) {
-                    if (i != 0) {
-                        parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(i), ignorePackage, fullyQualifiedNames);
-                    }
-                }
-                return;
-            }
-            Namespace ns = m.getNamespace(abc.constants);
-            String name = m.getName(abc.constants, fullyQualifiedNames, true);
-            NamespaceSet nss = m.getNamespaceSet(abc.constants);
-            if (ns != null) {
-                parseImportsUsagesFromNS(ignoredCustom, abc, imports, uses, m.namespace_index, ignorePackage, name);
-            }
-            if (nss != null) {
-                for (int n : nss.namespaces) {
-                    parseImportsUsagesFromNS(ignoredCustom, abc, imports, uses, n, ignorePackage, nss.namespaces.length > 1 ? "" : name);
-                }
-            }
-        }
-    }
-
-    private boolean parseUsagesFromNS(String ignoredCustom, ABC abc, List<DottedChain> imports, List<String> uses, int namespace_index, DottedChain ignorePackage, String name) {
-        Namespace ns = abc.constants.getNamespace(namespace_index);
-
-        if (ns.kind == Namespace.KIND_NAMESPACE) {
-            String nsVal = ns.getName(abc.constants).toRawString();
-            for (ABCContainerTag abcTag : abc.getAbcTags()) {
-                DottedChain nsimport = abcTag.getABC().nsValueToName(nsVal);
-                if (nsimport.equals(AVM2Deobfuscation.BUILTIN)) {
-                    return true; //handled, but import/use not added
-                }
-                if (!nsimport.isEmpty()) {
-
-                    if (!nsimport.getWithoutLast().equals(ignorePackage) && !imports.contains(nsimport)) {
-                        imports.add(nsimport);
-                    }
-                    if (ignoredCustom != null && nsVal.equals(ignoredCustom)) {
-                        return true;
-                    }
-                    if (!uses.contains(nsimport.getLast())) {
-                        uses.add(nsimport.getLast());
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    protected void parseImportsUsagesFromNS(String ignoredCustom, ABC abc, List<DottedChain> imports, List<String> uses, int namespace_index, DottedChain ignorePackage, String name) {
-        Namespace ns = abc.constants.getNamespace(namespace_index);
-        if (name.isEmpty()) {
-            name = "*";
-        }
-        DottedChain newimport = ns.getName(abc.constants);
-
-        if (parseUsagesFromNS(ignoredCustom, abc, imports, uses, namespace_index, ignorePackage, name)) {
-            return;
-        } else if ((ns.kind != Namespace.KIND_PACKAGE) && (ns.kind != Namespace.KIND_PACKAGE_INTERNAL)) {
-            return;
-        }
-        newimport = newimport.add(name);
-        if (!imports.contains(newimport)) {
-            DottedChain pkg = newimport.getWithoutLast(); //.substring(0, newimport.lastIndexOf('.'));
-            if (pkg.equals(InitVectorAVM2Item.VECTOR_PACKAGE)) { //special case - is imported always
-                return;
-            }
-            if (!pkg.equals(ignorePackage)) {
-                imports.add(newimport);
-            }
-        }
-        //}
-    }
-
-    protected void parseUsagesFromMultiname(String ignoredCustom, ABC abc, List<DottedChain> imports, List<String> uses, Multiname m, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
-        if (m != null) {
-            if (m.kind == Multiname.TYPENAME) {
-                if (m.qname_index != 0) {
-                    parseUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(m.qname_index), ignorePackage, fullyQualifiedNames);
-                }
-                for (Integer i : m.params) {
-                    if (i != 0) {
-                        parseUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(i), ignorePackage, fullyQualifiedNames);
-                    }
-                }
-                return;
-            }
-            Namespace ns = m.getNamespace(abc.constants);
-            String name = m.getName(abc.constants, fullyQualifiedNames, false);
-            NamespaceSet nss = m.getNamespaceSet(abc.constants);
-            if (ns != null) {
-                parseUsagesFromNS(ignoredCustom, abc, imports, uses, m.namespace_index, ignorePackage, name);
-            }
-            if (nss != null) {
-                if (nss.namespaces.length == 1) {
-                    parseUsagesFromNS(ignoredCustom, abc, imports, uses, nss.namespaces[0], ignorePackage, name);
-                } else {
-                    for (int n : nss.namespaces) {
-                        parseUsagesFromNS(ignoredCustom, abc, imports, uses, n, ignorePackage, "");
-                    }
-                }
-            }
-        }
-    }
-
     protected DottedChain getPackage(ABC abc) {
         return getName(abc).getNamespace(abc.constants).getName(abc.constants);
     }
@@ -291,7 +181,7 @@ public abstract class Trait implements Cloneable, Serializable {
                 ignoredCustom = n.getName(abc.constants).toRawString();
             }
         }
-        parseUsagesFromMultiname(ignoredCustom, abc, imports, uses, getName(abc), ignorePackage, fullyQualifiedNames);
+        ImportsUsagesParser.parseUsagesFromMultiname(ignoredCustom, abc, imports, uses, getName(abc), ignorePackage, fullyQualifiedNames);
     }
 
     private static final String[] builtInClasses = {"ArgumentError", "arguments", "Array", "Boolean", "Class", "Date", "DefinitionError", "Error", "EvalError", "Function", "int", "JSON", "Math", "Namespace", "Number", "Object", "QName", "RangeError", "ReferenceError", "RegExp", "SecurityError", "String", "SyntaxError", "TypeError", "uint", "URIError", "VerifyError", "XML", "XMLList"};
@@ -375,64 +265,6 @@ public abstract class Trait implements Cloneable, Serializable {
         }
     }
 
-    protected void parseImportsUsagesFromMethodInfo(String ignoredCustom, ABC abc, int method_index, List<DottedChain> imports, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames, List<Integer> visitedMethods) {
-        if ((method_index < 0) || (method_index >= abc.method_info.size())) {
-            return;
-        }
-        visitedMethods.add(method_index);
-        if (abc.method_info.get(method_index).ret_type != 0) {
-            parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(abc.method_info.get(method_index).ret_type), ignorePackage, fullyQualifiedNames);
-        }
-        for (int t : abc.method_info.get(method_index).param_types) {
-            if (t != 0) {
-                parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(t), ignorePackage, fullyQualifiedNames);
-            }
-        }
-        MethodBody body = abc.findBody(method_index);
-        if (body != null) {
-            body.traits.getImportsUsages(ignoredCustom, abc, imports, uses, ignorePackage, fullyQualifiedNames);
-            for (ABCException ex : body.exceptions) {
-                parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(ex.type_index), ignorePackage, fullyQualifiedNames);
-            }
-            for (AVM2Instruction ins : body.getCode().code) {
-                if (ins.definition instanceof AlchemyTypeIns) {
-                    DottedChain nimport = AlchemyTypeIns.ALCHEMY_PACKAGE.add(ins.definition.instructionName);
-                    if (!imports.contains(nimport)) {
-                        imports.add(nimport);
-                    }
-                }
-                if (ins.definition instanceof NewFunctionIns) {
-                    if (ins.operands[0] != method_index) {
-                        if (!visitedMethods.contains(ins.operands[0])) {
-                            parseImportsUsagesFromMethodInfo(ignoredCustom, abc, ins.operands[0], imports, uses, ignorePackage, fullyQualifiedNames, visitedMethods);
-                        }
-                    }
-                }
-                if ((ins.definition instanceof FindPropertyStrictIns)
-                        || (ins.definition instanceof FindPropertyIns)
-                        || (ins.definition instanceof GetLexIns)
-                        || (ins.definition instanceof CoerceIns)
-                        || (ins.definition instanceof AsTypeIns)) {
-                    int m = ins.operands[0];
-                    if (m != 0) {
-                        if (m < abc.constants.getMultinameCount()) {
-                            parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(m), ignorePackage, fullyQualifiedNames);
-                        }
-                    }
-                } else {
-                    for (int k = 0; k < ins.definition.operands.length; k++) {
-                        if (ins.definition.operands[k] == AVM2Code.DAT_MULTINAME_INDEX) {
-                            int multinameIndex = ins.operands[k];
-                            if (multinameIndex < abc.constants.getMultinameCount()) {
-                                parseUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(multinameIndex), ignorePackage, fullyQualifiedNames);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     public final GraphTextWriter getMetaData(Trait parent, ConvertData convertData, ABC abc, GraphTextWriter writer) {
         List<Entry<String, Map<String, String>>> md = getMetaDataTable(parent, convertData, abc);
         for (Entry<String, Map<String, String>> en : md) {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
index d21b8a12d..d92552773 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
@@ -25,6 +25,7 @@ import com.jpexs.decompiler.flash.abc.types.MethodBody;
 import com.jpexs.decompiler.flash.abc.types.Multiname;
 import com.jpexs.decompiler.flash.abc.types.Namespace;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
+import com.jpexs.decompiler.flash.exporters.script.ImportsUsagesParser;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.graph.DottedChain;
@@ -84,26 +85,26 @@ public class TraitClass extends Trait implements TraitWithSlot {
         InstanceInfo instanceInfo = abc.instance_info.get(class_info);
         DottedChain packageName = instanceInfo.getName(abc.constants).getNamespace(abc.constants).getName(abc.constants); //assume not null name
 
-        parseImportsUsagesFromMultiname(customNs, abc, imports, uses, abc.constants.getMultiname(instanceInfo.name_index), packageName, fullyQualifiedNames);
+        ImportsUsagesParser.parseImportsUsagesFromMultiname(customNs, abc, imports, uses, abc.constants.getMultiname(instanceInfo.name_index), packageName, fullyQualifiedNames);
 
         if (instanceInfo.super_index > 0) {
-            parseImportsUsagesFromMultiname(customNs, abc, imports, uses, abc.constants.getMultiname(instanceInfo.super_index), packageName, fullyQualifiedNames);
+            ImportsUsagesParser.parseImportsUsagesFromMultiname(customNs, abc, imports, uses, abc.constants.getMultiname(instanceInfo.super_index), packageName, fullyQualifiedNames);
         }
         for (int i : instanceInfo.interfaces) {
-            parseImportsUsagesFromMultiname(customNs, abc, imports, uses, abc.constants.getMultiname(i), packageName, fullyQualifiedNames);
+            ImportsUsagesParser.parseImportsUsagesFromMultiname(customNs, abc, imports, uses, abc.constants.getMultiname(i), packageName, fullyQualifiedNames);
         }
 
         //static
         classInfo.static_traits.getImportsUsages(customNs, abc, imports, uses, packageName, fullyQualifiedNames);
 
         //static initializer
-        parseImportsUsagesFromMethodInfo(customNs, abc, classInfo.cinit_index, imports, uses, packageName, fullyQualifiedNames, new ArrayList<>());
+        ImportsUsagesParser.parseImportsUsagesFromMethodInfo(customNs, abc, classInfo.cinit_index, imports, uses, packageName, fullyQualifiedNames, new ArrayList<>());
 
         //instance
         instanceInfo.instance_traits.getImportsUsages(customNs, abc, imports, uses, packageName, fullyQualifiedNames);
 
         //instance initializer
-        parseImportsUsagesFromMethodInfo(customNs, abc, instanceInfo.iinit_index, imports, uses, packageName, fullyQualifiedNames, new ArrayList<>());
+        ImportsUsagesParser.parseImportsUsagesFromMethodInfo(customNs, abc, instanceInfo.iinit_index, imports, uses, packageName, fullyQualifiedNames, new ArrayList<>());
     }
 
     @Override
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java
index 887971236..b18f5f1f1 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java
@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.types.ConvertData;
 import com.jpexs.decompiler.flash.abc.types.MethodBody;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
+import com.jpexs.decompiler.flash.exporters.script.ImportsUsagesParser;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.flash.helpers.hilight.HighlightSpecialType;
@@ -130,7 +131,7 @@ public class TraitFunction extends Trait implements TraitWithSlot {
         super.getImportsUsages(customNs, abc, imports, uses, ignorePackage, fullyQualifiedNames);
         //if (method_info != 0)
         {
-            parseImportsUsagesFromMethodInfo(customNs, abc, method_info, imports, uses, ignorePackage, fullyQualifiedNames, new ArrayList<>());
+            ImportsUsagesParser.parseImportsUsagesFromMethodInfo(customNs, abc, method_info, imports, uses, ignorePackage, fullyQualifiedNames, new ArrayList<>());
         }
     }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java
index cc836a0ae..7487d22f2 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java
@@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.abc.types.MethodInfo;
 import com.jpexs.decompiler.flash.abc.types.Namespace;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
+import com.jpexs.decompiler.flash.exporters.script.ImportsUsagesParser;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.flash.helpers.hilight.HighlightSpecialType;
@@ -72,7 +73,7 @@ public class TraitMethodGetterSetter extends Trait {
         }
         //if (method_info != 0)
         {
-            parseImportsUsagesFromMethodInfo(customNs, abc, method_info, imports, uses, ignorePackage, fullyQualifiedNames, new ArrayList<>());
+            ImportsUsagesParser.parseImportsUsagesFromMethodInfo(customNs, abc, method_info, imports, uses, ignorePackage, fullyQualifiedNames, new ArrayList<>());
         }
     }
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java
index 6971590a8..d46ec1c8b 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java
@@ -26,6 +26,7 @@ import com.jpexs.decompiler.flash.abc.types.Namespace;
 import com.jpexs.decompiler.flash.abc.types.ValueKind;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
+import com.jpexs.decompiler.flash.exporters.script.ImportsUsagesParser;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.flash.helpers.hilight.HighlightSpecialType;
@@ -201,7 +202,7 @@ public class TraitSlotConst extends Trait implements TraitWithSlot {
             ignorePackage = getPackage(abc);
         }
         super.getImportsUsages(customNs, abc, imports, uses, ignorePackage, fullyQualifiedNames);
-        parseImportsUsagesFromMultiname(customNs, abc, imports, uses, abc.constants.getMultiname(type_index), getPackage(abc), fullyQualifiedNames);
+        ImportsUsagesParser.parseImportsUsagesFromMultiname(customNs, abc, imports, uses, abc.constants.getMultiname(type_index), getPackage(abc), fullyQualifiedNames);
     }
 
     @Override
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/ImportsUsagesParser.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/ImportsUsagesParser.java
new file mode 100644
index 000000000..79637ff6d
--- /dev/null
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/ImportsUsagesParser.java
@@ -0,0 +1,211 @@
+/*
+ *  Copyright (C) 2010-2016 JPEXS, All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.
+ */
+package com.jpexs.decompiler.flash.exporters.script;
+
+import com.jpexs.decompiler.flash.abc.ABC;
+import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
+import com.jpexs.decompiler.flash.abc.avm2.AVM2Deobfuscation;
+import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
+import com.jpexs.decompiler.flash.abc.avm2.instructions.alchemy.AlchemyTypeIns;
+import com.jpexs.decompiler.flash.abc.avm2.instructions.construction.NewFunctionIns;
+import com.jpexs.decompiler.flash.abc.avm2.instructions.other.FindPropertyIns;
+import com.jpexs.decompiler.flash.abc.avm2.instructions.other.FindPropertyStrictIns;
+import com.jpexs.decompiler.flash.abc.avm2.instructions.other.GetLexIns;
+import com.jpexs.decompiler.flash.abc.avm2.instructions.types.AsTypeIns;
+import com.jpexs.decompiler.flash.abc.avm2.instructions.types.CoerceIns;
+import com.jpexs.decompiler.flash.abc.avm2.model.InitVectorAVM2Item;
+import com.jpexs.decompiler.flash.abc.types.ABCException;
+import com.jpexs.decompiler.flash.abc.types.MethodBody;
+import com.jpexs.decompiler.flash.abc.types.Multiname;
+import com.jpexs.decompiler.flash.abc.types.Namespace;
+import com.jpexs.decompiler.flash.abc.types.NamespaceSet;
+import com.jpexs.decompiler.flash.tags.ABCContainerTag;
+import com.jpexs.decompiler.graph.DottedChain;
+import java.util.List;
+
+public class ImportsUsagesParser {
+
+    public static void parseImportsUsagesFromNS(String ignoredCustom, ABC abc, List<DottedChain> imports, List<String> uses, int namespace_index, DottedChain ignorePackage, String name) {
+        Namespace ns = abc.constants.getNamespace(namespace_index);
+        if (name.isEmpty()) {
+            name = "*";
+        }
+        DottedChain newimport = ns.getName(abc.constants);
+
+        if (parseUsagesFromNS(ignoredCustom, abc, imports, uses, namespace_index, ignorePackage, name)) {
+            return;
+        } else if ((ns.kind != Namespace.KIND_PACKAGE) && (ns.kind != Namespace.KIND_PACKAGE_INTERNAL)) {
+            return;
+        }
+        newimport = newimport.add(name);
+        if (!imports.contains(newimport)) {
+            DottedChain pkg = newimport.getWithoutLast(); //.substring(0, newimport.lastIndexOf('.'));
+            if (pkg.equals(InitVectorAVM2Item.VECTOR_PACKAGE)) { //special case - is imported always
+                return;
+            }
+            if (!pkg.equals(ignorePackage)) {
+                imports.add(newimport);
+            }
+        }
+        //}
+    }
+
+    public static void parseImportsUsagesFromMultiname(String ignoredCustom, ABC abc, List<DottedChain> imports, List<String> uses, Multiname m, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
+        if (m != null) {
+            if (m.kind == Multiname.TYPENAME) {
+                if (m.qname_index != 0) {
+                    parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(m.qname_index), ignorePackage, fullyQualifiedNames);
+                }
+                for (Integer i : m.params) {
+                    if (i != 0) {
+                        parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(i), ignorePackage, fullyQualifiedNames);
+                    }
+                }
+                return;
+            }
+            Namespace ns = m.getNamespace(abc.constants);
+            String name = m.getName(abc.constants, fullyQualifiedNames, true);
+            NamespaceSet nss = m.getNamespaceSet(abc.constants);
+            if (ns != null) {
+                parseImportsUsagesFromNS(ignoredCustom, abc, imports, uses, m.namespace_index, ignorePackage, name);
+            }
+            if (nss != null) {
+                for (int n : nss.namespaces) {
+                    parseImportsUsagesFromNS(ignoredCustom, abc, imports, uses, n, ignorePackage, nss.namespaces.length > 1 ? "" : name);
+                }
+            }
+        }
+    }
+
+    public static void parseImportsUsagesFromMethodInfo(String ignoredCustom, ABC abc, int method_index, List<DottedChain> imports, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames, List<Integer> visitedMethods) {
+        if ((method_index < 0) || (method_index >= abc.method_info.size())) {
+            return;
+        }
+        visitedMethods.add(method_index);
+        if (abc.method_info.get(method_index).ret_type != 0) {
+            parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(abc.method_info.get(method_index).ret_type), ignorePackage, fullyQualifiedNames);
+        }
+        for (int t : abc.method_info.get(method_index).param_types) {
+            if (t != 0) {
+                parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(t), ignorePackage, fullyQualifiedNames);
+            }
+        }
+        MethodBody body = abc.findBody(method_index);
+        if (body != null) {
+            body.traits.getImportsUsages(ignoredCustom, abc, imports, uses, ignorePackage, fullyQualifiedNames);
+            for (ABCException ex : body.exceptions) {
+                parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(ex.type_index), ignorePackage, fullyQualifiedNames);
+            }
+            for (AVM2Instruction ins : body.getCode().code) {
+                if (ins.definition instanceof AlchemyTypeIns) {
+                    DottedChain nimport = AlchemyTypeIns.ALCHEMY_PACKAGE.add(ins.definition.instructionName);
+                    if (!imports.contains(nimport)) {
+                        imports.add(nimport);
+                    }
+                }
+                if (ins.definition instanceof NewFunctionIns) {
+                    if (ins.operands[0] != method_index) {
+                        if (!visitedMethods.contains(ins.operands[0])) {
+                            parseImportsUsagesFromMethodInfo(ignoredCustom, abc, ins.operands[0], imports, uses, ignorePackage, fullyQualifiedNames, visitedMethods);
+                        }
+                    }
+                }
+                if ((ins.definition instanceof FindPropertyStrictIns)
+                        || (ins.definition instanceof FindPropertyIns)
+                        || (ins.definition instanceof GetLexIns)
+                        || (ins.definition instanceof CoerceIns)
+                        || (ins.definition instanceof AsTypeIns)) {
+                    int m = ins.operands[0];
+                    if (m != 0) {
+                        if (m < abc.constants.getMultinameCount()) {
+                            parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(m), ignorePackage, fullyQualifiedNames);
+                        }
+                    }
+                } else {
+                    for (int k = 0; k < ins.definition.operands.length; k++) {
+                        if (ins.definition.operands[k] == AVM2Code.DAT_MULTINAME_INDEX) {
+                            int multinameIndex = ins.operands[k];
+                            if (multinameIndex < abc.constants.getMultinameCount()) {
+                                parseUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(multinameIndex), ignorePackage, fullyQualifiedNames);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public static void parseUsagesFromMultiname(String ignoredCustom, ABC abc, List<DottedChain> imports, List<String> uses, Multiname m, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
+        if (m != null) {
+            if (m.kind == Multiname.TYPENAME) {
+                if (m.qname_index != 0) {
+                    parseUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(m.qname_index), ignorePackage, fullyQualifiedNames);
+                }
+                for (Integer i : m.params) {
+                    if (i != 0) {
+                        parseUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(i), ignorePackage, fullyQualifiedNames);
+                    }
+                }
+                return;
+            }
+            Namespace ns = m.getNamespace(abc.constants);
+            String name = m.getName(abc.constants, fullyQualifiedNames, false);
+            NamespaceSet nss = m.getNamespaceSet(abc.constants);
+            if (ns != null) {
+                parseUsagesFromNS(ignoredCustom, abc, imports, uses, m.namespace_index, ignorePackage, name);
+            }
+            if (nss != null) {
+                if (nss.namespaces.length == 1) {
+                    parseUsagesFromNS(ignoredCustom, abc, imports, uses, nss.namespaces[0], ignorePackage, name);
+                } else {
+                    for (int n : nss.namespaces) {
+                        parseUsagesFromNS(ignoredCustom, abc, imports, uses, n, ignorePackage, "");
+                    }
+                }
+            }
+        }
+    }
+
+    private static boolean parseUsagesFromNS(String ignoredCustom, ABC abc, List<DottedChain> imports, List<String> uses, int namespace_index, DottedChain ignorePackage, String name) {
+        Namespace ns = abc.constants.getNamespace(namespace_index);
+
+        if (ns.kind == Namespace.KIND_NAMESPACE) {
+            String nsVal = ns.getName(abc.constants).toRawString();
+            for (ABCContainerTag abcTag : abc.getAbcTags()) {
+                DottedChain nsimport = abcTag.getABC().nsValueToName(nsVal);
+                if (nsimport.equals(AVM2Deobfuscation.BUILTIN)) {
+                    return true; //handled, but import/use not added
+                }
+                if (!nsimport.isEmpty()) {
+
+                    if (!nsimport.getWithoutLast().equals(ignorePackage) && !imports.contains(nsimport)) {
+                        imports.add(nsimport);
+                    }
+                    if (ignoredCustom != null && nsVal.equals(ignoredCustom)) {
+                        return true;
+                    }
+                    if (!uses.contains(nsimport.getLast())) {
+                        uses.add(nsimport.getLast());
+                    }
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/LinkReportExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/LinkReportExporter.java
new file mode 100644
index 000000000..b59db7d8a
--- /dev/null
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/LinkReportExporter.java
@@ -0,0 +1,206 @@
+/*
+ *  Copyright (C) 2010-2016 JPEXS, All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.
+ */
+package com.jpexs.decompiler.flash.exporters.script;
+
+import com.jpexs.decompiler.flash.EventListener;
+import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.abc.ABC;
+import com.jpexs.decompiler.flash.abc.ScriptPack;
+import com.jpexs.decompiler.flash.abc.types.ClassInfo;
+import com.jpexs.decompiler.flash.abc.types.InstanceInfo;
+import com.jpexs.decompiler.flash.abc.types.Multiname;
+import com.jpexs.decompiler.flash.abc.types.Namespace;
+import com.jpexs.decompiler.flash.abc.types.NamespaceSet;
+import com.jpexs.decompiler.flash.abc.types.ScriptInfo;
+import com.jpexs.decompiler.flash.abc.types.traits.Trait;
+import com.jpexs.decompiler.flash.abc.types.traits.TraitClass;
+import com.jpexs.decompiler.graph.DottedChain;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Class LinkReportExporter - generates Linker reports similar to Flex
+ * -link-report, but for SWF files
+ *
+ * @author JPEXS
+ */
+public class LinkReportExporter {
+
+    private String newLineChar = "\n";
+    private String indentStr = "  ";
+
+    /**
+     * Constructs reporter with LF as newline, two spaces as indent
+     */
+    public LinkReportExporter() {
+
+    }
+
+    /**
+     * Constructs reporter with custom newline char, two spaces as indent
+     *
+     * @param newLineChar
+     */
+    public LinkReportExporter(String newLineChar) {
+        this.newLineChar = newLineChar;
+    }
+
+    /**
+     * Constructs reporter with custom newline char and indent string
+     *
+     * @param newLineChar
+     * @param indentStr
+     */
+    public LinkReportExporter(String newLineChar, String indentStr) {
+        this.newLineChar = newLineChar;
+        this.indentStr = indentStr;
+
+    }
+
+    private String indent(int cnt) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < cnt; i++) {
+            sb.append(indentStr);
+        }
+        return sb.toString();
+    }
+
+    public String generateReport(SWF swf, List<ScriptPack> as3scripts, EventListener evl) {
+        StringBuilder sb = new StringBuilder();
+        Set<String> extDeps = new HashSet<>();
+        sb.append("<report>").append(newLineChar);
+        sb.append(indent(1)).append("<scripts>").append(newLineChar);
+        List<ScriptPack> revList = new ArrayList<>(as3scripts);
+        Collections.reverse(revList);
+
+        List<DottedChain> existingObjects = new ArrayList<>();
+        for (ScriptPack sp : as3scripts) {
+            existingObjects.add(sp.getClassPath().packageStr.add(sp.getClassPath().className));
+        }
+
+        for (ScriptPack sp : revList) {
+            String scriptName = "script" + sp.scriptIndex;
+            sb.append(indent(2)).append("<script name=\"").append(scriptName).append("\">").append(newLineChar);
+            //TODO: additional atributes - mod="1469951734131" size="525" optimizedsize="508
+            ScriptInfo script = sp.abc.script_info.get(sp.scriptIndex);
+            for (int traitIndex : sp.traitIndices) {
+                Trait trait = script.traits.traits.get(traitIndex);
+                sb.append(reportTrait(extDeps, existingObjects, swf, sp.abc, trait));
+            }
+            //how about script_init method(?)
+            sb.append(indent(2)).append("</script>").append(newLineChar);
+        }
+        sb.append(indent(1)).append("</scripts>").append(newLineChar);
+        sb.append("</report>").append(newLineChar);
+        return sb.toString();
+    }
+
+    private String multiNameToId(ABC abc, Multiname multiName) {
+        Namespace ns = multiName.getNamespace(abc.constants);
+        NamespaceSet nss = multiName.getNamespaceSet(abc.constants);
+        if (nss != null && nss.namespaces.length == 1) {
+            ns = abc.constants.getNamespace(nss.namespaces[0]);
+        }
+        String pkgName = ns == null ? "" : ns.getName(abc.constants).toRawString();
+        String clsName = multiName.getName(abc.constants, new ArrayList<>(), true);
+        return pkgName.isEmpty() ? clsName : pkgName + ":" + clsName;
+    }
+
+    private String dottedChainToId(DottedChain dc) {
+        if (dc.getWithoutLast().isEmpty()) {
+            return dc.getLast();
+        }
+        return dc.getWithoutLast().toRawString() + ":" + dc.getLast();
+    }
+
+    private String reportTrait(Set<String> externalDefs, List<DottedChain> existingObjects, SWF swf, ABC abc, Trait t) {
+        //TODO: handle externalDefs - <external-defs> <ext id="..." /> </external-defs>
+        StringBuilder sb = new StringBuilder();
+        if (t instanceof TraitClass) {
+            TraitClass tc = (TraitClass) t;
+            sb.append(indent(3)).append("<def id=\"").append(multiNameToId(abc, tc.getName(abc))).append("\" />").append(newLineChar);
+            ClassInfo ci = abc.class_info.get(tc.class_info);
+            InstanceInfo ii = abc.instance_info.get(tc.class_info);
+
+            Set<String> allDeps = new HashSet<>();
+
+            String superPre;
+            if (ii.super_index != 0) {
+                superPre = multiNameToId(abc, abc.constants.getMultiname(ii.super_index));
+            } else {
+                superPre = "Object";
+            }
+            allDeps.add(superPre);
+            sb.append(indent(3)).append("<pre id=\"").append(superPre).append("\" />").append(newLineChar);
+
+            for (int iface : ii.interfaces) {
+                String ifacePre = multiNameToId(abc, abc.constants.getMultiname(iface));
+                allDeps.add(ifacePre);
+                sb.append(indent(3)).append("<pre id=\"").append(ifacePre).append("\" />").append(newLineChar);
+            }
+
+            for (Trait ct : ci.static_traits.traits) {
+                reportTrait(externalDefs, existingObjects, swf, abc, ct);
+            }
+            for (Trait it : ii.instance_traits.traits) {
+                reportTrait(externalDefs, existingObjects, swf, abc, it);
+            }
+            List<DottedChain> imports = new ArrayList<>();
+            List<String> uses = new ArrayList<>();
+
+            sb.append(indent(3)).append("<dep id=\"AS3\" />").append(newLineChar); //Automatic
+
+            getImportsUsagesFromClass(tc.class_info, null, abc, imports, uses, new DottedChain("FAKE!PACKAGE") /*do not skip any package*/, new ArrayList<>());
+            for (DottedChain dc : imports) {
+                if (!"*".equals(dc.getLast())) {
+                    //some toplevel "imports" can be only method calls
+                    if (dc.getWithoutLast().isEmpty() && !existingObjects.contains(dc)) {
+                        continue;
+                    }
+                    String dep = dottedChainToId(dc);
+                    if (!allDeps.contains(dep)) {
+                        sb.append(indent(3)).append("<dep id=\"").append(dep).append("\" />").append(newLineChar);
+                        allDeps.add(dep);
+                    }
+                }
+            }
+        }
+        return sb.toString();
+    }
+
+    private void getImportsUsagesFromClass(int class_info, String customNs, ABC abc, List<DottedChain> imports, List<String> uses, DottedChain ignoredPackage, List<DottedChain> fullyQualifiedNames) {
+        ClassInfo classInfo = abc.class_info.get(class_info);
+        InstanceInfo instanceInfo = abc.instance_info.get(class_info);
+
+        //static initializer
+        ImportsUsagesParser.parseImportsUsagesFromMethodInfo(customNs, abc, classInfo.cinit_index, imports, uses, ignoredPackage, fullyQualifiedNames, new ArrayList<>());
+
+        //instance initializer
+        ImportsUsagesParser.parseImportsUsagesFromMethodInfo(customNs, abc, instanceInfo.iinit_index, imports, uses, ignoredPackage, fullyQualifiedNames, new ArrayList<>());
+
+        //static
+        classInfo.static_traits.getImportsUsages(customNs, abc, imports, uses, ignoredPackage, fullyQualifiedNames);
+
+        //instance
+        instanceInfo.instance_traits.getImportsUsages(customNs, abc, imports, uses, ignoredPackage, fullyQualifiedNames);
+
+    }
+
+}
diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
index 906c93de2..b1abaff39 100644
--- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
+++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
@@ -75,6 +75,7 @@ import com.jpexs.decompiler.flash.exporters.modes.ShapeExportMode;
 import com.jpexs.decompiler.flash.exporters.modes.SoundExportMode;
 import com.jpexs.decompiler.flash.exporters.modes.SpriteExportMode;
 import com.jpexs.decompiler.flash.exporters.modes.TextExportMode;
+import com.jpexs.decompiler.flash.exporters.script.LinkReportExporter;
 import com.jpexs.decompiler.flash.exporters.settings.BinaryDataExportSettings;
 import com.jpexs.decompiler.flash.exporters.settings.ButtonExportSettings;
 import com.jpexs.decompiler.flash.exporters.settings.FontExportSettings;
@@ -577,6 +578,13 @@ public class CommandLineArgumentParser {
             out.println("  ...<swffile>: SWF file to search instance in");
         }
 
+        if (filter == null || filter.equals("linkreport")) {
+            out.println(" " + (cnt++) + ") -linkReport [-outfile <outfile>] <swffile>");
+            out.println("  ...generates linker report for the swffile");
+            out.println("  ...-outfile <outfile> (optional): Saves XML report to <outfile>. When ommited, the report is printed to stdout.");
+            out.println("  ...<swffile>: SWF file to search instance in");
+        }
+
         printCmdLineUsageExamples(out, filter);
     }
 
@@ -792,7 +800,9 @@ public class CommandLineArgumentParser {
             command = nextParam.substring(1);
         }
 
-        if (command.equals("getinstancemetadata")) {
+        if (command.equals("linkreport")) {
+            parseLinkReport(selectionClasses, args);
+        } else if (command.equals("getinstancemetadata")) {
             parseGetInstanceMetadata(args);
         } else if (command.equals("setinstancemetadata")) {
             parseSetInstanceMetadata(args);
@@ -987,6 +997,50 @@ public class CommandLineArgumentParser {
         setConfigurations(args.pop());
     }
 
+    private static void parseLinkReport(List<String> selectionClasses, Stack<String> args) {
+        if (args.isEmpty()) {
+            badArguments("linkreport");
+        }
+        File stdOutFile = null;
+        File swfFile = null;
+        while (!args.isEmpty()) {
+            String paramName = args.pop().toLowerCase();
+            switch (paramName) {
+                case "-outfile":
+                    if (args.empty()) {
+                        System.err.println("Missing output file");
+                        badArguments("linkreport");
+                    }
+                    stdOutFile = new File(args.pop());
+                    break;
+                default:
+                    if (!args.isEmpty()) {
+                        badArguments("linkreport");
+                    }
+                    swfFile = new File(paramName);
+            }
+        }
+        if (swfFile == null) {
+            System.err.println("No SWF file specified");
+            badArguments("getinstancemetadata");
+        }
+        processReadSWF(swfFile, stdOutFile, (SWF swf, OutputStream stdout) -> {
+            LinkReportExporter lre = new LinkReportExporter();
+
+            List<ScriptPack> reportPacks;
+            try {
+                reportPacks = selectionClasses != null ? swf.getScriptPacksByClassNames(selectionClasses) : swf.getAS3Packs();
+            } catch (Exception ex) {
+                System.err.println("Error while getting packs");
+                System.exit(1);
+                return;
+            }
+
+            String reportStr = lre.generateReport(swf, reportPacks, null);
+            stdout.write(reportStr.getBytes("UTF-8"));
+        });
+    }
+
     private static void parseGetInstanceMetadata(Stack<String> args) {
         if (args.size() < 3) {
             badArguments("getinstancemetadata");

From 8c5345cfd86f8f7546db4d49c3f5b84fa03d1b51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sat, 6 Aug 2016 07:19:52 +0200
Subject: [PATCH 02/23] AS3 editation with flex - not really working yet:  -
 needs fixing circular references, etc. (eg. editing class which references
 classes which references this class)  - needs better errors displaying with
 jump to error line, etc.

---
 .../src/com/jpexs/decompiler/flash/SWF.java   |  10 +-
 .../com/jpexs/decompiler/flash/abc/ABC.java   | 136 ++++++---
 .../flash/abc/types/traits/Trait.java         |  19 +-
 .../flash/abc/types/traits/TraitClass.java    |  40 +--
 .../flash/abc/types/traits/TraitFunction.java |   9 +-
 .../types/traits/TraitMethodGetterSetter.java |   9 +-
 .../abc/types/traits/TraitSlotConst.java      |  10 +-
 .../flash/abc/types/traits/Traits.java        |   5 +-
 .../flash/configuration/Configuration.java    |   5 +
 .../flash/exporters/script/Dependency.java    |  58 ++++
 ...sagesParser.java => DependencyParser.java} |  62 +++--
 .../exporters/script/DependencyType.java      |   5 +
 .../exporters/script/LinkReportExporter.java  |  33 +--
 .../flash/exporters/swf/SwfToSwcExporter.java | 261 ++++++++++++++++++
 .../flash/exporters/swf/swc_main_abctag.xml   | 216 +++++++++++++++
 .../flash/flexsdk/As3ScriptReplacer.java      | 152 ++++++++++
 .../flash/flexsdk/MxmlcException.java         |  15 +
 .../decompiler/flash/flexsdk/MxmlcRunner.java |  54 ++++
 .../flash/importers/SwfXmlImporter.java       |  14 +-
 .../flash/flexsdk/As3ScriptReplacerTest.java  |  50 ++++
 .../console/CommandLineArgumentParser.java    |  33 ++-
 .../jpexs/decompiler/flash/gui/MainPanel.java |   8 +
 .../decompiler/flash/gui/abc/ABCPanel.java    |  11 +-
 .../locales/AdvancedSettingsDialog.properties |   3 +
 .../flash/gui/locales/MainFrame.properties    |   3 +-
 25 files changed, 1067 insertions(+), 154 deletions(-)
 create mode 100644 libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/Dependency.java
 rename libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/{ImportsUsagesParser.java => DependencyParser.java} (64%)
 create mode 100644 libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/DependencyType.java
 create mode 100644 libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/SwfToSwcExporter.java
 create mode 100644 libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/swc_main_abctag.xml
 create mode 100644 libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
 create mode 100644 libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcException.java
 create mode 100644 libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcRunner.java
 create mode 100644 libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacerTest.java

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
index f17f66ae3..664af0e18 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
@@ -2535,10 +2535,14 @@ public final class SWF implements SWFContainerItem, Timelined {
         System.gc();
     }
 
+    public void clearAbcListCache() {
+        abcList = null;
+    }
+
     public void clearAllCache() {
         characters = null;
         characterIdTags = null;
-        abcList = null;
+        clearAbcListCache();
         timeline = null;
         clearReadOnlyListCache();
         clearImageCache();
@@ -2890,7 +2894,8 @@ public final class SWF implements SWFContainerItem, Timelined {
             timelined.setModified(true);
             timelined.resetTimeline();
         } else // timeline should be always the swf here
-         if (removeDependencies) {
+        {
+            if (removeDependencies) {
                 removeTagWithDependenciesFromTimeline(tag, timelined.getTimeline());
                 timelined.setModified(true);
             } else {
@@ -2899,6 +2904,7 @@ public final class SWF implements SWFContainerItem, Timelined {
                     timelined.setModified(true);
                 }
             }
+        }
     }
 
     @Override
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
index 3c3a87945..29f090534 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
@@ -55,7 +55,11 @@ import com.jpexs.decompiler.flash.abc.usages.MethodParamsMultinameUsage;
 import com.jpexs.decompiler.flash.abc.usages.MethodReturnTypeMultinameUsage;
 import com.jpexs.decompiler.flash.abc.usages.MultinameUsage;
 import com.jpexs.decompiler.flash.abc.usages.TypeNameMultinameUsage;
+import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.dumpview.DumpInfo;
+import com.jpexs.decompiler.flash.exporters.script.LinkReportExporter;
+import com.jpexs.decompiler.flash.flexsdk.As3ScriptReplacer;
+import com.jpexs.decompiler.flash.flexsdk.MxmlcException;
 import com.jpexs.decompiler.flash.helpers.SWFDecompilerPlugin;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.flash.tags.Tag;
@@ -137,6 +141,25 @@ public class ABC {
         return method_info.size() - 1;
     }
 
+    public void deleteClass(int class_info, boolean d) {
+        ABC abc = this;
+        ClassInfo classInfo = abc.class_info.get(class_info);
+        classInfo.deleted = d;
+        InstanceInfo instanceInfo = abc.instance_info.get(class_info);
+        instanceInfo.deleted = d;
+
+        classInfo.static_traits.delete(abc, d);
+        abc.method_info.get(classInfo.cinit_index).delete(abc, d);
+
+        instanceInfo.instance_traits.delete(abc, d);
+        abc.method_info.get(instanceInfo.iinit_index).delete(abc, d);
+
+        int protectedNS = instanceInfo.protectedNS;
+        if (protectedNS != 0) {
+            abc.constants.getNamespace(protectedNS).deleted = d;
+        }
+    }
+
     public TraitMethodGetterSetter addMethod(int classId, String name, boolean isStatic) {
         Multiname multiname = new Multiname();
         multiname.kind = Multiname.QNAME;
@@ -743,10 +766,19 @@ public class ABC {
             aos.writeU30(ci.cinit_index);
             aos.writeTraits(ci.static_traits);
         }
-        aos.writeU30(script_info.size());
+        int numScripts = script_info.size();
         for (ScriptInfo si : script_info) {
-            aos.writeU30(si.init_index);
-            aos.writeTraits(si.traits);
+            if (si.deleted) {
+                numScripts--;
+            }
+        }
+
+        aos.writeU30(numScripts);
+        for (ScriptInfo si : script_info) {
+            if (!si.deleted) {
+                aos.writeU30(si.init_index);
+                aos.writeTraits(si.traits);
+            }
         }
 
         aos.writeU30(bodies.size());
@@ -964,7 +996,9 @@ public class ABC {
     public List<ScriptPack> getScriptPacks(String packagePrefix, List<ABC> allAbcs) {
         List<ScriptPack> ret = new ArrayList<>();
         for (int i = 0; i < script_info.size(); i++) {
-            ret.addAll(script_info.get(i).getPacks(this, i, packagePrefix, allAbcs));
+            if (!script_info.get(i).deleted) {
+                ret.addAll(script_info.get(i).getPacks(this, i, packagePrefix, allAbcs));
+            }
         }
         return ret;
     }
@@ -1328,67 +1362,81 @@ public class ABC {
     }
 
     public boolean replaceScriptPack(ScriptPack pack, String as) throws AVM2ParseException, CompilationException, IOException, InterruptedException {
-        String scriptName = pack.getPathScriptName() + ".as";
-        int oldIndex = pack.scriptIndex;
-        int newIndex = script_info.size();
-        String documentClass = getSwf().getDocumentClass();
-        boolean isDocumentClass = documentClass != null && documentClass.equals(pack.getClassPath().toString());
+
+        final boolean USE_FLEX = true;
 
         boolean isSimple = pack.isSimple;
 
-        ScriptInfo si = script_info.get(oldIndex);
-        if (isSimple) {
-            si.delete(this, true);
+        if (USE_FLEX) {
+            if (!pack.isSimple) {
+                return false;
+            }
+            As3ScriptReplacer asr = new As3ScriptReplacer(Configuration.flexSdkLocation.get(), new LinkReportExporter());
+            try {
+                asr.replaceScript(pack.getSwf(), pack, as);
+            } catch (MxmlcException ex) {
+                throw new AVM2ParseException(ex.getMxmlcErrorOutput(), 0);
+            }
         } else {
+            String scriptName = pack.getPathScriptName() + ".as";
+            int oldIndex = pack.scriptIndex;
+            int newIndex = script_info.size();
+            String documentClass = getSwf().getDocumentClass();
+            boolean isDocumentClass = documentClass != null && documentClass.equals(pack.getClassPath().toString());
+
+            ScriptInfo si = script_info.get(oldIndex);
+            if (isSimple) {
+                si.delete(this, true);
+            } else {
+                for (int t : pack.traitIndices) {
+                    si.traits.traits.get(t).delete(this, true);
+                }
+            }
+
+            int newClassIndex = instance_info.size();
             for (int t : pack.traitIndices) {
-                si.traits.traits.get(t).delete(this, true);
+                if (si.traits.traits.get(t) instanceof TraitClass) {
+                    TraitClass tc = (TraitClass) si.traits.traits.get(t);
+                    newClassIndex = tc.class_info + 1;
+                }
+
             }
-        }
+            List<ABC> otherAbcs = new ArrayList<>(pack.allABCs);
+            otherAbcs.remove(this);
+            ActionScript3Parser.compile(as, this, otherAbcs, isDocumentClass, scriptName, newClassIndex, oldIndex);
 
-        int newClassIndex = instance_info.size();
-        for (int t : pack.traitIndices) {
-            if (si.traits.traits.get(t) instanceof TraitClass) {
-                TraitClass tc = (TraitClass) si.traits.traits.get(t);
-                newClassIndex = tc.class_info + 1;
+            if (isSimple) {
+                // Move newly added script to its position
+                script_info.set(oldIndex, script_info.get(newIndex));
+                script_info.remove(newIndex);
+            } else {
+                script_info.get(newIndex).setModified(true);
+                //Note: Is deleting traits safe?
+                List<Integer> todel = new ArrayList<>(new TreeSet<>(pack.traitIndices));
+                for (int i = todel.size() - 1; i >= 0; i--) {
+                    si.traits.traits.remove((int) todel.get(i));
+                }
             }
-
+            script_info.get(oldIndex).setModified(true);
         }
-        List<ABC> otherAbcs = new ArrayList<>(pack.allABCs);
-        otherAbcs.remove(this);
-        ActionScript3Parser.compile(as, this, otherAbcs, isDocumentClass, scriptName, newClassIndex, oldIndex);
-
-        if (isSimple) {
-            // Move newly added script to its position
-            script_info.set(oldIndex, script_info.get(newIndex));
-            script_info.remove(newIndex);
-        } else {
-            script_info.get(newIndex).setModified(true);
-            //Note: Is deleting traits safe?
-            List<Integer> todel = new ArrayList<>(new TreeSet<>(pack.traitIndices));
-            for (int i = todel.size() - 1; i >= 0; i--) {
-                si.traits.traits.remove((int) todel.get(i));
-            }
-        }
-
-        script_info.get(oldIndex).setModified(true);
         pack(); // removes old classes/methods
         ((Tag) parentTag).setModified(true);
         return !isSimple;
     }
 
     public void pack() {
-        for (int c = 0; c < instance_info.size(); c++) {
-            if (instance_info.get(c).deleted) {
-                removeClass(c);
-                c--;
-            }
-        }
         for (int m = 0; m < method_info.size(); m++) {
             if (method_info.get(m).deleted) {
                 removeMethod(m);
                 m--;
             }
         }
+        for (int c = 0; c < instance_info.size(); c++) {
+            if (instance_info.get(c).deleted) {
+                removeClass(c);
+                c--;
+            }
+        }
 
         getMethodIndexing();
     }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
index 35b66c090..0c1446dc4 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
@@ -42,7 +42,9 @@ import com.jpexs.decompiler.flash.abc.types.NamespaceSet;
 import com.jpexs.decompiler.flash.abc.types.ScriptInfo;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
-import com.jpexs.decompiler.flash.exporters.script.ImportsUsagesParser;
+import com.jpexs.decompiler.flash.exporters.script.Dependency;
+import com.jpexs.decompiler.flash.exporters.script.DependencyParser;
+import com.jpexs.decompiler.flash.exporters.script.DependencyType;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
@@ -174,14 +176,14 @@ public abstract class Trait implements Cloneable, Serializable {
         return getName(abc).getNamespace(abc.constants).getName(abc.constants);
     }
 
-    public void getImportsUsages(String ignoredCustom, ABC abc, List<DottedChain> imports, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
+    public void getDependencies(String ignoredCustom, ABC abc, List<Dependency> dependencies, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
         if (ignoredCustom == null) {
             Namespace n = getName(abc).getNamespace(abc.constants);
             if (n.kind == Namespace.KIND_NAMESPACE) {
                 ignoredCustom = n.getName(abc.constants).toRawString();
             }
         }
-        ImportsUsagesParser.parseUsagesFromMultiname(ignoredCustom, abc, imports, uses, getName(abc), ignorePackage, fullyQualifiedNames);
+        DependencyParser.parseUsagesFromMultiname(ignoredCustom, abc, dependencies, uses, getName(abc), ignorePackage, fullyQualifiedNames, DependencyType.NAMESPACE);
     }
 
     private static final String[] builtInClasses = {"ArgumentError", "arguments", "Array", "Boolean", "Class", "Date", "DefinitionError", "Error", "EvalError", "Function", "int", "JSON", "Math", "Namespace", "Number", "Object", "QName", "RangeError", "ReferenceError", "RegExp", "SecurityError", "String", "SyntaxError", "TypeError", "uint", "URIError", "VerifyError", "XML", "XMLList"};
@@ -210,14 +212,21 @@ public abstract class Trait implements Cloneable, Serializable {
         }
 
         //imports
-        List<DottedChain> imports = new ArrayList<>();
+        List<Dependency> dependencies = new ArrayList<>();
         List<String> uses = new ArrayList<>();
         String customNs = null;
         Namespace ns = getName(abc).getNamespace(abc.constants);
         if (ns.kind == Namespace.KIND_NAMESPACE) {
             customNs = ns.getName(abc.constants).toRawString();
         }
-        getImportsUsages(customNs, abc, imports, uses, ignorePackage, new ArrayList<>());
+        getDependencies(customNs, abc, dependencies, uses, ignorePackage, new ArrayList<>());
+
+        List<DottedChain> imports = new ArrayList<>();
+        for (Dependency d : dependencies) {
+            if (!imports.contains(d.getId())) {
+                imports.add(d.getId());
+            }
+        }
 
         List<String> importnames = new ArrayList<>();
         importnames.addAll(namesInThisPackage);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
index d92552773..2eea9627c 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
@@ -25,7 +25,9 @@ import com.jpexs.decompiler.flash.abc.types.MethodBody;
 import com.jpexs.decompiler.flash.abc.types.Multiname;
 import com.jpexs.decompiler.flash.abc.types.Namespace;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
-import com.jpexs.decompiler.flash.exporters.script.ImportsUsagesParser;
+import com.jpexs.decompiler.flash.exporters.script.Dependency;
+import com.jpexs.decompiler.flash.exporters.script.DependencyParser;
+import com.jpexs.decompiler.flash.exporters.script.DependencyType;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.graph.DottedChain;
@@ -49,22 +51,7 @@ public class TraitClass extends Trait implements TraitWithSlot {
 
     @Override
     public void delete(ABC abc, boolean d) {
-        ClassInfo classInfo = abc.class_info.get(class_info);
-        classInfo.deleted = d;
-        InstanceInfo instanceInfo = abc.instance_info.get(class_info);
-        instanceInfo.deleted = d;
-
-        classInfo.static_traits.delete(abc, d);
-        abc.method_info.get(classInfo.cinit_index).delete(abc, d);
-
-        instanceInfo.instance_traits.delete(abc, d);
-        abc.method_info.get(instanceInfo.iinit_index).delete(abc, d);
-
-        int protectedNS = instanceInfo.protectedNS;
-        if (protectedNS != 0) {
-            abc.constants.getNamespace(protectedNS).deleted = d;
-        }
-
+        abc.deleteClass(class_info, d);
         abc.constants.getMultiname(name_index).deleted = d;
     }
 
@@ -79,32 +66,31 @@ public class TraitClass extends Trait implements TraitWithSlot {
     }
 
     @Override
-    public void getImportsUsages(String customNs, ABC abc, List<DottedChain> imports, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
-        super.getImportsUsages(customNs, abc, imports, uses, ignorePackage == null ? getPackage(abc) : ignorePackage, fullyQualifiedNames);
+    public void getDependencies(String customNs, ABC abc, List<Dependency> dependencies, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
+        super.getDependencies(customNs, abc, dependencies, uses, ignorePackage == null ? getPackage(abc) : ignorePackage, fullyQualifiedNames);
         ClassInfo classInfo = abc.class_info.get(class_info);
         InstanceInfo instanceInfo = abc.instance_info.get(class_info);
         DottedChain packageName = instanceInfo.getName(abc.constants).getNamespace(abc.constants).getName(abc.constants); //assume not null name
 
-        ImportsUsagesParser.parseImportsUsagesFromMultiname(customNs, abc, imports, uses, abc.constants.getMultiname(instanceInfo.name_index), packageName, fullyQualifiedNames);
-
+        //DependencyParser.parseDependenciesFromMultiname(customNs, abc, dependencies, uses, abc.constants.getMultiname(instanceInfo.name_index), packageName, fullyQualifiedNames);
         if (instanceInfo.super_index > 0) {
-            ImportsUsagesParser.parseImportsUsagesFromMultiname(customNs, abc, imports, uses, abc.constants.getMultiname(instanceInfo.super_index), packageName, fullyQualifiedNames);
+            DependencyParser.parseDependenciesFromMultiname(customNs, abc, dependencies, uses, abc.constants.getMultiname(instanceInfo.super_index), packageName, fullyQualifiedNames, DependencyType.INHERITANCE);
         }
         for (int i : instanceInfo.interfaces) {
-            ImportsUsagesParser.parseImportsUsagesFromMultiname(customNs, abc, imports, uses, abc.constants.getMultiname(i), packageName, fullyQualifiedNames);
+            DependencyParser.parseDependenciesFromMultiname(customNs, abc, dependencies, uses, abc.constants.getMultiname(i), packageName, fullyQualifiedNames, DependencyType.INHERITANCE);
         }
 
         //static
-        classInfo.static_traits.getImportsUsages(customNs, abc, imports, uses, packageName, fullyQualifiedNames);
+        classInfo.static_traits.getDependencies(customNs, abc, dependencies, uses, packageName, fullyQualifiedNames);
 
         //static initializer
-        ImportsUsagesParser.parseImportsUsagesFromMethodInfo(customNs, abc, classInfo.cinit_index, imports, uses, packageName, fullyQualifiedNames, new ArrayList<>());
+        DependencyParser.parseDependenciesFromMethodInfo(customNs, abc, classInfo.cinit_index, dependencies, uses, packageName, fullyQualifiedNames, new ArrayList<>());
 
         //instance
-        instanceInfo.instance_traits.getImportsUsages(customNs, abc, imports, uses, packageName, fullyQualifiedNames);
+        instanceInfo.instance_traits.getDependencies(customNs, abc, dependencies, uses, packageName, fullyQualifiedNames);
 
         //instance initializer
-        ImportsUsagesParser.parseImportsUsagesFromMethodInfo(customNs, abc, instanceInfo.iinit_index, imports, uses, packageName, fullyQualifiedNames, new ArrayList<>());
+        DependencyParser.parseDependenciesFromMethodInfo(customNs, abc, instanceInfo.iinit_index, dependencies, uses, packageName, fullyQualifiedNames, new ArrayList<>());
     }
 
     @Override
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java
index b18f5f1f1..b02f88e61 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java
@@ -20,7 +20,8 @@ import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.types.ConvertData;
 import com.jpexs.decompiler.flash.abc.types.MethodBody;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
-import com.jpexs.decompiler.flash.exporters.script.ImportsUsagesParser;
+import com.jpexs.decompiler.flash.exporters.script.Dependency;
+import com.jpexs.decompiler.flash.exporters.script.DependencyParser;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.flash.helpers.hilight.HighlightSpecialType;
@@ -124,14 +125,14 @@ public class TraitFunction extends Trait implements TraitWithSlot {
     }
 
     @Override
-    public void getImportsUsages(String customNs, ABC abc, List<DottedChain> imports, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
+    public void getDependencies(String customNs, ABC abc, List<Dependency> dependencies, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
         if (ignorePackage == null) {
             ignorePackage = getPackage(abc);
         }
-        super.getImportsUsages(customNs, abc, imports, uses, ignorePackage, fullyQualifiedNames);
+        super.getDependencies(customNs, abc, dependencies, uses, ignorePackage, fullyQualifiedNames);
         //if (method_info != 0)
         {
-            ImportsUsagesParser.parseImportsUsagesFromMethodInfo(customNs, abc, method_info, imports, uses, ignorePackage, fullyQualifiedNames, new ArrayList<>());
+            DependencyParser.parseDependenciesFromMethodInfo(customNs, abc, method_info, dependencies, uses, ignorePackage, fullyQualifiedNames, new ArrayList<>());
         }
     }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java
index 7487d22f2..8b24560a3 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java
@@ -23,7 +23,8 @@ import com.jpexs.decompiler.flash.abc.types.MethodInfo;
 import com.jpexs.decompiler.flash.abc.types.Namespace;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
-import com.jpexs.decompiler.flash.exporters.script.ImportsUsagesParser;
+import com.jpexs.decompiler.flash.exporters.script.Dependency;
+import com.jpexs.decompiler.flash.exporters.script.DependencyParser;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.flash.helpers.hilight.HighlightSpecialType;
@@ -59,11 +60,11 @@ public class TraitMethodGetterSetter extends Trait {
     }
 
     @Override
-    public void getImportsUsages(String customNs, ABC abc, List<DottedChain> imports, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
+    public void getDependencies(String customNs, ABC abc, List<Dependency> dependencies, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
         if (ignorePackage == null) {
             ignorePackage = getPackage(abc);
         }
-        super.getImportsUsages(customNs, abc, imports, uses, ignorePackage, fullyQualifiedNames);
+        super.getDependencies(customNs, abc, dependencies, uses, ignorePackage, fullyQualifiedNames);
 
         if (customNs == null) {
             Namespace n = getName(abc).getNamespace(abc.constants);
@@ -73,7 +74,7 @@ public class TraitMethodGetterSetter extends Trait {
         }
         //if (method_info != 0)
         {
-            ImportsUsagesParser.parseImportsUsagesFromMethodInfo(customNs, abc, method_info, imports, uses, ignorePackage, fullyQualifiedNames, new ArrayList<>());
+            DependencyParser.parseDependenciesFromMethodInfo(customNs, abc, method_info, dependencies, uses, ignorePackage, fullyQualifiedNames, new ArrayList<>());
         }
     }
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java
index d46ec1c8b..2ee16f80f 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java
@@ -26,7 +26,9 @@ import com.jpexs.decompiler.flash.abc.types.Namespace;
 import com.jpexs.decompiler.flash.abc.types.ValueKind;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
-import com.jpexs.decompiler.flash.exporters.script.ImportsUsagesParser;
+import com.jpexs.decompiler.flash.exporters.script.Dependency;
+import com.jpexs.decompiler.flash.exporters.script.DependencyParser;
+import com.jpexs.decompiler.flash.exporters.script.DependencyType;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.flash.helpers.hilight.HighlightSpecialType;
@@ -197,12 +199,12 @@ public class TraitSlotConst extends Trait implements TraitWithSlot {
     }
 
     @Override
-    public void getImportsUsages(String customNs, ABC abc, List<DottedChain> imports, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
+    public void getDependencies(String customNs, ABC abc, List<Dependency> dependencies, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
         if (ignorePackage == null) {
             ignorePackage = getPackage(abc);
         }
-        super.getImportsUsages(customNs, abc, imports, uses, ignorePackage, fullyQualifiedNames);
-        ImportsUsagesParser.parseImportsUsagesFromMultiname(customNs, abc, imports, uses, abc.constants.getMultiname(type_index), getPackage(abc), fullyQualifiedNames);
+        super.getDependencies(customNs, abc, dependencies, uses, ignorePackage, fullyQualifiedNames);
+        DependencyParser.parseDependenciesFromMultiname(customNs, abc, dependencies, uses, abc.constants.getMultiname(type_index), getPackage(abc), fullyQualifiedNames, DependencyType.SIGNATURE);
     }
 
     @Override
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Traits.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Traits.java
index ad3ed16dc..b863ed879 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Traits.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Traits.java
@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.types.ConvertData;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
+import com.jpexs.decompiler.flash.exporters.script.Dependency;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.graph.DottedChain;
@@ -244,9 +245,9 @@ public class Traits implements Cloneable, Serializable {
         }
     }
 
-    public void getImportsUsages(String customNs, ABC abc, List<DottedChain> imports, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
+    public void getDependencies(String customNs, ABC abc, List<Dependency> dependencies, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
         for (Trait t : traits) {
-            t.getImportsUsages(customNs, abc, imports, uses, ignorePackage, fullyQualifiedNames);
+            t.getDependencies(customNs, abc, dependencies, uses, ignorePackage, fullyQualifiedNames);
         }
     }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
index 36cd7e4bb..069800f3c 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
@@ -539,6 +539,11 @@ public class Configuration {
     @ConfigurationFile(".*\\.swc$")
     public static final ConfigurationItem<String> playerLibLocation = null;
 
+    @ConfigurationDefaultString("")
+    @ConfigurationCategory("paths")
+    @ConfigurationDirectory
+    public static final ConfigurationItem<String> flexSdkLocation = null;
+
     @ConfigurationDefaultDouble(0.7)
     @ConfigurationName("gui.avm2.splitPane.vars.dividerLocationPercent")
     @ConfigurationInternal
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/Dependency.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/Dependency.java
new file mode 100644
index 000000000..69a082735
--- /dev/null
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/Dependency.java
@@ -0,0 +1,58 @@
+package com.jpexs.decompiler.flash.exporters.script;
+
+import com.jpexs.decompiler.graph.DottedChain;
+import java.util.Objects;
+
+public class Dependency {
+
+    private DottedChain id;
+    private DependencyType type;
+
+    public Dependency(DottedChain id, DependencyType type) {
+        this.id = id;
+        this.type = type;
+    }
+
+    public DottedChain getId() {
+        return id;
+    }
+
+    public DependencyType getType() {
+        return type;
+    }
+
+    @Override
+    public String toString() {
+        return id.toString() + " (" + type + ")";
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 79 * hash + Objects.hashCode(this.id);
+        hash = 79 * hash + Objects.hashCode(this.type);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Dependency other = (Dependency) obj;
+        if (!Objects.equals(this.id, other.id)) {
+            return false;
+        }
+        if (this.type != other.type) {
+            return false;
+        }
+        return true;
+    }
+
+}
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/ImportsUsagesParser.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/DependencyParser.java
similarity index 64%
rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/ImportsUsagesParser.java
rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/DependencyParser.java
index 79637ff6d..a779c35d2 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/ImportsUsagesParser.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/DependencyParser.java
@@ -37,42 +37,44 @@ import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.graph.DottedChain;
 import java.util.List;
 
-public class ImportsUsagesParser {
+public class DependencyParser {
 
-    public static void parseImportsUsagesFromNS(String ignoredCustom, ABC abc, List<DottedChain> imports, List<String> uses, int namespace_index, DottedChain ignorePackage, String name) {
+    public static void parseDependenciesFromNS(String ignoredCustom, ABC abc, List<Dependency> dependencies, List<String> uses, int namespace_index, DottedChain ignorePackage, String name, DependencyType dependencyType) {
         Namespace ns = abc.constants.getNamespace(namespace_index);
         if (name.isEmpty()) {
             name = "*";
         }
         DottedChain newimport = ns.getName(abc.constants);
 
-        if (parseUsagesFromNS(ignoredCustom, abc, imports, uses, namespace_index, ignorePackage, name)) {
+        if (parseUsagesFromNS(ignoredCustom, abc, dependencies, uses, namespace_index, ignorePackage, name)) {
             return;
         } else if ((ns.kind != Namespace.KIND_PACKAGE) && (ns.kind != Namespace.KIND_PACKAGE_INTERNAL)) {
             return;
         }
         newimport = newimport.add(name);
-        if (!imports.contains(newimport)) {
+        Dependency dep = new Dependency(newimport, dependencyType);
+
+        if (!dependencies.contains(dep)) {
             DottedChain pkg = newimport.getWithoutLast(); //.substring(0, newimport.lastIndexOf('.'));
             if (pkg.equals(InitVectorAVM2Item.VECTOR_PACKAGE)) { //special case - is imported always
                 return;
             }
             if (!pkg.equals(ignorePackage)) {
-                imports.add(newimport);
+                dependencies.add(dep);
             }
         }
         //}
     }
 
-    public static void parseImportsUsagesFromMultiname(String ignoredCustom, ABC abc, List<DottedChain> imports, List<String> uses, Multiname m, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
+    public static void parseDependenciesFromMultiname(String ignoredCustom, ABC abc, List<Dependency> dependencies, List<String> uses, Multiname m, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames, DependencyType dependencyType) {
         if (m != null) {
             if (m.kind == Multiname.TYPENAME) {
                 if (m.qname_index != 0) {
-                    parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(m.qname_index), ignorePackage, fullyQualifiedNames);
+                    parseDependenciesFromMultiname(ignoredCustom, abc, dependencies, uses, abc.constants.getMultiname(m.qname_index), ignorePackage, fullyQualifiedNames, dependencyType);
                 }
                 for (Integer i : m.params) {
                     if (i != 0) {
-                        parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(i), ignorePackage, fullyQualifiedNames);
+                        parseDependenciesFromMultiname(ignoredCustom, abc, dependencies, uses, abc.constants.getMultiname(i), ignorePackage, fullyQualifiedNames, dependencyType);
                     }
                 }
                 return;
@@ -81,46 +83,47 @@ public class ImportsUsagesParser {
             String name = m.getName(abc.constants, fullyQualifiedNames, true);
             NamespaceSet nss = m.getNamespaceSet(abc.constants);
             if (ns != null) {
-                parseImportsUsagesFromNS(ignoredCustom, abc, imports, uses, m.namespace_index, ignorePackage, name);
+                parseDependenciesFromNS(ignoredCustom, abc, dependencies, uses, m.namespace_index, ignorePackage, name, dependencyType);
             }
             if (nss != null) {
                 for (int n : nss.namespaces) {
-                    parseImportsUsagesFromNS(ignoredCustom, abc, imports, uses, n, ignorePackage, nss.namespaces.length > 1 ? "" : name);
+                    parseDependenciesFromNS(ignoredCustom, abc, dependencies, uses, n, ignorePackage, nss.namespaces.length > 1 ? "" : name, dependencyType);
                 }
             }
         }
     }
 
-    public static void parseImportsUsagesFromMethodInfo(String ignoredCustom, ABC abc, int method_index, List<DottedChain> imports, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames, List<Integer> visitedMethods) {
+    public static void parseDependenciesFromMethodInfo(String ignoredCustom, ABC abc, int method_index, List<Dependency> dependencies, List<String> uses, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames, List<Integer> visitedMethods) {
         if ((method_index < 0) || (method_index >= abc.method_info.size())) {
             return;
         }
         visitedMethods.add(method_index);
         if (abc.method_info.get(method_index).ret_type != 0) {
-            parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(abc.method_info.get(method_index).ret_type), ignorePackage, fullyQualifiedNames);
+            parseDependenciesFromMultiname(ignoredCustom, abc, dependencies, uses, abc.constants.getMultiname(abc.method_info.get(method_index).ret_type), ignorePackage, fullyQualifiedNames, DependencyType.SIGNATURE);
         }
         for (int t : abc.method_info.get(method_index).param_types) {
             if (t != 0) {
-                parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(t), ignorePackage, fullyQualifiedNames);
+                parseDependenciesFromMultiname(ignoredCustom, abc, dependencies, uses, abc.constants.getMultiname(t), ignorePackage, fullyQualifiedNames, DependencyType.SIGNATURE);
             }
         }
         MethodBody body = abc.findBody(method_index);
         if (body != null) {
-            body.traits.getImportsUsages(ignoredCustom, abc, imports, uses, ignorePackage, fullyQualifiedNames);
+            body.traits.getDependencies(ignoredCustom, abc, dependencies, uses, ignorePackage, fullyQualifiedNames);
             for (ABCException ex : body.exceptions) {
-                parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(ex.type_index), ignorePackage, fullyQualifiedNames);
+                parseDependenciesFromMultiname(ignoredCustom, abc, dependencies, uses, abc.constants.getMultiname(ex.type_index), ignorePackage, fullyQualifiedNames, DependencyType.EXPRESSION /* or signature?*/);
             }
             for (AVM2Instruction ins : body.getCode().code) {
                 if (ins.definition instanceof AlchemyTypeIns) {
                     DottedChain nimport = AlchemyTypeIns.ALCHEMY_PACKAGE.add(ins.definition.instructionName);
-                    if (!imports.contains(nimport)) {
-                        imports.add(nimport);
+                    Dependency depExp = new Dependency(nimport, DependencyType.EXPRESSION);
+                    if (!dependencies.contains(depExp)) {
+                        dependencies.add(depExp);
                     }
                 }
                 if (ins.definition instanceof NewFunctionIns) {
                     if (ins.operands[0] != method_index) {
                         if (!visitedMethods.contains(ins.operands[0])) {
-                            parseImportsUsagesFromMethodInfo(ignoredCustom, abc, ins.operands[0], imports, uses, ignorePackage, fullyQualifiedNames, visitedMethods);
+                            parseDependenciesFromMethodInfo(ignoredCustom, abc, ins.operands[0], dependencies, uses, ignorePackage, fullyQualifiedNames, visitedMethods);
                         }
                     }
                 }
@@ -132,7 +135,7 @@ public class ImportsUsagesParser {
                     int m = ins.operands[0];
                     if (m != 0) {
                         if (m < abc.constants.getMultinameCount()) {
-                            parseImportsUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(m), ignorePackage, fullyQualifiedNames);
+                            parseDependenciesFromMultiname(ignoredCustom, abc, dependencies, uses, abc.constants.getMultiname(m), ignorePackage, fullyQualifiedNames, DependencyType.EXPRESSION);
                         }
                     }
                 } else {
@@ -140,7 +143,7 @@ public class ImportsUsagesParser {
                         if (ins.definition.operands[k] == AVM2Code.DAT_MULTINAME_INDEX) {
                             int multinameIndex = ins.operands[k];
                             if (multinameIndex < abc.constants.getMultinameCount()) {
-                                parseUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(multinameIndex), ignorePackage, fullyQualifiedNames);
+                                parseUsagesFromMultiname(ignoredCustom, abc, dependencies, uses, abc.constants.getMultiname(multinameIndex), ignorePackage, fullyQualifiedNames, DependencyType.EXPRESSION);
                             }
                         }
                     }
@@ -149,15 +152,15 @@ public class ImportsUsagesParser {
         }
     }
 
-    public static void parseUsagesFromMultiname(String ignoredCustom, ABC abc, List<DottedChain> imports, List<String> uses, Multiname m, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames) {
+    public static void parseUsagesFromMultiname(String ignoredCustom, ABC abc, List<Dependency> dependencies, List<String> uses, Multiname m, DottedChain ignorePackage, List<DottedChain> fullyQualifiedNames, DependencyType dependencyType) {
         if (m != null) {
             if (m.kind == Multiname.TYPENAME) {
                 if (m.qname_index != 0) {
-                    parseUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(m.qname_index), ignorePackage, fullyQualifiedNames);
+                    parseUsagesFromMultiname(ignoredCustom, abc, dependencies, uses, abc.constants.getMultiname(m.qname_index), ignorePackage, fullyQualifiedNames, dependencyType);
                 }
                 for (Integer i : m.params) {
                     if (i != 0) {
-                        parseUsagesFromMultiname(ignoredCustom, abc, imports, uses, abc.constants.getMultiname(i), ignorePackage, fullyQualifiedNames);
+                        parseUsagesFromMultiname(ignoredCustom, abc, dependencies, uses, abc.constants.getMultiname(i), ignorePackage, fullyQualifiedNames, dependencyType);
                     }
                 }
                 return;
@@ -166,21 +169,21 @@ public class ImportsUsagesParser {
             String name = m.getName(abc.constants, fullyQualifiedNames, false);
             NamespaceSet nss = m.getNamespaceSet(abc.constants);
             if (ns != null) {
-                parseUsagesFromNS(ignoredCustom, abc, imports, uses, m.namespace_index, ignorePackage, name);
+                parseUsagesFromNS(ignoredCustom, abc, dependencies, uses, m.namespace_index, ignorePackage, name);
             }
             if (nss != null) {
                 if (nss.namespaces.length == 1) {
-                    parseUsagesFromNS(ignoredCustom, abc, imports, uses, nss.namespaces[0], ignorePackage, name);
+                    parseUsagesFromNS(ignoredCustom, abc, dependencies, uses, nss.namespaces[0], ignorePackage, name);
                 } else {
                     for (int n : nss.namespaces) {
-                        parseUsagesFromNS(ignoredCustom, abc, imports, uses, n, ignorePackage, "");
+                        parseUsagesFromNS(ignoredCustom, abc, dependencies, uses, n, ignorePackage, "");
                     }
                 }
             }
         }
     }
 
-    private static boolean parseUsagesFromNS(String ignoredCustom, ABC abc, List<DottedChain> imports, List<String> uses, int namespace_index, DottedChain ignorePackage, String name) {
+    private static boolean parseUsagesFromNS(String ignoredCustom, ABC abc, List<Dependency> dependencies, List<String> uses, int namespace_index, DottedChain ignorePackage, String name) {
         Namespace ns = abc.constants.getNamespace(namespace_index);
 
         if (ns.kind == Namespace.KIND_NAMESPACE) {
@@ -192,8 +195,9 @@ public class ImportsUsagesParser {
                 }
                 if (!nsimport.isEmpty()) {
 
-                    if (!nsimport.getWithoutLast().equals(ignorePackage) && !imports.contains(nsimport)) {
-                        imports.add(nsimport);
+                    Dependency depNs = new Dependency(nsimport, DependencyType.NAMESPACE);
+                    if (!nsimport.getWithoutLast().equals(ignorePackage) && !dependencies.contains(depNs)) {
+                        dependencies.add(depNs);
                     }
                     if (ignoredCustom != null && nsVal.equals(ignoredCustom)) {
                         return true;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/DependencyType.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/DependencyType.java
new file mode 100644
index 000000000..a3c3d468e
--- /dev/null
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/DependencyType.java
@@ -0,0 +1,5 @@
+package com.jpexs.decompiler.flash.exporters.script;
+
+public enum DependencyType {
+    INHERITANCE, NAMESPACE, SIGNATURE, EXPRESSION
+}
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/LinkReportExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/LinkReportExporter.java
index b59db7d8a..222a8fd0d 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/LinkReportExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/LinkReportExporter.java
@@ -162,22 +162,23 @@ public class LinkReportExporter {
             for (Trait it : ii.instance_traits.traits) {
                 reportTrait(externalDefs, existingObjects, swf, abc, it);
             }
-            List<DottedChain> imports = new ArrayList<>();
+            List<Dependency> dependencies = new ArrayList<>();
             List<String> uses = new ArrayList<>();
 
             sb.append(indent(3)).append("<dep id=\"AS3\" />").append(newLineChar); //Automatic
 
-            getImportsUsagesFromClass(tc.class_info, null, abc, imports, uses, new DottedChain("FAKE!PACKAGE") /*do not skip any package*/, new ArrayList<>());
-            for (DottedChain dc : imports) {
+            tc.getDependencies(null, abc, dependencies, uses, new DottedChain("FAKE!PACKAGE"), new ArrayList<>());
+            for (Dependency dependency : dependencies) {
+                DottedChain dc = dependency.getId();
                 if (!"*".equals(dc.getLast())) {
                     //some toplevel "imports" can be only method calls
                     if (dc.getWithoutLast().isEmpty() && !existingObjects.contains(dc)) {
                         continue;
                     }
-                    String dep = dottedChainToId(dc);
-                    if (!allDeps.contains(dep)) {
-                        sb.append(indent(3)).append("<dep id=\"").append(dep).append("\" />").append(newLineChar);
-                        allDeps.add(dep);
+                    String reportDepId = dottedChainToId(dc);
+                    if (!allDeps.contains(reportDepId)) {
+                        sb.append(indent(3)).append("<dep id=\"").append(reportDepId).append("\" />").append(newLineChar);
+                        allDeps.add(reportDepId);
                     }
                 }
             }
@@ -185,22 +186,4 @@ public class LinkReportExporter {
         return sb.toString();
     }
 
-    private void getImportsUsagesFromClass(int class_info, String customNs, ABC abc, List<DottedChain> imports, List<String> uses, DottedChain ignoredPackage, List<DottedChain> fullyQualifiedNames) {
-        ClassInfo classInfo = abc.class_info.get(class_info);
-        InstanceInfo instanceInfo = abc.instance_info.get(class_info);
-
-        //static initializer
-        ImportsUsagesParser.parseImportsUsagesFromMethodInfo(customNs, abc, classInfo.cinit_index, imports, uses, ignoredPackage, fullyQualifiedNames, new ArrayList<>());
-
-        //instance initializer
-        ImportsUsagesParser.parseImportsUsagesFromMethodInfo(customNs, abc, instanceInfo.iinit_index, imports, uses, ignoredPackage, fullyQualifiedNames, new ArrayList<>());
-
-        //static
-        classInfo.static_traits.getImportsUsages(customNs, abc, imports, uses, ignoredPackage, fullyQualifiedNames);
-
-        //instance
-        instanceInfo.instance_traits.getImportsUsages(customNs, abc, imports, uses, ignoredPackage, fullyQualifiedNames);
-
-    }
-
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/SwfToSwcExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/SwfToSwcExporter.java
new file mode 100644
index 000000000..039748896
--- /dev/null
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/SwfToSwcExporter.java
@@ -0,0 +1,261 @@
+package com.jpexs.decompiler.flash.exporters.swf;
+
+import com.jpexs.decompiler.flash.ReadOnlyTagList;
+import com.jpexs.decompiler.flash.SWC;
+import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.abc.ABC;
+import com.jpexs.decompiler.flash.abc.ClassPath;
+import com.jpexs.decompiler.flash.abc.ScriptPack;
+import com.jpexs.decompiler.flash.exporters.script.Dependency;
+import com.jpexs.decompiler.flash.exporters.script.DependencyType;
+import com.jpexs.decompiler.flash.importers.SwfXmlImporter;
+import com.jpexs.decompiler.flash.tags.ABCContainerTag;
+import com.jpexs.decompiler.flash.tags.DoABC2Tag;
+import com.jpexs.decompiler.flash.tags.SymbolClassTag;
+import com.jpexs.decompiler.graph.DottedChain;
+import com.jpexs.helpers.Helper;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+public class SwfToSwcExporter {
+
+    private static final String DEPENDENCY_NAMESPACE = "n";
+    private static final String DEPENDENCY_INHERITANCE = "i";
+    private static final String DEPENDENCY_EXPRESSION = "e";
+    private static final String DEPENDENCY_SIGNATURE = "s";
+
+    private static String sha256(InputStream is) {
+        String output;
+        int read;
+        byte[] buffer = new byte[8192];
+
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA-256");
+            while ((read = is.read(buffer)) > 0) {
+                digest.update(buffer, 0, read);
+            }
+            byte[] hash = digest.digest();
+            BigInteger bigInt = new BigInteger(1, hash);
+            output = bigInt.toString(16);
+            while (output.length() < 32) {
+                output = "0" + output;
+            }
+        } catch (Exception e) {
+            return null;
+        }
+
+        return output;
+    }
+
+    public SwfToSwcExporter() {
+
+    }
+
+    private String dottedChainToId(DottedChain dc) {
+        if (dc.getWithoutLast().isEmpty()) {
+            return dc.getLast();
+        }
+        return dc.getWithoutLast().toRawString() + ":" + dc.getLast();
+    }
+
+    private String generateCatalog(SWF swf, byte[] swfBytes, boolean skipDependencies) {
+        StringBuilder sb = new StringBuilder();
+
+        final String libraryFileName = "library.swf";
+
+        final String SWC_VERSION = "1.2";
+        final String FLEX_VERSION = "4.6.0";
+        final String FLEX_BUILD = "23201";
+        final String MINIMUM_SUPPORTED_VERSION = "3.0.0";
+
+        sb.append("<?xml version=\"1.0\" encoding =\"utf-8\"?>\n")
+                .append("<swc xmlns=\"http://www.adobe.com/flash/swccatalog/9\">\n")
+                .append("  <versions>\n")
+                .append("    <swc version=\"").append(SWC_VERSION).append("\" />\n")
+                .append("    <flex version=\"").append(FLEX_VERSION).append("\" build=\"").append(FLEX_BUILD).append("\" minimumSupportedVersion=\"").append(MINIMUM_SUPPORTED_VERSION).append("\" />\n")
+                .append("  </versions>\n")
+                .append("  <features>\n")
+                .append("    <feature-script-deps />\n")
+                .append("    <feature-files />\n")
+                .append("  </features>\n")
+                .append("  <libraries>\n")
+                .append("    <library path=\"").append(libraryFileName).append("\">\n");
+
+        final long TIME_NOW = new Date().getTime();
+
+        Set<DottedChain> definedObjects = new HashSet<>();
+
+        List<ABCContainerTag> abcTagList = swf.getAbcList();
+
+        List<ScriptPack> packs = swf.getAS3Packs();
+
+        for (ScriptPack pack : packs) {
+            ClassPath cp = pack.getClassPath();
+            definedObjects.add(cp.packageStr.add(cp.className));
+        }
+
+        List<ABC> allAbcList = new ArrayList<>();
+        for (int i = 0; i < abcTagList.size(); i++) {
+            allAbcList.add(abcTagList.get(i).getABC());
+        }
+
+        for (ABCContainerTag abcContainer : abcTagList) {
+            if (!(abcContainer instanceof DoABC2Tag)) {
+                continue; //DoABCTag 1 does not have name
+            }
+            DoABC2Tag abcTag = (DoABC2Tag) abcContainer;
+            String scriptName = abcTag.name;
+            sb.append("      <script name=\"").append(scriptName).append("\" mod=\"").append(TIME_NOW).append("\">\n");
+            List<ScriptPack> tagPacks = abcTag.getABC().getScriptPacks(null, allAbcList);
+
+            for (ScriptPack pack : tagPacks) {
+                ClassPath cp = pack.getClassPath();
+                String defId = dottedChainToId(cp.packageStr.add(cp.className));
+
+                sb.append("        <def id=\"").append(defId).append("\" />\n");
+                List<Dependency> dependencies = new ArrayList<>();
+                List<String> uses = new ArrayList<>();
+                pack.abc.script_info.get(pack.scriptIndex).traits.getDependencies(null, pack.abc, dependencies, uses, new DottedChain("NO:PACKAGE"), new ArrayList<>());
+
+                Set<DottedChain> allDeps = new HashSet<>();
+                allDeps.add(new DottedChain("AS3"));
+                sb.append("        <dep id=\"AS3\" type=\"").append(DEPENDENCY_NAMESPACE).append("\" />\n");
+                if (!skipDependencies) {
+                    for (Dependency d : dependencies) {
+                        if ("*".equals(d.getId().getLast())) {
+                            continue;
+                        }
+                        //some toplevel "imports" can be only method calls
+                        if (d.getId().getWithoutLast().isEmpty() && !definedObjects.contains(d.getId())) {
+                            continue;
+                        }
+
+                        if (allDeps.contains(d.getId())) {
+                            continue;
+                        }
+                        sb.append("        <dep id=\"").append(dottedChainToId(d.getId())).append("\" type=\"").append(getDependencyStr(d.getType())).append("\" />\n");
+
+                        allDeps.add(d.getId());
+                    }
+                }
+            }
+            sb.append("      </script>\n");
+        }
+        String sha256Hash = sha256(new ByteArrayInputStream(swfBytes));
+        sb.append("      <digests>\n")
+                .append("        <digest type=\"SHA-256\" signed=\"false\" value=\"").append(sha256Hash).append("\" />\n")
+                .append("      </digests>\n")
+                .append("    </library>\n")
+                .append("  </libraries>\n")
+                .append("  <files>\n")
+                .append("  </files>\n")
+                .append("</swc>\n");
+        return sb.toString();
+    }
+
+    private static String getDependencyStr(DependencyType depType) {
+        switch (depType) {
+            case EXPRESSION:
+                return DEPENDENCY_EXPRESSION;
+            case INHERITANCE:
+                return DEPENDENCY_INHERITANCE;
+            case SIGNATURE:
+                return DEPENDENCY_SIGNATURE;
+            case NAMESPACE:
+                return DEPENDENCY_NAMESPACE;
+            default:
+                return null;
+        }
+    }
+
+    private SWF recompileSWF(SWF swf) throws IOException, InterruptedException {
+        ByteArrayOutputStream swfOrigBaos = new ByteArrayOutputStream();
+        swf.saveTo(swfOrigBaos);
+        return new SWF(new ByteArrayInputStream(swfOrigBaos.toByteArray()), false, false);
+    }
+
+    public void exportSwf(SWF swf, File outSwcFile, boolean skipDependencies) throws IOException {
+
+        //Make local copy of SWF so we do not modify original
+        try {
+            swf = recompileSWF(swf);
+            final String HASH = "myhash";
+            String abcTagXml = new String(Helper.readStream(SwfToSwcExporter.class.getResourceAsStream("/com/jpexs/decompiler/flash/exporters/swf/swc_main_abctag.xml")), "UTF-8");
+            abcTagXml = abcTagXml.replace("%hash%", HASH);
+            SwfXmlImporter xmlImporter = new SwfXmlImporter();
+            DoABC2Tag mainAbcTag = (DoABC2Tag) xmlImporter.importObject(abcTagXml, DoABC2Tag.class, swf);
+            ReadOnlyTagList list = swf.getTags();
+            final String documentClassStub = "_%hash%_flash_display_Sprite";
+            String documentClass = documentClassStub.replace("%hash%", HASH);
+            boolean documentClassSet = false;
+            for (int i = 0; i < list.size(); i++) {
+                if (list.get(i) instanceof ABCContainerTag) {
+                    swf.addTag(i, mainAbcTag);
+                    break;
+                }
+            }
+            for (int i = 0; i < list.size(); i++) {
+                if (list.get(i) instanceof SymbolClassTag) {
+                    SymbolClassTag sct = (SymbolClassTag) list.get(i);
+                    for (int j = 0; j < sct.tags.size(); j++) {
+                        if (sct.tags.get(j) == 0) {
+                            sct.names.set(j, documentClass);
+                            documentClassSet = true;
+                            break;
+                        }
+                    }
+                }
+            }
+            if (!documentClassSet) {
+                throw new IOException("Original document class not found!");
+            }
+            swf = recompileSWF(swf);
+
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        swf.saveTo(baos);
+        byte[] swfBytes = baos.toByteArray();
+        String catalogStr = generateCatalog(swf, swfBytes, skipDependencies);
+
+        File tempFile = new File((outSwcFile.getAbsolutePath()) + ".tmp");
+        try (FileOutputStream fos = new FileOutputStream(tempFile);
+                ZipOutputStream zos = new ZipOutputStream(fos)) {
+
+            ZipEntry libraryEntry = new ZipEntry("library.swf");
+            zos.putNextEntry(libraryEntry);
+            zos.write(swfBytes);
+            zos.closeEntry();
+
+            ZipEntry catalogEntry = new ZipEntry("catalog.xml");
+            zos.putNextEntry(catalogEntry);
+            zos.write(catalogStr.getBytes("UTF-8"));
+            zos.closeEntry();
+
+            zos.close();
+            outSwcFile.delete();
+            tempFile.renameTo(outSwcFile);
+        } finally {
+            if (tempFile.exists()) {
+                tempFile.delete();
+            }
+        }
+
+    }
+}
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/swc_main_abctag.xml b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/swc_main_abctag.xml
new file mode 100644
index 000000000..f5dcc83f0
--- /dev/null
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/swc_main_abctag.xml
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Stub for generating Main tag of SWC file -->
+<item flags="1" name="_%hash%_flash_display_Sprite" type="DoABC2Tag">
+    <abc type="ABC">
+        <version major="46" minor="16" type="ABCVersion"/>
+        <constants type="AVM2ConstantPool">
+            <constant_int/>
+            <constant_uint/>
+            <constant_double/>
+            <constant_decimal/>
+            <constant_float/>
+            <constant_float4/>
+            <constant_string>
+                <item isNull="true"/>
+                <item>_%hash%_flash_display_Sprite</item>
+                <item/>
+                <item>_%hash%_flash_display_Sprite/_%hash%_flash_display_Sprite</item>
+                <item>Security</item>
+                <item>flash.system</item>
+                <item>allowDomain</item>
+                <item>apply</item>
+                <item>http://adobe.com/AS3/2006/builtin</item>
+                <item>_%hash%_flash_display_Sprite/allowDomainInRSL</item>
+                <item>void</item>
+                <item>domains</item>
+                <item>allowInsecureDomain</item>
+                <item>_%hash%_flash_display_Sprite/allowInsecureDomainInRSL</item>
+                <item>allowDomainInRSL</item>
+                <item>__go_to_definition_help</item>
+                <item>pos</item>
+                <item>602</item>
+                <item>allowInsecureDomainInRSL</item>
+                <item>922</item>
+                <item>flash.display</item>
+                <item>Sprite</item>
+                <item>Object</item>
+                <item>EventDispatcher</item>
+                <item>flash.events</item>
+                <item>DisplayObject</item>
+                <item>InteractiveObject</item>
+                <item>DisplayObjectContainer</item>
+                <item>ExcludeClass</item>
+                <item>__go_to_ctor_definition_help</item>
+                <item>275</item>
+                <item>130</item>
+            </constant_string>
+            <constant_namespace>
+                <item isNull="true"/>
+                <item kind="5" name_index="1" type="Namespace"/>
+                <item kind="22" name_index="5" type="Namespace"/>
+                <item kind="22" name_index="2" type="Namespace"/>
+                <item kind="8" name_index="8" type="Namespace"/>
+                <item kind="22" name_index="20" type="Namespace"/>
+                <item kind="24" name_index="1" type="Namespace"/>
+                <item kind="22" name_index="24" type="Namespace"/>
+                <item kind="22" name_index="2" type="Namespace"/>
+            </constant_namespace>
+            <constant_namespace_set/>
+            <constant_multiname>
+                <item isNull="true"/>
+                <item kind="7" name_index="4" namespace_index="2" namespace_set_index="0" qname_index="0" type="Multiname"/>
+                <item kind="7" name_index="6" namespace_index="3" namespace_set_index="0" qname_index="0" type="Multiname"/>
+                <item kind="7" name_index="7" namespace_index="4" namespace_set_index="0" qname_index="0" type="Multiname"/>
+                <item kind="7" name_index="10" namespace_index="3" namespace_set_index="0" qname_index="0" type="Multiname"/>
+                <item kind="7" name_index="12" namespace_index="3" namespace_set_index="0" qname_index="0" type="Multiname"/>
+                <item kind="7" name_index="14" namespace_index="3" namespace_set_index="0" qname_index="0" type="Multiname"/>
+                <item kind="7" name_index="18" namespace_index="3" namespace_set_index="0" qname_index="0" type="Multiname"/>
+                <item kind="7" name_index="1" namespace_index="3" namespace_set_index="0" qname_index="0" type="Multiname"/>
+                <item kind="7" name_index="21" namespace_index="5" namespace_set_index="0" qname_index="0" type="Multiname"/>
+                <item kind="7" name_index="22" namespace_index="3" namespace_set_index="0" qname_index="0" type="Multiname"/>
+                <item kind="7" name_index="23" namespace_index="7" namespace_set_index="0" qname_index="0" type="Multiname"/>
+                <item kind="7" name_index="25" namespace_index="5" namespace_set_index="0" qname_index="0" type="Multiname"/>
+                <item kind="7" name_index="26" namespace_index="5" namespace_set_index="0" qname_index="0" type="Multiname"/>
+                <item kind="7" name_index="27" namespace_index="5" namespace_set_index="0" qname_index="0" type="Multiname"/>
+            </constant_multiname>
+        </constants>
+        <method_info>
+            <item flags="0" name_index="2" ret_type="0" type="MethodInfo">
+                <param_types/>
+                <optional/>
+                <paramNames/>
+            </item>
+            <item flags="0" name_index="3" ret_type="0" type="MethodInfo">
+                <param_types/>
+                <optional/>
+                <paramNames/>
+            </item>
+            <item flags="132" name_index="9" ret_type="4" type="MethodInfo">
+                <param_types/>
+                <optional/>
+                <paramNames/>
+            </item>
+            <item flags="132" name_index="13" ret_type="4" type="MethodInfo">
+                <param_types/>
+                <optional/>
+                <paramNames/>
+            </item>
+            <item flags="0" name_index="2" ret_type="0" type="MethodInfo">
+                <param_types/>
+                <optional/>
+                <paramNames/>
+            </item>
+        </method_info>
+        <metadata_info>
+            <item name_index="15" type="MetadataInfo">
+                <keys>
+                    <item>16</item>
+                </keys>
+                <values>
+                    <item>17</item>
+                </values>
+            </item>
+            <item name_index="15" type="MetadataInfo">
+                <keys>
+                    <item>16</item>
+                </keys>
+                <values>
+                    <item>19</item>
+                </values>
+            </item>
+            <item name_index="28" type="MetadataInfo">
+                <keys/>
+                <values/>
+            </item>
+            <item name_index="29" type="MetadataInfo">
+                <keys>
+                    <item>16</item>
+                </keys>
+                <values>
+                    <item>30</item>
+                </values>
+            </item>
+            <item name_index="15" type="MetadataInfo">
+                <keys>
+                    <item>16</item>
+                </keys>
+                <values>
+                    <item>31</item>
+                </values>
+            </item>
+        </metadata_info>
+        <instance_info>
+            <item flags="9" iinit_index="1" name_index="8" protectedNS="6" super_index="9" type="InstanceInfo">
+                <interfaces/>
+                <instance_traits type="Traits">
+                    <traits>
+                        <item bytes="064100020100" disp_id="0" fileOffset="1994" kindFlags="4" kindType="1" method_info="2" name_index="6" type="TraitMethodGetterSetter">
+                            <metadata>
+                                <item>0</item>
+                            </metadata>
+                        </item>
+                        <item bytes="074100030101" disp_id="0" fileOffset="2000" kindFlags="4" kindType="1" method_info="3" name_index="7" type="TraitMethodGetterSetter">
+                            <metadata>
+                                <item>1</item>
+                            </metadata>
+                        </item>
+                    </traits>
+                </instance_traits>
+            </item>
+        </instance_info>
+        <class_info>
+            <item cinit_index="0" type="ClassInfo">
+                <static_traits type="Traits">
+                    <traits/>
+                </static_traits>
+            </item>
+        </class_info>
+        <script_info>
+            <item init_index="4" type="ScriptInfo">
+                <traits type="Traits">
+                    <traits>
+                        <item bytes="0844010003020304" class_info="0" fileOffset="2011" kindFlags="4" kindType="4" name_index="8" slot_id="1" type="TraitClass">
+                            <metadata>
+                                <item>2</item>
+                                <item>3</item>
+                                <item>4</item>
+                            </metadata>
+                        </item>
+                    </traits>
+                </traits>
+            </item>
+        </script_info>
+        <bodies>
+            <item codeBytes="d03047" init_scope_depth="8" max_regs="1" max_scope_depth="9" max_stack="1" method_info="0" type="MethodBody">
+                <exceptions/>
+                <traits type="Traits">
+                    <traits/>
+                </traits>
+            </item>
+            <item codeBytes="d030d0490047" init_scope_depth="9" max_regs="1" max_scope_depth="10" max_stack="1" method_info="1" type="MethodBody">
+                <exceptions/>
+                <traits type="Traits">
+                    <traits/>
+                </traits>
+            </item>
+            <item codeBytes="d0305d016601660220d14603022947" init_scope_depth="9" max_regs="2" max_scope_depth="10" max_stack="3" method_info="2" type="MethodBody">
+                <exceptions/>
+                <traits type="Traits">
+                    <traits/>
+                </traits>
+            </item>
+            <item codeBytes="d0305d016601660520d14603022947" init_scope_depth="9" max_regs="2" max_scope_depth="10" max_stack="3" method_info="3" type="MethodBody">
+                <exceptions/>
+                <traits type="Traits">
+                    <traits/>
+                </traits>
+            </item>
+            <item codeBytes="d03065005d0a660a305d0b660b305d0c660c305d0d660d305d0e660e305d096609305d09660958001d1d1d1d1d1d680847" init_scope_depth="1" max_regs="1" max_scope_depth="8" max_stack="2" method_info="4" type="MethodBody">
+                <exceptions/>
+                <traits type="Traits">
+                    <traits/>
+                </traits>
+            </item>
+        </bodies>
+    </abc>
+</item>
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
new file mode 100644
index 000000000..bbdedd249
--- /dev/null
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
@@ -0,0 +1,152 @@
+package com.jpexs.decompiler.flash.flexsdk;
+
+import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.abc.ABC;
+import com.jpexs.decompiler.flash.abc.ScriptPack;
+import com.jpexs.decompiler.flash.abc.types.InstanceInfo;
+import com.jpexs.decompiler.flash.abc.types.ScriptInfo;
+import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.exporters.script.LinkReportExporter;
+import com.jpexs.decompiler.flash.exporters.swf.SwfToSwcExporter;
+import com.jpexs.decompiler.flash.tags.ABCContainerTag;
+import com.jpexs.decompiler.flash.tags.Tag;
+import com.jpexs.decompiler.graph.DottedChain;
+import com.jpexs.helpers.Helper;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.List;
+
+public class As3ScriptReplacer extends MxmlcRunner {
+
+    private LinkReportExporter linkReporter;
+
+    public As3ScriptReplacer(String flexSdkPath, LinkReportExporter linkReporter) {
+        super(flexSdkPath);
+        this.linkReporter = linkReporter;
+    }
+
+    private static void deleteFolder(File folder) {
+        File[] files = folder.listFiles();
+        if (files != null) { //some JVMs return null for empty dirs
+            for (File f : files) {
+                if (f.isDirectory()) {
+                    deleteFolder(f);
+                } else {
+                    f.delete();
+                }
+            }
+        }
+        folder.delete();
+    }
+
+    private SWF recompileSWF(SWF swf) throws IOException, InterruptedException {
+        ByteArrayOutputStream swfOrigBaos = new ByteArrayOutputStream();
+        swf.saveTo(swfOrigBaos);
+        return new SWF(new ByteArrayInputStream(swfOrigBaos.toByteArray()), false, false);
+    }
+
+    private boolean isParentDeleted(ABC abc, List<ABC> allAbcs, DottedChain className) {
+        int class_index = abc.findClassByName(className);
+        if (class_index == -1) {
+            for (ABC a : allAbcs) {
+                class_index = abc.findClassByName(className);
+                if (class_index != -1) {
+                    abc = a;
+                    break;
+                }
+            }
+            if (class_index == -1) {
+                return false;
+            }
+        }
+        InstanceInfo ii = abc.instance_info.get(class_index);
+        if (ii.deleted) {
+            return true;
+        }
+        if (ii.super_index != 0 && isParentDeleted(abc, allAbcs, abc.constants.getMultiname(ii.super_index).getNameWithNamespace(abc.constants))) {
+            return true;
+        }
+        for (int iface : ii.interfaces) {
+            if (isParentDeleted(abc, allAbcs, abc.constants.getMultiname(iface).getNameWithNamespace(abc.constants))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void replaceScript(SWF swf, ScriptPack oldPack, String txt) throws IOException, MxmlcException, InterruptedException {
+        if (!oldPack.isSimple) {
+            throw new IOException("Cannot compile such file"); //Alchemy, etc.
+        }
+
+        File tempDir = null;
+        try {
+            tempDir = Files.createTempDirectory("ffdec-mxmlc-replace").toFile();
+            File pkgDir = tempDir;
+            for (String pkgPart : oldPack.getClassPath().packageStr.toList()) {
+                if (!pkgPart.isEmpty()) {
+                    pkgDir = new File(pkgDir, pkgPart);
+                }
+            }
+            pkgDir.mkdirs();
+            File scriptFileToCompile = new File(pkgDir, oldPack.getClassPath().className + ".as");
+            File compiledSwfFile = new File(pkgDir, "out.swf");
+            File swcFile = new File(pkgDir, "out.swc");
+
+            //Make copy without the old script
+            SWF swfCopy = recompileSWF(swf);
+            List<ScriptPack> copyPacks = swfCopy.getAS3Packs();
+            for (ScriptPack sp : copyPacks) {
+                if (sp.getClassPath().equals(oldPack.getClassPath())) {
+                    sp.abc.script_info.get(sp.scriptIndex).delete(sp.abc, true);
+                    ((Tag) sp.abc.parentTag).setModified(true);
+                    break;
+                }
+            }
+            //remove all subclasses
+            for (ScriptPack sp : copyPacks) {
+                DottedChain dc = sp.getPathPackage().add(sp.getPathScriptName());
+                if (isParentDeleted(sp.abc, sp.allABCs, dc)) {
+                    sp.abc.script_info.get(sp.scriptIndex).delete(sp.abc, true);
+                }
+            }
+            SwfToSwcExporter swcExport = new SwfToSwcExporter();
+            swcExport.exportSwf(swfCopy, swcFile, true);
+
+            Helper.writeFile(scriptFileToCompile.getAbsolutePath(), txt.getBytes("UTF-8"));
+            mxmlc("-include-inheritance-dependencies-only", "-warnings=false", "-library-path", swcFile.getAbsolutePath(), "-source-path", tempDir.getAbsolutePath(), "-output", compiledSwfFile.getAbsolutePath(), "-debug=true", scriptFileToCompile.getAbsolutePath());
+
+            try (FileInputStream fis = new FileInputStream(compiledSwfFile)) {
+                SWF newSWF = new SWF(fis, false, false);
+                List<ABCContainerTag> newTags = newSWF.getAbcList();
+                ScriptInfo oldScriptInfo = oldPack.abc.script_info.get(oldPack.scriptIndex);
+                if (oldPack.isSimple) {
+                    oldScriptInfo.delete(oldPack.abc, true);
+                } else {
+                    //NOO
+                }
+                int oldTagIndex = swf.getTags().indexOf((Tag) oldPack.abc.parentTag);
+                if (oldPack.abc.script_info.size() == 1) {
+                    swf.removeTag(oldTagIndex);
+                }
+
+                for (ABCContainerTag act : newTags) {
+                    ((Tag) act).setSwf(swf);
+                    swf.addTag(oldTagIndex + 1, (Tag) act);
+                    ((Tag) act).setModified(true);
+                }
+                ((Tag) oldPack.abc.parentTag).setModified(true);
+                swf.clearAbcListCache();
+                swf.clearScriptCache();
+            }
+        } finally {
+            if (tempDir != null && tempDir.exists()) {
+                //deleteFolder(tempDir);
+            }
+        }
+    }
+}
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcException.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcException.java
new file mode 100644
index 000000000..ab8b2187e
--- /dev/null
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcException.java
@@ -0,0 +1,15 @@
+package com.jpexs.decompiler.flash.flexsdk;
+
+public class MxmlcException extends Exception {
+
+    private String mxmlcErrorOutput;
+
+    public MxmlcException(String mxmlcErrorOutput) {
+        this.mxmlcErrorOutput = mxmlcErrorOutput;
+    }
+
+    public String getMxmlcErrorOutput() {
+        return mxmlcErrorOutput;
+    }
+
+}
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcRunner.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcRunner.java
new file mode 100644
index 000000000..63a709e74
--- /dev/null
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcRunner.java
@@ -0,0 +1,54 @@
+package com.jpexs.decompiler.flash.flexsdk;
+
+import com.jpexs.helpers.Helper;
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class MxmlcRunner {
+
+    private String flexSdkPath;
+
+    public MxmlcRunner(String flexSdkPath) {
+        this.flexSdkPath = flexSdkPath;
+    }
+
+    public String getMxmlcPath() {
+        boolean isWin = System.getProperty("os.name").toLowerCase().contains("win");
+        return flexSdkPath + File.separator + "bin" + File.separator + "mxmlc" + (isWin ? ".exe" : "");
+    }
+
+    public void mxmlc(String... arguments) throws MxmlcException, InterruptedException, IOException {
+        String runArgs[] = new String[arguments.length + 1];
+        runArgs[0] = getMxmlcPath();
+        System.arraycopy(arguments, 0, runArgs, 1, arguments.length);
+        System.out.println("" + String.join(" ", runArgs));
+        Process proc = null;
+        try {
+            proc = Runtime.getRuntime().exec(runArgs);
+            Helper.readStream(proc.getInputStream());
+            String errstring = "";
+            try {
+                errstring = new String(Helper.readStream(proc.getErrorStream()), "UTF-8");
+            } catch (UnsupportedEncodingException ex) {
+                //should not happen
+            }
+            proc.waitFor();
+            int exitValue = proc.exitValue();
+            if (exitValue > 0) {
+                throw new MxmlcException(errstring);
+            }
+        } finally {
+            if (proc != null) {
+                try {
+                    proc.destroy();
+                } catch (Exception ex2) {
+                    //ignore
+                }
+            }
+        }
+    }
+
+}
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/SwfXmlImporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/SwfXmlImporter.java
index 691ef5c7a..59cb5113a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/SwfXmlImporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/SwfXmlImporter.java
@@ -151,6 +151,18 @@ public class SwfXmlImporter {
         }
     }
 
+    public Object importObject(String xml, Class requiredType, SWF swf) throws IOException {
+        DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+        try {
+            DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+            Document doc = docBuilder.parse(new InputSource(new StringReader(xml)));
+            return processObject(doc.getDocumentElement(), requiredType, swf, null);
+        } catch (ParserConfigurationException | SAXException | IllegalArgumentException | IllegalAccessException | NoSuchMethodException | InstantiationException | InvocationTargetException ex) {
+            Logger.getLogger(SwfXmlImporter.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        return null;
+    }
+
     private Field getField(Class cls, String name) throws NoSuchFieldException {
         Field field;
         try {
@@ -243,7 +255,7 @@ public class SwfXmlImporter {
                         setFieldValue(field, obj, childObj);
                     }
                 } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException | NoSuchMethodException | InstantiationException | InvocationTargetException ex) {
-                    logger.log(Level.SEVERE, null, ex);
+                    logger.log(Level.SEVERE, "Error while getting val from class " + cls + " field: " + name, ex);
                 }
             }
         }
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacerTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacerTest.java
new file mode 100644
index 000000000..40dcb7677
--- /dev/null
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacerTest.java
@@ -0,0 +1,50 @@
+package com.jpexs.decompiler.flash.flexsdk;
+
+import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.abc.ScriptPack;
+import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.exporters.script.LinkReportExporter;
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.testng.annotations.Test;
+
+public class As3ScriptReplacerTest {
+
+    @Test
+    public void testReplace() throws IOException, InterruptedException, Exception {
+        As3ScriptReplacer replacer = new As3ScriptReplacer(Configuration.flexSdkLocation.get(), new LinkReportExporter());
+        SWF swf = new SWF(new BufferedInputStream(new FileInputStream("testdata/as3/as3.swf")), false);
+        String replacement = "package classes\n"
+                + "{\n"
+                + "\n"
+                + "	public dynamic class TestClass1\n"
+                + "	{\n"
+                + "		public var attrib:int = 5;\n"
+                + "		public var sons:Array;\n"
+                + "\n"
+                + "		public function testHello()\n"
+                + "		{\n"
+                + "			trace(\"helloA\");\n"
+                + "		}\n"
+                + "\n"
+                + "		public function method(i:int):int\n"
+                + "		{\n"
+                + "			trace(\"methodB\");\n"
+                + "			return 7;\n"
+                + "		}\n"
+                + "	}\n"
+                + "}";
+        List<String> classNames = new ArrayList<>();
+        classNames.add("classes.TestClass1");
+        List<ScriptPack> packs = swf.getScriptPacksByClassNames(classNames);
+        for (ScriptPack sp : packs) {
+            replacer.replaceScript(swf, sp, replacement);
+            return;
+        }
+    }
+}
diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
index b1abaff39..d0c5261e4 100644
--- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
+++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
@@ -88,12 +88,14 @@ import com.jpexs.decompiler.flash.exporters.settings.ShapeExportSettings;
 import com.jpexs.decompiler.flash.exporters.settings.SoundExportSettings;
 import com.jpexs.decompiler.flash.exporters.settings.SpriteExportSettings;
 import com.jpexs.decompiler.flash.exporters.settings.TextExportSettings;
+import com.jpexs.decompiler.flash.exporters.swf.SwfToSwcExporter;
 import com.jpexs.decompiler.flash.exporters.swf.SwfXmlExporter;
 import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.gui.Main;
 import com.jpexs.decompiler.flash.gui.SearchInMemory;
 import com.jpexs.decompiler.flash.gui.SearchInMemoryListener;
 import com.jpexs.decompiler.flash.gui.SwfInMemory;
+import com.jpexs.decompiler.flash.gui.View;
 import com.jpexs.decompiler.flash.gui.helpers.CheckResources;
 import com.jpexs.decompiler.flash.helpers.FileTextWriter;
 import com.jpexs.decompiler.flash.helpers.SWFDecompilerPlugin;
@@ -193,6 +195,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.swing.JOptionPane;
 
 /**
  *
@@ -585,6 +588,13 @@ public class CommandLineArgumentParser {
             out.println("  ...<swffile>: SWF file to search instance in");
         }
 
+        if (filter == null || filter.equals("swf2swc")) {
+            out.println(" " + (cnt++) + ") -swf2swc <outfile> <swffile>");
+            out.println("  ...generates SWC file from SWF");
+            out.println("  ...<outfile>: Where to save SWC file");
+            out.println("  ...<swffile>: Input SWF file");
+        }
+
         printCmdLineUsageExamples(out, filter);
     }
 
@@ -800,7 +810,9 @@ public class CommandLineArgumentParser {
             command = nextParam.substring(1);
         }
 
-        if (command.equals("linkreport")) {
+        if (command.equals("swf2swc")) {
+            parseSwf2Swc(args);
+        } else if (command.equals("linkreport")) {
             parseLinkReport(selectionClasses, args);
         } else if (command.equals("getinstancemetadata")) {
             parseGetInstanceMetadata(args);
@@ -997,6 +1009,18 @@ public class CommandLineArgumentParser {
         setConfigurations(args.pop());
     }
 
+    private static void parseSwf2Swc(Stack<String> args) {
+        if (args.size() < 2) {
+            badArguments("swf2swc");
+        }
+        final File outFile = new File(args.pop());
+        final File swfFile = new File(args.pop());
+        processReadSWF(swfFile, null, (SWF swf, OutputStream stdout) -> {
+            SwfToSwcExporter exporter = new SwfToSwcExporter();
+            exporter.exportSwf(swf, outFile, false);
+        });
+    }
+
     private static void parseLinkReport(List<String> selectionClasses, Stack<String> args) {
         if (args.isEmpty()) {
             badArguments("linkreport");
@@ -3348,6 +3372,13 @@ public class CommandLineArgumentParser {
     }
 
     private static void parseImportScript(Stack<String> args) {
+
+        String flexLocation = Configuration.flexSdkLocation.get();
+        if (flexLocation.isEmpty() || (!new File(flexLocation).exists())) {
+            System.err.println("Flex SDK path not set");
+            System.exit(1);
+        }
+
         if (args.size() < 3) {
             badArguments("importscript");
         }
diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
index ce5577f9e..79265b496 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -2146,6 +2146,14 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
     }
 
     public void importScript(final SWF swf) {
+
+        String flexLocation = Configuration.flexSdkLocation.get();
+        if (flexLocation.isEmpty() || (!new File(flexLocation).exists())) {
+            View.showMessageDialog(null, AppStrings.translate("message.flexpath.notset"), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
+            Main.advancedSettings("paths");
+            return;
+        }
+
         JFileChooser chooser = new JFileChooser();
         chooser.setCurrentDirectory(new File(Configuration.lastExportDir.get()));
         chooser.setDialogTitle(translate("import.select.directory"));
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index b4014e147..2c24e0deb 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -1157,6 +1157,12 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
                 return;
             }
         }
+        String flexLocation = Configuration.flexSdkLocation.get();
+        if (flexLocation.isEmpty() || (!new File(flexLocation).exists())) {
+            View.showMessageDialog(null, AppStrings.translate("message.flexpath.notset"), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
+            Main.advancedSettings("paths");
+            return;
+        }
         if (View.showConfirmDialog(null, AppStrings.translate("message.confirm.experimental.function"), AppStrings.translate("message.warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, Configuration.warningExperimentalAS3Edit, JOptionPane.OK_OPTION) == JOptionPane.OK_OPTION) {
             setDecompiledEditMode(true);
         }
@@ -1173,11 +1179,6 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
 
         try {
             String oldSp = pack.getClassPath().toRawString();
-            /*List<ScriptPack> packs = abc.script_info.get(oldIndex).getPacks(abc, oldIndex, null, pack.allABCs);
-             if (!packs.isEmpty()) {
-
-             }*/
-
             String as = decompiledTextArea.getText();
             abc.replaceScriptPack(pack, as);
             lastDecompiled = as;
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
index 97539d86e..08d2a876c 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
@@ -432,3 +432,6 @@ config.description.simplifyExpressions = Evaluate and simplify expressions to ma
 
 config.name.resetLetterSpacingOnTextImport = Reset Letter Spacing on text import
 config.description.resetLetterSpacingOnTextImport = Useful for cyrillic fonts, because they are wider
+
+config.name.flexSdkLocation = 4) Flex SDK directory path
+config.description.flexSdkLocation = Location of Adobe Flex SDK. It is used mostly for AS3 compilation.
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
index 677619e94..126e31f6f 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
@@ -734,4 +734,5 @@ generic.editor.amf3.help = AMF3 value syntax:\n\
                            \ * Nonscalar datatypes can be referenced by previously declared "id" attributes with # syntax:\n\
                            %reference_sample%\n\
                            \ * Keys in Dictionary entries can be any type\n
-                            
\ No newline at end of file
+
+message.flexpath.notset = Flex SDK not found. Please configure its path in Advanced Settings / Paths (4).
\ No newline at end of file

From 6781d86a6c70026c4946ddf8887a8ec25171634e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sat, 6 Aug 2016 07:21:58 +0200
Subject: [PATCH 03/23] Reformat and organize imports

---
 .../decompiler/flash/abc/avm2/AVM2Code.java   |    2 +-
 .../AVM2DeobfuscatorRegisters.java            |    2 +-
 .../AVM2DeobfuscatorSimpleOld.java            |    7 +-
 .../flash/abc/avm2/model/AVM2Item.java        |    3 +-
 .../avm2/model/clauses/ForEachInAVM2Item.java |    2 +-
 .../abc/avm2/parser/pcode/Flasm3Lexer.java    |  103 +-
 .../avm2/parser/script/ActionScriptLexer.java |  107 +-
 .../abc/avm2/parser/script/NameAVM2Item.java  |    6 +-
 .../parser/script/NamespacedAVM2Item.java     |   44 +-
 .../parser/script/UnresolvedAVM2Item.java     |    2 +-
 .../methodinfo_parser/MethodInfoLexer.java    |  103 +-
 .../jpexs/decompiler/flash/action/Action.java |    4 +-
 .../action/model/FunctionActionItem.java      |   14 +-
 .../flash/action/parser/pcode/FlasmLexer.java |  103 +-
 .../parser/script/ActionScriptLexer.java      |  107 +-
 .../com/jpexs/decompiler/flash/docs/docs.js   |  190 +-
 .../flash/ecma/EcmaFloatingDecimal.java       |  116 +-
 .../flash/exporters/ShapeExporter.java        |    2 +-
 .../decompiler/flash/helpers/BMPFile.java     |   14 +-
 .../flash/helpers/GraphTextWriter.java        |    6 +-
 .../decompiler/flash/helpers/ImageHelper.java |   20 +-
 .../flash/importers/TextImporter.java         |   14 +-
 .../flash/importers/amf/amf3/Amf3Lexer.java   | 1895 +++++++++--------
 .../decompiler/flash/tags/DefineFont2Tag.java |    4 +-
 .../decompiler/flash/tags/DefineFont3Tag.java |    6 +-
 .../decompiler/flash/tags/DefineFontTag.java  |    6 +-
 .../jpexs/decompiler/flash/tags/DoABCTag.java |    2 +-
 .../flash/tags/gfx/DefineCompactedFont.java   |    4 +-
 .../decompiler/flash/tags/text/TextLexer.java |  101 +-
 .../annotations/parser/ConditionLexer.java    |  101 +-
 .../decompiler/flash/xfl/FLAVersion.java      |   10 +-
 .../com/jpexs/decompiler/graph/GraphPart.java |   12 +-
 .../src/com/jpexs/helpers/resource/canvas.js  |    3 +-
 .../flash/ActionScript2ModificationTest.java  |    3 +-
 .../decompiler/flash/gui/LicenseUpdater.java  |   72 +-
 .../decompiler/flash/gui/LoadingDialog.java   |    6 +-
 .../MyRibbonApplicationMenuPopupPanelUI.java  |   84 +-
 .../decompiler/flash/gui/OceanicSkin.java     |   26 +-
 .../decompiler/flash/gui/abc/DetailPanel.java |    6 +-
 .../flash/gui/editor/UndoFixedEditorPane.java |    8 +-
 .../process/win32/Win32ProcessTools.java      |   12 +-
 src/com/sun/jna/platform/win32/User32.java    |   21 +-
 src/com/sun/jna/platform/win32/WinBase.java   |    2 +-
 src/com/sun/jna/platform/win32/WinUser.java   |   16 +-
 .../flash/gui/AdobeFlashExecutor.java         |    2 +-
 .../decompiler/flash/gui/FlashPlayerTest.java |    2 +-
 46 files changed, 1738 insertions(+), 1637 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
index e4189d543..87f49c4ac 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
@@ -1638,7 +1638,7 @@ public class AVM2Code implements Cloneable {
              }
              }//*/
 
-            /*if ((ip + 2 < code.size()) && (ins.definition instanceof NewCatchIns)) { // Filling local register in catch clause
+ /*if ((ip + 2 < code.size()) && (ins.definition instanceof NewCatchIns)) { // Filling local register in catch clause
              if (code.get(ip + 1).definition instanceof DupIns) {
              if (code.get(ip + 2).definition instanceof SetLocalTypeIns) {
              ins.definition.translate(isStatic, classIndex, localRegs, stack, scopeStack, constants, ins, method_info, output, body, abc, localRegNames, fullyQualifiedNames);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AVM2DeobfuscatorRegisters.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AVM2DeobfuscatorRegisters.java
index 0063e899e..48ad09650 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AVM2DeobfuscatorRegisters.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AVM2DeobfuscatorRegisters.java
@@ -220,7 +220,7 @@ public class AVM2DeobfuscatorRegisters extends AVM2DeobfuscatorSimple {
 
                 AVM2Instruction ins = code.code.get(idx);
                 InstructionDefinition def = ins.definition;
-                    //System.err.println("" + idx + ": " + ins + " stack:" + stack.size());
+                //System.err.println("" + idx + ": " + ins + " stack:" + stack.size());
 
                 // do not throw EmptyStackException, much faster
                 int requiredStackSize = def.getStackPopCount(ins, abc);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AVM2DeobfuscatorSimpleOld.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AVM2DeobfuscatorSimpleOld.java
index 5fadb3a3d..11ded804a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AVM2DeobfuscatorSimpleOld.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AVM2DeobfuscatorSimpleOld.java
@@ -161,7 +161,7 @@ public class AVM2DeobfuscatorSimpleOld extends SWFDecompilerAdapter {
             AVM2Instruction ins = code.code.get(i);
             if (ins.definition instanceof JumpIns) {
                 long address = ins.getTargetAddress();
-                jumpTargets.add( code.adr2pos(address) );
+                jumpTargets.add(code.adr2pos(address));
             }
         }
 
@@ -294,9 +294,8 @@ public class AVM2DeobfuscatorSimpleOld extends SWFDecompilerAdapter {
 
             if (inlineIns.contains(ins)) {
                 if (def instanceof SetLocalTypeIns) {
-                    InstructionDefinition prevDef = code.code.get(idx-1).definition;
-                    if ((prevDef instanceof DupIns && !jumpTargets.contains(idx-2)) || !jumpTargets.contains(idx-1))
-                    {
+                    InstructionDefinition prevDef = code.code.get(idx - 1).definition;
+                    if ((prevDef instanceof DupIns && !jumpTargets.contains(idx - 2)) || !jumpTargets.contains(idx - 1)) {
                         int regId = ((SetLocalTypeIns) def).getRegisterId(ins);
                         staticRegs.put(regId, localData.localRegs.get(regId).getNotCoerced());
                         code.replaceInstruction(idx, new AVM2Instruction(0, DeobfuscatePopIns.getInstance(), null), body);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java
index 3d1159eaf..9ed4806b3 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java
@@ -108,8 +108,9 @@ public abstract class AVM2Item extends GraphTargetItem {
         }
         if (propertyName instanceof FullMultinameAVM2Item) {
             if (((FullMultinameAVM2Item) propertyName).name != null) {
-                if (((FullMultinameAVM2Item) propertyName).namespace != null)
+                if (((FullMultinameAVM2Item) propertyName).namespace != null) {
                     writer.append(".");
+                }
                 return propertyName.toString(writer, localData);
             } else {
                 writer.append(".");
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java
index 433285894..0ba0873f0 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java
@@ -77,7 +77,7 @@ public class ForEachInAVM2Item extends LoopItem implements Block {
 
 
          */
-        /*
+ /*
          if (!commands.isEmpty()) {
          GraphTargetItem firstAssign = commands.get(0);
          if (firstAssign instanceof SetTypeAVM2Item) {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/pcode/Flasm3Lexer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/pcode/Flasm3Lexer.java
index 5b57f3efe..bff9f84dd 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/pcode/Flasm3Lexer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/pcode/Flasm3Lexer.java
@@ -1,6 +1,6 @@
 /* The following code was generated by JFlex 1.6.0 */
 
-/*
+ /*
  *  Copyright (C) 2010-2016 JPEXS, All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.
  */
-/* Flash assembler language lexer specification */
+ /* Flash assembler language lexer specification */
 package com.jpexs.decompiler.flash.abc.avm2.parser.pcode;
 
 import com.jpexs.decompiler.flash.abc.avm2.parser.AVM2ParseException;
@@ -24,8 +24,7 @@ import java.util.Stack;
 
 /**
  * This class is a scanner generated by
- * <a href="http://www.jflex.de/">JFlex</a> 1.6.0
- * from the specification file
+ * <a href="http://www.jflex.de/">JFlex</a> 1.6.0 from the specification file
  * <tt>C:/FFDec/jpexs-decompiler/libsrc/ffdec_lib/lexers/actionscript3_pcode.flex</tt>
  */
 public final class Flasm3Lexer {
@@ -51,9 +50,8 @@ public final class Flasm3Lexer {
 
     /**
      * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-     * at the beginning of a line
-     * l is of the form l = 2*k, k a non negative integer
+     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l at the
+     * beginning of a line l is of the form l = 2*k, k a non negative integer
      */
     private static final int ZZ_LEXSTATE[] = {
         0, 0, 1, 1, 2, 2
@@ -272,9 +270,11 @@ public final class Flasm3Lexer {
     }
 
     private static int zzUnpackAction(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -380,9 +380,11 @@ public final class Flasm3Lexer {
     }
 
     private static int zzUnpackRowMap(String packed, int offset, int[] result) {
-        int i = 0;  /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -2479,9 +2481,11 @@ public final class Flasm3Lexer {
     }
 
     private static int zzUnpackTrans(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -2550,9 +2554,11 @@ public final class Flasm3Lexer {
     }
 
     private static int zzUnpackAttribute(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -2581,8 +2587,8 @@ public final class Flasm3Lexer {
     private int zzLexicalState = YYINITIAL;
 
     /**
-     * this buffer contains the current text to be matched and is
-     * the source of the yytext() string
+     * this buffer contains the current text to be matched and is the source of
+     * the yytext() string
      */
     private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
 
@@ -2602,8 +2608,8 @@ public final class Flasm3Lexer {
     private int zzStartRead;
 
     /**
-     * endRead marks the last character in the buffer, that has been read
-     * from input
+     * endRead marks the last character in the buffer, that has been read from
+     * input
      */
     private int zzEndRead;
 
@@ -2639,10 +2645,10 @@ public final class Flasm3Lexer {
     private boolean zzEOFDone;
 
     /**
-     * The number of occupied positions in zzBuffer beyond zzEndRead.
-     * When a lead/high surrogate has been read from the input stream
-     * into the final zzBuffer position, this will have a value of 1;
-     * otherwise, it will have a value of 0.
+     * The number of occupied positions in zzBuffer beyond zzEndRead. When a
+     * lead/high surrogate has been read from the input stream into the final
+     * zzBuffer position, this will have a value of 1; otherwise, it will have a
+     * value of 0.
      */
     private int zzFinalHighSurrogate = 0;
 
@@ -2705,9 +2711,11 @@ public final class Flasm3Lexer {
      */
     private static char[] zzUnpackCMap(String packed) {
         char[] map = new char[0x110000];
-        int i = 0;  /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = 0;  /* index in unpacked array */
+        int j = 0;
+        /* index in unpacked array */
 
         while (i < 2916) {
             int count = packed.charAt(i++);
@@ -2766,7 +2774,8 @@ public final class Flasm3Lexer {
 
         if (totalRead > 0) {
             zzEndRead += totalRead;
-            if (totalRead == requested) { /* possibly more input available */
+            if (totalRead == requested) {
+                /* possibly more input available */
 
                 if (Character.isHighSurrogate(zzBuffer[zzEndRead - 1])) {
                     --zzEndRead;
@@ -2784,9 +2793,11 @@ public final class Flasm3Lexer {
      * Closes the input stream.
      */
     public final void yyclose() throws java.io.IOException {
-        zzAtEOF = true;            /* indicate end of file */
+        zzAtEOF = true;
+        /* indicate end of file */
 
-        zzEndRead = zzStartRead;  /* invalidate buffer    */
+        zzEndRead = zzStartRead;
+        /* invalidate buffer    */
 
         if (zzReader != null) {
             zzReader.close();
@@ -2794,12 +2805,12 @@ public final class Flasm3Lexer {
     }
 
     /**
-     * Resets the scanner to read from a new input stream.
-     * Does not close the old reader.
+     * Resets the scanner to read from a new input stream. Does not close the
+     * old reader.
      *
      * All internal variables are reset, the old input stream
-     * <b>cannot</b> be reused (internal buffer is discarded and lost).
-     * Lexical state is set to <tt>ZZ_INITIAL</tt>.
+     * <b>cannot</b> be reused (internal buffer is discarded and lost). Lexical
+     * state is set to <tt>ZZ_INITIAL</tt>.
      *
      * Internal scan buffer is resized down to its initial length, if it has
      * grown.
@@ -2845,13 +2856,12 @@ public final class Flasm3Lexer {
     }
 
     /**
-     * Returns the character at position <tt>pos</tt> from the
-     * matched text.
+     * Returns the character at position <tt>pos</tt> from the matched text.
      *
      * It is equivalent to yytext().charAt(pos), but faster
      *
-     * @param pos the position of the character to fetch.
-     * A value from 0 to yylength()-1.
+     * @param pos the position of the character to fetch. A value from 0 to
+     * yylength()-1.
      *
      * @return the character at position pos
      */
@@ -2869,14 +2879,13 @@ public final class Flasm3Lexer {
     /**
      * Reports an error that occured while scanning.
      *
-     * In a wellformed scanner (no or only correct usage of
-     * yypushback(int) and a match-all fallback rule) this method
-     * will only be called with things that "Can't Possibly Happen".
-     * If this method is called, something is seriously wrong
-     * (e.g. a JFlex bug producing a faulty scanner etc.).
+     * In a wellformed scanner (no or only correct usage of yypushback(int) and
+     * a match-all fallback rule) this method will only be called with things
+     * that "Can't Possibly Happen". If this method is called, something is
+     * seriously wrong (e.g. a JFlex bug producing a faulty scanner etc.).
      *
-     * Usual syntax/scanner level error handling should be done
-     * in error fallback rules.
+     * Usual syntax/scanner level error handling should be done in error
+     * fallback rules.
      *
      * @param errorCode the code of the errormessage to display
      */
@@ -2896,8 +2905,8 @@ public final class Flasm3Lexer {
      *
      * They will be read again by then next call of the scanning method
      *
-     * @param number the number of characters to be read again.
-     * This number must not be greater than yylength()!
+     * @param number the number of characters to be read again. This number must
+     * not be greater than yylength()!
      */
     public void yypushback(int number) {
         if (number > yylength()) {
@@ -2908,8 +2917,8 @@ public final class Flasm3Lexer {
     }
 
     /**
-     * Resumes scanning until the next regular expression is matched,
-     * the end of input is encountered or an I/O-Error occurs.
+     * Resumes scanning until the next regular expression is matched, the end of
+     * input is encountered or an I/O-Error occurs.
      *
      * @return the next token
      * @exception java.io.IOException if any I/O-Error occurs
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptLexer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptLexer.java
index 6edf3e8a3..4bd05fca1 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptLexer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptLexer.java
@@ -1,6 +1,6 @@
 /* The following code was generated by JFlex 1.6.0 */
 
-/*
+ /*
  *  Copyright (C) 2010-2016 JPEXS, All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -26,8 +26,7 @@ import java.util.Stack;
 
 /**
  * This class is a scanner generated by
- * <a href="http://www.jflex.de/">JFlex</a> 1.6.0
- * from the specification file
+ * <a href="http://www.jflex.de/">JFlex</a> 1.6.0 from the specification file
  * <tt>C:/FFDec/jpexs-decompiler/libsrc/ffdec_lib/lexers/actionscript3_script.flex</tt>
  */
 public final class ActionScriptLexer {
@@ -69,9 +68,8 @@ public final class ActionScriptLexer {
 
     /**
      * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-     * at the beginning of a line
-     * l is of the form l = 2*k, k a non negative integer
+     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l at the
+     * beginning of a line l is of the form l = 2*k, k a non negative integer
      */
     private static final int ZZ_LEXSTATE[] = {
         0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7,
@@ -295,9 +293,11 @@ public final class ActionScriptLexer {
     }
 
     private static int zzUnpackAction(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -383,9 +383,11 @@ public final class ActionScriptLexer {
     }
 
     private static int zzUnpackRowMap(String packed, int offset, int[] result) {
-        int i = 0;  /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -833,9 +835,11 @@ public final class ActionScriptLexer {
     }
 
     private static int zzUnpackTrans(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -894,9 +898,11 @@ public final class ActionScriptLexer {
     }
 
     private static int zzUnpackAttribute(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -925,8 +931,8 @@ public final class ActionScriptLexer {
     private int zzLexicalState = YYINITIAL;
 
     /**
-     * this buffer contains the current text to be matched and is
-     * the source of the yytext() string
+     * this buffer contains the current text to be matched and is the source of
+     * the yytext() string
      */
     private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
 
@@ -946,8 +952,8 @@ public final class ActionScriptLexer {
     private int zzStartRead;
 
     /**
-     * endRead marks the last character in the buffer, that has been read
-     * from input
+     * endRead marks the last character in the buffer, that has been read from
+     * input
      */
     private int zzEndRead;
 
@@ -983,10 +989,10 @@ public final class ActionScriptLexer {
     private boolean zzEOFDone;
 
     /**
-     * The number of occupied positions in zzBuffer beyond zzEndRead.
-     * When a lead/high surrogate has been read from the input stream
-     * into the final zzBuffer position, this will have a value of 1;
-     * otherwise, it will have a value of 0.
+     * The number of occupied positions in zzBuffer beyond zzEndRead. When a
+     * lead/high surrogate has been read from the input stream into the final
+     * zzBuffer position, this will have a value of 1; otherwise, it will have a
+     * value of 0.
      */
     private int zzFinalHighSurrogate = 0;
 
@@ -1080,9 +1086,11 @@ public final class ActionScriptLexer {
      */
     private static char[] zzUnpackCMap(String packed) {
         char[] map = new char[0x110000];
-        int i = 0;  /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = 0;  /* index in unpacked array */
+        int j = 0;
+        /* index in unpacked array */
 
         while (i < 3136) {
             int count = packed.charAt(i++);
@@ -1141,7 +1149,8 @@ public final class ActionScriptLexer {
 
         if (totalRead > 0) {
             zzEndRead += totalRead;
-            if (totalRead == requested) { /* possibly more input available */
+            if (totalRead == requested) {
+                /* possibly more input available */
 
                 if (Character.isHighSurrogate(zzBuffer[zzEndRead - 1])) {
                     --zzEndRead;
@@ -1159,9 +1168,11 @@ public final class ActionScriptLexer {
      * Closes the input stream.
      */
     public final void yyclose() throws java.io.IOException {
-        zzAtEOF = true;            /* indicate end of file */
+        zzAtEOF = true;
+        /* indicate end of file */
 
-        zzEndRead = zzStartRead;  /* invalidate buffer    */
+        zzEndRead = zzStartRead;
+        /* invalidate buffer    */
 
         if (zzReader != null) {
             zzReader.close();
@@ -1169,12 +1180,12 @@ public final class ActionScriptLexer {
     }
 
     /**
-     * Resets the scanner to read from a new input stream.
-     * Does not close the old reader.
+     * Resets the scanner to read from a new input stream. Does not close the
+     * old reader.
      *
      * All internal variables are reset, the old input stream
-     * <b>cannot</b> be reused (internal buffer is discarded and lost).
-     * Lexical state is set to <tt>ZZ_INITIAL</tt>.
+     * <b>cannot</b> be reused (internal buffer is discarded and lost). Lexical
+     * state is set to <tt>ZZ_INITIAL</tt>.
      *
      * Internal scan buffer is resized down to its initial length, if it has
      * grown.
@@ -1220,13 +1231,12 @@ public final class ActionScriptLexer {
     }
 
     /**
-     * Returns the character at position <tt>pos</tt> from the
-     * matched text.
+     * Returns the character at position <tt>pos</tt> from the matched text.
      *
      * It is equivalent to yytext().charAt(pos), but faster
      *
-     * @param pos the position of the character to fetch.
-     * A value from 0 to yylength()-1.
+     * @param pos the position of the character to fetch. A value from 0 to
+     * yylength()-1.
      *
      * @return the character at position pos
      */
@@ -1244,14 +1254,13 @@ public final class ActionScriptLexer {
     /**
      * Reports an error that occured while scanning.
      *
-     * In a wellformed scanner (no or only correct usage of
-     * yypushback(int) and a match-all fallback rule) this method
-     * will only be called with things that "Can't Possibly Happen".
-     * If this method is called, something is seriously wrong
-     * (e.g. a JFlex bug producing a faulty scanner etc.).
+     * In a wellformed scanner (no or only correct usage of yypushback(int) and
+     * a match-all fallback rule) this method will only be called with things
+     * that "Can't Possibly Happen". If this method is called, something is
+     * seriously wrong (e.g. a JFlex bug producing a faulty scanner etc.).
      *
-     * Usual syntax/scanner level error handling should be done
-     * in error fallback rules.
+     * Usual syntax/scanner level error handling should be done in error
+     * fallback rules.
      *
      * @param errorCode the code of the errormessage to display
      */
@@ -1271,8 +1280,8 @@ public final class ActionScriptLexer {
      *
      * They will be read again by then next call of the scanning method
      *
-     * @param number the number of characters to be read again.
-     * This number must not be greater than yylength()!
+     * @param number the number of characters to be read again. This number must
+     * not be greater than yylength()!
      */
     public void yypushback(int number) {
         if (number > yylength()) {
@@ -1283,8 +1292,8 @@ public final class ActionScriptLexer {
     }
 
     /**
-     * Resumes scanning until the next regular expression is matched,
-     * the end of input is encountered or an I/O-Error occurs.
+     * Resumes scanning until the next regular expression is matched, the end of
+     * input is encountered or an I/O-Error occurs.
      *
      * @return the next token
      * @exception java.io.IOException if any I/O-Error occurs
@@ -1380,7 +1389,8 @@ public final class ActionScriptLexer {
                 }
                 case 167:
                     break;
-                case 3: { /*ignore*/
+                case 3: {
+                    /*ignore*/
 
                 }
                 case 168:
@@ -1794,7 +1804,8 @@ public final class ActionScriptLexer {
                 }
                 case 242:
                     break;
-                case 78: { /* ignore illegal character escape */
+                case 78: {
+                    /* ignore illegal character escape */
 
                 }
                 case 243:
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/NameAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/NameAVM2Item.java
index fe36c4106..e59836843 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/NameAVM2Item.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/NameAVM2Item.java
@@ -220,9 +220,9 @@ public class NameAVM2Item extends AssignableAVM2Item {
                 return toSourceMerge(localData, generator,
                         ins(AVM2Instructions.GetScopeObject, slotScope),
                         assignedValue, !(("" + assignedValue.returnType()).equals("" + type) && (basicTypes.contains("" + type))) ? generateCoerce(localData, generator, type) : null, needsReturn
-                                ? dupSetTemp(localData, generator, ret_temp) : null, generateSetLoc(regNumber), slotNumber > -1
-                                ? ins(AVM2Instructions.SetSlot, slotNumber)
-                                : null,
+                        ? dupSetTemp(localData, generator, ret_temp) : null, generateSetLoc(regNumber), slotNumber > -1
+                        ? ins(AVM2Instructions.SetSlot, slotNumber)
+                        : null,
                         needsReturn ? getTemp(localData, generator, ret_temp) : null,
                         killTemp(localData, generator, Arrays.asList(ret_temp)));
             } else {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/NamespacedAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/NamespacedAVM2Item.java
index c2db4f69e..8b0f08214 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/NamespacedAVM2Item.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/NamespacedAVM2Item.java
@@ -180,30 +180,28 @@ public class NamespacedAVM2Item extends AssignableAVM2Item {
                         killTemp(localData, generator, Arrays.asList(obj_temp))
                 );
             }
+        } else if (assignedValue != null) {
+            return toSourceMerge(localData, generator,
+                    obj == null ? ns : null, obj == null ? NameAVM2Item.generateCoerce(localData, generator, new TypeItem(DottedChain.NAMESPACE)) : null, obj != null ? obj : ins(AVM2Instructions.FindPropertyStrict, constants.getMultinameId(Multiname.createRTQName(attr, constants.getStringId(name, true)), true)),
+                    ns, NameAVM2Item.generateCoerce(localData, generator, new TypeItem(DottedChain.NAMESPACE)), assignedValue,
+                    needsReturn ? dupSetTemp(localData, generator, ret_temp) : null,
+                    ins(AVM2Instructions.SetProperty, constants.getMultinameId(Multiname.createRTQName(attr, constants.getStringId(name, true)), true)),
+                    needsReturn ? getTemp(localData, generator, ret_temp) : null,
+                    killTemp(localData, generator, Arrays.asList(ns_temp, index_temp, ret_temp))
+            );
         } else {
-            if (assignedValue != null) {
-                return toSourceMerge(localData, generator,
-                        obj == null ? ns : null, obj == null ? NameAVM2Item.generateCoerce(localData, generator, new TypeItem(DottedChain.NAMESPACE)) : null, obj != null ? obj : ins(AVM2Instructions.FindPropertyStrict, constants.getMultinameId(Multiname.createRTQName(attr, constants.getStringId(name, true)), true)),
-                        ns, NameAVM2Item.generateCoerce(localData, generator, new TypeItem(DottedChain.NAMESPACE)), assignedValue,
-                        needsReturn ? dupSetTemp(localData, generator, ret_temp) : null,
-                        ins(AVM2Instructions.SetProperty, constants.getMultinameId(Multiname.createRTQName(attr, constants.getStringId(name, true)), true)),
-                        needsReturn ? getTemp(localData, generator, ret_temp) : null,
-                        killTemp(localData, generator, Arrays.asList(ns_temp, index_temp, ret_temp))
-                );
-            } else {
-                return toSourceMerge(localData, generator,
-                        obj == null ? ns : null, obj == null ? NameAVM2Item.generateCoerce(localData, generator, new TypeItem(DottedChain.NAMESPACE)) : null, obj != null ? obj : ins(AVM2Instructions.FindPropertyStrict, constants.getMultinameId(Multiname.createRTQName(attr, constants.getStringId(name, true)), true)),
-                        call ? dupSetTemp(localData, generator, obj_temp) : null,
-                        ns, NameAVM2Item.generateCoerce(localData, generator, new TypeItem(DottedChain.NAMESPACE)),
-                        construct ? callargs : null,
-                        ins(construct ? AVM2Instructions.ConstructProp : delete ? AVM2Instructions.DeleteProperty : AVM2Instructions.GetProperty, constants.getMultinameId(Multiname.createRTQName(attr, constants.getStringId(name, true)), true), construct ? callargs.size() : null),
-                        call ? getTemp(localData, generator, obj_temp) : null,
-                        call ? callargs : null,
-                        call ? ins(AVM2Instructions.Call, callargs.size()) : null,
-                        needsReturn ? null : ins(AVM2Instructions.Pop),
-                        killTemp(localData, generator, Arrays.asList(obj_temp))
-                );
-            }
+            return toSourceMerge(localData, generator,
+                    obj == null ? ns : null, obj == null ? NameAVM2Item.generateCoerce(localData, generator, new TypeItem(DottedChain.NAMESPACE)) : null, obj != null ? obj : ins(AVM2Instructions.FindPropertyStrict, constants.getMultinameId(Multiname.createRTQName(attr, constants.getStringId(name, true)), true)),
+                    call ? dupSetTemp(localData, generator, obj_temp) : null,
+                    ns, NameAVM2Item.generateCoerce(localData, generator, new TypeItem(DottedChain.NAMESPACE)),
+                    construct ? callargs : null,
+                    ins(construct ? AVM2Instructions.ConstructProp : delete ? AVM2Instructions.DeleteProperty : AVM2Instructions.GetProperty, constants.getMultinameId(Multiname.createRTQName(attr, constants.getStringId(name, true)), true), construct ? callargs.size() : null),
+                    call ? getTemp(localData, generator, obj_temp) : null,
+                    call ? callargs : null,
+                    call ? ins(AVM2Instructions.Call, callargs.size()) : null,
+                    needsReturn ? null : ins(AVM2Instructions.Pop),
+                    killTemp(localData, generator, Arrays.asList(obj_temp))
+            );
         }
     }
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/UnresolvedAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/UnresolvedAVM2Item.java
index c40c93260..83ee345a5 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/UnresolvedAVM2Item.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/UnresolvedAVM2Item.java
@@ -116,12 +116,12 @@ public class UnresolvedAVM2Item extends AssignableAVM2Item {
         }
         return -1;
     }
+
     /*
      public GraphTargetItem getNs() {
      return ns;
      }
      */
-
     public void appendName(String name) {
         this.name = this.name.add(name);
     }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoLexer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoLexer.java
index 540e9d239..0531753b8 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoLexer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoLexer.java
@@ -1,6 +1,6 @@
 /* The following code was generated by JFlex 1.6.0 */
 
-/*
+ /*
  *  Copyright (C) 2010-2016 JPEXS, All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -16,13 +16,12 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.
  */
-/* Method info lexer specification */
+ /* Method info lexer specification */
 package com.jpexs.decompiler.flash.abc.methodinfo_parser;
 
 /**
  * This class is a scanner generated by
- * <a href="http://www.jflex.de/">JFlex</a> 1.6.0
- * from the specification file
+ * <a href="http://www.jflex.de/">JFlex</a> 1.6.0 from the specification file
  * <tt>C:/FFDec/jpexs-decompiler/libsrc/ffdec_lib/lexers/actionscript3_methodinfo.flex</tt>
  */
 public final class MethodInfoLexer {
@@ -46,9 +45,8 @@ public final class MethodInfoLexer {
 
     /**
      * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-     * at the beginning of a line
-     * l is of the form l = 2*k, k a non negative integer
+     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l at the
+     * beginning of a line l is of the form l = 2*k, k a non negative integer
      */
     private static final int ZZ_LEXSTATE[] = {
         0, 0, 1, 1
@@ -231,9 +229,11 @@ public final class MethodInfoLexer {
     }
 
     private static int zzUnpackAction(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -279,9 +279,11 @@ public final class MethodInfoLexer {
     }
 
     private static int zzUnpackRowMap(String packed, int offset, int[] result) {
-        int i = 0;  /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -466,9 +468,11 @@ public final class MethodInfoLexer {
     }
 
     private static int zzUnpackTrans(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -518,9 +522,11 @@ public final class MethodInfoLexer {
     }
 
     private static int zzUnpackAttribute(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -549,8 +555,8 @@ public final class MethodInfoLexer {
     private int zzLexicalState = YYINITIAL;
 
     /**
-     * this buffer contains the current text to be matched and is
-     * the source of the yytext() string
+     * this buffer contains the current text to be matched and is the source of
+     * the yytext() string
      */
     private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
 
@@ -570,8 +576,8 @@ public final class MethodInfoLexer {
     private int zzStartRead;
 
     /**
-     * endRead marks the last character in the buffer, that has been read
-     * from input
+     * endRead marks the last character in the buffer, that has been read from
+     * input
      */
     private int zzEndRead;
 
@@ -607,10 +613,10 @@ public final class MethodInfoLexer {
     private boolean zzEOFDone;
 
     /**
-     * The number of occupied positions in zzBuffer beyond zzEndRead.
-     * When a lead/high surrogate has been read from the input stream
-     * into the final zzBuffer position, this will have a value of 1;
-     * otherwise, it will have a value of 0.
+     * The number of occupied positions in zzBuffer beyond zzEndRead. When a
+     * lead/high surrogate has been read from the input stream into the final
+     * zzBuffer position, this will have a value of 1; otherwise, it will have a
+     * value of 0.
      */
     private int zzFinalHighSurrogate = 0;
 
@@ -654,9 +660,11 @@ public final class MethodInfoLexer {
      */
     private static char[] zzUnpackCMap(String packed) {
         char[] map = new char[0x110000];
-        int i = 0;  /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = 0;  /* index in unpacked array */
+        int j = 0;
+        /* index in unpacked array */
 
         while (i < 2868) {
             int count = packed.charAt(i++);
@@ -715,7 +723,8 @@ public final class MethodInfoLexer {
 
         if (totalRead > 0) {
             zzEndRead += totalRead;
-            if (totalRead == requested) { /* possibly more input available */
+            if (totalRead == requested) {
+                /* possibly more input available */
 
                 if (Character.isHighSurrogate(zzBuffer[zzEndRead - 1])) {
                     --zzEndRead;
@@ -733,9 +742,11 @@ public final class MethodInfoLexer {
      * Closes the input stream.
      */
     public final void yyclose() throws java.io.IOException {
-        zzAtEOF = true;            /* indicate end of file */
+        zzAtEOF = true;
+        /* indicate end of file */
 
-        zzEndRead = zzStartRead;  /* invalidate buffer    */
+        zzEndRead = zzStartRead;
+        /* invalidate buffer    */
 
         if (zzReader != null) {
             zzReader.close();
@@ -743,12 +754,12 @@ public final class MethodInfoLexer {
     }
 
     /**
-     * Resets the scanner to read from a new input stream.
-     * Does not close the old reader.
+     * Resets the scanner to read from a new input stream. Does not close the
+     * old reader.
      *
      * All internal variables are reset, the old input stream
-     * <b>cannot</b> be reused (internal buffer is discarded and lost).
-     * Lexical state is set to <tt>ZZ_INITIAL</tt>.
+     * <b>cannot</b> be reused (internal buffer is discarded and lost). Lexical
+     * state is set to <tt>ZZ_INITIAL</tt>.
      *
      * Internal scan buffer is resized down to its initial length, if it has
      * grown.
@@ -794,13 +805,12 @@ public final class MethodInfoLexer {
     }
 
     /**
-     * Returns the character at position <tt>pos</tt> from the
-     * matched text.
+     * Returns the character at position <tt>pos</tt> from the matched text.
      *
      * It is equivalent to yytext().charAt(pos), but faster
      *
-     * @param pos the position of the character to fetch.
-     * A value from 0 to yylength()-1.
+     * @param pos the position of the character to fetch. A value from 0 to
+     * yylength()-1.
      *
      * @return the character at position pos
      */
@@ -818,14 +828,13 @@ public final class MethodInfoLexer {
     /**
      * Reports an error that occured while scanning.
      *
-     * In a wellformed scanner (no or only correct usage of
-     * yypushback(int) and a match-all fallback rule) this method
-     * will only be called with things that "Can't Possibly Happen".
-     * If this method is called, something is seriously wrong
-     * (e.g. a JFlex bug producing a faulty scanner etc.).
+     * In a wellformed scanner (no or only correct usage of yypushback(int) and
+     * a match-all fallback rule) this method will only be called with things
+     * that "Can't Possibly Happen". If this method is called, something is
+     * seriously wrong (e.g. a JFlex bug producing a faulty scanner etc.).
      *
-     * Usual syntax/scanner level error handling should be done
-     * in error fallback rules.
+     * Usual syntax/scanner level error handling should be done in error
+     * fallback rules.
      *
      * @param errorCode the code of the errormessage to display
      */
@@ -845,8 +854,8 @@ public final class MethodInfoLexer {
      *
      * They will be read again by then next call of the scanning method
      *
-     * @param number the number of characters to be read again.
-     * This number must not be greater than yylength()!
+     * @param number the number of characters to be read again. This number must
+     * not be greater than yylength()!
      */
     public void yypushback(int number) {
         if (number > yylength()) {
@@ -857,8 +866,8 @@ public final class MethodInfoLexer {
     }
 
     /**
-     * Resumes scanning until the next regular expression is matched,
-     * the end of input is encountered or an I/O-Error occurs.
+     * Resumes scanning until the next regular expression is matched, the end of
+     * input is encountered or an I/O-Error occurs.
      *
      * @return the next token
      * @exception java.io.IOException if any I/O-Error occurs
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java
index 89a9cefc8..53b0bc1bc 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/Action.java
@@ -568,7 +568,7 @@ public abstract class Action implements GraphSourceItem {
 
                                 writer.appendNoHilight(Helper.byteToHex(fileData[(int) (fileOffset + i)]));
                             }
-                            
+
                             writer.appendNoHilight(")");
                         }
 
@@ -1114,7 +1114,7 @@ public abstract class Action implements GraphSourceItem {
             }
 
             /*ActionJump && ActionIf removed*/
-            /*if ((action instanceof ActionEnumerate2) || (action instanceof ActionEnumerate)) {
+ /*if ((action instanceof ActionEnumerate2) || (action instanceof ActionEnumerate)) {
              loopStart = ip + 1;
              isForIn = true;
              ip += 4;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java
index b970960e7..93cb192c3 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java
@@ -308,16 +308,12 @@ public class FunctionActionItem extends ActionItem {
                     } else {
                         v.setBoxedValue(new DirectValueActionItem(new RegisterNumber(registerNames.indexOf(varName), varName)));
                     }
+                } else if (v.isDefinition()) {
+                    v.setBoxedValue(new DefineLocalActionItem(null, null, ((ActionSourceGenerator) generator).pushConstTargetItem(varName), stored));
+                } else if (stored != null) {
+                    v.setBoxedValue(new SetVariableActionItem(null, null, ((ActionSourceGenerator) generator).pushConstTargetItem(varName), stored));
                 } else {
-                    if (v.isDefinition()) {
-                        v.setBoxedValue(new DefineLocalActionItem(null, null, ((ActionSourceGenerator) generator).pushConstTargetItem(varName), stored));
-                    } else {
-                        if (stored != null) {
-                            v.setBoxedValue(new SetVariableActionItem(null, null, ((ActionSourceGenerator) generator).pushConstTargetItem(varName), stored));
-                        } else {
-                            v.setBoxedValue(new GetVariableActionItem(null, null, ((ActionSourceGenerator) generator).pushConstTargetItem(varName)));
-                        }
-                    }
+                    v.setBoxedValue(new GetVariableActionItem(null, null, ((ActionSourceGenerator) generator).pushConstTargetItem(varName)));
                 }
 
             }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/pcode/FlasmLexer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/pcode/FlasmLexer.java
index b9e8ba77d..81b68d4e9 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/pcode/FlasmLexer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/pcode/FlasmLexer.java
@@ -1,6 +1,6 @@
 /* The following code was generated by JFlex 1.6.0 */
 
-/*
+ /*
  *  Copyright (C) 2010-2016 JPEXS, All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.
  */
-/* Flash assembler language lexer specification */
+ /* Flash assembler language lexer specification */
 package com.jpexs.decompiler.flash.action.parser.pcode;
 
 import com.jpexs.decompiler.flash.action.parser.ActionParseException;
@@ -27,8 +27,7 @@ import com.jpexs.decompiler.flash.ecma.Undefined;
 
 /**
  * This class is a scanner generated by
- * <a href="http://www.jflex.de/">JFlex</a> 1.6.0
- * from the specification file
+ * <a href="http://www.jflex.de/">JFlex</a> 1.6.0 from the specification file
  * <tt>C:/Dropbox/Programovani/JavaSE/FFDec/libsrc/ffdec_lib/lexers/actionscript_pcode.flex</tt>
  */
 public final class FlasmLexer {
@@ -54,9 +53,8 @@ public final class FlasmLexer {
 
     /**
      * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-     * at the beginning of a line
-     * l is of the form l = 2*k, k a non negative integer
+     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l at the
+     * beginning of a line l is of the form l = 2*k, k a non negative integer
      */
     private static final int ZZ_LEXSTATE[] = {
         0, 0, 1, 1, 2, 2
@@ -238,9 +236,11 @@ public final class FlasmLexer {
     }
 
     private static int zzUnpackAction(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -282,9 +282,11 @@ public final class FlasmLexer {
     }
 
     private static int zzUnpackRowMap(String packed, int offset, int[] result) {
-        int i = 0;  /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -458,9 +460,11 @@ public final class FlasmLexer {
     }
 
     private static int zzUnpackTrans(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -510,9 +514,11 @@ public final class FlasmLexer {
     }
 
     private static int zzUnpackAttribute(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -541,8 +547,8 @@ public final class FlasmLexer {
     private int zzLexicalState = YYINITIAL;
 
     /**
-     * this buffer contains the current text to be matched and is
-     * the source of the yytext() string
+     * this buffer contains the current text to be matched and is the source of
+     * the yytext() string
      */
     private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
 
@@ -562,8 +568,8 @@ public final class FlasmLexer {
     private int zzStartRead;
 
     /**
-     * endRead marks the last character in the buffer, that has been read
-     * from input
+     * endRead marks the last character in the buffer, that has been read from
+     * input
      */
     private int zzEndRead;
 
@@ -599,10 +605,10 @@ public final class FlasmLexer {
     private boolean zzEOFDone;
 
     /**
-     * The number of occupied positions in zzBuffer beyond zzEndRead.
-     * When a lead/high surrogate has been read from the input stream
-     * into the final zzBuffer position, this will have a value of 1;
-     * otherwise, it will have a value of 0.
+     * The number of occupied positions in zzBuffer beyond zzEndRead. When a
+     * lead/high surrogate has been read from the input stream into the final
+     * zzBuffer position, this will have a value of 1; otherwise, it will have a
+     * value of 0.
      */
     private int zzFinalHighSurrogate = 0;
 
@@ -642,9 +648,11 @@ public final class FlasmLexer {
      */
     private static char[] zzUnpackCMap(String packed) {
         char[] map = new char[0x110000];
-        int i = 0;  /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = 0;  /* index in unpacked array */
+        int j = 0;
+        /* index in unpacked array */
 
         while (i < 2854) {
             int count = packed.charAt(i++);
@@ -703,7 +711,8 @@ public final class FlasmLexer {
 
         if (totalRead > 0) {
             zzEndRead += totalRead;
-            if (totalRead == requested) { /* possibly more input available */
+            if (totalRead == requested) {
+                /* possibly more input available */
 
                 if (Character.isHighSurrogate(zzBuffer[zzEndRead - 1])) {
                     --zzEndRead;
@@ -721,9 +730,11 @@ public final class FlasmLexer {
      * Closes the input stream.
      */
     public final void yyclose() throws java.io.IOException {
-        zzAtEOF = true;            /* indicate end of file */
+        zzAtEOF = true;
+        /* indicate end of file */
 
-        zzEndRead = zzStartRead;  /* invalidate buffer    */
+        zzEndRead = zzStartRead;
+        /* invalidate buffer    */
 
         if (zzReader != null) {
             zzReader.close();
@@ -731,12 +742,12 @@ public final class FlasmLexer {
     }
 
     /**
-     * Resets the scanner to read from a new input stream.
-     * Does not close the old reader.
+     * Resets the scanner to read from a new input stream. Does not close the
+     * old reader.
      *
      * All internal variables are reset, the old input stream
-     * <b>cannot</b> be reused (internal buffer is discarded and lost).
-     * Lexical state is set to <tt>ZZ_INITIAL</tt>.
+     * <b>cannot</b> be reused (internal buffer is discarded and lost). Lexical
+     * state is set to <tt>ZZ_INITIAL</tt>.
      *
      * Internal scan buffer is resized down to its initial length, if it has
      * grown.
@@ -782,13 +793,12 @@ public final class FlasmLexer {
     }
 
     /**
-     * Returns the character at position <tt>pos</tt> from the
-     * matched text.
+     * Returns the character at position <tt>pos</tt> from the matched text.
      *
      * It is equivalent to yytext().charAt(pos), but faster
      *
-     * @param pos the position of the character to fetch.
-     * A value from 0 to yylength()-1.
+     * @param pos the position of the character to fetch. A value from 0 to
+     * yylength()-1.
      *
      * @return the character at position pos
      */
@@ -806,14 +816,13 @@ public final class FlasmLexer {
     /**
      * Reports an error that occured while scanning.
      *
-     * In a wellformed scanner (no or only correct usage of
-     * yypushback(int) and a match-all fallback rule) this method
-     * will only be called with things that "Can't Possibly Happen".
-     * If this method is called, something is seriously wrong
-     * (e.g. a JFlex bug producing a faulty scanner etc.).
+     * In a wellformed scanner (no or only correct usage of yypushback(int) and
+     * a match-all fallback rule) this method will only be called with things
+     * that "Can't Possibly Happen". If this method is called, something is
+     * seriously wrong (e.g. a JFlex bug producing a faulty scanner etc.).
      *
-     * Usual syntax/scanner level error handling should be done
-     * in error fallback rules.
+     * Usual syntax/scanner level error handling should be done in error
+     * fallback rules.
      *
      * @param errorCode the code of the errormessage to display
      */
@@ -833,8 +842,8 @@ public final class FlasmLexer {
      *
      * They will be read again by then next call of the scanning method
      *
-     * @param number the number of characters to be read again.
-     * This number must not be greater than yylength()!
+     * @param number the number of characters to be read again. This number must
+     * not be greater than yylength()!
      */
     public void yypushback(int number) {
         if (number > yylength()) {
@@ -845,8 +854,8 @@ public final class FlasmLexer {
     }
 
     /**
-     * Resumes scanning until the next regular expression is matched,
-     * the end of input is encountered or an I/O-Error occurs.
+     * Resumes scanning until the next regular expression is matched, the end of
+     * input is encountered or an I/O-Error occurs.
      *
      * @return the next token
      * @exception java.io.IOException if any I/O-Error occurs
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptLexer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptLexer.java
index 29d96d52e..21ebb8b7b 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptLexer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptLexer.java
@@ -1,6 +1,6 @@
 /* The following code was generated by JFlex 1.6.0 */
 
-/*
+ /*
  *  Copyright (C) 2010-2016 JPEXS, All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -25,8 +25,7 @@ import java.util.Stack;
 
 /**
  * This class is a scanner generated by
- * <a href="http://www.jflex.de/">JFlex</a> 1.6.0
- * from the specification file
+ * <a href="http://www.jflex.de/">JFlex</a> 1.6.0 from the specification file
  * <tt>D:/Dropbox/Programovani/JavaSE/FFDec/libsrc/ffdec_lib/lexers/actionscript_script.flex</tt>
  */
 public final class ActionScriptLexer {
@@ -58,9 +57,8 @@ public final class ActionScriptLexer {
 
     /**
      * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-     * at the beginning of a line
-     * l is of the form l = 2*k, k a non negative integer
+     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l at the
+     * beginning of a line l is of the form l = 2*k, k a non negative integer
      */
     private static final int ZZ_LEXSTATE[] = {
         0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5
@@ -278,9 +276,11 @@ public final class ActionScriptLexer {
     }
 
     private static int zzUnpackAction(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -395,9 +395,11 @@ public final class ActionScriptLexer {
     }
 
     private static int zzUnpackRowMap(String packed, int offset, int[] result) {
-        int i = 0;  /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -1100,9 +1102,11 @@ public final class ActionScriptLexer {
     }
 
     private static int zzUnpackTrans(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -1157,9 +1161,11 @@ public final class ActionScriptLexer {
     }
 
     private static int zzUnpackAttribute(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -1188,8 +1194,8 @@ public final class ActionScriptLexer {
     private int zzLexicalState = YYINITIAL;
 
     /**
-     * this buffer contains the current text to be matched and is
-     * the source of the yytext() string
+     * this buffer contains the current text to be matched and is the source of
+     * the yytext() string
      */
     private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
 
@@ -1209,8 +1215,8 @@ public final class ActionScriptLexer {
     private int zzStartRead;
 
     /**
-     * endRead marks the last character in the buffer, that has been read
-     * from input
+     * endRead marks the last character in the buffer, that has been read from
+     * input
      */
     private int zzEndRead;
 
@@ -1246,10 +1252,10 @@ public final class ActionScriptLexer {
     private boolean zzEOFDone;
 
     /**
-     * The number of occupied positions in zzBuffer beyond zzEndRead.
-     * When a lead/high surrogate has been read from the input stream
-     * into the final zzBuffer position, this will have a value of 1;
-     * otherwise, it will have a value of 0.
+     * The number of occupied positions in zzBuffer beyond zzEndRead. When a
+     * lead/high surrogate has been read from the input stream into the final
+     * zzBuffer position, this will have a value of 1; otherwise, it will have a
+     * value of 0.
      */
     private int zzFinalHighSurrogate = 0;
 
@@ -1326,9 +1332,11 @@ public final class ActionScriptLexer {
      */
     private static char[] zzUnpackCMap(String packed) {
         char[] map = new char[0x110000];
-        int i = 0;  /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = 0;  /* index in unpacked array */
+        int j = 0;
+        /* index in unpacked array */
 
         while (i < 2916) {
             int count = packed.charAt(i++);
@@ -1387,7 +1395,8 @@ public final class ActionScriptLexer {
 
         if (totalRead > 0) {
             zzEndRead += totalRead;
-            if (totalRead == requested) { /* possibly more input available */
+            if (totalRead == requested) {
+                /* possibly more input available */
 
                 if (Character.isHighSurrogate(zzBuffer[zzEndRead - 1])) {
                     --zzEndRead;
@@ -1405,9 +1414,11 @@ public final class ActionScriptLexer {
      * Closes the input stream.
      */
     public final void yyclose() throws java.io.IOException {
-        zzAtEOF = true;            /* indicate end of file */
+        zzAtEOF = true;
+        /* indicate end of file */
 
-        zzEndRead = zzStartRead;  /* invalidate buffer    */
+        zzEndRead = zzStartRead;
+        /* invalidate buffer    */
 
         if (zzReader != null) {
             zzReader.close();
@@ -1415,12 +1426,12 @@ public final class ActionScriptLexer {
     }
 
     /**
-     * Resets the scanner to read from a new input stream.
-     * Does not close the old reader.
+     * Resets the scanner to read from a new input stream. Does not close the
+     * old reader.
      *
      * All internal variables are reset, the old input stream
-     * <b>cannot</b> be reused (internal buffer is discarded and lost).
-     * Lexical state is set to <tt>ZZ_INITIAL</tt>.
+     * <b>cannot</b> be reused (internal buffer is discarded and lost). Lexical
+     * state is set to <tt>ZZ_INITIAL</tt>.
      *
      * Internal scan buffer is resized down to its initial length, if it has
      * grown.
@@ -1466,13 +1477,12 @@ public final class ActionScriptLexer {
     }
 
     /**
-     * Returns the character at position <tt>pos</tt> from the
-     * matched text.
+     * Returns the character at position <tt>pos</tt> from the matched text.
      *
      * It is equivalent to yytext().charAt(pos), but faster
      *
-     * @param pos the position of the character to fetch.
-     * A value from 0 to yylength()-1.
+     * @param pos the position of the character to fetch. A value from 0 to
+     * yylength()-1.
      *
      * @return the character at position pos
      */
@@ -1490,14 +1500,13 @@ public final class ActionScriptLexer {
     /**
      * Reports an error that occured while scanning.
      *
-     * In a wellformed scanner (no or only correct usage of
-     * yypushback(int) and a match-all fallback rule) this method
-     * will only be called with things that "Can't Possibly Happen".
-     * If this method is called, something is seriously wrong
-     * (e.g. a JFlex bug producing a faulty scanner etc.).
+     * In a wellformed scanner (no or only correct usage of yypushback(int) and
+     * a match-all fallback rule) this method will only be called with things
+     * that "Can't Possibly Happen". If this method is called, something is
+     * seriously wrong (e.g. a JFlex bug producing a faulty scanner etc.).
      *
-     * Usual syntax/scanner level error handling should be done
-     * in error fallback rules.
+     * Usual syntax/scanner level error handling should be done in error
+     * fallback rules.
      *
      * @param errorCode the code of the errormessage to display
      */
@@ -1517,8 +1526,8 @@ public final class ActionScriptLexer {
      *
      * They will be read again by then next call of the scanning method
      *
-     * @param number the number of characters to be read again.
-     * This number must not be greater than yylength()!
+     * @param number the number of characters to be read again. This number must
+     * not be greater than yylength()!
      */
     public void yypushback(int number) {
         if (number > yylength()) {
@@ -1529,8 +1538,8 @@ public final class ActionScriptLexer {
     }
 
     /**
-     * Resumes scanning until the next regular expression is matched,
-     * the end of input is encountered or an I/O-Error occurs.
+     * Resumes scanning until the next regular expression is matched, the end of
+     * input is encountered or an I/O-Error occurs.
      *
      * @return the next token
      * @exception java.io.IOException if any I/O-Error occurs
@@ -1626,7 +1635,8 @@ public final class ActionScriptLexer {
                 }
                 case 185:
                     break;
-                case 3: { /*ignore*/
+                case 3: {
+                    /*ignore*/
 
                 }
                 case 186:
@@ -1963,7 +1973,8 @@ public final class ActionScriptLexer {
                 case 250:
                     break;
                 case 68: {
-                    string.append('\\'); /*illegal escape sequence*/
+                    string.append('\\');
+                    /*illegal escape sequence*/
 
                 }
                 case 251:
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/docs/docs.js b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/docs/docs.js
index beeac0b56..d0f438957 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/docs/docs.js
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/docs/docs.js
@@ -1,152 +1,152 @@
 function bind(el, evt, func) {
-    if (el.addEventListener){
+    if (el.addEventListener) {
         el.addEventListener(evt, func, false);
     } else if (el.attachEvent) {
         el.attachEvent('on' + evt, func);
     }
 }
 
-function showhide(e,show){
-    var cls = " "+e.className+" ";
-      if(show && cls.indexOf(" hidden ") > -1){
-            cls = cls.replace(" hidden "," ");
-        }else if(!show && cls.indexOf(" hidden ") == -1 ){
-            cls = cls + "hidden ";
-        }
-        cls = cls.trim();
-        e.className = cls;
-}
-
-function hideNoName(name){
-   var lis = document.getElementsByTagName("li");
-    loopi:for(var i=0;i<lis.length;i++) {
-        if(lis[i].className == "instruction-item"){
-            if ((typeof name) != "undefined" && name.trim()!="") {
-              var ss = lis[i].getElementsByTagName("strong");
-              for(var s=0;s<ss.length;s++){
-                  if(ss[s].className=="instruction-name")
-                  {
-                      var insName = ss[s].innerHTML;
-                      if(insName.toLowerCase().indexOf(name.toLowerCase())!=0){ //does not start with desired name
-                          showhide(lis[i],false);
-                          continue loopi;
-                      }                  
-                  }
-              }
-            }
+function showhide(e, show) {
+    var cls = " " + e.className + " ";
+    if (show && cls.indexOf(" hidden ") > -1) {
+        cls = cls.replace(" hidden ", " ");
+    } else if (!show && cls.indexOf(" hidden ") == -1) {
+        cls = cls + "hidden ";
     }
-    } 
+    cls = cls.trim();
+    e.className = cls;
 }
 
-function showFlags(show,flagType){
+function hideNoName(name) {
+    var lis = document.getElementsByTagName("li");
+    loopi:for (var i = 0; i < lis.length; i++) {
+        if (lis[i].className == "instruction-item") {
+            if ((typeof name) != "undefined" && name.trim() != "") {
+                var ss = lis[i].getElementsByTagName("strong");
+                for (var s = 0; s < ss.length; s++) {
+                    if (ss[s].className == "instruction-name")
+                    {
+                        var insName = ss[s].innerHTML;
+                        if (insName.toLowerCase().indexOf(name.toLowerCase()) != 0) { //does not start with desired name
+                            showhide(lis[i], false);
+                            continue loopi;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+function showFlags(show, flagType) {
     var lis = document.getElementsByTagName("div");
-    loopi:for(var i=0;i<lis.length;i++){
-        var cls = " "+lis[i].className+" ";
-        if ((typeof flagType) != "undefined"){
-            if(cls.indexOf("instruction-flag-"+flagType) == -1){
+    loopi:for (var i = 0; i < lis.length; i++) {
+        var cls = " " + lis[i].className + " ";
+        if ((typeof flagType) != "undefined") {
+            if (cls.indexOf("instruction-flag-" + flagType) == -1) {
                 continue;
             }
-        }                        
-        showhide(lis[i].parentNode,show);      
+        }
+        showhide(lis[i].parentNode, show);
     }
 }
 
 
-function sortInstructions(order){
-  var newUl = document.createElement("ul");
-  newUl.className = "instruction-list";
-  
-  
-  var smallestItem = null;
-  var smallestVal = null;
-  var originalUl = null;
-  
-  do {   
-    smallestItem = null;
-    smallestVal = null;
-    var lis = document.getElementsByTagName("li");  
-    loopi:for(var i=0;i<lis.length;i++) {
-        var cls = " "+lis[i].className+" ";
-        if(cls.indexOf(" instruction-item ") != -1) {                                      
-                var ss = lis[i].getElementsByTagName(order == "code"?"span":"strong");
-                for(var s=0;s<ss.length;s++){
-                    if(ss[s].className=="instruction-"+order)
+function sortInstructions(order) {
+    var newUl = document.createElement("ul");
+    newUl.className = "instruction-list";
+
+
+    var smallestItem = null;
+    var smallestVal = null;
+    var originalUl = null;
+
+    do {
+        smallestItem = null;
+        smallestVal = null;
+        var lis = document.getElementsByTagName("li");
+        loopi:for (var i = 0; i < lis.length; i++) {
+            var cls = " " + lis[i].className + " ";
+            if (cls.indexOf(" instruction-item ") != -1) {
+                var ss = lis[i].getElementsByTagName(order == "code" ? "span" : "strong");
+                for (var s = 0; s < ss.length; s++) {
+                    if (ss[s].className == "instruction-" + order)
                     {
                         var checkedVal = ss[s].innerHTML;
-                        if(smallestVal == null || smallestVal > checkedVal)
+                        if (smallestVal == null || smallestVal > checkedVal)
                         {
                             smallestItem = lis[i];
                             smallestVal = checkedVal;
                         }
-                        break;                  
+                        break;
                     }
-                }                                                 
+                }
+            }
         }
-      }   
-      if(smallestItem != null){    
-          originalUl = smallestItem.parentNode;          
-          originalUl.removeChild(smallestItem);        
-          newUl.appendChild(smallestItem);
-      }   
-    }while(smallestItem != null);
-    originalUl.parentNode.replaceChild(newUl,originalUl);
-     
+        if (smallestItem != null) {
+            originalUl = smallestItem.parentNode;
+            originalUl.removeChild(smallestItem);
+            newUl.appendChild(smallestItem);
+        }
+    } while (smallestItem != null);
+    originalUl.parentNode.replaceChild(newUl, originalUl);
+
 }
 
 function applyFilter() {
     var order_new = document.getElementById("filter_order").value;
-    if(order_set != order_new) {
-      order_set = order_new;
-      sortInstructions(order_new);
+    if (order_set != order_new) {
+        order_set = order_new;
+        sortInstructions(order_new);
     }
     showFlags(true);
     hideNoName(document.getElementById("filter-byname").value);
     var inputs = document.getElementsByTagName("input");
-    for(var i=0;i<inputs.length;i++){
-        if(inputs[i].type == "checkbox" && inputs[i].className == "filter" && inputs[i].hasAttribute("data-flag")){
+    for (var i = 0; i < inputs.length; i++) {
+        if (inputs[i].type == "checkbox" && inputs[i].className == "filter" && inputs[i].hasAttribute("data-flag")) {
             var flag = inputs[i].getAttribute("data-flag");
-            if(inputs[i].checked){
-                showFlags(false,flag);
-            }            
+            if (inputs[i].checked) {
+                showFlags(false, flag);
+            }
         }
-    }    
+    }
 }
 
-function init(){
+function init() {
     var js_switcher = document.getElementById("js-switcher");
-    if(!js_switcher){
+    if (!js_switcher) {
         return;
     }
     var t = "";
     t += "<div class=\"filter\">";
-    
+
     t += "<div class=\"filter-item\">";
-    t += "<label for=\"filter-byname\"><strong class=\"filter-byname-title\">"+txt_filter_byname+"</strong></label>";
+    t += "<label for=\"filter-byname\"><strong class=\"filter-byname-title\">" + txt_filter_byname + "</strong></label>";
     t += "<input onkeydown=\"applyFilter();\" onkeyup=\"applyFilter();\" onkeypress=\"applyFilter();\" type=\"text\" id=\"filter-byname\" size=\"15\" />";
     t += "</div>";
-    
+
     t += "<div class=\"filter-item\">";
-    t += "<strong class=\"filter-hide-title\">"+txt_filter_hide+"</strong><br />";
-    for(var flag in flags){
+    t += "<strong class=\"filter-hide-title\">" + txt_filter_hide + "</strong><br />";
+    for (var flag in flags) {
         var flagDesc = flags[flag];
         var flagSet = flags_set[flag];
-        t+= '<input class="filter" data-flag="'+flag+'" onchange="applyFilter();" type="checkbox"'+(flagSet?' checked="checked"':'')+' id="flag-'+flag+'-switch"/><label for="flag-'+flag+'-switch">'+flagDesc+'</label><br />';
+        t += '<input class="filter" data-flag="' + flag + '" onchange="applyFilter();" type="checkbox"' + (flagSet ? ' checked="checked"' : '') + ' id="flag-' + flag + '-switch"/><label for="flag-' + flag + '-switch">' + flagDesc + '</label><br />';
     }
-    
+
     t += "<div class=\"filter-item\">";
-    t += "<label for=\"filter-order\"><strong class=\"filter-order-title\">"+txt_filter_order+"</strong></label>";
+    t += "<label for=\"filter-order\"><strong class=\"filter-order-title\">" + txt_filter_order + "</strong></label>";
     t += "<select id=\"filter_order\" onchange=\"applyFilter();\">";
-    t += "<option value=\"code\""+(order_set=="code"?' selected="selected"':'')+">"+txt_filter_order_code+"</option>";
-    t += "<option value=\"name\""+(order_set=="name"?' selected="selected"':'')+">"+txt_filter_order_name+"</option>";    
+    t += "<option value=\"code\"" + (order_set == "code" ? ' selected="selected"' : '') + ">" + txt_filter_order_code + "</option>";
+    t += "<option value=\"name\"" + (order_set == "name" ? ' selected="selected"' : '') + ">" + txt_filter_order_name + "</option>";
     t += "</select>";
-    t += "</div>";    
-    t += "</div>";        
-    
+    t += "</div>";
+    t += "</div>";
+
     t += "</div>"; //.filter
-    
-    
+
+
     js_switcher.innerHTML = t;
     applyFilter();
 }
 
-bind(window,"load",init);
\ No newline at end of file
+bind(window, "load", init);
\ No newline at end of file
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ecma/EcmaFloatingDecimal.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ecma/EcmaFloatingDecimal.java
index 6b2abd741..f6522cb59 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ecma/EcmaFloatingDecimal.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/ecma/EcmaFloatingDecimal.java
@@ -655,7 +655,7 @@ public class EcmaFloatingDecimal {
          * We keep track of powers of 2 and powers of 5.
          */
 
-        /*
+ /*
          * Estimate decimal exponent. (If it is small-ish,
          * we could double-check.)
          *
@@ -973,64 +973,60 @@ public class EcmaFloatingDecimal {
         if (isExceptional) {
             System.arraycopy(digits, 0, result, i, nDigits);
             i += nDigits;
-        } else {
-            if (decExponent > 0 && decExponent < 22) {
-                // print digits.digits.
-                int charLength = Math.min(nDigits, decExponent);
-                System.arraycopy(digits, 0, result, i, charLength);
+        } else if (decExponent > 0 && decExponent < 22) {
+            // print digits.digits.
+            int charLength = Math.min(nDigits, decExponent);
+            System.arraycopy(digits, 0, result, i, charLength);
+            i += charLength;
+            if (charLength < decExponent) {
+                charLength = decExponent - charLength;
+                System.arraycopy(zero, 0, result, i, charLength);
                 i += charLength;
-                if (charLength < decExponent) {
-                    charLength = decExponent - charLength;
-                    System.arraycopy(zero, 0, result, i, charLength);
-                    i += charLength;
-                } else {
-                    if (charLength < nDigits) {
-                        result[i++] = '.';
-                        int t = nDigits - charLength;
-                        System.arraycopy(digits, charLength, result, i, t);
-                        i += t;
-                    }
-                }
-            } else if (decExponent <= 0 && decExponent > -5) {
-                result[i++] = '0';
-                if (digits != zero) {
-                    result[i++] = '.';
-                    if (decExponent != 0) {
-                        System.arraycopy(zero, 0, result, i, -decExponent);
-                        i -= decExponent;
-                    }
-                    System.arraycopy(digits, 0, result, i, nDigits);
-                    i += nDigits;
-                }
-            } else {
-                result[i++] = digits[0];
+            } else if (charLength < nDigits) {
                 result[i++] = '.';
-                if (nDigits > 1) {
-                    System.arraycopy(digits, 1, result, i, nDigits - 1);
-                    i += nDigits - 1;
-                } else {
-                    result[i++] = '0';
-                }
-                result[i++] = 'e';
-                int e;
-                if (decExponent <= 0) {
-                    result[i++] = '-';
-                    e = -decExponent + 1;
-                } else {
-                    e = decExponent - 1;
-                }
-                // decExponent has 1, 2, or 3, digits
-                if (e <= 9) {
-                    result[i++] = (char) (e + '0');
-                } else if (e <= 99) {
-                    result[i++] = (char) (e / 10 + '0');
-                    result[i++] = (char) (e % 10 + '0');
-                } else {
-                    result[i++] = (char) (e / 100 + '0');
-                    e %= 100;
-                    result[i++] = (char) (e / 10 + '0');
-                    result[i++] = (char) (e % 10 + '0');
+                int t = nDigits - charLength;
+                System.arraycopy(digits, charLength, result, i, t);
+                i += t;
+            }
+        } else if (decExponent <= 0 && decExponent > -5) {
+            result[i++] = '0';
+            if (digits != zero) {
+                result[i++] = '.';
+                if (decExponent != 0) {
+                    System.arraycopy(zero, 0, result, i, -decExponent);
+                    i -= decExponent;
                 }
+                System.arraycopy(digits, 0, result, i, nDigits);
+                i += nDigits;
+            }
+        } else {
+            result[i++] = digits[0];
+            result[i++] = '.';
+            if (nDigits > 1) {
+                System.arraycopy(digits, 1, result, i, nDigits - 1);
+                i += nDigits - 1;
+            } else {
+                result[i++] = '0';
+            }
+            result[i++] = 'e';
+            int e;
+            if (decExponent <= 0) {
+                result[i++] = '-';
+                e = -decExponent + 1;
+            } else {
+                e = decExponent - 1;
+            }
+            // decExponent has 1, 2, or 3, digits
+            if (e <= 9) {
+                result[i++] = (char) (e + '0');
+            } else if (e <= 99) {
+                result[i++] = (char) (e / 10 + '0');
+                result[i++] = (char) (e % 10 + '0');
+            } else {
+                result[i++] = (char) (e / 100 + '0');
+                e %= 100;
+                result[i++] = (char) (e / 10 + '0');
+                result[i++] = (char) (e % 10 + '0');
             }
         }
         return i;
@@ -1185,8 +1181,8 @@ public class EcmaFloatingDecimal {
     }
 
     /**
-     * Extract a hexadecimal digit from position <code>position</code>
-     * of string <code>s</code>.
+     * Extract a hexadecimal digit from position <code>position</code> of string
+     * <code>s</code>.
      */
     static int getHexDigit(String s, int position) {
         int value = Character.digit(s.charAt(position), 16);
@@ -1567,8 +1563,8 @@ class FDBigInt {
             } else {
                 return 1; // b not big, answer is obvious;
             }
-        } else {
-            // a is not really big
+        } else // a is not really big
+        {
             if (b < 0) {
                 // but b is really big
                 return -1;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/ShapeExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/ShapeExporter.java
index 1f7e90540..277ff7f0d 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/ShapeExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/ShapeExporter.java
@@ -63,7 +63,7 @@ public class ShapeExporter {
             return ret;
         }
 
-            File foutdir = new File(outdir);
+        File foutdir = new File(outdir);
         Path.createDirectorySafe(foutdir);
 
         int count = 0;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/BMPFile.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/BMPFile.java
index 3528b9931..10a7d8e32 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/BMPFile.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/BMPFile.java
@@ -92,6 +92,7 @@ public class BMPFile extends Component {
             b.save(image, image.getWidth(null), image.getHeight(null));
         }
     }
+
     /*
      *  The saveMethod is the main method of the process. This method
      *  will call the convertImage method to convert the memory image to
@@ -100,7 +101,6 @@ public class BMPFile extends Component {
      *  information header; and writeBitmap writes the image.
      *
      */
-
     private void save(Image parImage, int parWidth, int parHeight) throws IOException {
         convertImage(parImage, parWidth, parHeight);
         writeBitmapFileHeader();
@@ -108,12 +108,12 @@ public class BMPFile extends Component {
         writeBitmap();
 
     }
+
     /*
      * convertImage converts the memory image to the bitmap format (BRG).
      * It also computes some information for the bitmap info header.
      *
      */
-
     private boolean convertImage(Image parImage, int parWidth, int parHeight) {
         int pad;
         bitmap = new int[parWidth * parHeight];
@@ -133,6 +133,7 @@ public class BMPFile extends Component {
         biHeight = parHeight;
         return (true);
     }
+
     /*
      * writeBitmap converts the image returned from the pixel grabber to
      * the format required. Remember: scan lines are inverted in
@@ -140,7 +141,6 @@ public class BMPFile extends Component {
      *
      * Each scan line must be padded to an even 4-byte boundary.
      */
-
     private void writeBitmap() throws IOException {
         byte[] rgb = new byte[3];
         int width = biWidth;
@@ -165,11 +165,11 @@ public class BMPFile extends Component {
         bfSize += padCount;
         biSizeImage += padCount;
     }
+
     /*
      * writeBitmapFileHeader writes the bitmap file header to the file.
      *
      */
-
     private void writeBitmapFileHeader() throws IOException {
 
         fo.write(bfType);
@@ -178,13 +178,13 @@ public class BMPFile extends Component {
         fo.write(intToWord(bfReserved2));
         fo.write(intToDWord(bfOffBits));
     }
+
     /*
      *
      * writeBitmapInfoHeader writes the bitmap information header
      * to the file.
      *
      */
-
     private void writeBitmapInfoHeader() throws IOException {
 
         fo.write(intToDWord(biSize));
@@ -200,26 +200,26 @@ public class BMPFile extends Component {
         fo.write(intToDWord(biClrImportant));
 
     }
+
     /*
      *
      * intToWord converts an int to a word, where the return
      * value is stored in a 2-byte array.
      *
      */
-
     private byte[] intToWord(int parValue) {
         byte[] retValue = new byte[2];
         retValue[0] = (byte) (parValue & 0x00FF);
         retValue[1] = (byte) ((parValue >> 8) & 0x00FF);
         return (retValue);
     }
+
     /*
      *
      * intToDWord converts an int to a double word, where the return
      * value is stored in a 4-byte array.
      *
      */
-
     private byte[] intToDWord(int parValue) {
         byte[] retValue = new byte[4];
         retValue[0] = (byte) (parValue & 0x00FF);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/GraphTextWriter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/GraphTextWriter.java
index 65db3bcb0..14fc85280 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/GraphTextWriter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/GraphTextWriter.java
@@ -243,10 +243,8 @@ public abstract class GraphTextWriter {
             if (formatting.spaceBeforeParenthesesMethodCallParentheses) {
                 space();
             }
-        } else {
-            if (formatting.spaceBeforeParenthesesMethodCallEmptyParentheses) {
-                space();
-            }
+        } else if (formatting.spaceBeforeParenthesesMethodCallEmptyParentheses) {
+            space();
         }
         return this;
     }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/ImageHelper.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/ImageHelper.java
index c368ac4cb..49018fd4f 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/ImageHelper.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/helpers/ImageHelper.java
@@ -103,19 +103,17 @@ public class ImageHelper {
         String formatName = getImageFormatString(format).toUpperCase(Locale.ENGLISH);
         if (format == ImageFormat.JPEG) {
             image = fixImageIOJpegBug(image);
-        } else {
-            if (image.getType() == BufferedImage.TYPE_INT_ARGB_PRE) {
-                BufferedImage image2 = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_INT_ARGB);
-                int[] pixels = ((DataBufferInt) image.getRaster().getDataBuffer()).getData();
-                divideAlpha(pixels);
+        } else if (image.getType() == BufferedImage.TYPE_INT_ARGB_PRE) {
+            BufferedImage image2 = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_INT_ARGB);
+            int[] pixels = ((DataBufferInt) image.getRaster().getDataBuffer()).getData();
+            divideAlpha(pixels);
 
-                int[] pixels2 = ((DataBufferInt) image2.getRaster().getDataBuffer()).getData();
-                for (int i = 0; i < pixels.length; i++) {
-                    pixels2[i] = pixels[i];
-                }
-
-                image = image2;
+            int[] pixels2 = ((DataBufferInt) image2.getRaster().getDataBuffer()).getData();
+            for (int i = 0; i < pixels.length; i++) {
+                pixels2[i] = pixels[i];
             }
+
+            image = image2;
         }
 
         try {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/TextImporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/TextImporter.java
index e45163425..e92169492 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/TextImporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/TextImporter.java
@@ -60,10 +60,8 @@ public class TextImporter {
                 int id = Integer.parseInt(idLine.substring(3).trim());
                 String[] records = textArr[1].split(recordSeparator);
                 result.put(id, records);
-            } else {
-                if (errorHandler.handle(null)) {
-                    return null;
-                }
+            } else if (errorHandler.handle(null)) {
+                return null;
             }
         }
         return result;
@@ -142,11 +140,9 @@ public class TextImporter {
                     return false;
                 }
             }
-        } else {
-            if (textTag != null) {
-                if (!saveText(textTag, newText, null)) {
-                    return false;
-                }
+        } else if (textTag != null) {
+            if (!saveText(textTag, newText, null)) {
+                return false;
             }
         }
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/amf/amf3/Amf3Lexer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/amf/amf3/Amf3Lexer.java
index 7052c61ef..e8d559a27 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/amf/amf3/Amf3Lexer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/amf/amf3/Amf3Lexer.java
@@ -1,6 +1,6 @@
 /* The following code was generated by JFlex 1.6.0 */
 
-/*
+ /*
  *  Copyright (C) 2010-2016 JPEXS, All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -17,517 +17,558 @@
  * License along with this library.
  */
 package com.jpexs.decompiler.flash.importers.amf.amf3;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Stack;
 
-
 /**
- * This class is a scanner generated by 
- * <a href="http://www.jflex.de/">JFlex</a> 1.6.0
- * from the specification file <tt>D:/Dropbox/Programovani/JavaSE/FFDec/libsrc/ffdec_lib/lexers/amf3.flex</tt>
+ * This class is a scanner generated by
+ * <a href="http://www.jflex.de/">JFlex</a> 1.6.0 from the specification file
+ * <tt>D:/Dropbox/Programovani/JavaSE/FFDec/libsrc/ffdec_lib/lexers/amf3.flex</tt>
  */
 public final class Amf3Lexer {
 
-  /** This character denotes the end of file */
-  public static final int YYEOF = -1;
+    /**
+     * This character denotes the end of file
+     */
+    public static final int YYEOF = -1;
 
-  /** initial size of the lookahead buffer */
-  private static final int ZZ_BUFFERSIZE = 16384;
+    /**
+     * initial size of the lookahead buffer
+     */
+    private static final int ZZ_BUFFERSIZE = 16384;
 
-  /** lexical states */
-  public static final int YYINITIAL = 0;
-  public static final int STRING = 2;
-  public static final int CHARLITERAL = 4;
+    /**
+     * lexical states
+     */
+    public static final int YYINITIAL = 0;
+    public static final int STRING = 2;
+    public static final int CHARLITERAL = 4;
 
-  /**
-   * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-   * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-   *                  at the beginning of a line
-   * l is of the form l = 2*k, k a non negative integer
-   */
-  private static final int ZZ_LEXSTATE[] = { 
-     0,  0,  1,  1,  2, 2
-  };
+    /**
+     * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
+     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l at the
+     * beginning of a line l is of the form l = 2*k, k a non negative integer
+     */
+    private static final int ZZ_LEXSTATE[] = {
+        0, 0, 1, 1, 2, 2
+    };
 
-  /** 
-   * Translates characters to character classes
-   */
-  private static final String ZZ_CMAP_PACKED = 
-    "\11\7\1\3\1\2\1\54\1\55\1\1\16\7\4\0\1\3\1\0"+
-    "\1\50\1\10\1\6\2\0\1\52\2\0\1\5\1\22\1\46\1\12"+
-    "\1\20\1\4\1\11\3\16\4\17\2\13\1\47\6\0\4\15\1\21"+
-    "\1\15\21\6\1\14\2\6\1\44\1\23\1\45\1\0\1\6\1\0"+
-    "\1\33\1\51\1\15\1\27\1\30\1\31\2\6\1\32\1\6\1\37"+
-    "\1\26\1\6\1\24\1\40\2\6\1\36\1\34\1\35\1\25\1\6"+
-    "\1\41\1\53\2\6\1\42\1\0\1\43\1\0\6\7\1\56\32\7"+
-    "\2\0\4\6\4\0\1\6\2\0\1\7\7\0\1\6\4\0\1\6"+
-    "\5\0\27\6\1\0\37\6\1\0\u01ca\6\4\0\14\6\16\0\5\6"+
-    "\7\0\1\6\1\0\1\6\21\0\160\7\5\6\1\0\2\6\2\0"+
-    "\4\6\10\0\1\6\1\0\3\6\1\0\1\6\1\0\24\6\1\0"+
-    "\123\6\1\0\213\6\1\0\5\7\2\0\236\6\11\0\46\6\2\0"+
-    "\1\6\7\0\47\6\7\0\1\6\1\0\55\7\1\0\1\7\1\0"+
-    "\2\7\1\0\2\7\1\0\1\7\10\0\33\6\5\0\3\6\15\0"+
-    "\5\7\6\0\1\6\4\0\13\7\5\0\53\6\37\7\4\0\2\6"+
-    "\1\7\143\6\1\0\1\6\10\7\1\0\6\7\2\6\2\7\1\0"+
-    "\4\7\2\6\12\7\3\6\2\0\1\6\17\0\1\7\1\6\1\7"+
-    "\36\6\33\7\2\0\131\6\13\7\1\6\16\0\12\7\41\6\11\7"+
-    "\2\6\4\0\1\6\5\0\26\6\4\7\1\6\11\7\1\6\3\7"+
-    "\1\6\5\7\22\0\31\6\3\7\104\0\1\6\1\0\13\6\67\0"+
-    "\33\7\1\0\4\7\66\6\3\7\1\6\22\7\1\6\7\7\12\6"+
-    "\2\7\2\0\12\7\1\0\7\6\1\0\7\6\1\0\3\7\1\0"+
-    "\10\6\2\0\2\6\2\0\26\6\1\0\7\6\1\0\1\6\3\0"+
-    "\4\6\2\0\1\7\1\6\7\7\2\0\2\7\2\0\3\7\1\6"+
-    "\10\0\1\7\4\0\2\6\1\0\3\6\2\7\2\0\12\7\4\6"+
-    "\7\0\1\6\5\0\3\7\1\0\6\6\4\0\2\6\2\0\26\6"+
-    "\1\0\7\6\1\0\2\6\1\0\2\6\1\0\2\6\2\0\1\7"+
-    "\1\0\5\7\4\0\2\7\2\0\3\7\3\0\1\7\7\0\4\6"+
-    "\1\0\1\6\7\0\14\7\3\6\1\7\13\0\3\7\1\0\11\6"+
-    "\1\0\3\6\1\0\26\6\1\0\7\6\1\0\2\6\1\0\5\6"+
-    "\2\0\1\7\1\6\10\7\1\0\3\7\1\0\3\7\2\0\1\6"+
-    "\17\0\2\6\2\7\2\0\12\7\1\0\1\6\17\0\3\7\1\0"+
-    "\10\6\2\0\2\6\2\0\26\6\1\0\7\6\1\0\2\6\1\0"+
-    "\5\6\2\0\1\7\1\6\7\7\2\0\2\7\2\0\3\7\10\0"+
-    "\2\7\4\0\2\6\1\0\3\6\2\7\2\0\12\7\1\0\1\6"+
-    "\20\0\1\7\1\6\1\0\6\6\3\0\3\6\1\0\4\6\3\0"+
-    "\2\6\1\0\1\6\1\0\2\6\3\0\2\6\3\0\3\6\3\0"+
-    "\14\6\4\0\5\7\3\0\3\7\1\0\4\7\2\0\1\6\6\0"+
-    "\1\7\16\0\12\7\11\0\1\6\7\0\3\7\1\0\10\6\1\0"+
-    "\3\6\1\0\27\6\1\0\12\6\1\0\5\6\3\0\1\6\7\7"+
-    "\1\0\3\7\1\0\4\7\7\0\2\7\1\0\2\6\6\0\2\6"+
-    "\2\7\2\0\12\7\22\0\2\7\1\0\10\6\1\0\3\6\1\0"+
-    "\27\6\1\0\12\6\1\0\5\6\2\0\1\7\1\6\7\7\1\0"+
-    "\3\7\1\0\4\7\7\0\2\7\7\0\1\6\1\0\2\6\2\7"+
-    "\2\0\12\7\1\0\2\6\17\0\2\7\1\0\10\6\1\0\3\6"+
-    "\1\0\51\6\2\0\1\6\7\7\1\0\3\7\1\0\4\7\1\6"+
-    "\10\0\1\7\10\0\2\6\2\7\2\0\12\7\12\0\6\6\2\0"+
-    "\2\7\1\0\22\6\3\0\30\6\1\0\11\6\1\0\1\6\2\0"+
-    "\7\6\3\0\1\7\4\0\6\7\1\0\1\7\1\0\10\7\22\0"+
-    "\2\7\15\0\60\6\1\7\2\6\7\7\4\0\10\6\10\7\1\0"+
-    "\12\7\47\0\2\6\1\0\1\6\2\0\2\6\1\0\1\6\2\0"+
-    "\1\6\6\0\4\6\1\0\7\6\1\0\3\6\1\0\1\6\1\0"+
-    "\1\6\2\0\2\6\1\0\4\6\1\7\2\6\6\7\1\0\2\7"+
-    "\1\6\2\0\5\6\1\0\1\6\1\0\6\7\2\0\12\7\2\0"+
-    "\4\6\40\0\1\6\27\0\2\7\6\0\12\7\13\0\1\7\1\0"+
-    "\1\7\1\0\1\7\4\0\2\7\10\6\1\0\44\6\4\0\24\7"+
-    "\1\0\2\7\5\6\13\7\1\0\44\7\11\0\1\7\71\0\53\6"+
-    "\24\7\1\6\12\7\6\0\6\6\4\7\4\6\3\7\1\6\3\7"+
-    "\2\6\7\7\3\6\4\7\15\6\14\7\1\6\17\7\2\0\46\6"+
-    "\1\0\1\6\5\0\1\6\2\0\53\6\1\0\u014d\6\1\0\4\6"+
-    "\2\0\7\6\1\0\1\6\1\0\4\6\2\0\51\6\1\0\4\6"+
-    "\2\0\41\6\1\0\4\6\2\0\7\6\1\0\1\6\1\0\4\6"+
-    "\2\0\17\6\1\0\71\6\1\0\4\6\2\0\103\6\2\0\3\7"+
-    "\40\0\20\6\20\0\125\6\14\0\u026c\6\2\0\21\6\1\0\32\6"+
-    "\5\0\113\6\3\0\3\6\17\0\15\6\1\0\4\6\3\7\13\0"+
-    "\22\6\3\7\13\0\22\6\2\7\14\0\15\6\1\0\3\6\1\0"+
-    "\2\7\14\0\64\6\40\7\3\0\1\6\3\0\2\6\1\7\2\0"+
-    "\12\7\41\0\3\7\2\0\12\7\6\0\130\6\10\0\51\6\1\7"+
-    "\1\6\5\0\106\6\12\0\35\6\3\0\14\7\4\0\14\7\12\0"+
-    "\12\7\36\6\2\0\5\6\13\0\54\6\4\0\21\7\7\6\2\7"+
-    "\6\0\12\7\46\0\27\6\5\7\4\0\65\6\12\7\1\0\35\7"+
-    "\2\0\13\7\6\0\12\7\15\0\1\6\130\0\5\7\57\6\21\7"+
-    "\7\6\4\0\12\7\21\0\11\7\14\0\3\7\36\6\15\7\2\6"+
-    "\12\7\54\6\16\7\14\0\44\6\24\7\10\0\12\7\3\0\3\6"+
-    "\12\7\44\6\122\0\3\7\1\0\25\7\4\6\1\7\4\6\3\7"+
-    "\2\6\11\0\300\6\47\7\25\0\4\7\u0116\6\2\0\6\6\2\0"+
-    "\46\6\2\0\6\6\2\0\10\6\1\0\1\6\1\0\1\6\1\0"+
-    "\1\6\1\0\37\6\2\0\65\6\1\0\7\6\1\0\1\6\3\0"+
-    "\3\6\1\0\7\6\3\0\4\6\2\0\6\6\4\0\15\6\5\0"+
-    "\3\6\1\0\7\6\16\0\5\7\30\0\1\54\1\54\5\7\20\0"+
-    "\2\6\23\0\1\6\13\0\5\7\5\0\6\7\1\0\1\6\15\0"+
-    "\1\6\20\0\15\6\3\0\33\6\25\0\15\7\4\0\1\7\3\0"+
-    "\14\7\21\0\1\6\4\0\1\6\2\0\12\6\1\0\1\6\3\0"+
-    "\5\6\6\0\1\6\1\0\1\6\1\0\1\6\1\0\4\6\1\0"+
-    "\13\6\2\0\4\6\5\0\5\6\4\0\1\6\21\0\51\6\u0a77\0"+
-    "\57\6\1\0\57\6\1\0\205\6\6\0\4\6\3\7\2\6\14\0"+
-    "\46\6\1\0\1\6\5\0\1\6\2\0\70\6\7\0\1\6\17\0"+
-    "\1\7\27\6\11\0\7\6\1\0\7\6\1\0\7\6\1\0\7\6"+
-    "\1\0\7\6\1\0\7\6\1\0\7\6\1\0\7\6\1\0\40\7"+
-    "\57\0\1\6\u01d5\0\3\6\31\0\11\6\6\7\1\0\5\6\2\0"+
-    "\5\6\4\0\126\6\2\0\2\7\2\0\3\6\1\0\132\6\1\0"+
-    "\4\6\5\0\51\6\3\0\136\6\21\0\33\6\65\0\20\6\u0200\0"+
-    "\u19b6\6\112\0\u51cd\6\63\0\u048d\6\103\0\56\6\2\0\u010d\6\3\0"+
-    "\20\6\12\7\2\6\24\0\57\6\1\7\4\0\12\7\1\0\31\6"+
-    "\7\0\1\7\120\6\2\7\45\0\11\6\2\0\147\6\2\0\4\6"+
-    "\1\0\4\6\14\0\13\6\115\0\12\6\1\7\3\6\1\7\4\6"+
-    "\1\7\27\6\5\7\20\0\1\6\7\0\64\6\14\0\2\7\62\6"+
-    "\21\7\13\0\12\7\6\0\22\7\6\6\3\0\1\6\4\0\12\7"+
-    "\34\6\10\7\2\0\27\6\15\7\14\0\35\6\3\0\4\7\57\6"+
-    "\16\7\16\0\1\6\12\7\46\0\51\6\16\7\11\0\3\6\1\7"+
-    "\10\6\2\7\2\0\12\7\6\0\27\6\3\0\1\6\1\7\4\0"+
-    "\60\6\1\7\1\6\3\7\2\6\2\7\5\6\2\7\1\6\1\7"+
-    "\1\6\30\0\3\6\2\0\13\6\5\7\2\0\3\6\2\7\12\0"+
-    "\6\6\2\0\6\6\2\0\6\6\11\0\7\6\1\0\7\6\221\0"+
-    "\43\6\10\7\1\0\2\7\2\0\12\7\6\0\u2ba4\6\14\0\27\6"+
-    "\4\0\61\6\u2104\0\u016e\6\2\0\152\6\46\0\7\6\14\0\5\6"+
-    "\5\0\1\6\1\7\12\6\1\0\15\6\1\0\5\6\1\0\1\6"+
-    "\1\0\2\6\1\0\2\6\1\0\154\6\41\0\u016b\6\22\0\100\6"+
-    "\2\0\66\6\50\0\15\6\3\0\20\7\20\0\7\7\14\0\2\6"+
-    "\30\0\3\6\31\0\1\6\6\0\5\6\1\0\207\6\2\0\1\7"+
-    "\4\0\1\6\13\0\12\7\7\0\32\6\4\0\1\6\1\0\32\6"+
-    "\13\0\131\6\3\0\6\6\2\0\6\6\2\0\6\6\2\0\3\6"+
-    "\3\0\2\6\3\0\2\6\22\0\3\7\4\0\14\6\1\0\32\6"+
-    "\1\0\23\6\1\0\2\6\1\0\17\6\2\0\16\6\42\0\173\6"+
-    "\105\0\65\6\210\0\1\7\202\0\35\6\3\0\61\6\57\0\37\6"+
-    "\21\0\33\6\65\0\36\6\2\0\44\6\4\0\10\6\1\0\5\6"+
-    "\52\0\236\6\2\0\12\7\u0356\0\6\6\2\0\1\6\1\0\54\6"+
-    "\1\0\2\6\3\0\1\6\2\0\27\6\252\0\26\6\12\0\32\6"+
-    "\106\0\70\6\6\0\2\6\100\0\1\6\3\7\1\0\2\7\5\0"+
-    "\4\7\4\6\1\0\3\6\1\0\33\6\4\0\3\7\4\0\1\7"+
-    "\40\0\35\6\203\0\66\6\12\0\26\6\12\0\23\6\215\0\111\6"+
-    "\u03b7\0\3\7\65\6\17\7\37\0\12\7\20\0\3\7\55\6\13\7"+
-    "\2\0\1\7\22\0\31\6\7\0\12\7\6\0\3\7\44\6\16\7"+
-    "\1\0\12\7\100\0\3\7\60\6\16\7\4\6\13\0\12\7\u04a6\0"+
-    "\53\6\15\7\10\0\12\7\u0936\0\u036f\6\221\0\143\6\u0b9d\0\u042f\6"+
-    "\u33d1\0\u0239\6\u04c7\0\105\6\13\0\1\6\56\7\20\0\4\7\15\6"+
-    "\u4060\0\2\6\u2163\0\5\7\3\0\26\7\2\0\7\7\36\0\4\7"+
-    "\224\0\3\7\u01bb\0\125\6\1\0\107\6\1\0\2\6\2\0\1\6"+
-    "\2\0\2\6\2\0\4\6\1\0\14\6\1\0\1\6\1\0\7\6"+
-    "\1\0\101\6\1\0\4\6\2\0\10\6\1\0\7\6\1\0\34\6"+
-    "\1\0\4\6\1\0\5\6\1\0\1\6\3\0\7\6\1\0\u0154\6"+
-    "\2\0\31\6\1\0\31\6\1\0\37\6\1\0\31\6\1\0\37\6"+
-    "\1\0\31\6\1\0\37\6\1\0\31\6\1\0\37\6\1\0\31\6"+
-    "\1\0\10\6\2\0\62\7\u1600\0\4\6\1\0\33\6\1\0\2\6"+
-    "\1\0\1\6\2\0\1\6\1\0\12\6\1\0\4\6\1\0\1\6"+
-    "\1\0\1\6\6\0\1\6\4\0\1\6\1\0\1\6\1\0\1\6"+
-    "\1\0\3\6\1\0\2\6\1\0\1\6\2\0\1\6\1\0\1\6"+
-    "\1\0\1\6\1\0\1\6\1\0\1\6\1\0\2\6\1\0\1\6"+
-    "\2\0\4\6\1\0\7\6\1\0\4\6\1\0\4\6\1\0\1\6"+
-    "\1\0\12\6\1\0\21\6\5\0\3\6\1\0\5\6\1\0\21\6"+
-    "\u1144\0\ua6d7\6\51\0\u1035\6\13\0\336\6\u3fe2\0\u021e\6\uffff\0\uffff\0\uffff\0\uffff\0\uffff\0\uffff\0\uffff\0\uffff\0\uffff\0\uffff\0\uffff\0\u05ee\0"+
-    "\1\7\36\0\140\7\200\0\360\7\uffff\0\uffff\0\ufe12\0";
+    /**
+     * Translates characters to character classes
+     */
+    private static final String ZZ_CMAP_PACKED
+            = "\11\7\1\3\1\2\1\54\1\55\1\1\16\7\4\0\1\3\1\0"
+            + "\1\50\1\10\1\6\2\0\1\52\2\0\1\5\1\22\1\46\1\12"
+            + "\1\20\1\4\1\11\3\16\4\17\2\13\1\47\6\0\4\15\1\21"
+            + "\1\15\21\6\1\14\2\6\1\44\1\23\1\45\1\0\1\6\1\0"
+            + "\1\33\1\51\1\15\1\27\1\30\1\31\2\6\1\32\1\6\1\37"
+            + "\1\26\1\6\1\24\1\40\2\6\1\36\1\34\1\35\1\25\1\6"
+            + "\1\41\1\53\2\6\1\42\1\0\1\43\1\0\6\7\1\56\32\7"
+            + "\2\0\4\6\4\0\1\6\2\0\1\7\7\0\1\6\4\0\1\6"
+            + "\5\0\27\6\1\0\37\6\1\0\u01ca\6\4\0\14\6\16\0\5\6"
+            + "\7\0\1\6\1\0\1\6\21\0\160\7\5\6\1\0\2\6\2\0"
+            + "\4\6\10\0\1\6\1\0\3\6\1\0\1\6\1\0\24\6\1\0"
+            + "\123\6\1\0\213\6\1\0\5\7\2\0\236\6\11\0\46\6\2\0"
+            + "\1\6\7\0\47\6\7\0\1\6\1\0\55\7\1\0\1\7\1\0"
+            + "\2\7\1\0\2\7\1\0\1\7\10\0\33\6\5\0\3\6\15\0"
+            + "\5\7\6\0\1\6\4\0\13\7\5\0\53\6\37\7\4\0\2\6"
+            + "\1\7\143\6\1\0\1\6\10\7\1\0\6\7\2\6\2\7\1\0"
+            + "\4\7\2\6\12\7\3\6\2\0\1\6\17\0\1\7\1\6\1\7"
+            + "\36\6\33\7\2\0\131\6\13\7\1\6\16\0\12\7\41\6\11\7"
+            + "\2\6\4\0\1\6\5\0\26\6\4\7\1\6\11\7\1\6\3\7"
+            + "\1\6\5\7\22\0\31\6\3\7\104\0\1\6\1\0\13\6\67\0"
+            + "\33\7\1\0\4\7\66\6\3\7\1\6\22\7\1\6\7\7\12\6"
+            + "\2\7\2\0\12\7\1\0\7\6\1\0\7\6\1\0\3\7\1\0"
+            + "\10\6\2\0\2\6\2\0\26\6\1\0\7\6\1\0\1\6\3\0"
+            + "\4\6\2\0\1\7\1\6\7\7\2\0\2\7\2\0\3\7\1\6"
+            + "\10\0\1\7\4\0\2\6\1\0\3\6\2\7\2\0\12\7\4\6"
+            + "\7\0\1\6\5\0\3\7\1\0\6\6\4\0\2\6\2\0\26\6"
+            + "\1\0\7\6\1\0\2\6\1\0\2\6\1\0\2\6\2\0\1\7"
+            + "\1\0\5\7\4\0\2\7\2\0\3\7\3\0\1\7\7\0\4\6"
+            + "\1\0\1\6\7\0\14\7\3\6\1\7\13\0\3\7\1\0\11\6"
+            + "\1\0\3\6\1\0\26\6\1\0\7\6\1\0\2\6\1\0\5\6"
+            + "\2\0\1\7\1\6\10\7\1\0\3\7\1\0\3\7\2\0\1\6"
+            + "\17\0\2\6\2\7\2\0\12\7\1\0\1\6\17\0\3\7\1\0"
+            + "\10\6\2\0\2\6\2\0\26\6\1\0\7\6\1\0\2\6\1\0"
+            + "\5\6\2\0\1\7\1\6\7\7\2\0\2\7\2\0\3\7\10\0"
+            + "\2\7\4\0\2\6\1\0\3\6\2\7\2\0\12\7\1\0\1\6"
+            + "\20\0\1\7\1\6\1\0\6\6\3\0\3\6\1\0\4\6\3\0"
+            + "\2\6\1\0\1\6\1\0\2\6\3\0\2\6\3\0\3\6\3\0"
+            + "\14\6\4\0\5\7\3\0\3\7\1\0\4\7\2\0\1\6\6\0"
+            + "\1\7\16\0\12\7\11\0\1\6\7\0\3\7\1\0\10\6\1\0"
+            + "\3\6\1\0\27\6\1\0\12\6\1\0\5\6\3\0\1\6\7\7"
+            + "\1\0\3\7\1\0\4\7\7\0\2\7\1\0\2\6\6\0\2\6"
+            + "\2\7\2\0\12\7\22\0\2\7\1\0\10\6\1\0\3\6\1\0"
+            + "\27\6\1\0\12\6\1\0\5\6\2\0\1\7\1\6\7\7\1\0"
+            + "\3\7\1\0\4\7\7\0\2\7\7\0\1\6\1\0\2\6\2\7"
+            + "\2\0\12\7\1\0\2\6\17\0\2\7\1\0\10\6\1\0\3\6"
+            + "\1\0\51\6\2\0\1\6\7\7\1\0\3\7\1\0\4\7\1\6"
+            + "\10\0\1\7\10\0\2\6\2\7\2\0\12\7\12\0\6\6\2\0"
+            + "\2\7\1\0\22\6\3\0\30\6\1\0\11\6\1\0\1\6\2\0"
+            + "\7\6\3\0\1\7\4\0\6\7\1\0\1\7\1\0\10\7\22\0"
+            + "\2\7\15\0\60\6\1\7\2\6\7\7\4\0\10\6\10\7\1\0"
+            + "\12\7\47\0\2\6\1\0\1\6\2\0\2\6\1\0\1\6\2\0"
+            + "\1\6\6\0\4\6\1\0\7\6\1\0\3\6\1\0\1\6\1\0"
+            + "\1\6\2\0\2\6\1\0\4\6\1\7\2\6\6\7\1\0\2\7"
+            + "\1\6\2\0\5\6\1\0\1\6\1\0\6\7\2\0\12\7\2\0"
+            + "\4\6\40\0\1\6\27\0\2\7\6\0\12\7\13\0\1\7\1\0"
+            + "\1\7\1\0\1\7\4\0\2\7\10\6\1\0\44\6\4\0\24\7"
+            + "\1\0\2\7\5\6\13\7\1\0\44\7\11\0\1\7\71\0\53\6"
+            + "\24\7\1\6\12\7\6\0\6\6\4\7\4\6\3\7\1\6\3\7"
+            + "\2\6\7\7\3\6\4\7\15\6\14\7\1\6\17\7\2\0\46\6"
+            + "\1\0\1\6\5\0\1\6\2\0\53\6\1\0\u014d\6\1\0\4\6"
+            + "\2\0\7\6\1\0\1\6\1\0\4\6\2\0\51\6\1\0\4\6"
+            + "\2\0\41\6\1\0\4\6\2\0\7\6\1\0\1\6\1\0\4\6"
+            + "\2\0\17\6\1\0\71\6\1\0\4\6\2\0\103\6\2\0\3\7"
+            + "\40\0\20\6\20\0\125\6\14\0\u026c\6\2\0\21\6\1\0\32\6"
+            + "\5\0\113\6\3\0\3\6\17\0\15\6\1\0\4\6\3\7\13\0"
+            + "\22\6\3\7\13\0\22\6\2\7\14\0\15\6\1\0\3\6\1\0"
+            + "\2\7\14\0\64\6\40\7\3\0\1\6\3\0\2\6\1\7\2\0"
+            + "\12\7\41\0\3\7\2\0\12\7\6\0\130\6\10\0\51\6\1\7"
+            + "\1\6\5\0\106\6\12\0\35\6\3\0\14\7\4\0\14\7\12\0"
+            + "\12\7\36\6\2\0\5\6\13\0\54\6\4\0\21\7\7\6\2\7"
+            + "\6\0\12\7\46\0\27\6\5\7\4\0\65\6\12\7\1\0\35\7"
+            + "\2\0\13\7\6\0\12\7\15\0\1\6\130\0\5\7\57\6\21\7"
+            + "\7\6\4\0\12\7\21\0\11\7\14\0\3\7\36\6\15\7\2\6"
+            + "\12\7\54\6\16\7\14\0\44\6\24\7\10\0\12\7\3\0\3\6"
+            + "\12\7\44\6\122\0\3\7\1\0\25\7\4\6\1\7\4\6\3\7"
+            + "\2\6\11\0\300\6\47\7\25\0\4\7\u0116\6\2\0\6\6\2\0"
+            + "\46\6\2\0\6\6\2\0\10\6\1\0\1\6\1\0\1\6\1\0"
+            + "\1\6\1\0\37\6\2\0\65\6\1\0\7\6\1\0\1\6\3\0"
+            + "\3\6\1\0\7\6\3\0\4\6\2\0\6\6\4\0\15\6\5\0"
+            + "\3\6\1\0\7\6\16\0\5\7\30\0\1\54\1\54\5\7\20\0"
+            + "\2\6\23\0\1\6\13\0\5\7\5\0\6\7\1\0\1\6\15\0"
+            + "\1\6\20\0\15\6\3\0\33\6\25\0\15\7\4\0\1\7\3\0"
+            + "\14\7\21\0\1\6\4\0\1\6\2\0\12\6\1\0\1\6\3\0"
+            + "\5\6\6\0\1\6\1\0\1\6\1\0\1\6\1\0\4\6\1\0"
+            + "\13\6\2\0\4\6\5\0\5\6\4\0\1\6\21\0\51\6\u0a77\0"
+            + "\57\6\1\0\57\6\1\0\205\6\6\0\4\6\3\7\2\6\14\0"
+            + "\46\6\1\0\1\6\5\0\1\6\2\0\70\6\7\0\1\6\17\0"
+            + "\1\7\27\6\11\0\7\6\1\0\7\6\1\0\7\6\1\0\7\6"
+            + "\1\0\7\6\1\0\7\6\1\0\7\6\1\0\7\6\1\0\40\7"
+            + "\57\0\1\6\u01d5\0\3\6\31\0\11\6\6\7\1\0\5\6\2\0"
+            + "\5\6\4\0\126\6\2\0\2\7\2\0\3\6\1\0\132\6\1\0"
+            + "\4\6\5\0\51\6\3\0\136\6\21\0\33\6\65\0\20\6\u0200\0"
+            + "\u19b6\6\112\0\u51cd\6\63\0\u048d\6\103\0\56\6\2\0\u010d\6\3\0"
+            + "\20\6\12\7\2\6\24\0\57\6\1\7\4\0\12\7\1\0\31\6"
+            + "\7\0\1\7\120\6\2\7\45\0\11\6\2\0\147\6\2\0\4\6"
+            + "\1\0\4\6\14\0\13\6\115\0\12\6\1\7\3\6\1\7\4\6"
+            + "\1\7\27\6\5\7\20\0\1\6\7\0\64\6\14\0\2\7\62\6"
+            + "\21\7\13\0\12\7\6\0\22\7\6\6\3\0\1\6\4\0\12\7"
+            + "\34\6\10\7\2\0\27\6\15\7\14\0\35\6\3\0\4\7\57\6"
+            + "\16\7\16\0\1\6\12\7\46\0\51\6\16\7\11\0\3\6\1\7"
+            + "\10\6\2\7\2\0\12\7\6\0\27\6\3\0\1\6\1\7\4\0"
+            + "\60\6\1\7\1\6\3\7\2\6\2\7\5\6\2\7\1\6\1\7"
+            + "\1\6\30\0\3\6\2\0\13\6\5\7\2\0\3\6\2\7\12\0"
+            + "\6\6\2\0\6\6\2\0\6\6\11\0\7\6\1\0\7\6\221\0"
+            + "\43\6\10\7\1\0\2\7\2\0\12\7\6\0\u2ba4\6\14\0\27\6"
+            + "\4\0\61\6\u2104\0\u016e\6\2\0\152\6\46\0\7\6\14\0\5\6"
+            + "\5\0\1\6\1\7\12\6\1\0\15\6\1\0\5\6\1\0\1\6"
+            + "\1\0\2\6\1\0\2\6\1\0\154\6\41\0\u016b\6\22\0\100\6"
+            + "\2\0\66\6\50\0\15\6\3\0\20\7\20\0\7\7\14\0\2\6"
+            + "\30\0\3\6\31\0\1\6\6\0\5\6\1\0\207\6\2\0\1\7"
+            + "\4\0\1\6\13\0\12\7\7\0\32\6\4\0\1\6\1\0\32\6"
+            + "\13\0\131\6\3\0\6\6\2\0\6\6\2\0\6\6\2\0\3\6"
+            + "\3\0\2\6\3\0\2\6\22\0\3\7\4\0\14\6\1\0\32\6"
+            + "\1\0\23\6\1\0\2\6\1\0\17\6\2\0\16\6\42\0\173\6"
+            + "\105\0\65\6\210\0\1\7\202\0\35\6\3\0\61\6\57\0\37\6"
+            + "\21\0\33\6\65\0\36\6\2\0\44\6\4\0\10\6\1\0\5\6"
+            + "\52\0\236\6\2\0\12\7\u0356\0\6\6\2\0\1\6\1\0\54\6"
+            + "\1\0\2\6\3\0\1\6\2\0\27\6\252\0\26\6\12\0\32\6"
+            + "\106\0\70\6\6\0\2\6\100\0\1\6\3\7\1\0\2\7\5\0"
+            + "\4\7\4\6\1\0\3\6\1\0\33\6\4\0\3\7\4\0\1\7"
+            + "\40\0\35\6\203\0\66\6\12\0\26\6\12\0\23\6\215\0\111\6"
+            + "\u03b7\0\3\7\65\6\17\7\37\0\12\7\20\0\3\7\55\6\13\7"
+            + "\2\0\1\7\22\0\31\6\7\0\12\7\6\0\3\7\44\6\16\7"
+            + "\1\0\12\7\100\0\3\7\60\6\16\7\4\6\13\0\12\7\u04a6\0"
+            + "\53\6\15\7\10\0\12\7\u0936\0\u036f\6\221\0\143\6\u0b9d\0\u042f\6"
+            + "\u33d1\0\u0239\6\u04c7\0\105\6\13\0\1\6\56\7\20\0\4\7\15\6"
+            + "\u4060\0\2\6\u2163\0\5\7\3\0\26\7\2\0\7\7\36\0\4\7"
+            + "\224\0\3\7\u01bb\0\125\6\1\0\107\6\1\0\2\6\2\0\1\6"
+            + "\2\0\2\6\2\0\4\6\1\0\14\6\1\0\1\6\1\0\7\6"
+            + "\1\0\101\6\1\0\4\6\2\0\10\6\1\0\7\6\1\0\34\6"
+            + "\1\0\4\6\1\0\5\6\1\0\1\6\3\0\7\6\1\0\u0154\6"
+            + "\2\0\31\6\1\0\31\6\1\0\37\6\1\0\31\6\1\0\37\6"
+            + "\1\0\31\6\1\0\37\6\1\0\31\6\1\0\37\6\1\0\31\6"
+            + "\1\0\10\6\2\0\62\7\u1600\0\4\6\1\0\33\6\1\0\2\6"
+            + "\1\0\1\6\2\0\1\6\1\0\12\6\1\0\4\6\1\0\1\6"
+            + "\1\0\1\6\6\0\1\6\4\0\1\6\1\0\1\6\1\0\1\6"
+            + "\1\0\3\6\1\0\2\6\1\0\1\6\2\0\1\6\1\0\1\6"
+            + "\1\0\1\6\1\0\1\6\1\0\1\6\1\0\2\6\1\0\1\6"
+            + "\2\0\4\6\1\0\7\6\1\0\4\6\1\0\4\6\1\0\1\6"
+            + "\1\0\12\6\1\0\21\6\5\0\3\6\1\0\5\6\1\0\21\6"
+            + "\u1144\0\ua6d7\6\51\0\u1035\6\13\0\336\6\u3fe2\0\u021e\6\uffff\0\uffff\0\uffff\0\uffff\0\uffff\0\uffff\0\uffff\0\uffff\0\uffff\0\uffff\0\uffff\0\u05ee\0"
+            + "\1\7\36\0\140\7\200\0\360\7\uffff\0\uffff\0\ufe12\0";
 
-  /** 
-   * Translates characters to character classes
-   */
-  private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
+    /**
+     * Translates characters to character classes
+     */
+    private static final char[] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
 
-  /** 
-   * Translates DFA states to action switch labels.
-   */
-  private static final int [] ZZ_ACTION = zzUnpackAction();
+    /**
+     * Translates DFA states to action switch labels.
+     */
+    private static final int[] ZZ_ACTION = zzUnpackAction();
 
-  private static final String ZZ_ACTION_PACKED_0 =
-    "\3\0\1\1\2\2\1\3\1\1\1\4\1\1\1\5"+
-    "\1\1\1\5\1\1\4\4\1\6\1\7\1\10\1\11"+
-    "\1\12\1\13\1\14\1\15\2\16\1\1\1\17\1\3"+
-    "\1\0\1\20\1\21\1\22\1\0\2\21\1\22\2\0"+
-    "\4\4\2\23\1\24\1\25\1\23\1\26\1\27\1\30"+
-    "\1\31\1\32\1\33\1\23\2\3\2\0\2\34\1\21"+
-    "\1\22\1\0\5\4\4\0\1\34\1\21\1\35\3\4"+
-    "\1\36\1\37\1\0\1\40\1\34\1\21\2\4\1\41"+
-    "\1\34\1\21\2\4\1\34\1\21\1\4\1\42\1\34"+
-    "\1\21\1\4\1\34\1\21\1\43\1\34\7\21";
+    private static final String ZZ_ACTION_PACKED_0
+            = "\3\0\1\1\2\2\1\3\1\1\1\4\1\1\1\5"
+            + "\1\1\1\5\1\1\4\4\1\6\1\7\1\10\1\11"
+            + "\1\12\1\13\1\14\1\15\2\16\1\1\1\17\1\3"
+            + "\1\0\1\20\1\21\1\22\1\0\2\21\1\22\2\0"
+            + "\4\4\2\23\1\24\1\25\1\23\1\26\1\27\1\30"
+            + "\1\31\1\32\1\33\1\23\2\3\2\0\2\34\1\21"
+            + "\1\22\1\0\5\4\4\0\1\34\1\21\1\35\3\4"
+            + "\1\36\1\37\1\0\1\40\1\34\1\21\2\4\1\41"
+            + "\1\34\1\21\2\4\1\34\1\21\1\4\1\42\1\34"
+            + "\1\21\1\4\1\34\1\21\1\43\1\34\7\21";
 
-  private static int [] zzUnpackAction() {
-    int [] result = new int[112];
-    int offset = 0;
-    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAction(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
+    private static int[] zzUnpackAction() {
+        int[] result = new int[112];
+        int offset = 0;
+        offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
+        return result;
     }
-    return j;
-  }
 
-
-  /** 
-   * Translates a state to a row index in the transition table
-   */
-  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
-
-  private static final String ZZ_ROWMAP_PACKED_0 =
-    "\0\0\0\57\0\136\0\215\0\274\0\215\0\353\0\u011a"+
-    "\0\u0149\0\u0178\0\u01a7\0\u01d6\0\u0205\0\u0234\0\u0263\0\u0292"+
-    "\0\u02c1\0\u02f0\0\215\0\215\0\215\0\215\0\215\0\215"+
-    "\0\215\0\u031f\0\u034e\0\215\0\u037d\0\215\0\u03ac\0\u03db"+
-    "\0\u040a\0\u0439\0\u0468\0\u0497\0\u04c6\0\u04f5\0\u0524\0\u0553"+
-    "\0\u0234\0\u0582\0\u05b1\0\u05e0\0\u060f\0\215\0\u063e\0\215"+
-    "\0\215\0\u066d\0\215\0\215\0\215\0\215\0\215\0\215"+
-    "\0\u069c\0\u06cb\0\215\0\u06fa\0\u0729\0\u0497\0\u0758\0\u0787"+
-    "\0\u07b6\0\u07b6\0\u07e5\0\u0814\0\u0843\0\u0872\0\u08a1\0\u08d0"+
-    "\0\u08ff\0\u092e\0\u095d\0\u098c\0\u09bb\0\u0149\0\u09ea\0\u0a19"+
-    "\0\u0a48\0\u0149\0\215\0\u069c\0\215\0\u0a77\0\u0aa6\0\u0ad5"+
-    "\0\u0b04\0\u0149\0\u0b33\0\u0b62\0\u0b91\0\u0bc0\0\u0bef\0\u0c1e"+
-    "\0\u0c4d\0\u0149\0\u0c7c\0\u0cab\0\u0cda\0\u0d09\0\u0d38\0\u0149"+
-    "\0\215\0\u0d67\0\u0d96\0\u0dc5\0\u0df4\0\u0e23\0\u0e52\0\u0468";
-
-  private static int [] zzUnpackRowMap() {
-    int [] result = new int[112];
-    int offset = 0;
-    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackRowMap(String packed, int offset, int [] result) {
-    int i = 0;  /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int high = packed.charAt(i++) << 16;
-      result[j++] = high | packed.charAt(i++);
+    private static int zzUnpackAction(String packed, int offset, int[] result) {
+        int i = 0;
+        /* index in packed string  */
+        int j = offset;
+        /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int count = packed.charAt(i++);
+            int value = packed.charAt(i++);
+            do {
+                result[j++] = value;
+            } while (--count > 0);
+        }
+        return j;
     }
-    return j;
-  }
 
-  /** 
-   * The transition table of the DFA
-   */
-  private static final int [] ZZ_TRANS = zzUnpackTrans();
+    /**
+     * Translates a state to a row index in the transition table
+     */
+    private static final int[] ZZ_ROWMAP = zzUnpackRowMap();
 
-  private static final String ZZ_TRANS_PACKED_0 =
-    "\1\4\1\5\1\6\1\7\1\10\1\4\1\11\1\4"+
-    "\1\12\1\13\1\14\1\15\2\11\2\15\1\16\1\11"+
-    "\2\4\1\17\1\20\3\11\1\21\3\11\1\22\4\11"+
-    "\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\11"+
-    "\1\4\1\11\1\4\1\7\1\4\1\32\1\33\1\34"+
-    "\20\32\1\35\24\32\1\36\6\32\57\4\61\0\1\6"+
-    "\57\0\1\7\51\0\1\7\5\0\1\37\1\40\57\0"+
-    "\2\11\1\0\1\11\1\0\5\11\1\0\1\11\2\0"+
-    "\16\11\7\0\1\11\1\0\1\11\2\0\1\11\6\0"+
-    "\1\41\5\0\2\41\3\0\1\41\2\0\16\41\7\0"+
-    "\1\41\1\0\1\41\14\0\1\42\1\0\1\43\1\44"+
-    "\1\0\1\45\1\46\1\47\1\50\6\0\1\50\22\0"+
-    "\1\44\14\0\1\43\1\0\1\15\2\0\2\15\1\51"+
-    "\47\0\1\15\1\0\1\15\2\0\2\15\1\47\1\50"+
-    "\6\0\1\50\37\0\1\47\1\0\1\47\2\0\2\47"+
-    "\45\0\2\11\1\0\1\11\1\0\5\11\1\0\1\11"+
-    "\2\0\1\11\1\52\14\11\7\0\1\11\1\0\1\11"+
-    "\2\0\1\11\6\0\2\11\1\0\1\11\1\0\5\11"+
-    "\1\0\1\11\2\0\1\53\15\11\7\0\1\11\1\0"+
-    "\1\11\2\0\1\11\6\0\2\11\1\0\1\11\1\0"+
-    "\5\11\1\0\1\11\2\0\7\11\1\54\6\11\7\0"+
-    "\1\11\1\0\1\11\2\0\1\11\6\0\2\11\1\0"+
-    "\1\11\1\0\5\11\1\0\1\11\2\0\12\11\1\55"+
-    "\3\11\7\0\1\11\1\0\1\11\2\0\1\11\1\32"+
-    "\2\0\20\32\1\0\24\32\1\0\6\32\2\0\1\34"+
-    "\54\0\1\56\2\0\6\56\1\57\4\56\2\57\3\56"+
-    "\1\60\1\61\1\62\3\56\1\63\3\56\1\64\1\65"+
-    "\11\56\1\66\1\67\1\70\1\71\3\0\1\37\1\72"+
-    "\1\73\54\37\5\74\1\75\51\74\6\0\2\41\1\0"+
-    "\1\41\1\0\5\41\1\0\1\41\2\0\16\41\7\0"+
-    "\1\41\1\0\1\41\2\0\1\41\11\0\1\42\1\0"+
-    "\1\43\2\0\1\45\1\46\1\47\1\50\6\0\1\50"+
-    "\37\0\1\43\1\0\1\43\2\0\2\43\1\47\1\50"+
-    "\6\0\1\50\37\0\1\76\1\0\1\77\1\0\3\77"+
-    "\1\0\1\77\5\0\3\77\1\0\1\77\15\0\1\77"+
-    "\16\0\1\46\1\0\1\43\2\0\2\46\1\47\1\50"+
-    "\6\0\1\50\37\0\1\100\1\0\1\43\2\0\2\100"+
-    "\1\47\1\50\6\0\1\50\37\0\1\47\1\0\1\47"+
-    "\2\0\2\47\1\0\1\50\6\0\1\50\37\0\1\101"+
-    "\1\102\1\101\2\0\2\101\2\0\1\102\42\0\2\11"+
-    "\1\0\1\11\1\0\5\11\1\0\1\11\2\0\2\11"+
-    "\1\103\13\11\7\0\1\11\1\0\1\11\2\0\1\11"+
-    "\6\0\2\11\1\0\1\11\1\0\5\11\1\0\1\11"+
-    "\2\0\3\11\1\104\7\11\1\105\2\11\7\0\1\11"+
-    "\1\0\1\11\2\0\1\11\6\0\2\11\1\0\1\11"+
-    "\1\0\5\11\1\0\1\11\2\0\2\11\1\106\13\11"+
-    "\7\0\1\11\1\0\1\11\2\0\1\11\6\0\2\11"+
-    "\1\0\1\11\1\0\5\11\1\0\1\11\2\0\1\11"+
-    "\1\107\14\11\7\0\1\11\1\0\1\11\2\0\1\11"+
-    "\11\0\1\110\4\0\2\110\50\0\1\111\1\0\1\111"+
-    "\1\0\3\111\1\0\1\111\5\0\3\111\1\0\1\111"+
-    "\15\0\1\111\16\0\1\112\1\0\1\112\1\0\3\112"+
-    "\1\0\1\112\5\0\3\112\1\0\1\112\15\0\1\112"+
-    "\7\0\1\73\54\0\5\74\1\113\51\74\4\0\1\73"+
-    "\1\75\62\0\1\114\1\0\1\114\1\0\3\114\1\0"+
-    "\1\114\5\0\3\114\1\0\1\114\15\0\1\114\16\0"+
-    "\1\115\1\0\1\43\2\0\2\115\1\47\1\50\6\0"+
-    "\1\50\37\0\1\101\1\0\1\101\2\0\2\101\45\0"+
-    "\2\11\1\0\1\11\1\0\5\11\1\0\1\11\2\0"+
-    "\2\11\1\116\13\11\7\0\1\11\1\0\1\11\2\0"+
-    "\1\11\6\0\2\11\1\0\1\11\1\0\5\11\1\0"+
-    "\1\11\2\0\4\11\1\117\11\11\7\0\1\11\1\0"+
-    "\1\11\2\0\1\11\6\0\2\11\1\0\1\11\1\0"+
-    "\5\11\1\0\1\11\2\0\1\120\15\11\7\0\1\11"+
-    "\1\0\1\11\2\0\1\11\6\0\2\11\1\0\1\11"+
-    "\1\0\5\11\1\0\1\11\2\0\10\11\1\121\5\11"+
-    "\7\0\1\11\1\0\1\11\2\0\1\11\6\0\2\11"+
-    "\1\0\1\11\1\0\5\11\1\0\1\11\2\0\4\11"+
-    "\1\122\11\11\7\0\1\11\1\0\1\11\2\0\1\11"+
-    "\11\0\1\123\4\0\2\123\50\0\1\124\1\0\1\124"+
-    "\1\0\3\124\1\0\1\124\5\0\3\124\1\0\1\124"+
-    "\15\0\1\124\16\0\1\125\1\0\1\125\1\0\3\125"+
-    "\1\0\1\125\5\0\3\125\1\0\1\125\15\0\1\125"+
-    "\5\0\4\74\1\73\1\113\51\74\11\0\1\126\1\0"+
-    "\1\126\1\0\3\126\1\0\1\126\5\0\3\126\1\0"+
-    "\1\126\15\0\1\126\16\0\1\127\1\0\1\43\2\0"+
-    "\2\127\1\47\1\50\6\0\1\50\34\0\2\11\1\0"+
-    "\1\11\1\0\5\11\1\0\1\11\2\0\5\11\1\130"+
-    "\10\11\7\0\1\11\1\0\1\11\2\0\1\11\6\0"+
-    "\2\11\1\0\1\11\1\0\5\11\1\0\1\11\2\0"+
-    "\14\11\1\131\1\11\7\0\1\11\1\0\1\11\2\0"+
-    "\1\11\6\0\2\11\1\0\1\11\1\0\5\11\1\0"+
-    "\1\11\2\0\4\11\1\132\11\11\7\0\1\11\1\0"+
-    "\1\11\2\0\1\11\11\0\1\133\1\0\1\133\1\0"+
-    "\3\133\1\0\1\133\5\0\3\133\1\0\1\133\15\0"+
-    "\1\133\16\0\1\134\1\0\1\43\2\0\2\134\1\47"+
-    "\1\50\6\0\1\50\34\0\2\11\1\0\1\11\1\0"+
-    "\5\11\1\0\1\11\2\0\6\11\1\135\7\11\7\0"+
-    "\1\11\1\0\1\11\2\0\1\11\6\0\2\11\1\0"+
-    "\1\11\1\0\5\11\1\0\1\11\2\0\15\11\1\136"+
-    "\7\0\1\11\1\0\1\11\2\0\1\11\11\0\1\137"+
-    "\1\0\1\137\1\0\3\137\1\0\1\137\5\0\3\137"+
-    "\1\0\1\137\15\0\1\137\16\0\1\140\1\0\1\43"+
-    "\2\0\2\140\1\47\1\50\6\0\1\50\34\0\2\11"+
-    "\1\0\1\11\1\0\5\11\1\0\1\11\2\0\1\141"+
-    "\15\11\7\0\1\11\1\0\1\11\2\0\1\11\6\0"+
-    "\2\11\1\0\1\11\1\0\5\11\1\0\1\11\2\0"+
-    "\1\142\15\11\7\0\1\11\1\0\1\11\2\0\1\11"+
-    "\11\0\1\143\1\0\1\143\1\0\3\143\1\0\1\143"+
-    "\5\0\3\143\1\0\1\143\15\0\1\143\16\0\1\144"+
-    "\1\0\1\43\2\0\2\144\1\47\1\50\6\0\1\50"+
-    "\34\0\2\11\1\0\1\11\1\0\5\11\1\0\1\11"+
-    "\2\0\4\11\1\145\11\11\7\0\1\11\1\0\1\11"+
-    "\2\0\1\11\11\0\1\146\1\0\1\146\1\0\3\146"+
-    "\1\0\1\146\5\0\3\146\1\0\1\146\15\0\1\146"+
-    "\16\0\1\147\1\0\1\43\2\0\2\147\1\47\1\50"+
-    "\6\0\1\50\34\0\2\11\1\0\1\11\1\0\5\11"+
-    "\1\0\1\11\2\0\3\11\1\150\12\11\7\0\1\11"+
-    "\1\0\1\11\2\0\1\11\11\0\1\151\1\0\1\151"+
-    "\1\0\3\151\1\0\1\151\5\0\3\151\1\0\1\151"+
-    "\15\0\1\151\16\0\1\152\1\0\1\43\2\0\2\152"+
-    "\1\47\1\50\6\0\1\50\37\0\1\153\1\0\1\43"+
-    "\2\0\2\153\1\47\1\50\6\0\1\50\37\0\1\154"+
-    "\1\0\1\43\2\0\2\154\1\47\1\50\6\0\1\50"+
-    "\37\0\1\155\1\0\1\43\2\0\2\155\1\47\1\50"+
-    "\6\0\1\50\37\0\1\156\1\0\1\43\2\0\2\156"+
-    "\1\47\1\50\6\0\1\50\37\0\1\157\1\0\1\43"+
-    "\2\0\2\157\1\47\1\50\6\0\1\50\37\0\1\160"+
-    "\1\0\1\43\2\0\2\160\1\47\1\50\6\0\1\50"+
-    "\26\0";
+    private static final String ZZ_ROWMAP_PACKED_0
+            = "\0\0\0\57\0\136\0\215\0\274\0\215\0\353\0\u011a"
+            + "\0\u0149\0\u0178\0\u01a7\0\u01d6\0\u0205\0\u0234\0\u0263\0\u0292"
+            + "\0\u02c1\0\u02f0\0\215\0\215\0\215\0\215\0\215\0\215"
+            + "\0\215\0\u031f\0\u034e\0\215\0\u037d\0\215\0\u03ac\0\u03db"
+            + "\0\u040a\0\u0439\0\u0468\0\u0497\0\u04c6\0\u04f5\0\u0524\0\u0553"
+            + "\0\u0234\0\u0582\0\u05b1\0\u05e0\0\u060f\0\215\0\u063e\0\215"
+            + "\0\215\0\u066d\0\215\0\215\0\215\0\215\0\215\0\215"
+            + "\0\u069c\0\u06cb\0\215\0\u06fa\0\u0729\0\u0497\0\u0758\0\u0787"
+            + "\0\u07b6\0\u07b6\0\u07e5\0\u0814\0\u0843\0\u0872\0\u08a1\0\u08d0"
+            + "\0\u08ff\0\u092e\0\u095d\0\u098c\0\u09bb\0\u0149\0\u09ea\0\u0a19"
+            + "\0\u0a48\0\u0149\0\215\0\u069c\0\215\0\u0a77\0\u0aa6\0\u0ad5"
+            + "\0\u0b04\0\u0149\0\u0b33\0\u0b62\0\u0b91\0\u0bc0\0\u0bef\0\u0c1e"
+            + "\0\u0c4d\0\u0149\0\u0c7c\0\u0cab\0\u0cda\0\u0d09\0\u0d38\0\u0149"
+            + "\0\215\0\u0d67\0\u0d96\0\u0dc5\0\u0df4\0\u0e23\0\u0e52\0\u0468";
 
-  private static int [] zzUnpackTrans() {
-    int [] result = new int[3713];
-    int offset = 0;
-    offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackTrans(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      value--;
-      do result[j++] = value; while (--count > 0);
+    private static int[] zzUnpackRowMap() {
+        int[] result = new int[112];
+        int offset = 0;
+        offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
+        return result;
     }
-    return j;
-  }
 
-
-  /* error codes */
-  private static final int ZZ_UNKNOWN_ERROR = 0;
-  private static final int ZZ_NO_MATCH = 1;
-  private static final int ZZ_PUSHBACK_2BIG = 2;
-
-  /* error messages for the codes above */
-  private static final String ZZ_ERROR_MSG[] = {
-    "Unkown internal scanner error",
-    "Error: could not match input",
-    "Error: pushback value was too large"
-  };
-
-  /**
-   * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
-   */
-  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
-
-  private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\3\0\1\11\1\1\1\11\14\1\7\11\2\1\1\11"+
-    "\1\1\1\11\1\1\1\0\3\1\1\0\3\1\2\0"+
-    "\4\1\1\11\1\1\2\11\1\1\6\11\2\1\1\11"+
-    "\2\0\4\1\1\0\5\1\4\0\7\1\1\11\1\0"+
-    "\1\11\23\1\1\11\7\1";
-
-  private static int [] zzUnpackAttribute() {
-    int [] result = new int[112];
-    int offset = 0;
-    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
-    return result;
-  }
-
-  private static int zzUnpackAttribute(String packed, int offset, int [] result) {
-    int i = 0;       /* index in packed string  */
-    int j = offset;  /* index in unpacked array */
-    int l = packed.length();
-    while (i < l) {
-      int count = packed.charAt(i++);
-      int value = packed.charAt(i++);
-      do result[j++] = value; while (--count > 0);
+    private static int zzUnpackRowMap(String packed, int offset, int[] result) {
+        int i = 0;
+        /* index in packed string  */
+        int j = offset;
+        /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int high = packed.charAt(i++) << 16;
+            result[j++] = high | packed.charAt(i++);
+        }
+        return j;
     }
-    return j;
-  }
 
-  /** the input device */
-  private java.io.Reader zzReader;
+    /**
+     * The transition table of the DFA
+     */
+    private static final int[] ZZ_TRANS = zzUnpackTrans();
 
-  /** the current state of the DFA */
-  private int zzState;
+    private static final String ZZ_TRANS_PACKED_0
+            = "\1\4\1\5\1\6\1\7\1\10\1\4\1\11\1\4"
+            + "\1\12\1\13\1\14\1\15\2\11\2\15\1\16\1\11"
+            + "\2\4\1\17\1\20\3\11\1\21\3\11\1\22\4\11"
+            + "\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\11"
+            + "\1\4\1\11\1\4\1\7\1\4\1\32\1\33\1\34"
+            + "\20\32\1\35\24\32\1\36\6\32\57\4\61\0\1\6"
+            + "\57\0\1\7\51\0\1\7\5\0\1\37\1\40\57\0"
+            + "\2\11\1\0\1\11\1\0\5\11\1\0\1\11\2\0"
+            + "\16\11\7\0\1\11\1\0\1\11\2\0\1\11\6\0"
+            + "\1\41\5\0\2\41\3\0\1\41\2\0\16\41\7\0"
+            + "\1\41\1\0\1\41\14\0\1\42\1\0\1\43\1\44"
+            + "\1\0\1\45\1\46\1\47\1\50\6\0\1\50\22\0"
+            + "\1\44\14\0\1\43\1\0\1\15\2\0\2\15\1\51"
+            + "\47\0\1\15\1\0\1\15\2\0\2\15\1\47\1\50"
+            + "\6\0\1\50\37\0\1\47\1\0\1\47\2\0\2\47"
+            + "\45\0\2\11\1\0\1\11\1\0\5\11\1\0\1\11"
+            + "\2\0\1\11\1\52\14\11\7\0\1\11\1\0\1\11"
+            + "\2\0\1\11\6\0\2\11\1\0\1\11\1\0\5\11"
+            + "\1\0\1\11\2\0\1\53\15\11\7\0\1\11\1\0"
+            + "\1\11\2\0\1\11\6\0\2\11\1\0\1\11\1\0"
+            + "\5\11\1\0\1\11\2\0\7\11\1\54\6\11\7\0"
+            + "\1\11\1\0\1\11\2\0\1\11\6\0\2\11\1\0"
+            + "\1\11\1\0\5\11\1\0\1\11\2\0\12\11\1\55"
+            + "\3\11\7\0\1\11\1\0\1\11\2\0\1\11\1\32"
+            + "\2\0\20\32\1\0\24\32\1\0\6\32\2\0\1\34"
+            + "\54\0\1\56\2\0\6\56\1\57\4\56\2\57\3\56"
+            + "\1\60\1\61\1\62\3\56\1\63\3\56\1\64\1\65"
+            + "\11\56\1\66\1\67\1\70\1\71\3\0\1\37\1\72"
+            + "\1\73\54\37\5\74\1\75\51\74\6\0\2\41\1\0"
+            + "\1\41\1\0\5\41\1\0\1\41\2\0\16\41\7\0"
+            + "\1\41\1\0\1\41\2\0\1\41\11\0\1\42\1\0"
+            + "\1\43\2\0\1\45\1\46\1\47\1\50\6\0\1\50"
+            + "\37\0\1\43\1\0\1\43\2\0\2\43\1\47\1\50"
+            + "\6\0\1\50\37\0\1\76\1\0\1\77\1\0\3\77"
+            + "\1\0\1\77\5\0\3\77\1\0\1\77\15\0\1\77"
+            + "\16\0\1\46\1\0\1\43\2\0\2\46\1\47\1\50"
+            + "\6\0\1\50\37\0\1\100\1\0\1\43\2\0\2\100"
+            + "\1\47\1\50\6\0\1\50\37\0\1\47\1\0\1\47"
+            + "\2\0\2\47\1\0\1\50\6\0\1\50\37\0\1\101"
+            + "\1\102\1\101\2\0\2\101\2\0\1\102\42\0\2\11"
+            + "\1\0\1\11\1\0\5\11\1\0\1\11\2\0\2\11"
+            + "\1\103\13\11\7\0\1\11\1\0\1\11\2\0\1\11"
+            + "\6\0\2\11\1\0\1\11\1\0\5\11\1\0\1\11"
+            + "\2\0\3\11\1\104\7\11\1\105\2\11\7\0\1\11"
+            + "\1\0\1\11\2\0\1\11\6\0\2\11\1\0\1\11"
+            + "\1\0\5\11\1\0\1\11\2\0\2\11\1\106\13\11"
+            + "\7\0\1\11\1\0\1\11\2\0\1\11\6\0\2\11"
+            + "\1\0\1\11\1\0\5\11\1\0\1\11\2\0\1\11"
+            + "\1\107\14\11\7\0\1\11\1\0\1\11\2\0\1\11"
+            + "\11\0\1\110\4\0\2\110\50\0\1\111\1\0\1\111"
+            + "\1\0\3\111\1\0\1\111\5\0\3\111\1\0\1\111"
+            + "\15\0\1\111\16\0\1\112\1\0\1\112\1\0\3\112"
+            + "\1\0\1\112\5\0\3\112\1\0\1\112\15\0\1\112"
+            + "\7\0\1\73\54\0\5\74\1\113\51\74\4\0\1\73"
+            + "\1\75\62\0\1\114\1\0\1\114\1\0\3\114\1\0"
+            + "\1\114\5\0\3\114\1\0\1\114\15\0\1\114\16\0"
+            + "\1\115\1\0\1\43\2\0\2\115\1\47\1\50\6\0"
+            + "\1\50\37\0\1\101\1\0\1\101\2\0\2\101\45\0"
+            + "\2\11\1\0\1\11\1\0\5\11\1\0\1\11\2\0"
+            + "\2\11\1\116\13\11\7\0\1\11\1\0\1\11\2\0"
+            + "\1\11\6\0\2\11\1\0\1\11\1\0\5\11\1\0"
+            + "\1\11\2\0\4\11\1\117\11\11\7\0\1\11\1\0"
+            + "\1\11\2\0\1\11\6\0\2\11\1\0\1\11\1\0"
+            + "\5\11\1\0\1\11\2\0\1\120\15\11\7\0\1\11"
+            + "\1\0\1\11\2\0\1\11\6\0\2\11\1\0\1\11"
+            + "\1\0\5\11\1\0\1\11\2\0\10\11\1\121\5\11"
+            + "\7\0\1\11\1\0\1\11\2\0\1\11\6\0\2\11"
+            + "\1\0\1\11\1\0\5\11\1\0\1\11\2\0\4\11"
+            + "\1\122\11\11\7\0\1\11\1\0\1\11\2\0\1\11"
+            + "\11\0\1\123\4\0\2\123\50\0\1\124\1\0\1\124"
+            + "\1\0\3\124\1\0\1\124\5\0\3\124\1\0\1\124"
+            + "\15\0\1\124\16\0\1\125\1\0\1\125\1\0\3\125"
+            + "\1\0\1\125\5\0\3\125\1\0\1\125\15\0\1\125"
+            + "\5\0\4\74\1\73\1\113\51\74\11\0\1\126\1\0"
+            + "\1\126\1\0\3\126\1\0\1\126\5\0\3\126\1\0"
+            + "\1\126\15\0\1\126\16\0\1\127\1\0\1\43\2\0"
+            + "\2\127\1\47\1\50\6\0\1\50\34\0\2\11\1\0"
+            + "\1\11\1\0\5\11\1\0\1\11\2\0\5\11\1\130"
+            + "\10\11\7\0\1\11\1\0\1\11\2\0\1\11\6\0"
+            + "\2\11\1\0\1\11\1\0\5\11\1\0\1\11\2\0"
+            + "\14\11\1\131\1\11\7\0\1\11\1\0\1\11\2\0"
+            + "\1\11\6\0\2\11\1\0\1\11\1\0\5\11\1\0"
+            + "\1\11\2\0\4\11\1\132\11\11\7\0\1\11\1\0"
+            + "\1\11\2\0\1\11\11\0\1\133\1\0\1\133\1\0"
+            + "\3\133\1\0\1\133\5\0\3\133\1\0\1\133\15\0"
+            + "\1\133\16\0\1\134\1\0\1\43\2\0\2\134\1\47"
+            + "\1\50\6\0\1\50\34\0\2\11\1\0\1\11\1\0"
+            + "\5\11\1\0\1\11\2\0\6\11\1\135\7\11\7\0"
+            + "\1\11\1\0\1\11\2\0\1\11\6\0\2\11\1\0"
+            + "\1\11\1\0\5\11\1\0\1\11\2\0\15\11\1\136"
+            + "\7\0\1\11\1\0\1\11\2\0\1\11\11\0\1\137"
+            + "\1\0\1\137\1\0\3\137\1\0\1\137\5\0\3\137"
+            + "\1\0\1\137\15\0\1\137\16\0\1\140\1\0\1\43"
+            + "\2\0\2\140\1\47\1\50\6\0\1\50\34\0\2\11"
+            + "\1\0\1\11\1\0\5\11\1\0\1\11\2\0\1\141"
+            + "\15\11\7\0\1\11\1\0\1\11\2\0\1\11\6\0"
+            + "\2\11\1\0\1\11\1\0\5\11\1\0\1\11\2\0"
+            + "\1\142\15\11\7\0\1\11\1\0\1\11\2\0\1\11"
+            + "\11\0\1\143\1\0\1\143\1\0\3\143\1\0\1\143"
+            + "\5\0\3\143\1\0\1\143\15\0\1\143\16\0\1\144"
+            + "\1\0\1\43\2\0\2\144\1\47\1\50\6\0\1\50"
+            + "\34\0\2\11\1\0\1\11\1\0\5\11\1\0\1\11"
+            + "\2\0\4\11\1\145\11\11\7\0\1\11\1\0\1\11"
+            + "\2\0\1\11\11\0\1\146\1\0\1\146\1\0\3\146"
+            + "\1\0\1\146\5\0\3\146\1\0\1\146\15\0\1\146"
+            + "\16\0\1\147\1\0\1\43\2\0\2\147\1\47\1\50"
+            + "\6\0\1\50\34\0\2\11\1\0\1\11\1\0\5\11"
+            + "\1\0\1\11\2\0\3\11\1\150\12\11\7\0\1\11"
+            + "\1\0\1\11\2\0\1\11\11\0\1\151\1\0\1\151"
+            + "\1\0\3\151\1\0\1\151\5\0\3\151\1\0\1\151"
+            + "\15\0\1\151\16\0\1\152\1\0\1\43\2\0\2\152"
+            + "\1\47\1\50\6\0\1\50\37\0\1\153\1\0\1\43"
+            + "\2\0\2\153\1\47\1\50\6\0\1\50\37\0\1\154"
+            + "\1\0\1\43\2\0\2\154\1\47\1\50\6\0\1\50"
+            + "\37\0\1\155\1\0\1\43\2\0\2\155\1\47\1\50"
+            + "\6\0\1\50\37\0\1\156\1\0\1\43\2\0\2\156"
+            + "\1\47\1\50\6\0\1\50\37\0\1\157\1\0\1\43"
+            + "\2\0\2\157\1\47\1\50\6\0\1\50\37\0\1\160"
+            + "\1\0\1\43\2\0\2\160\1\47\1\50\6\0\1\50"
+            + "\26\0";
 
-  /** the current lexical state */
-  private int zzLexicalState = YYINITIAL;
+    private static int[] zzUnpackTrans() {
+        int[] result = new int[3713];
+        int offset = 0;
+        offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
+        return result;
+    }
 
-  /** this buffer contains the current text to be matched and is
-      the source of the yytext() string */
-  private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
+    private static int zzUnpackTrans(String packed, int offset, int[] result) {
+        int i = 0;
+        /* index in packed string  */
+        int j = offset;
+        /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int count = packed.charAt(i++);
+            int value = packed.charAt(i++);
+            value--;
+            do {
+                result[j++] = value;
+            } while (--count > 0);
+        }
+        return j;
+    }
 
-  /** the textposition at the last accepting state */
-  private int zzMarkedPos;
 
-  /** the current text position in the buffer */
-  private int zzCurrentPos;
+    /* error codes */
+    private static final int ZZ_UNKNOWN_ERROR = 0;
+    private static final int ZZ_NO_MATCH = 1;
+    private static final int ZZ_PUSHBACK_2BIG = 2;
 
-  /** startRead marks the beginning of the yytext() string in the buffer */
-  private int zzStartRead;
+    /* error messages for the codes above */
+    private static final String ZZ_ERROR_MSG[] = {
+        "Unkown internal scanner error",
+        "Error: could not match input",
+        "Error: pushback value was too large"
+    };
 
-  /** endRead marks the last character in the buffer, that has been read
-      from input */
-  private int zzEndRead;
+    /**
+     * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
+     */
+    private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute();
 
-  /** number of newlines encountered up to the start of the matched text */
-  private int yyline;
+    private static final String ZZ_ATTRIBUTE_PACKED_0
+            = "\3\0\1\11\1\1\1\11\14\1\7\11\2\1\1\11"
+            + "\1\1\1\11\1\1\1\0\3\1\1\0\3\1\2\0"
+            + "\4\1\1\11\1\1\2\11\1\1\6\11\2\1\1\11"
+            + "\2\0\4\1\1\0\5\1\4\0\7\1\1\11\1\0"
+            + "\1\11\23\1\1\11\7\1";
 
-  /** the number of characters up to the start of the matched text */
-  private int yychar;
+    private static int[] zzUnpackAttribute() {
+        int[] result = new int[112];
+        int offset = 0;
+        offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
+        return result;
+    }
 
-  /**
-   * the number of characters from the last newline up to the start of the 
-   * matched text
-   */
-  private int yycolumn;
+    private static int zzUnpackAttribute(String packed, int offset, int[] result) {
+        int i = 0;
+        /* index in packed string  */
+        int j = offset;
+        /* index in unpacked array */
+        int l = packed.length();
+        while (i < l) {
+            int count = packed.charAt(i++);
+            int value = packed.charAt(i++);
+            do {
+                result[j++] = value;
+            } while (--count > 0);
+        }
+        return j;
+    }
 
-  /** 
-   * zzAtBOL == true <=> the scanner is currently at the beginning of a line
-   */
-  private boolean zzAtBOL = true;
+    /**
+     * the input device
+     */
+    private java.io.Reader zzReader;
 
-  /** zzAtEOF == true <=> the scanner is at the EOF */
-  private boolean zzAtEOF;
+    /**
+     * the current state of the DFA
+     */
+    private int zzState;
 
-  /** denotes if the user-EOF-code has already been executed */
-  private boolean zzEOFDone;
-  
-  /** 
-   * The number of occupied positions in zzBuffer beyond zzEndRead.
-   * When a lead/high surrogate has been read from the input stream
-   * into the final zzBuffer position, this will have a value of 1;
-   * otherwise, it will have a value of 0.
-   */
-  private int zzFinalHighSurrogate = 0;
+    /**
+     * the current lexical state
+     */
+    private int zzLexicalState = YYINITIAL;
 
-  /* user code: */
+    /**
+     * this buffer contains the current text to be matched and is the source of
+     * the yytext() string
+     */
+    private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
 
+    /**
+     * the textposition at the last accepting state
+     */
+    private int zzMarkedPos;
+
+    /**
+     * the current text position in the buffer
+     */
+    private int zzCurrentPos;
+
+    /**
+     * startRead marks the beginning of the yytext() string in the buffer
+     */
+    private int zzStartRead;
+
+    /**
+     * endRead marks the last character in the buffer, that has been read from
+     * input
+     */
+    private int zzEndRead;
+
+    /**
+     * number of newlines encountered up to the start of the matched text
+     */
+    private int yyline;
+
+    /**
+     * the number of characters up to the start of the matched text
+     */
+    private int yychar;
+
+    /**
+     * the number of characters from the last newline up to the start of the
+     * matched text
+     */
+    private int yycolumn;
+
+    /**
+     * zzAtBOL == true <=> the scanner is currently at the beginning of a line
+     */
+    private boolean zzAtBOL = true;
+
+    /**
+     * zzAtEOF == true <=> the scanner is at the EOF
+     */
+    private boolean zzAtEOF;
+
+    /**
+     * denotes if the user-EOF-code has already been executed
+     */
+    private boolean zzEOFDone;
+
+    /**
+     * The number of occupied positions in zzBuffer beyond zzEndRead. When a
+     * lead/high surrogate has been read from the input stream into the final
+     * zzBuffer position, this will have a value of 1; otherwise, it will have a
+     * value of 0.
+     */
+    private int zzFinalHighSurrogate = 0;
+
+    /* user code: */
     StringBuilder string = new StringBuilder();
 
     private static String xmlTagName = "";
@@ -548,9 +589,10 @@ public final class Amf3Lexer {
     }
 
     ParsedSymbol last;
-    public ParsedSymbol lex() throws java.io.IOException, Amf3ParseException{
+
+    public ParsedSymbol lex() throws java.io.IOException, Amf3ParseException {
         ParsedSymbol ret = null;
-        if (!pushedBack.isEmpty()){
+        if (!pushedBack.isEmpty()) {
             ret = last = pushedBack.pop();
         } else {
             ret = last = yylex();
@@ -558,476 +600,505 @@ public final class Amf3Lexer {
         return ret;
     }
 
-
-
-  /**
-   * Creates a new scanner
-   *
-   * @param   in  the java.io.Reader to read input from.
-   */
-  public Amf3Lexer(java.io.Reader in) {
-    this.zzReader = in;
-  }
-
-
-  /** 
-   * Unpacks the compressed character translation table.
-   *
-   * @param packed   the packed character translation table
-   * @return         the unpacked character translation table
-   */
-  private static char [] zzUnpackCMap(String packed) {
-    char [] map = new char[0x110000];
-    int i = 0;  /* index in packed string  */
-    int j = 0;  /* index in unpacked array */
-    while (i < 2856) {
-      int  count = packed.charAt(i++);
-      char value = packed.charAt(i++);
-      do map[j++] = value; while (--count > 0);
-    }
-    return map;
-  }
-
-
-  /**
-   * Refills the input buffer.
-   *
-   * @return      <code>false</code>, iff there was new input.
-   * 
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  private boolean zzRefill() throws java.io.IOException {
-
-    /* first: make room (if you can) */
-    if (zzStartRead > 0) {
-      zzEndRead += zzFinalHighSurrogate;
-      zzFinalHighSurrogate = 0;
-      System.arraycopy(zzBuffer, zzStartRead,
-                       zzBuffer, 0,
-                       zzEndRead-zzStartRead);
-
-      /* translate stored positions */
-      zzEndRead-= zzStartRead;
-      zzCurrentPos-= zzStartRead;
-      zzMarkedPos-= zzStartRead;
-      zzStartRead = 0;
+    /**
+     * Creates a new scanner
+     *
+     * @param in the java.io.Reader to read input from.
+     */
+    public Amf3Lexer(java.io.Reader in) {
+        this.zzReader = in;
     }
 
-    /* is the buffer big enough? */
-    if (zzCurrentPos >= zzBuffer.length - zzFinalHighSurrogate) {
-      /* if not: blow it up */
-      char newBuffer[] = new char[zzBuffer.length*2];
-      System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length);
-      zzBuffer = newBuffer;
-      zzEndRead += zzFinalHighSurrogate;
-      zzFinalHighSurrogate = 0;
-    }
-
-    /* fill the buffer with new input */
-    int requested = zzBuffer.length - zzEndRead;           
-    int totalRead = 0;
-    while (totalRead < requested) {
-      int numRead = zzReader.read(zzBuffer, zzEndRead + totalRead, requested - totalRead);
-      if (numRead == -1) {
-        break;
-      }
-      totalRead += numRead;
-    }
-
-    if (totalRead > 0) {
-      zzEndRead += totalRead;
-      if (totalRead == requested) { /* possibly more input available */
-        if (Character.isHighSurrogate(zzBuffer[zzEndRead - 1])) {
-          --zzEndRead;
-          zzFinalHighSurrogate = 1;
+    /**
+     * Unpacks the compressed character translation table.
+     *
+     * @param packed the packed character translation table
+     * @return the unpacked character translation table
+     */
+    private static char[] zzUnpackCMap(String packed) {
+        char[] map = new char[0x110000];
+        int i = 0;
+        /* index in packed string  */
+        int j = 0;
+        /* index in unpacked array */
+        while (i < 2856) {
+            int count = packed.charAt(i++);
+            char value = packed.charAt(i++);
+            do {
+                map[j++] = value;
+            } while (--count > 0);
         }
-      }
-      return false;
+        return map;
     }
 
-    // totalRead = 0: End of stream
-    return true;
-  }
+    /**
+     * Refills the input buffer.
+     *
+     * @return      <code>false</code>, iff there was new input.
+     *
+     * @exception java.io.IOException if any I/O-Error occurs
+     */
+    private boolean zzRefill() throws java.io.IOException {
 
-    
-  /**
-   * Closes the input stream.
-   */
-  public final void yyclose() throws java.io.IOException {
-    zzAtEOF = true;            /* indicate end of file */
-    zzEndRead = zzStartRead;  /* invalidate buffer    */
+        /* first: make room (if you can) */
+        if (zzStartRead > 0) {
+            zzEndRead += zzFinalHighSurrogate;
+            zzFinalHighSurrogate = 0;
+            System.arraycopy(zzBuffer, zzStartRead,
+                    zzBuffer, 0,
+                    zzEndRead - zzStartRead);
 
-    if (zzReader != null)
-      zzReader.close();
-  }
+            /* translate stored positions */
+            zzEndRead -= zzStartRead;
+            zzCurrentPos -= zzStartRead;
+            zzMarkedPos -= zzStartRead;
+            zzStartRead = 0;
+        }
 
+        /* is the buffer big enough? */
+        if (zzCurrentPos >= zzBuffer.length - zzFinalHighSurrogate) {
+            /* if not: blow it up */
+            char newBuffer[] = new char[zzBuffer.length * 2];
+            System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length);
+            zzBuffer = newBuffer;
+            zzEndRead += zzFinalHighSurrogate;
+            zzFinalHighSurrogate = 0;
+        }
 
-  /**
-   * Resets the scanner to read from a new input stream.
-   * Does not close the old reader.
-   *
-   * All internal variables are reset, the old input stream 
-   * <b>cannot</b> be reused (internal buffer is discarded and lost).
-   * Lexical state is set to <tt>ZZ_INITIAL</tt>.
-   *
-   * Internal scan buffer is resized down to its initial length, if it has grown.
-   *
-   * @param reader   the new input stream 
-   */
-  public final void yyreset(java.io.Reader reader) {
-    zzReader = reader;
-    zzAtBOL  = true;
-    zzAtEOF  = false;
-    zzEOFDone = false;
-    zzEndRead = zzStartRead = 0;
-    zzCurrentPos = zzMarkedPos = 0;
-    zzFinalHighSurrogate = 0;
-    yyline = yychar = yycolumn = 0;
-    zzLexicalState = YYINITIAL;
-    if (zzBuffer.length > ZZ_BUFFERSIZE)
-      zzBuffer = new char[ZZ_BUFFERSIZE];
-  }
+        /* fill the buffer with new input */
+        int requested = zzBuffer.length - zzEndRead;
+        int totalRead = 0;
+        while (totalRead < requested) {
+            int numRead = zzReader.read(zzBuffer, zzEndRead + totalRead, requested - totalRead);
+            if (numRead == -1) {
+                break;
+            }
+            totalRead += numRead;
+        }
 
+        if (totalRead > 0) {
+            zzEndRead += totalRead;
+            if (totalRead == requested) {
+                /* possibly more input available */
+                if (Character.isHighSurrogate(zzBuffer[zzEndRead - 1])) {
+                    --zzEndRead;
+                    zzFinalHighSurrogate = 1;
+                }
+            }
+            return false;
+        }
 
-  /**
-   * Returns the current lexical state.
-   */
-  public final int yystate() {
-    return zzLexicalState;
-  }
-
-
-  /**
-   * Enters a new lexical state
-   *
-   * @param newState the new lexical state
-   */
-  public final void yybegin(int newState) {
-    zzLexicalState = newState;
-  }
-
-
-  /**
-   * Returns the text matched by the current regular expression.
-   */
-  public final String yytext() {
-    return new String( zzBuffer, zzStartRead, zzMarkedPos-zzStartRead );
-  }
-
-
-  /**
-   * Returns the character at position <tt>pos</tt> from the 
-   * matched text. 
-   * 
-   * It is equivalent to yytext().charAt(pos), but faster
-   *
-   * @param pos the position of the character to fetch. 
-   *            A value from 0 to yylength()-1.
-   *
-   * @return the character at position pos
-   */
-  public final char yycharat(int pos) {
-    return zzBuffer[zzStartRead+pos];
-  }
-
-
-  /**
-   * Returns the length of the matched text region.
-   */
-  public final int yylength() {
-    return zzMarkedPos-zzStartRead;
-  }
-
-
-  /**
-   * Reports an error that occured while scanning.
-   *
-   * In a wellformed scanner (no or only correct usage of 
-   * yypushback(int) and a match-all fallback rule) this method 
-   * will only be called with things that "Can't Possibly Happen".
-   * If this method is called, something is seriously wrong
-   * (e.g. a JFlex bug producing a faulty scanner etc.).
-   *
-   * Usual syntax/scanner level error handling should be done
-   * in error fallback rules.
-   *
-   * @param   errorCode  the code of the errormessage to display
-   */
-  private void zzScanError(int errorCode) {
-    String message;
-    try {
-      message = ZZ_ERROR_MSG[errorCode];
-    }
-    catch (ArrayIndexOutOfBoundsException e) {
-      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
+        // totalRead = 0: End of stream
+        return true;
     }
 
-    throw new Error(message);
-  } 
+    /**
+     * Closes the input stream.
+     */
+    public final void yyclose() throws java.io.IOException {
+        zzAtEOF = true;
+        /* indicate end of file */
+        zzEndRead = zzStartRead;
+        /* invalidate buffer    */
 
+        if (zzReader != null) {
+            zzReader.close();
+        }
+    }
 
-  /**
-   * Pushes the specified amount of characters back into the input stream.
-   *
-   * They will be read again by then next call of the scanning method
-   *
-   * @param number  the number of characters to be read again.
-   *                This number must not be greater than yylength()!
-   */
-  public void yypushback(int number)  {
-    if ( number > yylength() )
-      zzScanError(ZZ_PUSHBACK_2BIG);
+    /**
+     * Resets the scanner to read from a new input stream. Does not close the
+     * old reader.
+     *
+     * All internal variables are reset, the old input stream
+     * <b>cannot</b> be reused (internal buffer is discarded and lost). Lexical
+     * state is set to <tt>ZZ_INITIAL</tt>.
+     *
+     * Internal scan buffer is resized down to its initial length, if it has
+     * grown.
+     *
+     * @param reader the new input stream
+     */
+    public final void yyreset(java.io.Reader reader) {
+        zzReader = reader;
+        zzAtBOL = true;
+        zzAtEOF = false;
+        zzEOFDone = false;
+        zzEndRead = zzStartRead = 0;
+        zzCurrentPos = zzMarkedPos = 0;
+        zzFinalHighSurrogate = 0;
+        yyline = yychar = yycolumn = 0;
+        zzLexicalState = YYINITIAL;
+        if (zzBuffer.length > ZZ_BUFFERSIZE) {
+            zzBuffer = new char[ZZ_BUFFERSIZE];
+        }
+    }
 
-    zzMarkedPos -= number;
-  }
+    /**
+     * Returns the current lexical state.
+     */
+    public final int yystate() {
+        return zzLexicalState;
+    }
 
+    /**
+     * Enters a new lexical state
+     *
+     * @param newState the new lexical state
+     */
+    public final void yybegin(int newState) {
+        zzLexicalState = newState;
+    }
 
-  /**
-   * Resumes scanning until the next regular expression is matched,
-   * the end of input is encountered or an I/O-Error occurs.
-   *
-   * @return      the next token
-   * @exception   java.io.IOException  if any I/O-Error occurs
-   */
-  public ParsedSymbol yylex() throws java.io.IOException, Amf3ParseException {
-    int zzInput;
-    int zzAction;
+    /**
+     * Returns the text matched by the current regular expression.
+     */
+    public final String yytext() {
+        return new String(zzBuffer, zzStartRead, zzMarkedPos - zzStartRead);
+    }
 
-    // cached fields:
-    int zzCurrentPosL;
-    int zzMarkedPosL;
-    int zzEndReadL = zzEndRead;
-    char [] zzBufferL = zzBuffer;
-    char [] zzCMapL = ZZ_CMAP;
+    /**
+     * Returns the character at position <tt>pos</tt> from the matched text.
+     *
+     * It is equivalent to yytext().charAt(pos), but faster
+     *
+     * @param pos the position of the character to fetch. A value from 0 to
+     * yylength()-1.
+     *
+     * @return the character at position pos
+     */
+    public final char yycharat(int pos) {
+        return zzBuffer[zzStartRead + pos];
+    }
 
-    int [] zzTransL = ZZ_TRANS;
-    int [] zzRowMapL = ZZ_ROWMAP;
-    int [] zzAttrL = ZZ_ATTRIBUTE;
+    /**
+     * Returns the length of the matched text region.
+     */
+    public final int yylength() {
+        return zzMarkedPos - zzStartRead;
+    }
 
-    while (true) {
-      zzMarkedPosL = zzMarkedPos;
+    /**
+     * Reports an error that occured while scanning.
+     *
+     * In a wellformed scanner (no or only correct usage of yypushback(int) and
+     * a match-all fallback rule) this method will only be called with things
+     * that "Can't Possibly Happen". If this method is called, something is
+     * seriously wrong (e.g. a JFlex bug producing a faulty scanner etc.).
+     *
+     * Usual syntax/scanner level error handling should be done in error
+     * fallback rules.
+     *
+     * @param errorCode the code of the errormessage to display
+     */
+    private void zzScanError(int errorCode) {
+        String message;
+        try {
+            message = ZZ_ERROR_MSG[errorCode];
+        } catch (ArrayIndexOutOfBoundsException e) {
+            message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
+        }
 
-      yychar+= zzMarkedPosL-zzStartRead;
+        throw new Error(message);
+    }
 
-      zzAction = -1;
+    /**
+     * Pushes the specified amount of characters back into the input stream.
+     *
+     * They will be read again by then next call of the scanning method
+     *
+     * @param number the number of characters to be read again. This number must
+     * not be greater than yylength()!
+     */
+    public void yypushback(int number) {
+        if (number > yylength()) {
+            zzScanError(ZZ_PUSHBACK_2BIG);
+        }
 
-      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
-  
-      zzState = ZZ_LEXSTATE[zzLexicalState];
+        zzMarkedPos -= number;
+    }
 
-      // set up zzAction for empty match case:
-      int zzAttributes = zzAttrL[zzState];
-      if ( (zzAttributes & 1) == 1 ) {
-        zzAction = zzState;
-      }
+    /**
+     * Resumes scanning until the next regular expression is matched, the end of
+     * input is encountered or an I/O-Error occurs.
+     *
+     * @return the next token
+     * @exception java.io.IOException if any I/O-Error occurs
+     */
+    public ParsedSymbol yylex() throws java.io.IOException, Amf3ParseException {
+        int zzInput;
+        int zzAction;
 
+        // cached fields:
+        int zzCurrentPosL;
+        int zzMarkedPosL;
+        int zzEndReadL = zzEndRead;
+        char[] zzBufferL = zzBuffer;
+        char[] zzCMapL = ZZ_CMAP;
+
+        int[] zzTransL = ZZ_TRANS;
+        int[] zzRowMapL = ZZ_ROWMAP;
+        int[] zzAttrL = ZZ_ATTRIBUTE;
 
-      zzForAction: {
         while (true) {
-    
-          if (zzCurrentPosL < zzEndReadL) {
-            zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL, zzEndReadL);
-            zzCurrentPosL += Character.charCount(zzInput);
-          }
-          else if (zzAtEOF) {
-            zzInput = YYEOF;
-            break zzForAction;
-          }
-          else {
-            // store back cached positions
-            zzCurrentPos  = zzCurrentPosL;
-            zzMarkedPos   = zzMarkedPosL;
-            boolean eof = zzRefill();
-            // get translated positions and possibly new buffer
-            zzCurrentPosL  = zzCurrentPos;
-            zzMarkedPosL   = zzMarkedPos;
-            zzBufferL      = zzBuffer;
-            zzEndReadL     = zzEndRead;
-            if (eof) {
-              zzInput = YYEOF;
-              break zzForAction;
-            }
-            else {
-              zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL, zzEndReadL);
-              zzCurrentPosL += Character.charCount(zzInput);
-            }
-          }
-          int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];
-          if (zzNext == -1) break zzForAction;
-          zzState = zzNext;
+            zzMarkedPosL = zzMarkedPos;
 
-          zzAttributes = zzAttrL[zzState];
-          if ( (zzAttributes & 1) == 1 ) {
-            zzAction = zzState;
-            zzMarkedPosL = zzCurrentPosL;
-            if ( (zzAttributes & 8) == 8 ) break zzForAction;
-          }
+            yychar += zzMarkedPosL - zzStartRead;
 
+            zzAction = -1;
+
+            zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
+
+            zzState = ZZ_LEXSTATE[zzLexicalState];
+
+            // set up zzAction for empty match case:
+            int zzAttributes = zzAttrL[zzState];
+            if ((zzAttributes & 1) == 1) {
+                zzAction = zzState;
+            }
+
+            zzForAction:
+            {
+                while (true) {
+
+                    if (zzCurrentPosL < zzEndReadL) {
+                        zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL, zzEndReadL);
+                        zzCurrentPosL += Character.charCount(zzInput);
+                    } else if (zzAtEOF) {
+                        zzInput = YYEOF;
+                        break zzForAction;
+                    } else {
+                        // store back cached positions
+                        zzCurrentPos = zzCurrentPosL;
+                        zzMarkedPos = zzMarkedPosL;
+                        boolean eof = zzRefill();
+                        // get translated positions and possibly new buffer
+                        zzCurrentPosL = zzCurrentPos;
+                        zzMarkedPosL = zzMarkedPos;
+                        zzBufferL = zzBuffer;
+                        zzEndReadL = zzEndRead;
+                        if (eof) {
+                            zzInput = YYEOF;
+                            break zzForAction;
+                        } else {
+                            zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL, zzEndReadL);
+                            zzCurrentPosL += Character.charCount(zzInput);
+                        }
+                    }
+                    int zzNext = zzTransL[zzRowMapL[zzState] + zzCMapL[zzInput]];
+                    if (zzNext == -1) {
+                        break zzForAction;
+                    }
+                    zzState = zzNext;
+
+                    zzAttributes = zzAttrL[zzState];
+                    if ((zzAttributes & 1) == 1) {
+                        zzAction = zzState;
+                        zzMarkedPosL = zzCurrentPosL;
+                        if ((zzAttributes & 8) == 8) {
+                            break zzForAction;
+                        }
+                    }
+
+                }
+            }
+
+            // store back cached position
+            zzMarkedPos = zzMarkedPosL;
+
+            switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
+                case 1: {
+                }
+                case 36:
+                    break;
+                case 2: {
+                    yyline++;
+                }
+                case 37:
+                    break;
+                case 3: {
+                    /*ignore*/
+                }
+                case 38:
+                    break;
+                case 4: {
+                    return new ParsedSymbol(SymbolGroup.IDENTIFIER, SymbolType.IDENTIFIER, yytext());
+                }
+                case 39:
+                    break;
+                case 5: {
+                    return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong((yytext())));
+                }
+                case 40:
+                    break;
+                case 6: {
+                    return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.CURLY_OPEN, yytext());
+                }
+                case 41:
+                    break;
+                case 7: {
+                    return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.CURLY_CLOSE, yytext());
+                }
+                case 42:
+                    break;
+                case 8: {
+                    return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.BRACKET_OPEN, yytext());
+                }
+                case 43:
+                    break;
+                case 9: {
+                    return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.BRACKET_CLOSE, yytext());
+                }
+                case 44:
+                    break;
+                case 10: {
+                    return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.COMMA, yytext());
+                }
+                case 45:
+                    break;
+                case 11: {
+                    return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.COLON, yytext());
+                }
+                case 46:
+                    break;
+                case 12: {
+                    string.setLength(0);
+                    yybegin(STRING);
+                }
+                case 47:
+                    break;
+                case 13: {
+                    string.append(yytext());
+                }
+                case 48:
+                    break;
+                case 14: {
+                    yybegin(YYINITIAL);
+                    yyline++;
+                }
+                case 49:
+                    break;
+                case 15: {
+                    yybegin(YYINITIAL);
+                    // length also includes the trailing quote
+                    return new ParsedSymbol(SymbolGroup.STRING, SymbolType.STRING, string.toString());
+                }
+                case 50:
+                    break;
+                case 16: {
+                    return new ParsedSymbol(SymbolGroup.IDENTIFIER, SymbolType.REFERENCE, yytext().substring(1));
+                }
+                case 51:
+                    break;
+                case 17: {
+                    return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext(), 8));
+                }
+                case 52:
+                    break;
+                case 18: {
+                    return new ParsedSymbol(SymbolGroup.DOUBLE, SymbolType.DOUBLE, Double.parseDouble((yytext())));
+                }
+                case 53:
+                    break;
+                case 19: {
+                    string.append('\\');
+                    /*illegal escape sequence*/
+                }
+                case 54:
+                    break;
+                case 20: {
+                    string.append('\\');
+                }
+                case 55:
+                    break;
+                case 21: {
+                    string.append('\n');
+                }
+                case 56:
+                    break;
+                case 22: {
+                    string.append('\f');
+                }
+                case 57:
+                    break;
+                case 23: {
+                    string.append('\t');
+                }
+                case 58:
+                    break;
+                case 24: {
+                    string.append('\r');
+                }
+                case 59:
+                    break;
+                case 25: {
+                    string.append('\"');
+                }
+                case 60:
+                    break;
+                case 26: {
+                    string.append('\b');
+                }
+                case 61:
+                    break;
+                case 27: {
+                    string.append('\'');
+                }
+                case 62:
+                    break;
+                case 28: {
+                    return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext().substring(2), 16));
+                }
+                case 63:
+                    break;
+                case 29: {
+                    return new ParsedSymbol(SymbolGroup.GLOBALCONST, SymbolType.NULL, yytext());
+                }
+                case 64:
+                    break;
+                case 30: {
+                    return new ParsedSymbol(SymbolGroup.KEYWORD, SymbolType.TRUE, yytext());
+                }
+                case 65:
+                    break;
+                case 31: {
+                    char val = (char) Integer.parseInt(yytext().substring(1), 8);
+                    string.append(val);
+                }
+                case 66:
+                    break;
+                case 32: {
+                    char val = (char) Integer.parseInt(yytext().substring(2), 16);
+                    string.append(val);
+                }
+                case 67:
+                    break;
+                case 33: {
+                    return new ParsedSymbol(SymbolGroup.KEYWORD, SymbolType.FALSE, yytext());
+                }
+                case 68:
+                    break;
+                case 34: {
+                    return new ParsedSymbol(SymbolGroup.UNKNOWN, SymbolType.UNKNOWN, yytext());
+                }
+                case 69:
+                    break;
+                case 35: {
+                    return new ParsedSymbol(SymbolGroup.GLOBALCONST, SymbolType.UNDEFINED, yytext());
+                }
+                case 70:
+                    break;
+                default:
+                    if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
+                        zzAtEOF = true;
+                        {
+                            return new ParsedSymbol(SymbolGroup.EOF, SymbolType.EOF, null);
+                        }
+                    } else {
+                        zzScanError(ZZ_NO_MATCH);
+                    }
+            }
         }
-      }
-
-      // store back cached position
-      zzMarkedPos = zzMarkedPosL;
-
-      switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
-        case 1: 
-          { 
-          }
-        case 36: break;
-        case 2: 
-          { yyline++;
-          }
-        case 37: break;
-        case 3: 
-          { /*ignore*/
-          }
-        case 38: break;
-        case 4: 
-          { return new ParsedSymbol(SymbolGroup.IDENTIFIER, SymbolType.IDENTIFIER, yytext());
-          }
-        case 39: break;
-        case 5: 
-          { return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong((yytext())));
-          }
-        case 40: break;
-        case 6: 
-          { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.CURLY_OPEN, yytext());
-          }
-        case 41: break;
-        case 7: 
-          { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.CURLY_CLOSE, yytext());
-          }
-        case 42: break;
-        case 8: 
-          { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.BRACKET_OPEN, yytext());
-          }
-        case 43: break;
-        case 9: 
-          { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.BRACKET_CLOSE, yytext());
-          }
-        case 44: break;
-        case 10: 
-          { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.COMMA, yytext());
-          }
-        case 45: break;
-        case 11: 
-          { return new ParsedSymbol(SymbolGroup.OPERATOR, SymbolType.COLON, yytext());
-          }
-        case 46: break;
-        case 12: 
-          { string.setLength(0);
-                                    yybegin(STRING);
-          }
-        case 47: break;
-        case 13: 
-          { string.append(yytext());
-          }
-        case 48: break;
-        case 14: 
-          { yybegin(YYINITIAL);  yyline++;
-          }
-        case 49: break;
-        case 15: 
-          { yybegin(YYINITIAL);
-                                     // length also includes the trailing quote
-                                     return new ParsedSymbol(SymbolGroup.STRING, SymbolType.STRING, string.toString());
-          }
-        case 50: break;
-        case 16: 
-          { return new ParsedSymbol(SymbolGroup.IDENTIFIER, SymbolType.REFERENCE, yytext().substring(1));
-          }
-        case 51: break;
-        case 17: 
-          { return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext(), 8));
-          }
-        case 52: break;
-        case 18: 
-          { return new ParsedSymbol(SymbolGroup.DOUBLE, SymbolType.DOUBLE, Double.parseDouble((yytext())));
-          }
-        case 53: break;
-        case 19: 
-          { string.append('\\'); /*illegal escape sequence*/
-          }
-        case 54: break;
-        case 20: 
-          { string.append('\\');
-          }
-        case 55: break;
-        case 21: 
-          { string.append('\n');
-          }
-        case 56: break;
-        case 22: 
-          { string.append('\f');
-          }
-        case 57: break;
-        case 23: 
-          { string.append('\t');
-          }
-        case 58: break;
-        case 24: 
-          { string.append('\r');
-          }
-        case 59: break;
-        case 25: 
-          { string.append('\"');
-          }
-        case 60: break;
-        case 26: 
-          { string.append('\b');
-          }
-        case 61: break;
-        case 27: 
-          { string.append('\'');
-          }
-        case 62: break;
-        case 28: 
-          { return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext().substring(2), 16));
-          }
-        case 63: break;
-        case 29: 
-          { return new ParsedSymbol(SymbolGroup.GLOBALCONST, SymbolType.NULL, yytext());
-          }
-        case 64: break;
-        case 30: 
-          { return new ParsedSymbol(SymbolGroup.KEYWORD, SymbolType.TRUE, yytext());
-          }
-        case 65: break;
-        case 31: 
-          { char val = (char) Integer.parseInt(yytext().substring(1), 8);
-                        				   string.append(val);
-          }
-        case 66: break;
-        case 32: 
-          { char val = (char) Integer.parseInt(yytext().substring(2), 16);
-                        				   string.append(val);
-          }
-        case 67: break;
-        case 33: 
-          { return new ParsedSymbol(SymbolGroup.KEYWORD, SymbolType.FALSE, yytext());
-          }
-        case 68: break;
-        case 34: 
-          { return new ParsedSymbol(SymbolGroup.UNKNOWN, SymbolType.UNKNOWN, yytext());
-          }
-        case 69: break;
-        case 35: 
-          { return new ParsedSymbol(SymbolGroup.GLOBALCONST, SymbolType.UNDEFINED, yytext());
-          }
-        case 70: break;
-        default: 
-          if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
-            zzAtEOF = true;
-              {
-                return new ParsedSymbol(SymbolGroup.EOF, SymbolType.EOF, null);
-              }
-          } 
-          else {
-            zzScanError(ZZ_NO_MATCH);
-          }
-      }
     }
-  }
-
 
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java
index 05bf32095..e976871e0 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java
@@ -500,7 +500,7 @@ public class DefineFont2Tag extends FontTag {
                     pos = i;
                     break;
                 }
-                
+
                 return false;
             }
         }
@@ -524,7 +524,7 @@ public class DefineFont2Tag extends FontTag {
         getSwf().clearImageCache();
         return true;
     }
-    
+
     @Override
     public void setAdvanceValues(Font font) {
         boolean hasLayout = fontFlagsHasLayout;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java
index 5f113c6de..504f87e89 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java
@@ -485,7 +485,7 @@ public class DefineFont3Tag extends FontTag {
 
     @Override
     public boolean removeCharacter(char character) {
-        
+
         //Font Align Zones will be removed as removing character zones is not supported:-(
         for (int i = 0; i < swf.getTags().size(); i++) {
             Tag t = swf.getTags().get(i);
@@ -523,13 +523,13 @@ public class DefineFont3Tag extends FontTag {
         }
 
         shiftGlyphIndices(fontID, pos + 1, false);
-        
+
         checkWideParameters();
         setModified(true);
         getSwf().clearImageCache();
         return true;
     }
-    
+
     @Override
     public void setAdvanceValues(Font font) {
         boolean hasLayout = fontFlagsHasLayout;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java
index f7b79f8be..0d443c6b8 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java
@@ -312,7 +312,7 @@ public class DefineFontTag extends FontTag {
         if (fontInfoTag == null) {
             return false;
         }
-        
+
         int code = (int) character;
         int pos = -1;
         List<Integer> codeTable = fontInfoTag.getCodeTable();
@@ -335,12 +335,12 @@ public class DefineFontTag extends FontTag {
         fontInfoTag.removeFontCharacter(pos);
 
         shiftGlyphIndices(fontId, pos + 1, false);
-        
+
         setModified(true);
         getSwf().clearImageCache();
         return true;
     }
-    
+
     @Override
     public void setAdvanceValues(Font font) {
         throw new UnsupportedOperationException("Setting the advance values for DefineFontTag is not supported.");
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoABCTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoABCTag.java
index 4a68db226..cf43bddf2 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoABCTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DoABCTag.java
@@ -72,7 +72,7 @@ public class DoABCTag extends Tag implements ABCContainerTag {
     @Override
     public final void readData(SWFInputStream sis, ByteArrayRange data, int level, boolean parallel, boolean skipUnusualTags, boolean lazy) throws IOException {
         ABCInputStream ais = new ABCInputStream(sis.getBaseStream());
-        
+
         // put it to the dumpview:
         sis.readByteRangeEx(sis.available(), "abcBytes");
         abc = new ABC(ais, swf, this);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineCompactedFont.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineCompactedFont.java
index 5980c4e2a..1ff43dc49 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineCompactedFont.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/gfx/DefineCompactedFont.java
@@ -210,7 +210,7 @@ public final class DefineCompactedFont extends FontTag {
                     pos = i;
                     break;
                 }
-                
+
                 return false;
             }
         }
@@ -218,7 +218,7 @@ public final class DefineCompactedFont extends FontTag {
         if (pos == -1) {
             return false;
         }
-        
+
         font.glyphInfo.remove(pos);
         font.glyphs.remove(pos);
         shapeCache.remove(pos);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java
index 7296f86d8..1a51cf957 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java
@@ -1,6 +1,6 @@
 /* The following code was generated by JFlex 1.6.0 */
 
-/*
+ /*
  *  Copyright (C) 2010-2016 JPEXS, All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -20,8 +20,7 @@ package com.jpexs.decompiler.flash.tags.text;
 
 /**
  * This class is a scanner generated by
- * <a href="http://www.jflex.de/">JFlex</a> 1.6.0
- * from the specification file
+ * <a href="http://www.jflex.de/">JFlex</a> 1.6.0 from the specification file
  * <tt>C:/Dropbox/Programovani/JavaSE/FFDec/libsrc/ffdec_lib/lexers/text.flex</tt>
  */
 public final class TextLexer {
@@ -47,9 +46,8 @@ public final class TextLexer {
 
     /**
      * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-     * at the beginning of a line
-     * l is of the form l = 2*k, k a non negative integer
+     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l at the
+     * beginning of a line l is of the form l = 2*k, k a non negative integer
      */
     private static final int ZZ_LEXSTATE[] = {
         0, 0, 1, 1, 2, 2
@@ -88,9 +86,11 @@ public final class TextLexer {
     }
 
     private static int zzUnpackAction(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -122,9 +122,11 @@ public final class TextLexer {
     }
 
     private static int zzUnpackRowMap(String packed, int offset, int[] result) {
-        int i = 0;  /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -158,9 +160,11 @@ public final class TextLexer {
     }
 
     private static int zzUnpackTrans(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -206,9 +210,11 @@ public final class TextLexer {
     }
 
     private static int zzUnpackAttribute(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -237,8 +243,8 @@ public final class TextLexer {
     private int zzLexicalState = YYINITIAL;
 
     /**
-     * this buffer contains the current text to be matched and is
-     * the source of the yytext() string
+     * this buffer contains the current text to be matched and is the source of
+     * the yytext() string
      */
     private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
 
@@ -258,8 +264,8 @@ public final class TextLexer {
     private int zzStartRead;
 
     /**
-     * endRead marks the last character in the buffer, that has been read
-     * from input
+     * endRead marks the last character in the buffer, that has been read from
+     * input
      */
     private int zzEndRead;
 
@@ -295,10 +301,10 @@ public final class TextLexer {
     private boolean zzEOFDone;
 
     /**
-     * The number of occupied positions in zzBuffer beyond zzEndRead.
-     * When a lead/high surrogate has been read from the input stream
-     * into the final zzBuffer position, this will have a value of 1;
-     * otherwise, it will have a value of 0.
+     * The number of occupied positions in zzBuffer beyond zzEndRead. When a
+     * lead/high surrogate has been read from the input stream into the final
+     * zzBuffer position, this will have a value of 1; otherwise, it will have a
+     * value of 0.
      */
     private int zzFinalHighSurrogate = 0;
 
@@ -344,9 +350,11 @@ public final class TextLexer {
      */
     private static char[] zzUnpackCMap(String packed) {
         char[] map = new char[0x110000];
-        int i = 0;  /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = 0;  /* index in unpacked array */
+        int j = 0;
+        /* index in unpacked array */
 
         while (i < 114) {
             int count = packed.charAt(i++);
@@ -405,7 +413,8 @@ public final class TextLexer {
 
         if (totalRead > 0) {
             zzEndRead += totalRead;
-            if (totalRead == requested) { /* possibly more input available */
+            if (totalRead == requested) {
+                /* possibly more input available */
 
                 if (Character.isHighSurrogate(zzBuffer[zzEndRead - 1])) {
                     --zzEndRead;
@@ -423,9 +432,11 @@ public final class TextLexer {
      * Closes the input stream.
      */
     public final void yyclose() throws java.io.IOException {
-        zzAtEOF = true;            /* indicate end of file */
+        zzAtEOF = true;
+        /* indicate end of file */
 
-        zzEndRead = zzStartRead;  /* invalidate buffer    */
+        zzEndRead = zzStartRead;
+        /* invalidate buffer    */
 
         if (zzReader != null) {
             zzReader.close();
@@ -433,12 +444,12 @@ public final class TextLexer {
     }
 
     /**
-     * Resets the scanner to read from a new input stream.
-     * Does not close the old reader.
+     * Resets the scanner to read from a new input stream. Does not close the
+     * old reader.
      *
      * All internal variables are reset, the old input stream
-     * <b>cannot</b> be reused (internal buffer is discarded and lost).
-     * Lexical state is set to <tt>ZZ_INITIAL</tt>.
+     * <b>cannot</b> be reused (internal buffer is discarded and lost). Lexical
+     * state is set to <tt>ZZ_INITIAL</tt>.
      *
      * Internal scan buffer is resized down to its initial length, if it has
      * grown.
@@ -484,13 +495,12 @@ public final class TextLexer {
     }
 
     /**
-     * Returns the character at position <tt>pos</tt> from the
-     * matched text.
+     * Returns the character at position <tt>pos</tt> from the matched text.
      *
      * It is equivalent to yytext().charAt(pos), but faster
      *
-     * @param pos the position of the character to fetch.
-     * A value from 0 to yylength()-1.
+     * @param pos the position of the character to fetch. A value from 0 to
+     * yylength()-1.
      *
      * @return the character at position pos
      */
@@ -508,14 +518,13 @@ public final class TextLexer {
     /**
      * Reports an error that occured while scanning.
      *
-     * In a wellformed scanner (no or only correct usage of
-     * yypushback(int) and a match-all fallback rule) this method
-     * will only be called with things that "Can't Possibly Happen".
-     * If this method is called, something is seriously wrong
-     * (e.g. a JFlex bug producing a faulty scanner etc.).
+     * In a wellformed scanner (no or only correct usage of yypushback(int) and
+     * a match-all fallback rule) this method will only be called with things
+     * that "Can't Possibly Happen". If this method is called, something is
+     * seriously wrong (e.g. a JFlex bug producing a faulty scanner etc.).
      *
-     * Usual syntax/scanner level error handling should be done
-     * in error fallback rules.
+     * Usual syntax/scanner level error handling should be done in error
+     * fallback rules.
      *
      * @param errorCode the code of the errormessage to display
      */
@@ -535,8 +544,8 @@ public final class TextLexer {
      *
      * They will be read again by then next call of the scanning method
      *
-     * @param number the number of characters to be read again.
-     * This number must not be greater than yylength()!
+     * @param number the number of characters to be read again. This number must
+     * not be greater than yylength()!
      */
     public void yypushback(int number) {
         if (number > yylength()) {
@@ -547,8 +556,8 @@ public final class TextLexer {
     }
 
     /**
-     * Resumes scanning until the next regular expression is matched,
-     * the end of input is encountered or an I/O-Error occurs.
+     * Resumes scanning until the next regular expression is matched, the end of
+     * input is encountered or an I/O-Error occurs.
      *
      * @return the next token
      * @exception java.io.IOException if any I/O-Error occurs
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/annotations/parser/ConditionLexer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/annotations/parser/ConditionLexer.java
index b0e6bb1ab..44a56fdff 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/annotations/parser/ConditionLexer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/annotations/parser/ConditionLexer.java
@@ -1,6 +1,6 @@
 /* The following code was generated by JFlex 1.6.0 */
 
-/*
+ /*
  *  Copyright (C) 2010-2016 JPEXS, All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -22,8 +22,7 @@ import java.util.Stack;
 
 /**
  * This class is a scanner generated by
- * <a href="http://www.jflex.de/">JFlex</a> 1.6.0
- * from the specification file
+ * <a href="http://www.jflex.de/">JFlex</a> 1.6.0 from the specification file
  * <tt>C:/FFDec/jpexs-decompiler/libsrc/ffdec_lib/lexers/tag_conditions.flex</tt>
  */
 public final class ConditionLexer {
@@ -45,9 +44,8 @@ public final class ConditionLexer {
 
     /**
      * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
-     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
-     * at the beginning of a line
-     * l is of the form l = 2*k, k a non negative integer
+     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l at the
+     * beginning of a line l is of the form l = 2*k, k a non negative integer
      */
     private static final int ZZ_LEXSTATE[] = {
         0, 0
@@ -84,9 +82,11 @@ public final class ConditionLexer {
     }
 
     private static int zzUnpackAction(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -116,9 +116,11 @@ public final class ConditionLexer {
     }
 
     private static int zzUnpackRowMap(String packed, int offset, int[] result) {
-        int i = 0;  /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -145,9 +147,11 @@ public final class ConditionLexer {
     }
 
     private static int zzUnpackTrans(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -192,9 +196,11 @@ public final class ConditionLexer {
     }
 
     private static int zzUnpackAttribute(String packed, int offset, int[] result) {
-        int i = 0;       /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = offset;  /* index in unpacked array */
+        int j = offset;
+        /* index in unpacked array */
 
         int l = packed.length();
         while (i < l) {
@@ -223,8 +229,8 @@ public final class ConditionLexer {
     private int zzLexicalState = YYINITIAL;
 
     /**
-     * this buffer contains the current text to be matched and is
-     * the source of the yytext() string
+     * this buffer contains the current text to be matched and is the source of
+     * the yytext() string
      */
     private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
 
@@ -244,8 +250,8 @@ public final class ConditionLexer {
     private int zzStartRead;
 
     /**
-     * endRead marks the last character in the buffer, that has been read
-     * from input
+     * endRead marks the last character in the buffer, that has been read from
+     * input
      */
     private int zzEndRead;
 
@@ -281,10 +287,10 @@ public final class ConditionLexer {
     private boolean zzEOFDone;
 
     /**
-     * The number of occupied positions in zzBuffer beyond zzEndRead.
-     * When a lead/high surrogate has been read from the input stream
-     * into the final zzBuffer position, this will have a value of 1;
-     * otherwise, it will have a value of 0.
+     * The number of occupied positions in zzBuffer beyond zzEndRead. When a
+     * lead/high surrogate has been read from the input stream into the final
+     * zzBuffer position, this will have a value of 1; otherwise, it will have a
+     * value of 0.
      */
     private int zzFinalHighSurrogate = 0;
 
@@ -338,9 +344,11 @@ public final class ConditionLexer {
      */
     private static char[] zzUnpackCMap(String packed) {
         char[] map = new char[0x110000];
-        int i = 0;  /* index in packed string  */
+        int i = 0;
+        /* index in packed string  */
 
-        int j = 0;  /* index in unpacked array */
+        int j = 0;
+        /* index in unpacked array */
 
         while (i < 96) {
             int count = packed.charAt(i++);
@@ -399,7 +407,8 @@ public final class ConditionLexer {
 
         if (totalRead > 0) {
             zzEndRead += totalRead;
-            if (totalRead == requested) { /* possibly more input available */
+            if (totalRead == requested) {
+                /* possibly more input available */
 
                 if (Character.isHighSurrogate(zzBuffer[zzEndRead - 1])) {
                     --zzEndRead;
@@ -417,9 +426,11 @@ public final class ConditionLexer {
      * Closes the input stream.
      */
     public final void yyclose() throws java.io.IOException {
-        zzAtEOF = true;            /* indicate end of file */
+        zzAtEOF = true;
+        /* indicate end of file */
 
-        zzEndRead = zzStartRead;  /* invalidate buffer    */
+        zzEndRead = zzStartRead;
+        /* invalidate buffer    */
 
         if (zzReader != null) {
             zzReader.close();
@@ -427,12 +438,12 @@ public final class ConditionLexer {
     }
 
     /**
-     * Resets the scanner to read from a new input stream.
-     * Does not close the old reader.
+     * Resets the scanner to read from a new input stream. Does not close the
+     * old reader.
      *
      * All internal variables are reset, the old input stream
-     * <b>cannot</b> be reused (internal buffer is discarded and lost).
-     * Lexical state is set to <tt>ZZ_INITIAL</tt>.
+     * <b>cannot</b> be reused (internal buffer is discarded and lost). Lexical
+     * state is set to <tt>ZZ_INITIAL</tt>.
      *
      * Internal scan buffer is resized down to its initial length, if it has
      * grown.
@@ -478,13 +489,12 @@ public final class ConditionLexer {
     }
 
     /**
-     * Returns the character at position <tt>pos</tt> from the
-     * matched text.
+     * Returns the character at position <tt>pos</tt> from the matched text.
      *
      * It is equivalent to yytext().charAt(pos), but faster
      *
-     * @param pos the position of the character to fetch.
-     * A value from 0 to yylength()-1.
+     * @param pos the position of the character to fetch. A value from 0 to
+     * yylength()-1.
      *
      * @return the character at position pos
      */
@@ -502,14 +512,13 @@ public final class ConditionLexer {
     /**
      * Reports an error that occured while scanning.
      *
-     * In a wellformed scanner (no or only correct usage of
-     * yypushback(int) and a match-all fallback rule) this method
-     * will only be called with things that "Can't Possibly Happen".
-     * If this method is called, something is seriously wrong
-     * (e.g. a JFlex bug producing a faulty scanner etc.).
+     * In a wellformed scanner (no or only correct usage of yypushback(int) and
+     * a match-all fallback rule) this method will only be called with things
+     * that "Can't Possibly Happen". If this method is called, something is
+     * seriously wrong (e.g. a JFlex bug producing a faulty scanner etc.).
      *
-     * Usual syntax/scanner level error handling should be done
-     * in error fallback rules.
+     * Usual syntax/scanner level error handling should be done in error
+     * fallback rules.
      *
      * @param errorCode the code of the errormessage to display
      */
@@ -529,8 +538,8 @@ public final class ConditionLexer {
      *
      * They will be read again by then next call of the scanning method
      *
-     * @param number the number of characters to be read again.
-     * This number must not be greater than yylength()!
+     * @param number the number of characters to be read again. This number must
+     * not be greater than yylength()!
      */
     public void yypushback(int number) {
         if (number > yylength()) {
@@ -541,8 +550,8 @@ public final class ConditionLexer {
     }
 
     /**
-     * Resumes scanning until the next regular expression is matched,
-     * the end of input is encountered or an I/O-Error occurs.
+     * Resumes scanning until the next regular expression is matched, the end of
+     * input is encountered or an I/O-Error occurs.
      *
      * @return the next token
      * @exception java.io.IOException if any I/O-Error occurs
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/FLAVersion.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/FLAVersion.java
index 3f6d8b0a2..5fd9169df 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/FLAVersion.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/FLAVersion.java
@@ -29,11 +29,11 @@ public enum FLAVersion {
     CS5_5("CS5.5", "Flash CS 5.5", "2.1", 11),
     CS6("CS6", "Flash CS 6", "2.2", 17),
     CC("CC", "Flash CC", "2.4", Integer.MAX_VALUE) {
-                @Override
-                public int minASVersion() {
-                    return 3; //AS 1/2 not supported anymore
-                }
-            };
+        @Override
+        public int minASVersion() {
+            return 3; //AS 1/2 not supported anymore
+        }
+    };
 
     private final String xflVersion;
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphPart.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphPart.java
index 8f7c388aa..30d297596 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphPart.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/GraphPart.java
@@ -171,19 +171,15 @@ public class GraphPart implements Serializable {
         for (GraphPart p : nextParts) {
             if (p == part) {
                 return true;
-            } else {
-                if (p.leadsTo(localData, gr, code, part, visited, loops)) {
-                    return true;
-                }
+            } else if (p.leadsTo(localData, gr, code, part, visited, loops)) {
+                return true;
             }
         }
         for (GraphPart p : throwParts) {
             if (p == part) {
                 return true;
-            } else {
-                if (p.leadsTo(localData, gr, code, part, visited, loops)) {
-                    return true;
-                }
+            } else if (p.leadsTo(localData, gr, code, part, visited, loops)) {
+                return true;
             }
         }
         return false;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/helpers/resource/canvas.js b/libsrc/ffdec_lib/src/com/jpexs/helpers/resource/canvas.js
index de65f1536..debbdd6e1 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/helpers/resource/canvas.js
+++ b/libsrc/ffdec_lib/src/com/jpexs/helpers/resource/canvas.js
@@ -957,8 +957,7 @@ function doDrag(e) {
     if (dragWidth) {
         canvas.width = (startWidth + e.clientX - startX);
         canvas.height = canvas.width * originalHeight / originalWidth;
-    }
-    else if (dragHeight) {
+    } else if (dragHeight) {
         canvas.height = (startHeight + e.clientY - startY);
         canvas.width = canvas.height * originalWidth / originalHeight;
     }
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2ModificationTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2ModificationTest.java
index 82bf6a30b..0d7c5370c 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2ModificationTest.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2ModificationTest.java
@@ -175,7 +175,8 @@ public class ActionScript2ModificationTest extends ActionScript2TestBase {
                 + "Return\n"
                 + "}\n"
                 + "Push 2\n"
-                + "Jump label_1\n" + // remove this action
+                + "Jump label_1\n"
+                + // remove this action
                 "label_1:Push 3";
         String expectedResult
                 = "ConstantPool\n"
diff --git a/src/com/jpexs/decompiler/flash/gui/LicenseUpdater.java b/src/com/jpexs/decompiler/flash/gui/LicenseUpdater.java
index 8dfdeb39b..d2586bda5 100644
--- a/src/com/jpexs/decompiler/flash/gui/LicenseUpdater.java
+++ b/src/com/jpexs/decompiler/flash/gui/LicenseUpdater.java
@@ -99,50 +99,48 @@ public class LicenseUpdater {
         for (File f : files) {
             if (f.isDirectory()) {
                 updateLicenseInDir(f, lgpl);
-            } else {
-                if (f.getName().endsWith(".java")) {
-                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                    PrintWriter pw = new Utf8PrintWriter(baos);
-                    try {
-                        try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(f), Utf8Helper.charset))) {
-                            String s;
-                            boolean packageFound = false;
-                            String author = defaultAuthor;
-                            String yearStr = defaultYearStr;
-                            while ((s = br.readLine()) != null) {
-                                if (!packageFound) {
-                                    if (s.trim().startsWith("package")) {
-                                        packageFound = true;
-                                        pw.println(license.replace("{year}", yearStr).replace("{author}", author));
-                                    } else {
-                                        Matcher mAuthor = Pattern.compile(lgpl ? "^.*Copyright \\(C\\) ([0-9]+)(-[0-9]+)? (.*), All rights reserved.*" : "^.*Copyright \\(C\\) ([0-9]+)(-[0-9]+)? (.*)$").matcher(s);
-                                        if (mAuthor.matches()) {
-                                            author = mAuthor.group(3).trim();
-                                            int startYear = Integer.parseInt(mAuthor.group(1).trim());
-                                            if (startYear == defaultFinalYear) {
-                                                yearStr = Integer.toString(startYear);
-                                            } else {
-                                                yearStr = Integer.toString(startYear) + "-" + defaultFinalYear;
-                                            }
-                                            if (!author.equals(defaultAuthor)) {
-                                                System.out.println("Detected nodefault author:" + author + " in " + f.getAbsolutePath());
-                                            }
+            } else if (f.getName().endsWith(".java")) {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                PrintWriter pw = new Utf8PrintWriter(baos);
+                try {
+                    try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(f), Utf8Helper.charset))) {
+                        String s;
+                        boolean packageFound = false;
+                        String author = defaultAuthor;
+                        String yearStr = defaultYearStr;
+                        while ((s = br.readLine()) != null) {
+                            if (!packageFound) {
+                                if (s.trim().startsWith("package")) {
+                                    packageFound = true;
+                                    pw.println(license.replace("{year}", yearStr).replace("{author}", author));
+                                } else {
+                                    Matcher mAuthor = Pattern.compile(lgpl ? "^.*Copyright \\(C\\) ([0-9]+)(-[0-9]+)? (.*), All rights reserved.*" : "^.*Copyright \\(C\\) ([0-9]+)(-[0-9]+)? (.*)$").matcher(s);
+                                    if (mAuthor.matches()) {
+                                        author = mAuthor.group(3).trim();
+                                        int startYear = Integer.parseInt(mAuthor.group(1).trim());
+                                        if (startYear == defaultFinalYear) {
+                                            yearStr = Integer.toString(startYear);
+                                        } else {
+                                            yearStr = Integer.toString(startYear) + "-" + defaultFinalYear;
+                                        }
+                                        if (!author.equals(defaultAuthor)) {
+                                            System.out.println("Detected nodefault author:" + author + " in " + f.getAbsolutePath());
                                         }
                                     }
                                 }
-                                if (packageFound) {
-                                    pw.println(s);
-                                }
+                            }
+                            if (packageFound) {
+                                pw.println(s);
                             }
                         }
-                        pw.close();
-                    } catch (IOException ex) {
                     }
+                    pw.close();
+                } catch (IOException ex) {
+                }
 
-                    try (OutputStream fos = new BufferedOutputStream(new FileOutputStream(f))) {
-                        fos.write(baos.toByteArray());
-                    } catch (IOException ex) {
-                    }
+                try (OutputStream fos = new BufferedOutputStream(new FileOutputStream(f))) {
+                    fos.write(baos.toByteArray());
+                } catch (IOException ex) {
                 }
             }
         }
diff --git a/src/com/jpexs/decompiler/flash/gui/LoadingDialog.java b/src/com/jpexs/decompiler/flash/gui/LoadingDialog.java
index 3c83c101d..24590097e 100644
--- a/src/com/jpexs/decompiler/flash/gui/LoadingDialog.java
+++ b/src/com/jpexs/decompiler/flash/gui/LoadingDialog.java
@@ -100,10 +100,8 @@ public class LoadingDialog extends AppDialog {
             public void windowClosing(WindowEvent e) {
                 if (Main.shouldCloseWhenClosingLoadingDialog) {
                     System.exit(0);
-                } else {
-                    if (worker != null) {
-                        worker.cancel(true);
-                    }
+                } else if (worker != null) {
+                    worker.cancel(true);
                 }
             }
         });
diff --git a/src/com/jpexs/decompiler/flash/gui/MyRibbonApplicationMenuPopupPanelUI.java b/src/com/jpexs/decompiler/flash/gui/MyRibbonApplicationMenuPopupPanelUI.java
index a6961ad73..b6e7b5d27 100644
--- a/src/com/jpexs/decompiler/flash/gui/MyRibbonApplicationMenuPopupPanelUI.java
+++ b/src/com/jpexs/decompiler/flash/gui/MyRibbonApplicationMenuPopupPanelUI.java
@@ -55,65 +55,65 @@ public class MyRibbonApplicationMenuPopupPanelUI extends BasicRibbonApplicationM
         super.installComponents();
         Border newBorder = new CompoundBorder(new SubstanceBorder(new Insets(2,
                 2, 2, 2)), new Border() {
-                    @Override
-                    public boolean isBorderOpaque() {
-                        return true;
-                    }
+            @Override
+            public boolean isBorderOpaque() {
+                return true;
+            }
 
-                    @Override
-                    public Insets getBorderInsets(Component c) {
-                        return new Insets(18, 0, 0, 0);
-                    }
+            @Override
+            public Insets getBorderInsets(Component c) {
+                return new Insets(18, 0, 0, 0);
+            }
 
-                    @Override
-                    public void paintBorder(Component c, Graphics g, int x, int y,
-                            int width, int height) {
-                        SubstanceColorScheme bgFillScheme = SubstanceColorSchemeUtilities
+            @Override
+            public void paintBorder(Component c, Graphics g, int x, int y,
+                    int width, int height) {
+                SubstanceColorScheme bgFillScheme = SubstanceColorSchemeUtilities
                         .getColorScheme(c,
                                 ColorSchemeAssociationKind.HIGHLIGHT,
                                 ComponentState.ENABLED);
-                        SubstanceColorScheme bgBorderScheme = SubstanceColorSchemeUtilities
+                SubstanceColorScheme bgBorderScheme = SubstanceColorSchemeUtilities
                         .getColorScheme(c,
                                 ColorSchemeAssociationKind.HIGHLIGHT_BORDER,
                                 ComponentState.ENABLED);
-                        HighlightPainterUtils.paintHighlight(g, null, c, new Rectangle(
-                                        x, y, width, height), 0.0f, null, bgFillScheme,
-                                bgBorderScheme);
+                HighlightPainterUtils.paintHighlight(g, null, c, new Rectangle(
+                        x, y, width, height), 0.0f, null, bgFillScheme,
+                        bgBorderScheme);
 
-                        // draw the application menu button
-                        JRibbonApplicationMenuButton rendererButton = new JRibbonApplicationMenuButton(
-                                applicationMenuPopupPanel.getAppMenuButton()
-                                .getRibbon());
+                // draw the application menu button
+                JRibbonApplicationMenuButton rendererButton = new JRibbonApplicationMenuButton(
+                        applicationMenuPopupPanel.getAppMenuButton()
+                        .getRibbon());
 
-                        JRibbonApplicationMenuButton appMenuButton = applicationMenuPopupPanel
+                JRibbonApplicationMenuButton appMenuButton = applicationMenuPopupPanel
                         .getAppMenuButton();
-                        rendererButton.applyComponentOrientation(appMenuButton
-                                .getComponentOrientation());
+                rendererButton.applyComponentOrientation(appMenuButton
+                        .getComponentOrientation());
 
-                        rendererButton.setPopupKeyTip(appMenuButton.getPopupKeyTip());
-                        rendererButton.getPopupModel().setPopupShowing(true);
-                        rendererButton.setDisplayState(appMenuButton.getDisplayState());
+                rendererButton.setPopupKeyTip(appMenuButton.getPopupKeyTip());
+                rendererButton.getPopupModel().setPopupShowing(true);
+                rendererButton.setDisplayState(appMenuButton.getDisplayState());
 
-                        rendererButton.getPopupModel().setRollover(false);
-                        rendererButton.getPopupModel().setPressed(true);
-                        rendererButton.getPopupModel().setArmed(true);
+                rendererButton.getPopupModel().setRollover(false);
+                rendererButton.getPopupModel().setPressed(true);
+                rendererButton.getPopupModel().setArmed(true);
 
-                        CellRendererPane buttonRendererPane = new CellRendererPane();
-                        Point buttonLoc = appMenuButton.getLocationOnScreen();
-                        Point panelLoc = c.getLocationOnScreen();
+                CellRendererPane buttonRendererPane = new CellRendererPane();
+                Point buttonLoc = appMenuButton.getLocationOnScreen();
+                Point panelLoc = c.getLocationOnScreen();
 
-                        buttonRendererPane.setBounds(panelLoc.x - buttonLoc.x,
-                                panelLoc.y - buttonLoc.y, appMenuButton.getWidth(),
-                                appMenuButton.getHeight());
+                buttonRendererPane.setBounds(panelLoc.x - buttonLoc.x,
+                        panelLoc.y - buttonLoc.y, appMenuButton.getWidth(),
+                        appMenuButton.getHeight());
 
-                        buttonRendererPane.paintComponent(g, rendererButton,
-                                (Container) c, -panelLoc.x + buttonLoc.x, -panelLoc.y
-                                + buttonLoc.y, appMenuButton.getWidth(),
-                                appMenuButton.getHeight(), true);
-                        /*g.setColor(Color.red);
+                buttonRendererPane.paintComponent(g, rendererButton,
+                        (Container) c, -panelLoc.x + buttonLoc.x, -panelLoc.y
+                        + buttonLoc.y, appMenuButton.getWidth(),
+                        appMenuButton.getHeight(), true);
+                /*g.setColor(Color.red);
                          g.fillRect(0, 0, width,height);*/
-                    }
-                });
+            }
+        });
         this.applicationMenuPopupPanel.setBorder(newBorder);
 
         this.panelLevel2.setBorder(new Border() {
diff --git a/src/com/jpexs/decompiler/flash/gui/OceanicSkin.java b/src/com/jpexs/decompiler/flash/gui/OceanicSkin.java
index 5d270968c..d04b2835d 100644
--- a/src/com/jpexs/decompiler/flash/gui/OceanicSkin.java
+++ b/src/com/jpexs/decompiler/flash/gui/OceanicSkin.java
@@ -186,13 +186,13 @@ public class OceanicSkin extends SubstanceSkin {
 
         this.addOverlayPainter(new BottomLineOverlayPainter(
                 new ColorSchemeSingleColorQuery() {
-                    @Override
-                    public Color query(SubstanceColorScheme scheme) {
-                        Color fg = scheme.getForegroundColor();
-                        return new Color(fg.getRed(), fg.getGreen(), fg
-                                .getBlue(), 72);
-                    }
-                }), DecorationAreaType.PRIMARY_TITLE_PANE,
+            @Override
+            public Color query(SubstanceColorScheme scheme) {
+                Color fg = scheme.getForegroundColor();
+                return new Color(fg.getRed(), fg.getGreen(), fg
+                        .getBlue(), 72);
+            }
+        }), DecorationAreaType.PRIMARY_TITLE_PANE,
                 DecorationAreaType.SECONDARY_TITLE_PANE);
 
         this.buttonShaper = new ClassicButtonShaper();
@@ -216,12 +216,12 @@ public class OceanicSkin extends SubstanceSkin {
                 "Oceanic Inner", outerBorderPainter, new int[]{
                     0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
                 new ColorSchemeTransform() {
-                    @Override
-                    public SubstanceColorScheme transform(
-                            SubstanceColorScheme scheme) {
-                                return scheme.tint(0.8f);
-                            }
-                });
+            @Override
+            public SubstanceColorScheme transform(
+                    SubstanceColorScheme scheme) {
+                return scheme.tint(0.8f);
+            }
+        });
         this.borderPainter = new CompositeBorderPainter("Oceanic",
                 outerBorderPainter, innerBorderPainter);
 
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java
index 7f9e8b158..7eae0d6eb 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java
@@ -225,10 +225,8 @@ public class DetailPanel extends JPanel implements TagEditorPanel {
             selectedLabel.setText(AppStrings.translate(name));
             if (trait == null) {
                 traitNameLabel.setText("-");
-            } else {
-                if (abcPanel != null) {
-                    traitNameLabel.setText(trait.getName(abcPanel.abc).getName(abcPanel.abc.constants, null, false));
-                }
+            } else if (abcPanel != null) {
+                traitNameLabel.setText(trait.getName(abcPanel.abc).getName(abcPanel.abc.constants, null, false));
             }
         });
 
diff --git a/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java b/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java
index 3d2149ea3..6779614bd 100644
--- a/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java
+++ b/src/com/jpexs/decompiler/flash/gui/editor/UndoFixedEditorPane.java
@@ -114,11 +114,9 @@ public class UndoFixedEditorPane extends JEditorPane {
                     contentType = "text/plain";
                     originalContentType = getContentType();
                     changeContentType(contentType);
-                } else {
-                    if (originalContentType != null) {
-                        changeContentType(originalContentType);
-                        originalContentType = null;
-                    }
+                } else if (originalContentType != null) {
+                    changeContentType(originalContentType);
+                    originalContentType = null;
                 }
 
                 Stopwatch sw = Stopwatch.startNew();
diff --git a/src/com/jpexs/process/win32/Win32ProcessTools.java b/src/com/jpexs/process/win32/Win32ProcessTools.java
index 467712a74..3342ac5d2 100644
--- a/src/com/jpexs/process/win32/Win32ProcessTools.java
+++ b/src/com/jpexs/process/win32/Win32ProcessTools.java
@@ -438,13 +438,11 @@ public class Win32ProcessTools extends ProcessTools {
                         bufSize = maxsize - pos;
                     }
                 } while (bufSize > 0);
-            } else {
-                if (hasGuard(mbi)) {
-                    if (unsetGuard(hOtherProcess, mbi)) {
-                        guardedPages.add(pg);
-                        pg--;
-                        continue;
-                    }
+            } else if (hasGuard(mbi)) {
+                if (unsetGuard(hOtherProcess, mbi)) {
+                    guardedPages.add(pg);
+                    pg--;
+                    continue;
                 }
             }
             actualPos += mbi.regionSize.longValue();
diff --git a/src/com/sun/jna/platform/win32/User32.java b/src/com/sun/jna/platform/win32/User32.java
index dcdc68e74..e795b7bd3 100644
--- a/src/com/sun/jna/platform/win32/User32.java
+++ b/src/com/sun/jna/platform/win32/User32.java
@@ -966,12 +966,9 @@ public interface User32 extends StdCallLibrary, WinUser {
      * process is idle.
      *
      * @return The following table shows the possible return values for this
-     * function.
-     * Return code: Description
-     * 0: The wait was satisfied successfully.
-     * WAIT_TIMEOUT: The wait was terminated because the time-out interval
-     * elapsed.
-     * WAIT_FAILED: An error occurred.
+     * function. Return code: Description 0: The wait was satisfied
+     * successfully. WAIT_TIMEOUT: The wait was terminated because the time-out
+     * interval elapsed. WAIT_FAILED: An error occurred.
      */
     DWORD WaitForInputIdle(HANDLE hProcess, DWORD dwMilliseconds);
 
@@ -1099,8 +1096,7 @@ public interface User32 extends StdCallLibrary, WinUser {
      * If the function fails, the return value is zero. To get extended error
      * information, call {@link Kernel32#GetLastError}.
      * {@link WinUser#WM_HOTKEY} messages generated by the hot key
-     * {@link WinUser#WM_HOTKEY} message.
-     * A combination of the following values
+     * {@link WinUser#WM_HOTKEY} message. A combination of the following values
      * <ul>
      * <li>{@link WinUser#MOD_ALT} Either ALT key must be held down.</li>
      * <li>{@link WinUser#MOD_CONTROL} Either CTRL key must be held down.</li>
@@ -1317,11 +1313,10 @@ public interface User32 extends StdCallLibrary, WinUser {
      *
      * This function typically fails for one of the following reasons:
      *
-     * - an invalid parameter value
-     * - the system class was registered by a different module
-     * - The WH_CBT hook is installed and returns a failure code
-     * - if one of the controls in the dialog template is not registered, or its
-     * window window procedure fails WM_CREATE or WM_NCCREATE
+     * - an invalid parameter value - the system class was registered by a
+     * different module - The WH_CBT hook is installed and returns a failure
+     * code - if one of the controls in the dialog template is not registered,
+     * or its window window procedure fails WM_CREATE or WM_NCCREATE
      */
     public HWND CreateWindowEx(int dwExStyle, WString lpClassName,
             String lpWindowName, int dwStyle, int x, int y, int nWidth,
diff --git a/src/com/sun/jna/platform/win32/WinBase.java b/src/com/sun/jna/platform/win32/WinBase.java
index fe6d49784..e305f1e16 100644
--- a/src/com/sun/jna/platform/win32/WinBase.java
+++ b/src/com/sun/jna/platform/win32/WinBase.java
@@ -36,7 +36,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD {
      */
     HANDLE INVALID_HANDLE_VALUE
             = new HANDLE(Pointer.createConstant(Pointer.SIZE == 8
-                                    ? -1 : 0xFFFFFFFFL));
+                    ? -1 : 0xFFFFFFFFL));
 
     /**
      * Maximum computer name length. The value is 15 on Mac, 31 on everything
diff --git a/src/com/sun/jna/platform/win32/WinUser.java b/src/com/sun/jna/platform/win32/WinUser.java
index 36b22ed2c..af3c91519 100644
--- a/src/com/sun/jna/platform/win32/WinUser.java
+++ b/src/com/sun/jna/platform/win32/WinUser.java
@@ -555,17 +555,17 @@ public interface WinUser extends StdCallLibrary, WinDef {
 
     int SM_CMOUSEBUTTONS = 43;
 
-    int SM_CXFIXEDFRAME = SM_CXDLGFRAME; /* ;win40 name change */
+    int SM_CXFIXEDFRAME = SM_CXDLGFRAME;
+    /* ;win40 name change */
 
+    int SM_CYFIXEDFRAME = SM_CYDLGFRAME;
+    /* ;win40 name change */
 
-    int SM_CYFIXEDFRAME = SM_CYDLGFRAME; /* ;win40 name change */
-
-
-    int SM_CXSIZEFRAME = SM_CXFRAME; /* ;win40 name change */
-
-
-    int SM_CYSIZEFRAME = SM_CYFRAME; /* ;win40 name change */
+    int SM_CXSIZEFRAME = SM_CXFRAME;
+    /* ;win40 name change */
 
+    int SM_CYSIZEFRAME = SM_CYFRAME;
+    /* ;win40 name change */
 
     int SM_SECURE = 44;
 
diff --git a/test/com/jpexs/decompiler/flash/gui/AdobeFlashExecutor.java b/test/com/jpexs/decompiler/flash/gui/AdobeFlashExecutor.java
index ac9c945a3..91d659809 100644
--- a/test/com/jpexs/decompiler/flash/gui/AdobeFlashExecutor.java
+++ b/test/com/jpexs/decompiler/flash/gui/AdobeFlashExecutor.java
@@ -263,7 +263,7 @@ public class AdobeFlashExecutor {
 
              cnt++;
              }*/
-            /*try {
+ /*try {
              String res = flash.CallFunction("<invoke name=\"testFunc\" returntype=\"xml\"><arguments><string>something</string></arguments></invoke>");
              //String str = flash.GetVariable("_root.myText.text");
              throw new Error(res + " " + body.getCode().toString() + "");
diff --git a/test/com/jpexs/decompiler/flash/gui/FlashPlayerTest.java b/test/com/jpexs/decompiler/flash/gui/FlashPlayerTest.java
index 6f9844502..9fdebc123 100644
--- a/test/com/jpexs/decompiler/flash/gui/FlashPlayerTest.java
+++ b/test/com/jpexs/decompiler/flash/gui/FlashPlayerTest.java
@@ -539,7 +539,7 @@ public class FlashPlayerTest {
              }
              }*/
 
-            /*if (!ffdecResult.equals(flashResult)) {
+ /*if (!ffdecResult.equals(flashResult)) {
              LocalDataArea lda = new LocalDataArea();
              for (Action a : task.actions) {
              if (!a.execute(lda)) {

From 5b9c6837b0e650e44f7365f3b94e0b79978f46ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sun, 14 Aug 2016 19:49:29 +0200
Subject: [PATCH 04/23] Saving files before refreshing line endings

---
 .../main/jflex/jsyntaxpane/lexers/bash.flex   | 728 ++++++-------
 .../jflex/jsyntaxpane/lexers/clojure.flex     | 992 +++++++++---------
 .../jflex/jsyntaxpane/lexers/dosbatch.flex    | 338 +++---
 .../main/jflex/jsyntaxpane/lexers/groovy.flex | 982 ++++++++---------
 .../main/jflex/jsyntaxpane/lexers/java.flex   | 752 ++++++-------
 .../main/jflex/jsyntaxpane/lexers/jflex.flex  | 800 +++++++-------
 .../main/jflex/jsyntaxpane/lexers/lua.flex    | 596 +++++------
 .../jflex/jsyntaxpane/lexers/properties.flex  | 124 +--
 .../main/jflex/jsyntaxpane/lexers/python.flex | 772 +++++++-------
 .../main/jflex/jsyntaxpane/lexers/ruby.flex   | 552 +++++-----
 .../main/jflex/jsyntaxpane/lexers/scala.flex  | 688 ++++++------
 .../main/jflex/jsyntaxpane/lexers/sql.flex    | 766 +++++++-------
 .../main/jflex/jsyntaxpane/lexers/tal.flex    | 332 +++---
 .../main/jflex/jsyntaxpane/lexers/xhtml.flex  | 742 ++++++-------
 .../main/jflex/jsyntaxpane/lexers/xml.flex    | 392 +++----
 .../main/jflex/jsyntaxpane/lexers/xpath.flex  | 532 +++++-----
 16 files changed, 5044 insertions(+), 5044 deletions(-)

diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/bash.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/bash.flex
index 98e8d1791..d76031627 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/bash.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/bash.flex
@@ -1,365 +1,365 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jsyntaxpane.lexers;
-
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
-
-%%
-
-%public
-%class BashLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-
-%{
-    /**
-     * Create an empty lexer, yyrset will be called later to reset and assign
-     * the reader
-     */
-    public BashLexer() {
-        super();
-    }
-
-    private static final byte PARAN     = 1;
-    private static final byte BRACKET   = 2;
-    private static final byte CURLY     = 3;
-    private static final byte DO        = 4;
-    private static final byte CASE      = 5;
-    private static final byte IF        = 5;
-    private static final byte INT_EXPR  = 6;
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-
-%}
-
-LineTerminator = \r|\n|\r\n
-InputCharacter = [^\r\n]
-
-Identifier = [a-zA-Z][a-zA-Z0-9_]*
-
-Comment = "#"  {InputCharacter}* {LineTerminator}?
-Shebang = "#!" {InputCharacter}* {LineTerminator}?
-
-StringCharacter = [^\r\n\"\\]
-SingleCharacter = [^\r\n\'\\]
-BackQuoteChars  = [^\r\n\`\\]
-
-
-%%
-
-<YYINITIAL> 
-{
-  /* Bash keywords */
-  "if"                          { return token(TokenType.KEYWORD,  IF); }
-  "fi"                          { return token(TokenType.KEYWORD, -IF); }
-  "do"                          { return token(TokenType.KEYWORD,  DO); }
-  "done"                        { return token(TokenType.KEYWORD, -DO); }
-  "case"                        { return token(TokenType.KEYWORD,  CASE); }
-  "esac"                        { return token(TokenType.KEYWORD, -CASE); }
-  "$(("                         { return token(TokenType.KEYWORD,  INT_EXPR); }
-  "))"                          { return token(TokenType.KEYWORD, -INT_EXPR); }
-
-  "("                           { return token(TokenType.OPERATOR,  PARAN); }
-  ")"                           { return token(TokenType.OPERATOR, -PARAN); }
-  "{"                           { return token(TokenType.OPERATOR,  CURLY); }
-  "}"                           { return token(TokenType.OPERATOR, -CURLY); }
-  "["                           { return token(TokenType.OPERATOR,  BRACKET); }
-  "]"                           { return token(TokenType.OPERATOR, -BRACKET); }
-
-  "-eq"                         |
-  "-ne"                         |
-  "-lt"                         |
-  "-gt"                         |
-  "-ge"                         |
-  "-le"                         |
-  ">="                          |
-  "<="                          |
-  "=="                          |
-  "!="                          |
-  "-z"                          |
-  "-n"                          |
-  "=~"                          |
-
-  "$"                           |
-  "#"                           |
-  "&"                           |
-  "."                           |
-  ";"                           |
-  "+"                           |
-  "-"                           |
-  "="                           |
-  "/"                           |
-  "++"                          |
-  "@"                           { return token(TokenType.OPERATOR); }
-
-  "then"                        |
-  "else"                        |
-  "elif"                        |
-  "for"                         |
-  "in"                          |
-  "until"                       |
-  "while"                       |
-  "break"                       |
-  "local"                       |
-  "continue"                    { return token(TokenType.KEYWORD); }
-
-  /* string literal */
-  \"{StringCharacter}+\"        |
-
-  \'{SingleCharacter}+\         { return token(TokenType.STRING); }
-
-  \`{BackQuoteChars}+\`         { return token(TokenType.STRING2); }
-
-
-  /* Other commands */
-  "alias"                    |
-  "apropos"                  |
-  "apt"                      |
-  "aspell"                   |
-  "awk"                      |
-  "bash"                     |
-  "basename"                 |
-  "bc"                       |
-  "bg"                       |
-  "builtin"                  |
-  "bzip2"                    |
-  "cal"                      |
-  "cat"                      |
-  "cd"                       |
-  "cfdisk"                   |
-  "chgrp"                    |
-  "chmod"                    |
-  "chown"                    |
-  "chroot"                   |
-  "chkconfig"                |
-  "cksum"                    |
-  "clear"                    |
-  "cmp"                      |
-  "comm"                     |
-  "command"                  |
-  "continue"                 |
-  "cp"                       |
-  "cron"                     |
-  "crontab"                  |
-  "csplit"                   |
-  "cut"                      |
-  "date"                     |
-  "dc"                       |
-  "dd"                       |
-  "ddrescue"                 |
-  "declare"                  |
-  "df"                       |
-  "diff"                     |
-  "diff3"                    |
-  "dig"                      |
-  "dir"                      |
-  "dircolors"                |
-  "dirname"                  |
-  "dirs"                     |
-  "dmesg"                    |
-  "du"                       |
-  "echo"                     |
-  "egrep"                    |
-  "eject"                    |
-  "enable"                   |
-  "env"                      |
-  "ethtool"                  |
-  "eval"                     |
-  "exec"                     |
-  "exit"                     |
-  "expect"                   |
-  "expand"                   |
-  "export"                   |
-  "expr"                     |
-  "false"                    |
-  "fdformat"                 |
-  "fdisk"                    |
-  "fg"                       |
-  "fgrep"                    |
-  "file"                     |
-  "find"                     |
-  "fmt"                      |
-  "fold"                     |
-  "format"                   |
-  "free"                     |
-  "fsck"                     |
-  "ftp"                      |
-  "function"                 |
-  "gawk"                     |
-  "getopts"                  |
-  "grep"                     |
-  "groups"                   |
-  "gzip"                     |
-  "hash"                     |
-  "head"                     |
-  "history"                  |
-  "hostname"                 |
-  "id"                       |
-  "ifconfig"                 |
-  "ifdown"                   |
-  "ifup"                     |
-  "import"                   |
-  "install"                  |
-  "join"                     |
-  "kill"                     |
-  "killall"                  |
-  "less"                     |
-  "let"                      |
-  "ln"                       |
-  "locate"                   |
-  "logname"                  |
-  "logout"                   |
-  "look"                     |
-  "lpc"                      |
-  "lpr"                      |
-  "lprint"                   |
-  "lprintd"                  |
-  "lprintq"                  |
-  "lprm"                     |
-  "ls"                       |
-  "lsof"                     |
-  "man"                      |
-  "mkdir"                    |
-  "mkfifo"                   |
-  "mkisofs"                  |
-  "mknod"                    |
-  "more"                     |
-  "mount"                    |
-  "mtools"                   |
-  "mv"                       |
-  "mmv"                      |
-  "netstat"                  |
-  "nice"                     |
-  "nl"                       |
-  "nohup"                    |
-  "nslookup"                 |
-  "open"                     |
-  "op"                       |
-  "passwd"                   |
-  "paste"                    |
-  "pathchk"                  |
-  "ping"                     |
-  "popd"                     |
-  "pr"                       |
-  "printcap"                 |
-  "printenv"                 |
-  "printf"                   |
-  "ps"                       |
-  "pushd"                    |
-  "pwd"                      |
-  "quota"                    |
-  "quotacheck"               |
-  "quotactl"                 |
-  "ram"                      |
-  "rcp"                      |
-  "read"                     |
-  "readonly"                 |
-  "reboot"                   |
-  "renice"                   |
-  "remsync"                  |
-  "return"                   |
-  "rev"                      |
-  "rm"                       |
-  "rmdir"                    |
-  "rsync"                    |
-  "screen"                   |
-  "scp"                      |
-  "sdiff"                    |
-  "sed"                      |
-  "select"                   |
-  "seq"                      |
-  "set"                      |
-  "sftp"                     |
-  "shift"                    |
-  "shopt"                    |
-  "shutdown"                 |
-  "sleep"                    |
-  "slocate"                  |
-  "sort"                     |
-  "source"                   |
-  "split"                    |
-  "ssh"                      |
-  "strace"                   |
-  "su"                       |
-  "sudo"                     |
-  "sum"                      |
-  "symlink"                  |
-  "sync"                     |
-  "tail"                     |
-  "tar"                      |
-  "tee"                      |
-  "test"                     |
-  "time"                     |
-  "times"                    |
-  "touch"                    |
-  "top"                      |
-  "traceroute"               |
-  "trap"                     |
-  "tr"                       |
-  "true"                     |
-  "tsort"                    |
-  "tty"                      |
-  "type"                     |
-  "ulimit"                   |
-  "umask"                    |
-  "umount"                   |
-  "unalias"                  |
-  "uname"                    |
-  "unexpand"                 |
-  "uniq"                     |
-  "units"                    |
-  "unset"                    |
-  "unshar"                   |
-  "useradd"                  |
-  "usermod"                  |
-  "users"                    |
-  "uuencode"                 |
-  "uudecode"                 |
-  "v"                        |
-  "vdir"                     |
-  "vi"                       |
-  "vmstat"                   |
-  "watch"                    |
-  "wc"                       |
-  "whereis"                  |
-  "which"                    |
-  "who"                      |
-  "whoami"                   |
-  "Wget"                     |
-  "write"                    |
-  "xargs"                    |
-  "yes"                      { return token(TokenType.KEYWORD); }
-
-  {Identifier}               { return token(TokenType.IDENTIFIER); }
-
-  /* labels */
-  ":" [a-zA-Z][a-zA-Z0-9_]*  { return token(TokenType.TYPE); }
-
-  /* comments */
-  {Shebang}                   { return token(TokenType.COMMENT2); }
-  {Comment}                   { return token(TokenType.COMMENT); }
-  . | {LineTerminator}        { /* skip */ }
-
-}
-
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jsyntaxpane.lexers;
+
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+
+%%
+
+%public
+%class BashLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+
+%{
+    /**
+     * Create an empty lexer, yyrset will be called later to reset and assign
+     * the reader
+     */
+    public BashLexer() {
+        super();
+    }
+
+    private static final byte PARAN     = 1;
+    private static final byte BRACKET   = 2;
+    private static final byte CURLY     = 3;
+    private static final byte DO        = 4;
+    private static final byte CASE      = 5;
+    private static final byte IF        = 5;
+    private static final byte INT_EXPR  = 6;
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+
+%}
+
+LineTerminator = \r|\n|\r\n
+InputCharacter = [^\r\n]
+
+Identifier = [a-zA-Z][a-zA-Z0-9_]*
+
+Comment = "#"  {InputCharacter}* {LineTerminator}?
+Shebang = "#!" {InputCharacter}* {LineTerminator}?
+
+StringCharacter = [^\r\n\"\\]
+SingleCharacter = [^\r\n\'\\]
+BackQuoteChars  = [^\r\n\`\\]
+
+
+%%
+
+<YYINITIAL> 
+{
+  /* Bash keywords */
+  "if"                          { return token(TokenType.KEYWORD,  IF); }
+  "fi"                          { return token(TokenType.KEYWORD, -IF); }
+  "do"                          { return token(TokenType.KEYWORD,  DO); }
+  "done"                        { return token(TokenType.KEYWORD, -DO); }
+  "case"                        { return token(TokenType.KEYWORD,  CASE); }
+  "esac"                        { return token(TokenType.KEYWORD, -CASE); }
+  "$(("                         { return token(TokenType.KEYWORD,  INT_EXPR); }
+  "))"                          { return token(TokenType.KEYWORD, -INT_EXPR); }
+
+  "("                           { return token(TokenType.OPERATOR,  PARAN); }
+  ")"                           { return token(TokenType.OPERATOR, -PARAN); }
+  "{"                           { return token(TokenType.OPERATOR,  CURLY); }
+  "}"                           { return token(TokenType.OPERATOR, -CURLY); }
+  "["                           { return token(TokenType.OPERATOR,  BRACKET); }
+  "]"                           { return token(TokenType.OPERATOR, -BRACKET); }
+
+  "-eq"                         |
+  "-ne"                         |
+  "-lt"                         |
+  "-gt"                         |
+  "-ge"                         |
+  "-le"                         |
+  ">="                          |
+  "<="                          |
+  "=="                          |
+  "!="                          |
+  "-z"                          |
+  "-n"                          |
+  "=~"                          |
+
+  "$"                           |
+  "#"                           |
+  "&"                           |
+  "."                           |
+  ";"                           |
+  "+"                           |
+  "-"                           |
+  "="                           |
+  "/"                           |
+  "++"                          |
+  "@"                           { return token(TokenType.OPERATOR); }
+
+  "then"                        |
+  "else"                        |
+  "elif"                        |
+  "for"                         |
+  "in"                          |
+  "until"                       |
+  "while"                       |
+  "break"                       |
+  "local"                       |
+  "continue"                    { return token(TokenType.KEYWORD); }
+
+  /* string literal */
+  \"{StringCharacter}+\"        |
+
+  \'{SingleCharacter}+\         { return token(TokenType.STRING); }
+
+  \`{BackQuoteChars}+\`         { return token(TokenType.STRING2); }
+
+
+  /* Other commands */
+  "alias"                    |
+  "apropos"                  |
+  "apt"                      |
+  "aspell"                   |
+  "awk"                      |
+  "bash"                     |
+  "basename"                 |
+  "bc"                       |
+  "bg"                       |
+  "builtin"                  |
+  "bzip2"                    |
+  "cal"                      |
+  "cat"                      |
+  "cd"                       |
+  "cfdisk"                   |
+  "chgrp"                    |
+  "chmod"                    |
+  "chown"                    |
+  "chroot"                   |
+  "chkconfig"                |
+  "cksum"                    |
+  "clear"                    |
+  "cmp"                      |
+  "comm"                     |
+  "command"                  |
+  "continue"                 |
+  "cp"                       |
+  "cron"                     |
+  "crontab"                  |
+  "csplit"                   |
+  "cut"                      |
+  "date"                     |
+  "dc"                       |
+  "dd"                       |
+  "ddrescue"                 |
+  "declare"                  |
+  "df"                       |
+  "diff"                     |
+  "diff3"                    |
+  "dig"                      |
+  "dir"                      |
+  "dircolors"                |
+  "dirname"                  |
+  "dirs"                     |
+  "dmesg"                    |
+  "du"                       |
+  "echo"                     |
+  "egrep"                    |
+  "eject"                    |
+  "enable"                   |
+  "env"                      |
+  "ethtool"                  |
+  "eval"                     |
+  "exec"                     |
+  "exit"                     |
+  "expect"                   |
+  "expand"                   |
+  "export"                   |
+  "expr"                     |
+  "false"                    |
+  "fdformat"                 |
+  "fdisk"                    |
+  "fg"                       |
+  "fgrep"                    |
+  "file"                     |
+  "find"                     |
+  "fmt"                      |
+  "fold"                     |
+  "format"                   |
+  "free"                     |
+  "fsck"                     |
+  "ftp"                      |
+  "function"                 |
+  "gawk"                     |
+  "getopts"                  |
+  "grep"                     |
+  "groups"                   |
+  "gzip"                     |
+  "hash"                     |
+  "head"                     |
+  "history"                  |
+  "hostname"                 |
+  "id"                       |
+  "ifconfig"                 |
+  "ifdown"                   |
+  "ifup"                     |
+  "import"                   |
+  "install"                  |
+  "join"                     |
+  "kill"                     |
+  "killall"                  |
+  "less"                     |
+  "let"                      |
+  "ln"                       |
+  "locate"                   |
+  "logname"                  |
+  "logout"                   |
+  "look"                     |
+  "lpc"                      |
+  "lpr"                      |
+  "lprint"                   |
+  "lprintd"                  |
+  "lprintq"                  |
+  "lprm"                     |
+  "ls"                       |
+  "lsof"                     |
+  "man"                      |
+  "mkdir"                    |
+  "mkfifo"                   |
+  "mkisofs"                  |
+  "mknod"                    |
+  "more"                     |
+  "mount"                    |
+  "mtools"                   |
+  "mv"                       |
+  "mmv"                      |
+  "netstat"                  |
+  "nice"                     |
+  "nl"                       |
+  "nohup"                    |
+  "nslookup"                 |
+  "open"                     |
+  "op"                       |
+  "passwd"                   |
+  "paste"                    |
+  "pathchk"                  |
+  "ping"                     |
+  "popd"                     |
+  "pr"                       |
+  "printcap"                 |
+  "printenv"                 |
+  "printf"                   |
+  "ps"                       |
+  "pushd"                    |
+  "pwd"                      |
+  "quota"                    |
+  "quotacheck"               |
+  "quotactl"                 |
+  "ram"                      |
+  "rcp"                      |
+  "read"                     |
+  "readonly"                 |
+  "reboot"                   |
+  "renice"                   |
+  "remsync"                  |
+  "return"                   |
+  "rev"                      |
+  "rm"                       |
+  "rmdir"                    |
+  "rsync"                    |
+  "screen"                   |
+  "scp"                      |
+  "sdiff"                    |
+  "sed"                      |
+  "select"                   |
+  "seq"                      |
+  "set"                      |
+  "sftp"                     |
+  "shift"                    |
+  "shopt"                    |
+  "shutdown"                 |
+  "sleep"                    |
+  "slocate"                  |
+  "sort"                     |
+  "source"                   |
+  "split"                    |
+  "ssh"                      |
+  "strace"                   |
+  "su"                       |
+  "sudo"                     |
+  "sum"                      |
+  "symlink"                  |
+  "sync"                     |
+  "tail"                     |
+  "tar"                      |
+  "tee"                      |
+  "test"                     |
+  "time"                     |
+  "times"                    |
+  "touch"                    |
+  "top"                      |
+  "traceroute"               |
+  "trap"                     |
+  "tr"                       |
+  "true"                     |
+  "tsort"                    |
+  "tty"                      |
+  "type"                     |
+  "ulimit"                   |
+  "umask"                    |
+  "umount"                   |
+  "unalias"                  |
+  "uname"                    |
+  "unexpand"                 |
+  "uniq"                     |
+  "units"                    |
+  "unset"                    |
+  "unshar"                   |
+  "useradd"                  |
+  "usermod"                  |
+  "users"                    |
+  "uuencode"                 |
+  "uudecode"                 |
+  "v"                        |
+  "vdir"                     |
+  "vi"                       |
+  "vmstat"                   |
+  "watch"                    |
+  "wc"                       |
+  "whereis"                  |
+  "which"                    |
+  "who"                      |
+  "whoami"                   |
+  "Wget"                     |
+  "write"                    |
+  "xargs"                    |
+  "yes"                      { return token(TokenType.KEYWORD); }
+
+  {Identifier}               { return token(TokenType.IDENTIFIER); }
+
+  /* labels */
+  ":" [a-zA-Z][a-zA-Z0-9_]*  { return token(TokenType.TYPE); }
+
+  /* comments */
+  {Shebang}                   { return token(TokenType.COMMENT2); }
+  {Comment}                   { return token(TokenType.COMMENT); }
+  . | {LineTerminator}        { /* skip */ }
+
+}
+
 <<EOF>>                          { return null; }
\ No newline at end of file
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/clojure.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/clojure.flex
index 7b0216676..f3117c901 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/clojure.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/clojure.flex
@@ -1,496 +1,496 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jsyntaxpane.lexers;
-
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
- 
-%% 
-
-%public
-%class ClojureLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-
-
-%{
-    /**
-     * Create an empty lexer, yyrset will be called later to reset and assign
-     * the reader
-     */
-    public ClojureLexer() {
-        super();
-    }
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-
-    private static final byte PARAN     = 1;
-    private static final byte BRACKET   = 2;
-    private static final byte CURLY     = 3;
-
-%}
-
-/* main character classes */
-LineTerminator = \r|\n|\r\n
-InputCharacter = [^\r\n]
-
-WhiteSpace = {LineTerminator} | [ \t\f]+
-
-/* comments */
-Comment = {EndOfLineComment} 
-
-EndOfLineComment = ";" {InputCharacter}* {LineTerminator}?
-
-/* identifiers */
-Identifier = [:jletter:][:jletterdigit:]*
-
-/* integer literals */
-DecIntegerLiteral = 0 | [1-9][0-9]*
-DecLongLiteral    = {DecIntegerLiteral} [lL]
-
-HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
-HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
-HexDigit          = [0-9a-fA-F]
-
-OctIntegerLiteral = 0+ [1-3]? {OctDigit} {1,15}
-OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
-OctDigit          = [0-7]
-    
-/* floating point literals */        
-FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
-DoubleLiteral = ({FLit1}|{FLit2}|{FLit3}) {Exponent}?
-
-FLit1    = [0-9]+ \. [0-9]* 
-FLit2    = \. [0-9]+ 
-FLit3    = [0-9]+ 
-Exponent = [eE] [+-]? [0-9]+
-
-/* string and character literals */
-StringCharacter = [^\r\n\"\\]
-SingleCharacter = [^\r\n\'\\]
-
-%state STRING, CHARLITERAL
-
-%%
-
-<YYINITIAL> {
-
-  /* keywords */
-  "fn"             |
-  "fn*"            |
-  "if"             |
-  "def"            |
-  "let"            |
-  "let*"           |
-  "loop*"          |
-  "new"            |
-  "nil"            |
-  "recur"          |
-  "loop"           |
-  "do"             |
-  "quote"          |
-  "the-var"        |
-  "identical?"     |
-  "throw"          |
-  "set!"           |
-  "monitor-enter"  |
-  "monitor-exit"   |
-  "try"            |
-  "catch"          |
-  "finally"        |
-  "in-ns"          { return token(TokenType.KEYWORD); }
-
-  /* Built-ins */
-  "*agent*"                   |
-  "*command-line-args*"       |
-  "*in*"                      |
-  "*macro-meta*"              |
-  "*ns*"                      |
-  "*out*"                     |
-  "*print-meta*"              |
-  "*print-readably*"          |
-  "*proxy-classes*"           |
-  "*warn-on-reflection*"      |
-  "+"                         |
-  "-"                         |
-  "->"                        |
-  ".."                        |
-  "/"                         |
-  "<"                         |
-  "<="                        |
-  "="                         |
-  "=="                        |
-  ">"                         |
-  ">="                        |
-  "accessor"                  |
-  "agent"                     |
-  "agent-errors"              |
-  "aget"                      |
-  "alength"                   |
-  "all-ns"                    |
-  "alter"                     |
-  "and"                       |
-  "apply"                     |
-  "array-map"                 |
-  "aset"                      |
-  "aset-boolean"              |
-  "aset-byte"                 |
-  "aset-char"                 |
-  "aset-double"               |
-  "aset-float"                |
-  "aset-int"                  |
-  "aset-long"                 |
-  "aset-short"                |
-  "assert"                    |
-  "assoc"                     |
-  "await"                     |
-  "await-for"                 |
-  "bean"                      |
-  "binding"                   |
-  "bit-and"                   |
-  "bit-not"                   |
-  "bit-or"                    |
-  "bit-shift-left"            |
-  "bit-shift-right"           |
-  "bit-xor"                   |
-  "boolean"                   |
-  "butlast"                   |
-  "byte"                      |
-  "cast"                      |
-  "char"                      |
-  "class"                     |
-  "clear-agent-errors"        |
-  "comment"                   |
-  "commute"                   |
-  "comp"                      |
-  "comparator"                |
-  "complement"                |
-  "concat"                    |
-  "cond"                      |
-  "conj"                      |
-  "cons"                      |
-  "constantly"                |
-  "construct-proxy"           |
-  "contains?"                 |
-  "count"                     |
-  "create-ns"                 |
-  "create-struct"             |
-  "cycle"                     |
-  "dec"                       |
-  "defmacro"                  |
-  "defmethod"                 |
-  "defmulti"                  |
-  "defn"                      |
-  "defn-"                     |
-  "defstruct"                 |
-  "deref"                     |
-  "destructure"               |
-  "disj"                      |
-  "dissoc"                    |
-  "distinct"                  |
-  "doall"                     |
-  "doc"                       |
-  "dorun"                     |
-  "doseq"                     |
-  "dosync"                    |
-  "dotimes"                   |
-  "doto"                      |
-  "double"                    |
-  "drop"                      |
-  "drop-while"                |
-  "ensure"                    |
-  "eval"                      |
-  "every?"                    |
-  "false?"                    |
-  "ffirst"                    |
-  "file-seq"                  |
-  "filter"                    |
-  "find"                      |
-  "find-doc"                  |
-  "find-ns"                   |
-  "find-var"                  |
-  "first"                     |
-  "float"                     |
-  "flush"                     |
-  "fnseq"                     |
-  "for"                       |
-  "frest"                     |
-  "gensym"                    |
-  "gen-class"                 |
-  "gen-interface"             |
-  "get"                       |
-  "get-proxy-class"           |
-  "hash-map"                  |
-  "hash-set"                  |
-  "identity"                  |
-  "if-let"                    |
-  "import"                    |
-  "inc"                       |
-  "instance?"                 |
-  "int"                       |
-  "interleave"                |
-  "into"                      |
-  "into-array"                |
-  "iterate"                   |
-  "key"                       |
-  "keys"                      |
-  "keyword"                   |
-  "keyword?"                  |
-  "last"                      |
-  "lazy-cat"                  |
-  "lazy-cons"                 |
-  "line-seq"                  |
-  "list"                      |
-  "list*"                     |
-  "load"                      |
-  "load-file"                 |
-  "locking"                   |
-  "long"                      |
-  "macroexpand"               |
-  "macroexpand-1"             |
-  "make-array"                |
-  "map"                       |
-  "map?"                      |
-  "mapcat"                    |
-  "max"                       |
-  "max-key"                   |
-  "memfn"                     |
-  "merge"                     |
-  "merge-with"                |
-  "meta"                      |
-  "min"                       |
-  "min-key"                   |
-  "name"                      |
-  "namespace"                 |
-  "neg?"                      |
-  "newline"                   |
-  "nil?"                      |
-  "not"                       |
-  "not-any?"                  |
-  "not-every?"                |
-  "not="                      |
-  "ns-imports"                |
-  "ns-interns"                |
-  "ns-map"                    |
-  "ns-name"                   |
-  "ns-publics"                |
-  "ns-refers"                 |
-  "ns-resolve"                |
-  "ns-unmap"                  |
-  "nth"                       |
-  "nthrest"                   |
-  "or"                        |
-  "partial"                   |
-  "peek"                      |
-  "pmap"                      |
-  "pop"                       |
-  "pos?"                      |
-  "pr"                        |
-  "pr-str"                    |
-  "print"                     |
-  "print-doc"                 |
-  "print-str"                 |
-  "println"                   |
-  "println-str"               |
-  "prn"                       |
-  "prn-str"                   |
-  "proxy"                     |
-  "proxy-mappings"            |
-  "quot"                      |
-  "rand"                      |
-  "rand-int"                  |
-  "range"                     |
-  "re-find"                   |
-  "re-groups"                 |
-  "re-matcher"                |
-  "re-matches"                |
-  "re-pattern"                |
-  "re-seq"                    |
-  "read"                      |
-  "read-line"                 |
-  "reduce"                    |
-  "ref"                       |
-  "ref-set"                   |
-  "refer"                     |
-  "rem"                       |
-  "remove-method"             |
-  "remove-ns"                 |
-  "repeat"                    |
-  "replace"                   |
-  "replicate"                 |
-  "require"                   |
-  "resolve"                   |
-  "rest"                      |
-  "resultset-seq"             |
-  "reverse"                   |
-  "rfirst"                    |
-  "rrest"                     |
-  "rseq"                      |
-  "scan"                      |
-  "second"                    |
-  "select-keys"               |
-  "send"                      |
-  "send-off"                  |
-  "seq"                       |
-  "seq?"                      |
-  "set"                       |
-  "short"                     |
-  "slurp"                     |
-  "some"                      |
-  "sort"                      |
-  "sort-by"                   |
-  "sorted-map"                |
-  "sorted-map-by"             |
-  "sorted-set"                |
-  "special-symbol?"           |
-  "split-at"                  |
-  "split-with"                |
-  "str"                       |
-  "string?"                   |
-  "struct"                    |
-  "struct-map"                |
-  "subs"                      |
-  "subvec"                    |
-  "symbol"                    |
-  "symbol?"                   |
-  "sync"                      |
-  "take"                      |
-  "take-nth"                  |
-  "take-while"                |
-  "test"                      |
-  "time"                      |
-  "to-array"                  |
-  "to-array-2d"               |
-  "touch"                     |
-  "tree-seq"                  |
-  "true?"                     |
-  "update-proxy"              |
-  "val"                       |
-  "vals"                      |
-  "var-get"                   |
-  "var-set"                   |
-  "var?"                      |
-  "vector"                    |
-  "vector?"                   |
-  "when"                      |
-  "when-first"                |
-  "when-let"                  |
-  "when-not"                  |
-  "while"                     |
-  "with-local-vars"           |
-  "with-meta"                 |
-  "with-open"                 |
-  "with-out-str"              |
-  "xml-seq"                   |
-  "zero?"                     |
-  "zipmap"                    |
-  "repeatedly"                |
-  "add-classpath"             |
-  "vec"                       |
-  "hash"                      { return token(TokenType.KEYWORD2); }
-
-
-  /* operators */
-
-  "("                            { return token(TokenType.OPERATOR,  PARAN); }
-  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
-  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
-  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
-  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
-  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
-  
-  /* string literal */
-  \"                             {  
-                                    yybegin(STRING); 
-                                    tokenStart = yychar; 
-                                    tokenLength = 1; 
-                                 }
-
-  /* character literal */
-  \'                             {  
-                                    yybegin(CHARLITERAL); 
-                                    tokenStart = yychar; 
-                                    tokenLength = 1; 
-                                 }
-
-  /* numeric literals */
-
-  {DecIntegerLiteral}            |
-  {DecLongLiteral}               |
-  
-  {HexIntegerLiteral}            |
-  {HexLongLiteral}               |
- 
-  {OctIntegerLiteral}            |
-  {OctLongLiteral}               |
-  
-  {FloatLiteral}                 |
-  {DoubleLiteral}                |
-  {DoubleLiteral}[dD]            { return token(TokenType.NUMBER); }
-  
-  /* comments */
-  {Comment}                      { return token(TokenType.COMMENT); }
-
-  /* whitespace */
-  {WhiteSpace}                   { }
-
-  /* identifiers */ 
-  {Identifier}                   { return token(TokenType.IDENTIFIER); }
-}
-
-
-<STRING> {
-  \"                             { 
-                                     yybegin(YYINITIAL); 
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-  
-  {StringCharacter}+             { tokenLength += yylength(); }
-
-  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
-  
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-}
-
-<CHARLITERAL> {
-  \'                             { 
-                                     yybegin(YYINITIAL); 
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-  
-  {SingleCharacter}+             { tokenLength += yylength(); }
-  
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-}
-
-/* error fallback */
-.|\n                             {  }
-<<EOF>>                          { return null; }
-
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jsyntaxpane.lexers;
+
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+ 
+%% 
+
+%public
+%class ClojureLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+
+
+%{
+    /**
+     * Create an empty lexer, yyrset will be called later to reset and assign
+     * the reader
+     */
+    public ClojureLexer() {
+        super();
+    }
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+
+    private static final byte PARAN     = 1;
+    private static final byte BRACKET   = 2;
+    private static final byte CURLY     = 3;
+
+%}
+
+/* main character classes */
+LineTerminator = \r|\n|\r\n
+InputCharacter = [^\r\n]
+
+WhiteSpace = {LineTerminator} | [ \t\f]+
+
+/* comments */
+Comment = {EndOfLineComment} 
+
+EndOfLineComment = ";" {InputCharacter}* {LineTerminator}?
+
+/* identifiers */
+Identifier = [:jletter:][:jletterdigit:]*
+
+/* integer literals */
+DecIntegerLiteral = 0 | [1-9][0-9]*
+DecLongLiteral    = {DecIntegerLiteral} [lL]
+
+HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
+HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
+HexDigit          = [0-9a-fA-F]
+
+OctIntegerLiteral = 0+ [1-3]? {OctDigit} {1,15}
+OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
+OctDigit          = [0-7]
+    
+/* floating point literals */        
+FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
+DoubleLiteral = ({FLit1}|{FLit2}|{FLit3}) {Exponent}?
+
+FLit1    = [0-9]+ \. [0-9]* 
+FLit2    = \. [0-9]+ 
+FLit3    = [0-9]+ 
+Exponent = [eE] [+-]? [0-9]+
+
+/* string and character literals */
+StringCharacter = [^\r\n\"\\]
+SingleCharacter = [^\r\n\'\\]
+
+%state STRING, CHARLITERAL
+
+%%
+
+<YYINITIAL> {
+
+  /* keywords */
+  "fn"             |
+  "fn*"            |
+  "if"             |
+  "def"            |
+  "let"            |
+  "let*"           |
+  "loop*"          |
+  "new"            |
+  "nil"            |
+  "recur"          |
+  "loop"           |
+  "do"             |
+  "quote"          |
+  "the-var"        |
+  "identical?"     |
+  "throw"          |
+  "set!"           |
+  "monitor-enter"  |
+  "monitor-exit"   |
+  "try"            |
+  "catch"          |
+  "finally"        |
+  "in-ns"          { return token(TokenType.KEYWORD); }
+
+  /* Built-ins */
+  "*agent*"                   |
+  "*command-line-args*"       |
+  "*in*"                      |
+  "*macro-meta*"              |
+  "*ns*"                      |
+  "*out*"                     |
+  "*print-meta*"              |
+  "*print-readably*"          |
+  "*proxy-classes*"           |
+  "*warn-on-reflection*"      |
+  "+"                         |
+  "-"                         |
+  "->"                        |
+  ".."                        |
+  "/"                         |
+  "<"                         |
+  "<="                        |
+  "="                         |
+  "=="                        |
+  ">"                         |
+  ">="                        |
+  "accessor"                  |
+  "agent"                     |
+  "agent-errors"              |
+  "aget"                      |
+  "alength"                   |
+  "all-ns"                    |
+  "alter"                     |
+  "and"                       |
+  "apply"                     |
+  "array-map"                 |
+  "aset"                      |
+  "aset-boolean"              |
+  "aset-byte"                 |
+  "aset-char"                 |
+  "aset-double"               |
+  "aset-float"                |
+  "aset-int"                  |
+  "aset-long"                 |
+  "aset-short"                |
+  "assert"                    |
+  "assoc"                     |
+  "await"                     |
+  "await-for"                 |
+  "bean"                      |
+  "binding"                   |
+  "bit-and"                   |
+  "bit-not"                   |
+  "bit-or"                    |
+  "bit-shift-left"            |
+  "bit-shift-right"           |
+  "bit-xor"                   |
+  "boolean"                   |
+  "butlast"                   |
+  "byte"                      |
+  "cast"                      |
+  "char"                      |
+  "class"                     |
+  "clear-agent-errors"        |
+  "comment"                   |
+  "commute"                   |
+  "comp"                      |
+  "comparator"                |
+  "complement"                |
+  "concat"                    |
+  "cond"                      |
+  "conj"                      |
+  "cons"                      |
+  "constantly"                |
+  "construct-proxy"           |
+  "contains?"                 |
+  "count"                     |
+  "create-ns"                 |
+  "create-struct"             |
+  "cycle"                     |
+  "dec"                       |
+  "defmacro"                  |
+  "defmethod"                 |
+  "defmulti"                  |
+  "defn"                      |
+  "defn-"                     |
+  "defstruct"                 |
+  "deref"                     |
+  "destructure"               |
+  "disj"                      |
+  "dissoc"                    |
+  "distinct"                  |
+  "doall"                     |
+  "doc"                       |
+  "dorun"                     |
+  "doseq"                     |
+  "dosync"                    |
+  "dotimes"                   |
+  "doto"                      |
+  "double"                    |
+  "drop"                      |
+  "drop-while"                |
+  "ensure"                    |
+  "eval"                      |
+  "every?"                    |
+  "false?"                    |
+  "ffirst"                    |
+  "file-seq"                  |
+  "filter"                    |
+  "find"                      |
+  "find-doc"                  |
+  "find-ns"                   |
+  "find-var"                  |
+  "first"                     |
+  "float"                     |
+  "flush"                     |
+  "fnseq"                     |
+  "for"                       |
+  "frest"                     |
+  "gensym"                    |
+  "gen-class"                 |
+  "gen-interface"             |
+  "get"                       |
+  "get-proxy-class"           |
+  "hash-map"                  |
+  "hash-set"                  |
+  "identity"                  |
+  "if-let"                    |
+  "import"                    |
+  "inc"                       |
+  "instance?"                 |
+  "int"                       |
+  "interleave"                |
+  "into"                      |
+  "into-array"                |
+  "iterate"                   |
+  "key"                       |
+  "keys"                      |
+  "keyword"                   |
+  "keyword?"                  |
+  "last"                      |
+  "lazy-cat"                  |
+  "lazy-cons"                 |
+  "line-seq"                  |
+  "list"                      |
+  "list*"                     |
+  "load"                      |
+  "load-file"                 |
+  "locking"                   |
+  "long"                      |
+  "macroexpand"               |
+  "macroexpand-1"             |
+  "make-array"                |
+  "map"                       |
+  "map?"                      |
+  "mapcat"                    |
+  "max"                       |
+  "max-key"                   |
+  "memfn"                     |
+  "merge"                     |
+  "merge-with"                |
+  "meta"                      |
+  "min"                       |
+  "min-key"                   |
+  "name"                      |
+  "namespace"                 |
+  "neg?"                      |
+  "newline"                   |
+  "nil?"                      |
+  "not"                       |
+  "not-any?"                  |
+  "not-every?"                |
+  "not="                      |
+  "ns-imports"                |
+  "ns-interns"                |
+  "ns-map"                    |
+  "ns-name"                   |
+  "ns-publics"                |
+  "ns-refers"                 |
+  "ns-resolve"                |
+  "ns-unmap"                  |
+  "nth"                       |
+  "nthrest"                   |
+  "or"                        |
+  "partial"                   |
+  "peek"                      |
+  "pmap"                      |
+  "pop"                       |
+  "pos?"                      |
+  "pr"                        |
+  "pr-str"                    |
+  "print"                     |
+  "print-doc"                 |
+  "print-str"                 |
+  "println"                   |
+  "println-str"               |
+  "prn"                       |
+  "prn-str"                   |
+  "proxy"                     |
+  "proxy-mappings"            |
+  "quot"                      |
+  "rand"                      |
+  "rand-int"                  |
+  "range"                     |
+  "re-find"                   |
+  "re-groups"                 |
+  "re-matcher"                |
+  "re-matches"                |
+  "re-pattern"                |
+  "re-seq"                    |
+  "read"                      |
+  "read-line"                 |
+  "reduce"                    |
+  "ref"                       |
+  "ref-set"                   |
+  "refer"                     |
+  "rem"                       |
+  "remove-method"             |
+  "remove-ns"                 |
+  "repeat"                    |
+  "replace"                   |
+  "replicate"                 |
+  "require"                   |
+  "resolve"                   |
+  "rest"                      |
+  "resultset-seq"             |
+  "reverse"                   |
+  "rfirst"                    |
+  "rrest"                     |
+  "rseq"                      |
+  "scan"                      |
+  "second"                    |
+  "select-keys"               |
+  "send"                      |
+  "send-off"                  |
+  "seq"                       |
+  "seq?"                      |
+  "set"                       |
+  "short"                     |
+  "slurp"                     |
+  "some"                      |
+  "sort"                      |
+  "sort-by"                   |
+  "sorted-map"                |
+  "sorted-map-by"             |
+  "sorted-set"                |
+  "special-symbol?"           |
+  "split-at"                  |
+  "split-with"                |
+  "str"                       |
+  "string?"                   |
+  "struct"                    |
+  "struct-map"                |
+  "subs"                      |
+  "subvec"                    |
+  "symbol"                    |
+  "symbol?"                   |
+  "sync"                      |
+  "take"                      |
+  "take-nth"                  |
+  "take-while"                |
+  "test"                      |
+  "time"                      |
+  "to-array"                  |
+  "to-array-2d"               |
+  "touch"                     |
+  "tree-seq"                  |
+  "true?"                     |
+  "update-proxy"              |
+  "val"                       |
+  "vals"                      |
+  "var-get"                   |
+  "var-set"                   |
+  "var?"                      |
+  "vector"                    |
+  "vector?"                   |
+  "when"                      |
+  "when-first"                |
+  "when-let"                  |
+  "when-not"                  |
+  "while"                     |
+  "with-local-vars"           |
+  "with-meta"                 |
+  "with-open"                 |
+  "with-out-str"              |
+  "xml-seq"                   |
+  "zero?"                     |
+  "zipmap"                    |
+  "repeatedly"                |
+  "add-classpath"             |
+  "vec"                       |
+  "hash"                      { return token(TokenType.KEYWORD2); }
+
+
+  /* operators */
+
+  "("                            { return token(TokenType.OPERATOR,  PARAN); }
+  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
+  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
+  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
+  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
+  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
+  
+  /* string literal */
+  \"                             {  
+                                    yybegin(STRING); 
+                                    tokenStart = yychar; 
+                                    tokenLength = 1; 
+                                 }
+
+  /* character literal */
+  \'                             {  
+                                    yybegin(CHARLITERAL); 
+                                    tokenStart = yychar; 
+                                    tokenLength = 1; 
+                                 }
+
+  /* numeric literals */
+
+  {DecIntegerLiteral}            |
+  {DecLongLiteral}               |
+  
+  {HexIntegerLiteral}            |
+  {HexLongLiteral}               |
+ 
+  {OctIntegerLiteral}            |
+  {OctLongLiteral}               |
+  
+  {FloatLiteral}                 |
+  {DoubleLiteral}                |
+  {DoubleLiteral}[dD]            { return token(TokenType.NUMBER); }
+  
+  /* comments */
+  {Comment}                      { return token(TokenType.COMMENT); }
+
+  /* whitespace */
+  {WhiteSpace}                   { }
+
+  /* identifiers */ 
+  {Identifier}                   { return token(TokenType.IDENTIFIER); }
+}
+
+
+<STRING> {
+  \"                             { 
+                                     yybegin(YYINITIAL); 
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+  
+  {StringCharacter}+             { tokenLength += yylength(); }
+
+  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
+  
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+}
+
+<CHARLITERAL> {
+  \'                             { 
+                                     yybegin(YYINITIAL); 
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+  
+  {SingleCharacter}+             { tokenLength += yylength(); }
+  
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+}
+
+/* error fallback */
+.|\n                             {  }
+<<EOF>>                          { return null; }
+
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/dosbatch.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/dosbatch.flex
index f733059ab..1b3893e10 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/dosbatch.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/dosbatch.flex
@@ -1,170 +1,170 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jsyntaxpane.lexers;
-
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
-
-%%
-
-%public
-%class DOSBatchLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-%ignorecase
-%state ECHO_TEXT
-
-%{
-    /**
-     * Create an empty lexer, yyrset will be called later to reset and assign
-     * the reader
-     */
-    public DOSBatchLexer() {
-        super();
-    }
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-%}
-
-StartComment = "rem"
-LineTerminator = \r|\n|\r\n
-InputCharacter = [^\r\n]
-
-Comment = {StartComment} {InputCharacter}* {LineTerminator}?
-
-%%
-
-<YYINITIAL> {
-  /* DOS keywords */
-  "@"                           |
-  "goto"                        |
-  "call"                        |
-  "exit"                        |
-  "if"                          |
-  "else"                        |
-  "for"                         |
-  "copy"                        |
-  "set"                         |
-  "dir"                         |
-  "cd"                          |
-  "set"                         |
-  "errorlevel"                  { return token(TokenType.KEYWORD); }
-
-  "%" [:jletter:] [:jletterdigit:]* "%"           {  return token(TokenType.STRING2); }
-
-  "%" [:digit:]+                {  return token(TokenType.KEYWORD2); }
-
-  "echo"       {
-                 yybegin(ECHO_TEXT);
-                 return token(TokenType.KEYWORD);
-               }
-
-  /* DOS commands */
-  "append"     |
-  "assoc"      |
-  "at"         |
-  "attrib"     |
-  "break"      |
-  "cacls"      |
-  "cd"         |
-  "chcp"       |
-  "chdir"      |
-  "chkdsk"     |
-  "chkntfs"    |
-  "cls"        |
-  "cmd"        |
-  "color"      |
-  "comp"       |
-  "compact"    |
-  "convert"    |
-  "copy"       |
-  "date"       |
-  "del"        |
-  "dir"        |
-  "diskcomp"   |
-  "diskcopy"   |
-  "doskey"     |
-  "exist"      |
-  "endlocal"   |
-  "erase"      |
-  "fc"         |
-  "find"       |
-  "findstr"    |
-  "format"     |
-  "ftype"      |
-  "graftabl"   |
-  "help"       |
-  "keyb"       |
-  "label"      |
-  "md"         |
-  "mkdir"      |
-  "mode"       |
-  "more"       |
-  "move"       |
-  "path"       |
-  "pause"      |
-  "popd"       |
-  "print"      |
-  "prompt"     |
-  "pushd"      |
-  "rd"         |
-  "recover"    |
-  "rem"        |
-  "ren"        |
-  "rename"     |
-  "replace"    |
-  "restore"    |
-  "rmdir"      |
-  "set"        |
-  "setlocal"   |
-  "shift"      |
-  "sort"       |
-  "start"      |
-  "subst"      |
-  "time"       |
-  "title"      |
-  "tree"       |
-  "type"       |
-  "ver"        |
-  "verify"     |
-  "vol"        |
-  "xcopy"      { return token(TokenType.KEYWORD); }
-
-  [:jletterdigit:]+ { return token(TokenType.IDENTIFIER);  }
-
-  /* labels */
-  ":" [a-zA-Z][a-zA-Z0-9_]*     { return token(TokenType.TYPE3); }
-
-  /* comments */
-  {Comment}                      { return token(TokenType.COMMENT); }
-  . | {LineTerminator}           { /* skip */ }
-}
-
-<ECHO_TEXT> {
-  "%" [:jletter:] [:jletterdigit:]* "%"           {  return token(TokenType.STRING2); }
-
-  "%" [:digit:]+                {  return token(TokenType.KEYWORD2); }
-
-  . *                    { return token(TokenType.STRING); }
-  {LineTerminator}       { yybegin(YYINITIAL) ; }
-}
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jsyntaxpane.lexers;
+
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+
+%%
+
+%public
+%class DOSBatchLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+%ignorecase
+%state ECHO_TEXT
+
+%{
+    /**
+     * Create an empty lexer, yyrset will be called later to reset and assign
+     * the reader
+     */
+    public DOSBatchLexer() {
+        super();
+    }
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+%}
+
+StartComment = "rem"
+LineTerminator = \r|\n|\r\n
+InputCharacter = [^\r\n]
+
+Comment = {StartComment} {InputCharacter}* {LineTerminator}?
+
+%%
+
+<YYINITIAL> {
+  /* DOS keywords */
+  "@"                           |
+  "goto"                        |
+  "call"                        |
+  "exit"                        |
+  "if"                          |
+  "else"                        |
+  "for"                         |
+  "copy"                        |
+  "set"                         |
+  "dir"                         |
+  "cd"                          |
+  "set"                         |
+  "errorlevel"                  { return token(TokenType.KEYWORD); }
+
+  "%" [:jletter:] [:jletterdigit:]* "%"           {  return token(TokenType.STRING2); }
+
+  "%" [:digit:]+                {  return token(TokenType.KEYWORD2); }
+
+  "echo"       {
+                 yybegin(ECHO_TEXT);
+                 return token(TokenType.KEYWORD);
+               }
+
+  /* DOS commands */
+  "append"     |
+  "assoc"      |
+  "at"         |
+  "attrib"     |
+  "break"      |
+  "cacls"      |
+  "cd"         |
+  "chcp"       |
+  "chdir"      |
+  "chkdsk"     |
+  "chkntfs"    |
+  "cls"        |
+  "cmd"        |
+  "color"      |
+  "comp"       |
+  "compact"    |
+  "convert"    |
+  "copy"       |
+  "date"       |
+  "del"        |
+  "dir"        |
+  "diskcomp"   |
+  "diskcopy"   |
+  "doskey"     |
+  "exist"      |
+  "endlocal"   |
+  "erase"      |
+  "fc"         |
+  "find"       |
+  "findstr"    |
+  "format"     |
+  "ftype"      |
+  "graftabl"   |
+  "help"       |
+  "keyb"       |
+  "label"      |
+  "md"         |
+  "mkdir"      |
+  "mode"       |
+  "more"       |
+  "move"       |
+  "path"       |
+  "pause"      |
+  "popd"       |
+  "print"      |
+  "prompt"     |
+  "pushd"      |
+  "rd"         |
+  "recover"    |
+  "rem"        |
+  "ren"        |
+  "rename"     |
+  "replace"    |
+  "restore"    |
+  "rmdir"      |
+  "set"        |
+  "setlocal"   |
+  "shift"      |
+  "sort"       |
+  "start"      |
+  "subst"      |
+  "time"       |
+  "title"      |
+  "tree"       |
+  "type"       |
+  "ver"        |
+  "verify"     |
+  "vol"        |
+  "xcopy"      { return token(TokenType.KEYWORD); }
+
+  [:jletterdigit:]+ { return token(TokenType.IDENTIFIER);  }
+
+  /* labels */
+  ":" [a-zA-Z][a-zA-Z0-9_]*     { return token(TokenType.TYPE3); }
+
+  /* comments */
+  {Comment}                      { return token(TokenType.COMMENT); }
+  . | {LineTerminator}           { /* skip */ }
+}
+
+<ECHO_TEXT> {
+  "%" [:jletter:] [:jletterdigit:]* "%"           {  return token(TokenType.STRING2); }
+
+  "%" [:digit:]+                {  return token(TokenType.KEYWORD2); }
+
+  . *                    { return token(TokenType.STRING); }
+  {LineTerminator}       { yybegin(YYINITIAL) ; }
+}
 <<EOF>>                          { return null; }
\ No newline at end of file
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/groovy.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/groovy.flex
index 3560a120d..ccb52a08a 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/groovy.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/groovy.flex
@@ -1,491 +1,491 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jsyntaxpane.lexers;
-
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
-
-%%
-
-%public
-%class GroovyLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-
-
-%{
-    /**
-     * Default constructor is needed as we will always call the yyreset
-     */
-    public GroovyLexer() {
-        super();
-    }
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-
-    private static final byte PARAN     = 1;
-    private static final byte BRACKET   = 2;
-    private static final byte CURLY     = 3;
-%}
-
-/* main character classes */
-LineTerminator = \r|\n|\r\n
-InputCharacter = [^\r\n]
-
-WhiteSpace = {LineTerminator} | [ \t\f]
-
-/* comments */
-Comment = {TraditionalComment} | {EndOfLineComment} 
-
-TraditionalComment = "/*" [^*] ~"*/" | "/*" "*"+ "/"
-EndOfLineComment = "//" {InputCharacter}* {LineTerminator}?
-
-/* identifiers */
-Identifier = [:jletter:][:jletterdigit:]*
-
-/* Groovy and generally Java types have first UpperCase Letter */
-// Type = [:uppercase:][:jletterdigit:]*
-
-/* integer literals */
-DecIntegerLiteral = 0 | [1-9][0-9]*
-DecLongLiteral    = {DecIntegerLiteral} [lL]
-
-HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
-HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
-HexDigit          = [0-9a-fA-F]
-
-OctIntegerLiteral = 0+ [1-3]? {OctDigit} {1,15}
-OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
-OctDigit          = [0-7]
-    
-/* floating point literals */        
-FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
-DoubleLiteral = ({FLit1}|{FLit2}|{FLit3}) {Exponent}?
-
-FLit1    = [0-9]+ \. [0-9]* 
-FLit2    = \. [0-9]+ 
-FLit3    = [0-9]+ 
-Exponent = [eE] [+-]? [0-9]+
-
-/* string and character literals */
-StringCharacter = [^\r\n\"\\\$]
-SingleCharacter = [^\r\n\'\\]
-RegexCharacter  = [^\r\n\/]
-
-%state STRING, CHARLITERAL, REGEX, GSTRING_EXPR, CHARLITERAL, JDOC, JDOC_TAG
-%state ML_STRING, ML_STRING_EXPR
-
-%%
-
-<YYINITIAL> {
-
-  /* keywords */
-  "abstract"                     |
-  "boolean"                      |
-  "break"                        |
-  "byte"                         |
-  "case"                         |
-  "catch"                        |
-  "char"                         |
-  "class"                        |
-  "const"                        |
-  "continue"                     |
-  "do"                           |
-  "double"                       |
-  "enum"                         |
-  "else"                         |
-  "extends"                      |
-  "final"                        |
-  "finally"                      |
-  "float"                        |
-  "for"                          |
-  "default"                      |
-  "implements"                   |
-  "import"                       |
-  "instanceof"                   |
-  "int"                          |
-  "interface"                    |
-  "long"                         |
-  "native"                       |
-  "new"                          |
-  "goto"                         |
-  "if"                           |
-  "public"                       |
-  "short"                        |
-  "super"                        |
-  "switch"                       |
-  "synchronized"                 |
-  "package"                      |
-  "private"                      |
-  "protected"                    |
-  "transient"                    |
-  "return"                       |
-  "void"                         |
-  "static"                       |
-  "while"                        |
-  "this"                         |
-  "throw"                        |
-  "throws"                       |
-  "try"                          |
-  "volatile"                     |
-  "strictfp"                     |
-
-  /* Groovy reserved words not in Java */
-  "as"                           |
-  "asssert"                      | 
-  "def"                          |
-  "in"                           |
-  "threadsafe"                   |
-
-  /* Booleans and null */
-  "true"                         |
-  "false"                        |
-  "null"                         { return token(TokenType.KEYWORD); }
-
-
-  /* Builtin Types and Object Wrappers */
-  "Boolean"                      |
-  "Byte"                         |
-  "Character"                    |
-  "Double"                       |
-  "Float"                        |
-  "Integer"                      |
-  "Object"                       |
-  "Short"                        |
-  "String"                       |
-  "Void"                         |
-  "Class"                        |
-  "Number"                       |
-  "Package"                      |
-  "StringBuffer"                 |
-  "StringBuilder"                |
-  "CharSequence"                 |
-  "Thread"                       |
-  "Regex"                        { return token(TokenType.TYPE); }
-  
-  /* Some Java standard Library Types */
-  "Throwable"                    |
-  "Cloneable"                    |
-  "Comparable"                   |
-  "Serializable"                 |
-  "Runnable"                     { return token(TokenType.TYPE); }
-
-  /* Groovy commonly used methods */
-  "print"                        |
-  "println"                      { return token(TokenType.KEYWORD); }
-
-  /* Frequently used Standard Exceptions */
-  "ArithmeticException"              |
-  "ArrayIndexOutOfBoundsException"   |
-  "ClassCastException"               |
-  "ClassNotFoundException"           |
-  "CloneNotSupportedException"       |
-  "Exception"                        |
-  "IllegalAccessException"           |
-  "IllegalArgumentException"         |
-  "IllegalStateException"            |
-  "IllegalThreadStateException"      |
-  "IndexOutOfBoundsException"        |
-  "InstantiationException"           |
-  "InterruptedException"             |
-  "NegativeArraySizeException"       |
-  "NoSuchFieldException"             |
-  "NoSuchMethodException"            |
-  "NullPointerException"             |
-  "NumberFormatException"            |
-  "RuntimeException"                 |
-  "SecurityException"                |
-  "StringIndexOutOfBoundsException"  |
-  "UnsupportedOperationException"    { return token(TokenType.TYPE2); }
-
-  /* operators */
-  "("                            { return token(TokenType.OPERATOR,  PARAN); }
-  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
-  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
-  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
-  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
-  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
-
-  ";"                            | 
-  ","                            | 
-  "."                            | 
-  "@"                            | 
-  "="                            | 
-  ">"                            | 
-  "<"                            |
-  "!"                            | 
-  "~"                            | 
-  "?"                            | 
-  ":"                            | 
-  "=="                           | 
-  "<="                           | 
-  ">="                           | 
-  "!="                           | 
-  "&&"                           | 
-  "||"                           | 
-  "++"                           | 
-  "--"                           | 
-  "+"                            | 
-  "-"                            | 
-  "*"                            | 
-  "/"                            | 
-  "&"                            | 
-  "|"                            | 
-  "^"                            | 
-  "%"                            | 
-  "<<"                           | 
-  ">>"                           | 
-  ">>>"                          | 
-  "+="                           | 
-  "-="                           | 
-  "*="                           | 
-  "/="                           | 
-  "&="                           | 
-  "|="                           | 
-  "^="                           | 
-  "%="                           | 
-  "<<="                          | 
-  ">>="                          | 
-  ">>>="                         { return token(TokenType.OPERATOR); }
-
-  "~="                           | 
-  "?."                           { return token(TokenType.OPERATOR); } 
-
-  /* string literal */
-  \"{3}                          {
-                                    yybegin(ML_STRING);
-                                    tokenStart = yychar;
-                                    tokenLength = 3;
-                                 }
-
-  /* string literal */
-  \"                             {  
-                                    yybegin(STRING); 
-                                    tokenStart = yychar; 
-                                    tokenLength = 1; 
-                                 }
-
-  /* character literal */
-  \'                             {  
-                                    yybegin(CHARLITERAL); 
-                                    tokenStart = yychar; 
-                                    tokenLength = 1; 
-                                 }
-
-  /* numeric literals */
-
-  {DecIntegerLiteral}            |
-  {DecLongLiteral}               |
-  
-  {HexIntegerLiteral}            |
-  {HexLongLiteral}               |
- 
-  {OctIntegerLiteral}            |
-  {OctLongLiteral}               |
-  
-  {FloatLiteral}                 |
-  {DoubleLiteral}                |
-  {DoubleLiteral}[dD]            { return token(TokenType.NUMBER); }
-  
-  // JavaDoc comments need a state so that we can highlight the @ controls
-  "/**"                          {
-                                    yybegin(JDOC);
-                                    tokenStart = yychar;
-                                    tokenLength = 3;
-                                 }
-
-  /* comments */
-  {Comment}                      { return token(TokenType.COMMENT); }
-
-  /* whitespace */
-  {WhiteSpace}+                  { /* skip */ }
-
-  /* identifiers */ 
-  {Identifier}                   { return token(TokenType.IDENTIFIER); }
-
-  /*
-     Groovy Regex -- state cannot be easily used here due to / by itself being
-     a valid operator.  So if we flip into the REGEX state, we cannot distinguish
-     a regular /
-  */
-  "/" [^*] {RegexCharacter}+ "/"  { return token(TokenType.REGEX); }
-
-}
-
-
-<STRING> {
-
-  \"                             { 
-                                    yybegin(YYINITIAL); 
-                                    // length also includes the trailing quote
-                                    return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-
-  "${"                           { 
-                                    yybegin(GSTRING_EXPR); 
-                                    // length also includes the trailing quote
-                                    int s = tokenStart;
-                                    int l = tokenLength;
-                                    tokenStart = yychar;
-                                    tokenLength = 2;
-                                    return token(TokenType.STRING, s, l);
-                                 }
-  
-  {StringCharacter}+             { tokenLength += yylength(); }
-
-  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
-  
-  /* escape sequences */
-
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-
-}
-
-<GSTRING_EXPR> {
-    "}"                          { 
-                                    yybegin(STRING); 
-                                    // length also includes the trailing quote
-                                    int s = tokenStart;
-                                    int l = tokenLength + 1;
-                                    tokenStart = yychar + 1;
-                                    tokenLength = 0;
-                                    return token(TokenType.STRING2, s, l);
-                                 }
-
-  {StringCharacter}              { tokenLength ++; }
-}
-
-<ML_STRING> {
-
-  \"{3}                          {
-                                    yybegin(YYINITIAL);
-                                    // length also includes the trailing quote
-                                    return token(TokenType.STRING, tokenStart, tokenLength + 3);
-                                 }
-
-  "${"                           {
-                                    yybegin(ML_STRING_EXPR);
-                                    // length also includes the trailing quote
-                                    int s = tokenStart;
-                                    int l = tokenLength;
-                                    tokenStart = yychar;
-                                    tokenLength = 2;
-                                    return token(TokenType.STRING, s, l);
-                                 }
-
-  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
-
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  .|{LineTerminator}             { tokenLength += yylength(); }
-
-}
-
-<ML_STRING_EXPR> {
-    "}"                          {
-                                    yybegin(ML_STRING);
-                                    // length also includes the trailing quote
-                                    int s = tokenStart;
-                                    int l = tokenLength + 1;
-                                    tokenStart = yychar + 1;
-                                    tokenLength = 0;
-                                    return token(TokenType.STRING2, s, l);
-                                 }
-
-  .|\n|\r                        { tokenLength ++; }
-}
-
-<CHARLITERAL> {
-  \'                             { 
-                                     yybegin(YYINITIAL); 
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-  
-  {SingleCharacter}+             { tokenLength += yylength(); }
-  
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-}
-
-<JDOC> {
-  "*/"                           {
-                                     yybegin(YYINITIAL);
-                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
-                                 }
-
-  "@"                            {
-                                     yybegin(JDOC_TAG);
-                                     int start = tokenStart;
-                                     tokenStart = yychar;
-                                     int len = tokenLength;
-                                     tokenLength = 1;
-                                     return token(TokenType.COMMENT, start, len);
-                                 }
-
-  .|\n                           { tokenLength ++; }
-
-}
-
-<JDOC_TAG> {
-  ([:letter:])+ ":"?             { tokenLength += yylength(); }
-
-  "*/"                           {
-                                     yybegin(YYINITIAL);
-                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
-                                 }
-
-  .|\n                           {
-                                     yybegin(JDOC);
-                                     // length also includes the trailing quote
-                                     int start = tokenStart;
-                                     tokenStart = yychar;
-                                     int len = tokenLength;
-                                     tokenLength = 1;
-                                     return token(TokenType.COMMENT2, start, len);
-                                 }
-}
-
-<REGEX> {
-  "/"                            { 
-                                     yybegin(YYINITIAL); 
-                                     // length also includes the trailing quote
-                                     return token(TokenType.REGEX, tokenStart, tokenLength + 1);
-                                 }
-  
-  {RegexCharacter}+             { tokenLength += yylength(); }
-  
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-}
-
-/* error fallback */
-.|\n                             {  }
-<<EOF>>                          { return null; }
-
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jsyntaxpane.lexers;
+
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+
+%%
+
+%public
+%class GroovyLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+
+
+%{
+    /**
+     * Default constructor is needed as we will always call the yyreset
+     */
+    public GroovyLexer() {
+        super();
+    }
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+
+    private static final byte PARAN     = 1;
+    private static final byte BRACKET   = 2;
+    private static final byte CURLY     = 3;
+%}
+
+/* main character classes */
+LineTerminator = \r|\n|\r\n
+InputCharacter = [^\r\n]
+
+WhiteSpace = {LineTerminator} | [ \t\f]
+
+/* comments */
+Comment = {TraditionalComment} | {EndOfLineComment} 
+
+TraditionalComment = "/*" [^*] ~"*/" | "/*" "*"+ "/"
+EndOfLineComment = "//" {InputCharacter}* {LineTerminator}?
+
+/* identifiers */
+Identifier = [:jletter:][:jletterdigit:]*
+
+/* Groovy and generally Java types have first UpperCase Letter */
+// Type = [:uppercase:][:jletterdigit:]*
+
+/* integer literals */
+DecIntegerLiteral = 0 | [1-9][0-9]*
+DecLongLiteral    = {DecIntegerLiteral} [lL]
+
+HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
+HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
+HexDigit          = [0-9a-fA-F]
+
+OctIntegerLiteral = 0+ [1-3]? {OctDigit} {1,15}
+OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
+OctDigit          = [0-7]
+    
+/* floating point literals */        
+FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
+DoubleLiteral = ({FLit1}|{FLit2}|{FLit3}) {Exponent}?
+
+FLit1    = [0-9]+ \. [0-9]* 
+FLit2    = \. [0-9]+ 
+FLit3    = [0-9]+ 
+Exponent = [eE] [+-]? [0-9]+
+
+/* string and character literals */
+StringCharacter = [^\r\n\"\\\$]
+SingleCharacter = [^\r\n\'\\]
+RegexCharacter  = [^\r\n\/]
+
+%state STRING, CHARLITERAL, REGEX, GSTRING_EXPR, CHARLITERAL, JDOC, JDOC_TAG
+%state ML_STRING, ML_STRING_EXPR
+
+%%
+
+<YYINITIAL> {
+
+  /* keywords */
+  "abstract"                     |
+  "boolean"                      |
+  "break"                        |
+  "byte"                         |
+  "case"                         |
+  "catch"                        |
+  "char"                         |
+  "class"                        |
+  "const"                        |
+  "continue"                     |
+  "do"                           |
+  "double"                       |
+  "enum"                         |
+  "else"                         |
+  "extends"                      |
+  "final"                        |
+  "finally"                      |
+  "float"                        |
+  "for"                          |
+  "default"                      |
+  "implements"                   |
+  "import"                       |
+  "instanceof"                   |
+  "int"                          |
+  "interface"                    |
+  "long"                         |
+  "native"                       |
+  "new"                          |
+  "goto"                         |
+  "if"                           |
+  "public"                       |
+  "short"                        |
+  "super"                        |
+  "switch"                       |
+  "synchronized"                 |
+  "package"                      |
+  "private"                      |
+  "protected"                    |
+  "transient"                    |
+  "return"                       |
+  "void"                         |
+  "static"                       |
+  "while"                        |
+  "this"                         |
+  "throw"                        |
+  "throws"                       |
+  "try"                          |
+  "volatile"                     |
+  "strictfp"                     |
+
+  /* Groovy reserved words not in Java */
+  "as"                           |
+  "asssert"                      | 
+  "def"                          |
+  "in"                           |
+  "threadsafe"                   |
+
+  /* Booleans and null */
+  "true"                         |
+  "false"                        |
+  "null"                         { return token(TokenType.KEYWORD); }
+
+
+  /* Builtin Types and Object Wrappers */
+  "Boolean"                      |
+  "Byte"                         |
+  "Character"                    |
+  "Double"                       |
+  "Float"                        |
+  "Integer"                      |
+  "Object"                       |
+  "Short"                        |
+  "String"                       |
+  "Void"                         |
+  "Class"                        |
+  "Number"                       |
+  "Package"                      |
+  "StringBuffer"                 |
+  "StringBuilder"                |
+  "CharSequence"                 |
+  "Thread"                       |
+  "Regex"                        { return token(TokenType.TYPE); }
+  
+  /* Some Java standard Library Types */
+  "Throwable"                    |
+  "Cloneable"                    |
+  "Comparable"                   |
+  "Serializable"                 |
+  "Runnable"                     { return token(TokenType.TYPE); }
+
+  /* Groovy commonly used methods */
+  "print"                        |
+  "println"                      { return token(TokenType.KEYWORD); }
+
+  /* Frequently used Standard Exceptions */
+  "ArithmeticException"              |
+  "ArrayIndexOutOfBoundsException"   |
+  "ClassCastException"               |
+  "ClassNotFoundException"           |
+  "CloneNotSupportedException"       |
+  "Exception"                        |
+  "IllegalAccessException"           |
+  "IllegalArgumentException"         |
+  "IllegalStateException"            |
+  "IllegalThreadStateException"      |
+  "IndexOutOfBoundsException"        |
+  "InstantiationException"           |
+  "InterruptedException"             |
+  "NegativeArraySizeException"       |
+  "NoSuchFieldException"             |
+  "NoSuchMethodException"            |
+  "NullPointerException"             |
+  "NumberFormatException"            |
+  "RuntimeException"                 |
+  "SecurityException"                |
+  "StringIndexOutOfBoundsException"  |
+  "UnsupportedOperationException"    { return token(TokenType.TYPE2); }
+
+  /* operators */
+  "("                            { return token(TokenType.OPERATOR,  PARAN); }
+  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
+  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
+  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
+  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
+  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
+
+  ";"                            | 
+  ","                            | 
+  "."                            | 
+  "@"                            | 
+  "="                            | 
+  ">"                            | 
+  "<"                            |
+  "!"                            | 
+  "~"                            | 
+  "?"                            | 
+  ":"                            | 
+  "=="                           | 
+  "<="                           | 
+  ">="                           | 
+  "!="                           | 
+  "&&"                           | 
+  "||"                           | 
+  "++"                           | 
+  "--"                           | 
+  "+"                            | 
+  "-"                            | 
+  "*"                            | 
+  "/"                            | 
+  "&"                            | 
+  "|"                            | 
+  "^"                            | 
+  "%"                            | 
+  "<<"                           | 
+  ">>"                           | 
+  ">>>"                          | 
+  "+="                           | 
+  "-="                           | 
+  "*="                           | 
+  "/="                           | 
+  "&="                           | 
+  "|="                           | 
+  "^="                           | 
+  "%="                           | 
+  "<<="                          | 
+  ">>="                          | 
+  ">>>="                         { return token(TokenType.OPERATOR); }
+
+  "~="                           | 
+  "?."                           { return token(TokenType.OPERATOR); } 
+
+  /* string literal */
+  \"{3}                          {
+                                    yybegin(ML_STRING);
+                                    tokenStart = yychar;
+                                    tokenLength = 3;
+                                 }
+
+  /* string literal */
+  \"                             {  
+                                    yybegin(STRING); 
+                                    tokenStart = yychar; 
+                                    tokenLength = 1; 
+                                 }
+
+  /* character literal */
+  \'                             {  
+                                    yybegin(CHARLITERAL); 
+                                    tokenStart = yychar; 
+                                    tokenLength = 1; 
+                                 }
+
+  /* numeric literals */
+
+  {DecIntegerLiteral}            |
+  {DecLongLiteral}               |
+  
+  {HexIntegerLiteral}            |
+  {HexLongLiteral}               |
+ 
+  {OctIntegerLiteral}            |
+  {OctLongLiteral}               |
+  
+  {FloatLiteral}                 |
+  {DoubleLiteral}                |
+  {DoubleLiteral}[dD]            { return token(TokenType.NUMBER); }
+  
+  // JavaDoc comments need a state so that we can highlight the @ controls
+  "/**"                          {
+                                    yybegin(JDOC);
+                                    tokenStart = yychar;
+                                    tokenLength = 3;
+                                 }
+
+  /* comments */
+  {Comment}                      { return token(TokenType.COMMENT); }
+
+  /* whitespace */
+  {WhiteSpace}+                  { /* skip */ }
+
+  /* identifiers */ 
+  {Identifier}                   { return token(TokenType.IDENTIFIER); }
+
+  /*
+     Groovy Regex -- state cannot be easily used here due to / by itself being
+     a valid operator.  So if we flip into the REGEX state, we cannot distinguish
+     a regular /
+  */
+  "/" [^*] {RegexCharacter}+ "/"  { return token(TokenType.REGEX); }
+
+}
+
+
+<STRING> {
+
+  \"                             { 
+                                    yybegin(YYINITIAL); 
+                                    // length also includes the trailing quote
+                                    return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+
+  "${"                           { 
+                                    yybegin(GSTRING_EXPR); 
+                                    // length also includes the trailing quote
+                                    int s = tokenStart;
+                                    int l = tokenLength;
+                                    tokenStart = yychar;
+                                    tokenLength = 2;
+                                    return token(TokenType.STRING, s, l);
+                                 }
+  
+  {StringCharacter}+             { tokenLength += yylength(); }
+
+  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
+  
+  /* escape sequences */
+
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+
+}
+
+<GSTRING_EXPR> {
+    "}"                          { 
+                                    yybegin(STRING); 
+                                    // length also includes the trailing quote
+                                    int s = tokenStart;
+                                    int l = tokenLength + 1;
+                                    tokenStart = yychar + 1;
+                                    tokenLength = 0;
+                                    return token(TokenType.STRING2, s, l);
+                                 }
+
+  {StringCharacter}              { tokenLength ++; }
+}
+
+<ML_STRING> {
+
+  \"{3}                          {
+                                    yybegin(YYINITIAL);
+                                    // length also includes the trailing quote
+                                    return token(TokenType.STRING, tokenStart, tokenLength + 3);
+                                 }
+
+  "${"                           {
+                                    yybegin(ML_STRING_EXPR);
+                                    // length also includes the trailing quote
+                                    int s = tokenStart;
+                                    int l = tokenLength;
+                                    tokenStart = yychar;
+                                    tokenLength = 2;
+                                    return token(TokenType.STRING, s, l);
+                                 }
+
+  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
+
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  .|{LineTerminator}             { tokenLength += yylength(); }
+
+}
+
+<ML_STRING_EXPR> {
+    "}"                          {
+                                    yybegin(ML_STRING);
+                                    // length also includes the trailing quote
+                                    int s = tokenStart;
+                                    int l = tokenLength + 1;
+                                    tokenStart = yychar + 1;
+                                    tokenLength = 0;
+                                    return token(TokenType.STRING2, s, l);
+                                 }
+
+  .|\n|\r                        { tokenLength ++; }
+}
+
+<CHARLITERAL> {
+  \'                             { 
+                                     yybegin(YYINITIAL); 
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+  
+  {SingleCharacter}+             { tokenLength += yylength(); }
+  
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+}
+
+<JDOC> {
+  "*/"                           {
+                                     yybegin(YYINITIAL);
+                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
+                                 }
+
+  "@"                            {
+                                     yybegin(JDOC_TAG);
+                                     int start = tokenStart;
+                                     tokenStart = yychar;
+                                     int len = tokenLength;
+                                     tokenLength = 1;
+                                     return token(TokenType.COMMENT, start, len);
+                                 }
+
+  .|\n                           { tokenLength ++; }
+
+}
+
+<JDOC_TAG> {
+  ([:letter:])+ ":"?             { tokenLength += yylength(); }
+
+  "*/"                           {
+                                     yybegin(YYINITIAL);
+                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
+                                 }
+
+  .|\n                           {
+                                     yybegin(JDOC);
+                                     // length also includes the trailing quote
+                                     int start = tokenStart;
+                                     tokenStart = yychar;
+                                     int len = tokenLength;
+                                     tokenLength = 1;
+                                     return token(TokenType.COMMENT2, start, len);
+                                 }
+}
+
+<REGEX> {
+  "/"                            { 
+                                     yybegin(YYINITIAL); 
+                                     // length also includes the trailing quote
+                                     return token(TokenType.REGEX, tokenStart, tokenLength + 1);
+                                 }
+  
+  {RegexCharacter}+             { tokenLength += yylength(); }
+  
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+}
+
+/* error fallback */
+.|\n                             {  }
+<<EOF>>                          { return null; }
+
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/java.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/java.flex
index e67524635..6b282dd54 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/java.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/java.flex
@@ -1,376 +1,376 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jsyntaxpane.lexers;
-
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
- 
-%% 
-
-%public
-%class JavaLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-
-
-%{
-    /**
-     * Create an empty lexer, yyrset will be called later to reset and assign
-     * the reader
-     */
-    public JavaLexer() {
-        super();
-    }
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-
-    private static final byte PARAN     = 1;
-    private static final byte BRACKET   = 2;
-    private static final byte CURLY     = 3;
-
-%}
-
-/* main character classes */
-LineTerminator = \r|\n|\r\n
-InputCharacter = [^\r\n]
-
-WhiteSpace = {LineTerminator} | [ \t\f]+
-
-/* comments */
-Comment = {TraditionalComment} | {EndOfLineComment} 
-
-TraditionalComment = "/*" [^*] ~"*/" | "/*" "*"+ "/"
-EndOfLineComment = "//" {InputCharacter}* {LineTerminator}?
-
-/* identifiers */
-Identifier = [:jletter:][:jletterdigit:]*
-
-/* integer literals */
-DecIntegerLiteral = 0 | [1-9][0-9]*
-DecLongLiteral    = {DecIntegerLiteral} [lL]
-
-HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
-HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
-HexDigit          = [0-9a-fA-F]
-
-OctIntegerLiteral = 0+ [1-3]? {OctDigit} {1,15}
-OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
-OctDigit          = [0-7]
-    
-/* floating point literals */        
-FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
-DoubleLiteral = ({FLit1}|{FLit2}|{FLit3}) {Exponent}?
-
-FLit1    = [0-9]+ \. [0-9]* 
-FLit2    = \. [0-9]+ 
-FLit3    = [0-9]+ 
-Exponent = [eE] [+-]? [0-9]+
-
-/* string and character literals */
-StringCharacter = [^\r\n\"\\]
-SingleCharacter = [^\r\n\'\\]
-
-%state STRING, CHARLITERAL, JDOC, JDOC_TAG
-
-%%
-
-<YYINITIAL> {
-
-  /* keywords */
-  "abstract"                     |
-  "boolean"                      |
-  "break"                        |
-  "byte"                         |
-  "case"                         |
-  "catch"                        |
-  "char"                         |
-  "class"                        |
-  "const"                        |
-  "continue"                     |
-  "do"                           |
-  "double"                       |
-  "enum"                         |
-  "else"                         |
-  "extends"                      |
-  "final"                        |
-  "finally"                      |
-  "float"                        |
-  "for"                          |
-  "default"                      |
-  "implements"                   |
-  "import"                       |
-  "instanceof"                   |
-  "int"                          |
-  "interface"                    |
-  "long"                         |
-  "native"                       |
-  "new"                          |
-  "goto"                         |
-  "if"                           |
-  "public"                       |
-  "short"                        |
-  "super"                        |
-  "switch"                       |
-  "synchronized"                 |
-  "package"                      |
-  "private"                      |
-  "protected"                    |
-  "transient"                    |
-  "return"                       |
-  "void"                         |
-  "static"                       |
-  "while"                        |
-  "this"                         |
-  "throw"                        |
-  "throws"                       |
-  "try"                          |
-  "volatile"                     |
-  "strictfp"                     |
-  
-  "true"                         |
-  "false"                        |
-  "null"                         { return token(TokenType.KEYWORD); }
-
-  /* Java Built in types and wrappers */
-  "Boolean"                      |
-  "Byte"                         |
-  "Character"                    |
-  "Double"                       |
-  "Float"                        |
-  "Integer"                      |
-  "Object"                       |
-  "Short"                        |
-  "Void"                         |
-  "Class"                        |
-  "Number"                       |
-  "Package"                      |
-  "StringBuffer"                 |
-  "StringBuilder"                |
-  "CharSequence"                 |
-  "Thread"                       |
-  "String"                       { return token(TokenType.TYPE); }
-
-  /* Some Java standard Library Types */
-  "Throwable"                    |
-  "Cloneable"                    |
-  "Comparable"                   |
-  "Serializable"                 |
-  "Runnable"                     { return token(TokenType.TYPE); }
-
-  "WARNING"                      { return token(TokenType.WARNING); }
-  "ERROR"                        { return token(TokenType.ERROR); }
-
-  /* Frequently used Standard Exceptions */
-  "ArithmeticException"              |
-  "ArrayIndexOutOfBoundsException"   |
-  "ClassCastException"               |
-  "ClassNotFoundException"           |
-  "CloneNotSupportedException"       |
-  "Exception"                        |
-  "IllegalAccessException"           |
-  "IllegalArgumentException"         |
-  "IllegalStateException"            |
-  "IllegalThreadStateException"      |
-  "IndexOutOfBoundsException"        |
-  "InstantiationException"           |
-  "InterruptedException"             |
-  "NegativeArraySizeException"       |
-  "NoSuchFieldException"             |
-  "NoSuchMethodException"            |
-  "NullPointerException"             |
-  "NumberFormatException"            |
-  "RuntimeException"                 |
-  "SecurityException"                |
-  "StringIndexOutOfBoundsException"  |
-  "UnsupportedOperationException"    { return token(TokenType.TYPE2); }
-
-  /* operators */
-
-  "("                            { return token(TokenType.OPERATOR,  PARAN); }
-  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
-  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
-  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
-  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
-  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
-  ";"                            | 
-  ","                            | 
-  "."                            | 
-  "="                            | 
-  ">"                            | 
-  "<"                            |
-  "!"                            | 
-  "~"                            | 
-  "?"                            | 
-  ":"                            | 
-  "=="                           | 
-  "<="                           | 
-  ">="                           | 
-  "!="                           | 
-  "&&"                           | 
-  "||"                           | 
-  "++"                           | 
-  "--"                           | 
-  "+"                            | 
-  "-"                            | 
-  "*"                            | 
-  "/"                            | 
-  "&"                            | 
-  "|"                            | 
-  "^"                            | 
-  "%"                            | 
-  "<<"                           | 
-  ">>"                           | 
-  ">>>"                          | 
-  "+="                           | 
-  "-="                           | 
-  "*="                           | 
-  "/="                           | 
-  "&="                           | 
-  "|="                           | 
-  "^="                           | 
-  "%="                           | 
-  "<<="                          | 
-  ">>="                          | 
-  ">>>="                         { return token(TokenType.OPERATOR); } 
-  
-  /* string literal */
-  \"                             {  
-                                    yybegin(STRING); 
-                                    tokenStart = yychar; 
-                                    tokenLength = 1; 
-                                 }
-
-  /* character literal */
-  \'                             {  
-                                    yybegin(CHARLITERAL); 
-                                    tokenStart = yychar; 
-                                    tokenLength = 1; 
-                                 }
-
-  /* numeric literals */
-
-  {DecIntegerLiteral}            |
-  {DecLongLiteral}               |
-  
-  {HexIntegerLiteral}            |
-  {HexLongLiteral}               |
- 
-  {OctIntegerLiteral}            |
-  {OctLongLiteral}               |
-  
-  {FloatLiteral}                 |
-  {DoubleLiteral}                |
-  {DoubleLiteral}[dD]            { return token(TokenType.NUMBER); }
-  
-  // JavaDoc comments need a state so that we can highlight the @ controls
-  "/**"                          {  
-                                    yybegin(JDOC); 
-                                    tokenStart = yychar; 
-                                    tokenLength = 3; 
-                                 }
-
-  /* comments */
-  {Comment}                      { return token(TokenType.COMMENT); }
-
-  /* whitespace */
-  {WhiteSpace}                   { }
-
-  /* identifiers */ 
-  {Identifier}                   { return token(TokenType.IDENTIFIER); }
-}
-
-
-<STRING> {
-  \"                             { 
-                                     yybegin(YYINITIAL); 
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-  
-  {StringCharacter}+             { tokenLength += yylength(); }
-
-  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
-  
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-}
-
-<CHARLITERAL> {
-  \'                             { 
-                                     yybegin(YYINITIAL); 
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-  
-  {SingleCharacter}+             { tokenLength += yylength(); }
-  
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-}
-
-<JDOC> {
-  "*/"                           { 
-                                     yybegin(YYINITIAL); 
-                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
-                                 }
-
-  "@"                            {   
-                                     yybegin(JDOC_TAG); 
-                                     int start = tokenStart;
-                                     tokenStart = yychar;
-                                     int len = tokenLength;
-                                     tokenLength = 1;
-                                     return token(TokenType.COMMENT, start, len);
-                                 }
-
-  .|\n                           { tokenLength ++; }
-
-}
-
-<JDOC_TAG> {
-  ([:letter:])+ ":"?             { tokenLength += yylength(); }
-
-  "*/"                           { 
-                                     yybegin(YYINITIAL); 
-                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
-                                 }
-
-  .|\n                           {   
-                                     yybegin(JDOC); 
-                                     // length also includes the trailing quote
-                                     int start = tokenStart;
-                                     tokenStart = yychar;
-                                     int len = tokenLength;
-                                     tokenLength = 1;
-                                     return token(TokenType.COMMENT2, start, len);
-                                 }
-}
-
-
-/* error fallback */
-.|\n                             {  }
-<<EOF>>                          { return null; }
-
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jsyntaxpane.lexers;
+
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+ 
+%% 
+
+%public
+%class JavaLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+
+
+%{
+    /**
+     * Create an empty lexer, yyrset will be called later to reset and assign
+     * the reader
+     */
+    public JavaLexer() {
+        super();
+    }
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+
+    private static final byte PARAN     = 1;
+    private static final byte BRACKET   = 2;
+    private static final byte CURLY     = 3;
+
+%}
+
+/* main character classes */
+LineTerminator = \r|\n|\r\n
+InputCharacter = [^\r\n]
+
+WhiteSpace = {LineTerminator} | [ \t\f]+
+
+/* comments */
+Comment = {TraditionalComment} | {EndOfLineComment} 
+
+TraditionalComment = "/*" [^*] ~"*/" | "/*" "*"+ "/"
+EndOfLineComment = "//" {InputCharacter}* {LineTerminator}?
+
+/* identifiers */
+Identifier = [:jletter:][:jletterdigit:]*
+
+/* integer literals */
+DecIntegerLiteral = 0 | [1-9][0-9]*
+DecLongLiteral    = {DecIntegerLiteral} [lL]
+
+HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
+HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
+HexDigit          = [0-9a-fA-F]
+
+OctIntegerLiteral = 0+ [1-3]? {OctDigit} {1,15}
+OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
+OctDigit          = [0-7]
+    
+/* floating point literals */        
+FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
+DoubleLiteral = ({FLit1}|{FLit2}|{FLit3}) {Exponent}?
+
+FLit1    = [0-9]+ \. [0-9]* 
+FLit2    = \. [0-9]+ 
+FLit3    = [0-9]+ 
+Exponent = [eE] [+-]? [0-9]+
+
+/* string and character literals */
+StringCharacter = [^\r\n\"\\]
+SingleCharacter = [^\r\n\'\\]
+
+%state STRING, CHARLITERAL, JDOC, JDOC_TAG
+
+%%
+
+<YYINITIAL> {
+
+  /* keywords */
+  "abstract"                     |
+  "boolean"                      |
+  "break"                        |
+  "byte"                         |
+  "case"                         |
+  "catch"                        |
+  "char"                         |
+  "class"                        |
+  "const"                        |
+  "continue"                     |
+  "do"                           |
+  "double"                       |
+  "enum"                         |
+  "else"                         |
+  "extends"                      |
+  "final"                        |
+  "finally"                      |
+  "float"                        |
+  "for"                          |
+  "default"                      |
+  "implements"                   |
+  "import"                       |
+  "instanceof"                   |
+  "int"                          |
+  "interface"                    |
+  "long"                         |
+  "native"                       |
+  "new"                          |
+  "goto"                         |
+  "if"                           |
+  "public"                       |
+  "short"                        |
+  "super"                        |
+  "switch"                       |
+  "synchronized"                 |
+  "package"                      |
+  "private"                      |
+  "protected"                    |
+  "transient"                    |
+  "return"                       |
+  "void"                         |
+  "static"                       |
+  "while"                        |
+  "this"                         |
+  "throw"                        |
+  "throws"                       |
+  "try"                          |
+  "volatile"                     |
+  "strictfp"                     |
+  
+  "true"                         |
+  "false"                        |
+  "null"                         { return token(TokenType.KEYWORD); }
+
+  /* Java Built in types and wrappers */
+  "Boolean"                      |
+  "Byte"                         |
+  "Character"                    |
+  "Double"                       |
+  "Float"                        |
+  "Integer"                      |
+  "Object"                       |
+  "Short"                        |
+  "Void"                         |
+  "Class"                        |
+  "Number"                       |
+  "Package"                      |
+  "StringBuffer"                 |
+  "StringBuilder"                |
+  "CharSequence"                 |
+  "Thread"                       |
+  "String"                       { return token(TokenType.TYPE); }
+
+  /* Some Java standard Library Types */
+  "Throwable"                    |
+  "Cloneable"                    |
+  "Comparable"                   |
+  "Serializable"                 |
+  "Runnable"                     { return token(TokenType.TYPE); }
+
+  "WARNING"                      { return token(TokenType.WARNING); }
+  "ERROR"                        { return token(TokenType.ERROR); }
+
+  /* Frequently used Standard Exceptions */
+  "ArithmeticException"              |
+  "ArrayIndexOutOfBoundsException"   |
+  "ClassCastException"               |
+  "ClassNotFoundException"           |
+  "CloneNotSupportedException"       |
+  "Exception"                        |
+  "IllegalAccessException"           |
+  "IllegalArgumentException"         |
+  "IllegalStateException"            |
+  "IllegalThreadStateException"      |
+  "IndexOutOfBoundsException"        |
+  "InstantiationException"           |
+  "InterruptedException"             |
+  "NegativeArraySizeException"       |
+  "NoSuchFieldException"             |
+  "NoSuchMethodException"            |
+  "NullPointerException"             |
+  "NumberFormatException"            |
+  "RuntimeException"                 |
+  "SecurityException"                |
+  "StringIndexOutOfBoundsException"  |
+  "UnsupportedOperationException"    { return token(TokenType.TYPE2); }
+
+  /* operators */
+
+  "("                            { return token(TokenType.OPERATOR,  PARAN); }
+  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
+  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
+  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
+  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
+  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
+  ";"                            | 
+  ","                            | 
+  "."                            | 
+  "="                            | 
+  ">"                            | 
+  "<"                            |
+  "!"                            | 
+  "~"                            | 
+  "?"                            | 
+  ":"                            | 
+  "=="                           | 
+  "<="                           | 
+  ">="                           | 
+  "!="                           | 
+  "&&"                           | 
+  "||"                           | 
+  "++"                           | 
+  "--"                           | 
+  "+"                            | 
+  "-"                            | 
+  "*"                            | 
+  "/"                            | 
+  "&"                            | 
+  "|"                            | 
+  "^"                            | 
+  "%"                            | 
+  "<<"                           | 
+  ">>"                           | 
+  ">>>"                          | 
+  "+="                           | 
+  "-="                           | 
+  "*="                           | 
+  "/="                           | 
+  "&="                           | 
+  "|="                           | 
+  "^="                           | 
+  "%="                           | 
+  "<<="                          | 
+  ">>="                          | 
+  ">>>="                         { return token(TokenType.OPERATOR); } 
+  
+  /* string literal */
+  \"                             {  
+                                    yybegin(STRING); 
+                                    tokenStart = yychar; 
+                                    tokenLength = 1; 
+                                 }
+
+  /* character literal */
+  \'                             {  
+                                    yybegin(CHARLITERAL); 
+                                    tokenStart = yychar; 
+                                    tokenLength = 1; 
+                                 }
+
+  /* numeric literals */
+
+  {DecIntegerLiteral}            |
+  {DecLongLiteral}               |
+  
+  {HexIntegerLiteral}            |
+  {HexLongLiteral}               |
+ 
+  {OctIntegerLiteral}            |
+  {OctLongLiteral}               |
+  
+  {FloatLiteral}                 |
+  {DoubleLiteral}                |
+  {DoubleLiteral}[dD]            { return token(TokenType.NUMBER); }
+  
+  // JavaDoc comments need a state so that we can highlight the @ controls
+  "/**"                          {  
+                                    yybegin(JDOC); 
+                                    tokenStart = yychar; 
+                                    tokenLength = 3; 
+                                 }
+
+  /* comments */
+  {Comment}                      { return token(TokenType.COMMENT); }
+
+  /* whitespace */
+  {WhiteSpace}                   { }
+
+  /* identifiers */ 
+  {Identifier}                   { return token(TokenType.IDENTIFIER); }
+}
+
+
+<STRING> {
+  \"                             { 
+                                     yybegin(YYINITIAL); 
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+  
+  {StringCharacter}+             { tokenLength += yylength(); }
+
+  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
+  
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+}
+
+<CHARLITERAL> {
+  \'                             { 
+                                     yybegin(YYINITIAL); 
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+  
+  {SingleCharacter}+             { tokenLength += yylength(); }
+  
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+}
+
+<JDOC> {
+  "*/"                           { 
+                                     yybegin(YYINITIAL); 
+                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
+                                 }
+
+  "@"                            {   
+                                     yybegin(JDOC_TAG); 
+                                     int start = tokenStart;
+                                     tokenStart = yychar;
+                                     int len = tokenLength;
+                                     tokenLength = 1;
+                                     return token(TokenType.COMMENT, start, len);
+                                 }
+
+  .|\n                           { tokenLength ++; }
+
+}
+
+<JDOC_TAG> {
+  ([:letter:])+ ":"?             { tokenLength += yylength(); }
+
+  "*/"                           { 
+                                     yybegin(YYINITIAL); 
+                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
+                                 }
+
+  .|\n                           {   
+                                     yybegin(JDOC); 
+                                     // length also includes the trailing quote
+                                     int start = tokenStart;
+                                     tokenStart = yychar;
+                                     int len = tokenLength;
+                                     tokenLength = 1;
+                                     return token(TokenType.COMMENT2, start, len);
+                                 }
+}
+
+
+/* error fallback */
+.|\n                             {  }
+<<EOF>>                          { return null; }
+
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/jflex.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/jflex.flex
index a0696912a..8e1d88c9e 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/jflex.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/jflex.flex
@@ -1,400 +1,400 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jsyntaxpane.lexers;
-
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
- 
-%% 
-
-%public
-%class JFlexLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-
-
-%{
-    /**
-     * Create an empty lexer, yyrset will be called later to reset and assign
-     * the reader
-     */
-    public JFlexLexer() {
-        super();
-    }
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-%}
-
-/* main character classes */
-LineTerminator = \r|\n|\r\n
-InputCharacter = [^\r\n]
-
-WhiteSpace = {LineTerminator} | [ \t\f]+
-
-/* comments */
-Comment = {TraditionalComment} | {EndOfLineComment} 
-
-TraditionalComment = "/*" [^*] ~"*/" | "/*" "*"+ "/"
-EndOfLineComment = "//" {InputCharacter}* {LineTerminator}?
-
-/* identifiers */
-Identifier = [:jletter:][:jletterdigit:]*
-
-/* integer literals */
-DecIntegerLiteral = 0 | [1-9][0-9]*
-DecLongLiteral    = {DecIntegerLiteral} [lL]
-
-HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
-HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
-HexDigit          = [0-9a-fA-F]
-
-OctIntegerLiteral = 0+ [1-3]? {OctDigit} {1,15}
-OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
-OctDigit          = [0-7]
-    
-/* floating point literals */        
-FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
-DoubleLiteral = ({FLit1}|{FLit2}|{FLit3}) {Exponent}?
-
-FLit1    = [0-9]+ \. [0-9]* 
-FLit2    = \. [0-9]+ 
-FLit3    = [0-9]+ 
-Exponent = [eE] [+-]? [0-9]+
-
-/* string and character literals */
-StringCharacter = [^\r\n\"\\]
-SingleCharacter = [^\r\n\'\\]
-
-%state STRING, CHARLITERAL, JDOC, JDOC_TAG
-
-%%
-
-<YYINITIAL> {
-
-  /* keywords */
-  "abstract"                     |
-  "boolean"                      |
-  "break"                        |
-  "byte"                         |
-  "case"                         |
-  "catch"                        |
-  "char"                         |
-  "class"                        |
-  "const"                        |
-  "continue"                     |
-  "do"                           |
-  "double"                       |
-  "enum"                         |
-  "else"                         |
-  "extends"                      |
-  "final"                        |
-  "finally"                      |
-  "float"                        |
-  "for"                          |
-  "default"                      |
-  "implements"                   |
-  "import"                       |
-  "instanceof"                   |
-  "int"                          |
-  "interface"                    |
-  "long"                         |
-  "native"                       |
-  "new"                          |
-  "goto"                         |
-  "if"                           |
-  "public"                       |
-  "short"                        |
-  "super"                        |
-  "switch"                       |
-  "synchronized"                 |
-  "package"                      |
-  "private"                      |
-  "protected"                    |
-  "transient"                    |
-  "return"                       |
-  "void"                         |
-  "static"                       |
-  "while"                        |
-  "this"                         |
-  "throw"                        |
-  "throws"                       |
-  "try"                          |
-  "volatile"                     |
-  "strictfp"                     |
-  "true"                         |
-  "false"                        |
-  "null"                         { return token(TokenType.KEYWORD); }
-
-  /* JFlex special types */
-  "<<EOF>>"                      |
-  "[:jletter:]"                  |
-  "[:jletterdigit:]"             |
-  "[:letter:]"                   |
-  "[:digit:]"                    |
-  "[:uppercase:]"                |
-  "[:lowercase:]"                |
-  "<" [a-zA-Z][a-zA-Z0-9_]* ">"  { return token(TokenType.TYPE2); }
-
-  /* JFlex Specials */
-  "%%"                           |
-  "%{"                           |
-  "%}"                           |
-  "%class"                       |
-  "%implements"                  |
-  "%extends"                     |
-  "%public"                      |
-  "%final"                       |
-  "%abstract"                    |
-  "%apiprivate"                  |
-  "%init{"                       |
-  "%init}"                       |
-  "%initthrow{"                  |
-  "%initthrow}"                  |
-  "%initthrow"                   |
-  "%ctorarg"                     |
-  "%scanerror"                   |
-  "%buffer"                      |
-  "%include"                     |
-  "%function"                    |
-  "%integer"                     |
-  "%int"                         |
-  "%intwrap"                     |
-  "%yylexthrow{"                 |
-  "%yylexthrow}"                 |
-  "%yylexthrow"                  |
-  "%eofval{"                     |
-  "%eofval}"                     |
-  "%eof{"                        |
-  "%eof}"                        |
-  "%eofthrow{"                   |
-  "%eofthrow}"                   |
-  "%eofthrow"                    |
-  "%eofclose"                    |
-  "%debug"                       |
-  "%standalone"                  |
-  "%cup"                         |
-  "%cupsym"                      |
-  "%cupdebug"                    |
-  "%byacc"                       |
-  "%switch"                      |
-  "%table"                       |
-  "%pack"                        |
-  "%7bit"                        |
-  "%8bit"                        |
-  "%full"                        |
-  "%unicode"                     |
-  "%16bit"                       |
-  "%caseless"                    |
-  "%ignorecase"                  |
-  "%char"                        |
-  "%line"                        |
-  "%column"                      |
-  "%notunix"                     |
-  "%yyeof"                       |
-  "%s"                           |
-  "%state"                       |
-  "%x"                           |
-  "%xstate"                      |
-  "%type"                        { return token(TokenType.KEYWORD2); }
-
-
-  /* Java Built in types and wrappers */
-  "Boolean"                      |
-  "Byte"                         |
-  "Double"                       |
-  "Float"                        |
-  "Integer"                      |
-  "Object"                       |
-  "Short"                        |
-  "String"                       { return token(TokenType.TYPE); }
-  
-  /* operators */
-
-  "("                            |
-  ")"                            |
-  "{"                            | 
-  "}"                            | 
-  "["                            | 
-  "]"                            | 
-  ";"                            | 
-  ","                            | 
-  "."                            | 
-  "="                            | 
-  ">"                            | 
-  "<"                            |
-  "!"                            | 
-  "~"                            | 
-  "?"                            | 
-  ":"                            | 
-  "=="                           | 
-  "<="                           | 
-  ">="                           | 
-  "!="                           | 
-  "&&"                           | 
-  "||"                           | 
-  "++"                           | 
-  "--"                           | 
-  "+"                            | 
-  "-"                            | 
-  "*"                            | 
-  "/"                            | 
-  "&"                            | 
-  "|"                            | 
-  "^"                            | 
-  "%"                            | 
-  "<<"                           | 
-  ">>"                           | 
-  ">>>"                          | 
-  "+="                           | 
-  "-="                           | 
-  "*="                           | 
-  "/="                           | 
-  "&="                           | 
-  "|="                           | 
-  "^="                           | 
-  "%="                           | 
-  "<<="                          | 
-  ">>="                          | 
-  ">>>="                         { return token(TokenType.OPERATOR); } 
-  
-  /* string literal */
-  \"                             {  
-                                    yybegin(STRING); 
-                                    tokenStart = yychar; 
-                                    tokenLength = 1; 
-                                 }
-
-  /* character literal */
-  \'                             {  
-                                    yybegin(CHARLITERAL); 
-                                    tokenStart = yychar; 
-                                    tokenLength = 1; 
-                                 }
-
-  /* numeric literals */
-
-  {DecIntegerLiteral}            |
-  {DecLongLiteral}               |
-  
-  {HexIntegerLiteral}            |
-  {HexLongLiteral}               |
- 
-  {OctIntegerLiteral}            |
-  {OctLongLiteral}               |
-  
-  {FloatLiteral}                 |
-  {DoubleLiteral}                |
-  {DoubleLiteral}[dD]            { return token(TokenType.NUMBER); }
-  
-  // JavaDoc comments need a state so that we can highlight the @ controls
-  "/**"                          {  
-                                    yybegin(JDOC); 
-                                    tokenStart = yychar; 
-                                    tokenLength = 3; 
-                                 }
-
-  /* comments */
-  {Comment}                      { return token(TokenType.COMMENT); }
-
-  /* whitespace */
-  {WhiteSpace}                   { }
-
-  /* identifiers */ 
-  {Identifier}                   { return token(TokenType.IDENTIFIER); }
-}
-
-
-<STRING> {
-  \"                             { 
-                                     yybegin(YYINITIAL); 
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-  
-  {StringCharacter}+             { tokenLength += yylength(); }
-
-  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
-  
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-}
-
-<CHARLITERAL> {
-  \'                             { 
-                                     yybegin(YYINITIAL); 
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-  
-  {SingleCharacter}+             { tokenLength += yylength(); }
-  
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-}
-
-<JDOC> {
-  "*/"                           { 
-                                     yybegin(YYINITIAL); 
-                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
-                                 }
-
-  "@"                            {   
-                                     yybegin(JDOC_TAG); 
-                                     int start = tokenStart;
-                                     tokenStart = yychar;
-                                     int len = tokenLength;
-                                     tokenLength = 1;
-                                     return token(TokenType.COMMENT, start, len);
-                                 }
-
-  .|\n                           { tokenLength ++; }
-
-}
-
-<JDOC_TAG> {
-  ([:letter:])+ ":"?             { tokenLength += yylength(); }
-
-  "*/"                           { 
-                                     yybegin(YYINITIAL); 
-                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
-                                 }
-
-  .|\n                           {   
-                                     yybegin(JDOC); 
-                                     // length also includes the trailing quote
-                                     int start = tokenStart;
-                                     tokenStart = yychar;
-                                     int len = tokenLength;
-                                     tokenLength = 1;
-                                     return token(TokenType.COMMENT2, start, len);
-                                 }
-}
-
-
-/* error fallback */
-.|\n                             {  }
-<<EOF>>                          { return null; }
-
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jsyntaxpane.lexers;
+
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+ 
+%% 
+
+%public
+%class JFlexLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+
+
+%{
+    /**
+     * Create an empty lexer, yyrset will be called later to reset and assign
+     * the reader
+     */
+    public JFlexLexer() {
+        super();
+    }
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+%}
+
+/* main character classes */
+LineTerminator = \r|\n|\r\n
+InputCharacter = [^\r\n]
+
+WhiteSpace = {LineTerminator} | [ \t\f]+
+
+/* comments */
+Comment = {TraditionalComment} | {EndOfLineComment} 
+
+TraditionalComment = "/*" [^*] ~"*/" | "/*" "*"+ "/"
+EndOfLineComment = "//" {InputCharacter}* {LineTerminator}?
+
+/* identifiers */
+Identifier = [:jletter:][:jletterdigit:]*
+
+/* integer literals */
+DecIntegerLiteral = 0 | [1-9][0-9]*
+DecLongLiteral    = {DecIntegerLiteral} [lL]
+
+HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
+HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
+HexDigit          = [0-9a-fA-F]
+
+OctIntegerLiteral = 0+ [1-3]? {OctDigit} {1,15}
+OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
+OctDigit          = [0-7]
+    
+/* floating point literals */        
+FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
+DoubleLiteral = ({FLit1}|{FLit2}|{FLit3}) {Exponent}?
+
+FLit1    = [0-9]+ \. [0-9]* 
+FLit2    = \. [0-9]+ 
+FLit3    = [0-9]+ 
+Exponent = [eE] [+-]? [0-9]+
+
+/* string and character literals */
+StringCharacter = [^\r\n\"\\]
+SingleCharacter = [^\r\n\'\\]
+
+%state STRING, CHARLITERAL, JDOC, JDOC_TAG
+
+%%
+
+<YYINITIAL> {
+
+  /* keywords */
+  "abstract"                     |
+  "boolean"                      |
+  "break"                        |
+  "byte"                         |
+  "case"                         |
+  "catch"                        |
+  "char"                         |
+  "class"                        |
+  "const"                        |
+  "continue"                     |
+  "do"                           |
+  "double"                       |
+  "enum"                         |
+  "else"                         |
+  "extends"                      |
+  "final"                        |
+  "finally"                      |
+  "float"                        |
+  "for"                          |
+  "default"                      |
+  "implements"                   |
+  "import"                       |
+  "instanceof"                   |
+  "int"                          |
+  "interface"                    |
+  "long"                         |
+  "native"                       |
+  "new"                          |
+  "goto"                         |
+  "if"                           |
+  "public"                       |
+  "short"                        |
+  "super"                        |
+  "switch"                       |
+  "synchronized"                 |
+  "package"                      |
+  "private"                      |
+  "protected"                    |
+  "transient"                    |
+  "return"                       |
+  "void"                         |
+  "static"                       |
+  "while"                        |
+  "this"                         |
+  "throw"                        |
+  "throws"                       |
+  "try"                          |
+  "volatile"                     |
+  "strictfp"                     |
+  "true"                         |
+  "false"                        |
+  "null"                         { return token(TokenType.KEYWORD); }
+
+  /* JFlex special types */
+  "<<EOF>>"                      |
+  "[:jletter:]"                  |
+  "[:jletterdigit:]"             |
+  "[:letter:]"                   |
+  "[:digit:]"                    |
+  "[:uppercase:]"                |
+  "[:lowercase:]"                |
+  "<" [a-zA-Z][a-zA-Z0-9_]* ">"  { return token(TokenType.TYPE2); }
+
+  /* JFlex Specials */
+  "%%"                           |
+  "%{"                           |
+  "%}"                           |
+  "%class"                       |
+  "%implements"                  |
+  "%extends"                     |
+  "%public"                      |
+  "%final"                       |
+  "%abstract"                    |
+  "%apiprivate"                  |
+  "%init{"                       |
+  "%init}"                       |
+  "%initthrow{"                  |
+  "%initthrow}"                  |
+  "%initthrow"                   |
+  "%ctorarg"                     |
+  "%scanerror"                   |
+  "%buffer"                      |
+  "%include"                     |
+  "%function"                    |
+  "%integer"                     |
+  "%int"                         |
+  "%intwrap"                     |
+  "%yylexthrow{"                 |
+  "%yylexthrow}"                 |
+  "%yylexthrow"                  |
+  "%eofval{"                     |
+  "%eofval}"                     |
+  "%eof{"                        |
+  "%eof}"                        |
+  "%eofthrow{"                   |
+  "%eofthrow}"                   |
+  "%eofthrow"                    |
+  "%eofclose"                    |
+  "%debug"                       |
+  "%standalone"                  |
+  "%cup"                         |
+  "%cupsym"                      |
+  "%cupdebug"                    |
+  "%byacc"                       |
+  "%switch"                      |
+  "%table"                       |
+  "%pack"                        |
+  "%7bit"                        |
+  "%8bit"                        |
+  "%full"                        |
+  "%unicode"                     |
+  "%16bit"                       |
+  "%caseless"                    |
+  "%ignorecase"                  |
+  "%char"                        |
+  "%line"                        |
+  "%column"                      |
+  "%notunix"                     |
+  "%yyeof"                       |
+  "%s"                           |
+  "%state"                       |
+  "%x"                           |
+  "%xstate"                      |
+  "%type"                        { return token(TokenType.KEYWORD2); }
+
+
+  /* Java Built in types and wrappers */
+  "Boolean"                      |
+  "Byte"                         |
+  "Double"                       |
+  "Float"                        |
+  "Integer"                      |
+  "Object"                       |
+  "Short"                        |
+  "String"                       { return token(TokenType.TYPE); }
+  
+  /* operators */
+
+  "("                            |
+  ")"                            |
+  "{"                            | 
+  "}"                            | 
+  "["                            | 
+  "]"                            | 
+  ";"                            | 
+  ","                            | 
+  "."                            | 
+  "="                            | 
+  ">"                            | 
+  "<"                            |
+  "!"                            | 
+  "~"                            | 
+  "?"                            | 
+  ":"                            | 
+  "=="                           | 
+  "<="                           | 
+  ">="                           | 
+  "!="                           | 
+  "&&"                           | 
+  "||"                           | 
+  "++"                           | 
+  "--"                           | 
+  "+"                            | 
+  "-"                            | 
+  "*"                            | 
+  "/"                            | 
+  "&"                            | 
+  "|"                            | 
+  "^"                            | 
+  "%"                            | 
+  "<<"                           | 
+  ">>"                           | 
+  ">>>"                          | 
+  "+="                           | 
+  "-="                           | 
+  "*="                           | 
+  "/="                           | 
+  "&="                           | 
+  "|="                           | 
+  "^="                           | 
+  "%="                           | 
+  "<<="                          | 
+  ">>="                          | 
+  ">>>="                         { return token(TokenType.OPERATOR); } 
+  
+  /* string literal */
+  \"                             {  
+                                    yybegin(STRING); 
+                                    tokenStart = yychar; 
+                                    tokenLength = 1; 
+                                 }
+
+  /* character literal */
+  \'                             {  
+                                    yybegin(CHARLITERAL); 
+                                    tokenStart = yychar; 
+                                    tokenLength = 1; 
+                                 }
+
+  /* numeric literals */
+
+  {DecIntegerLiteral}            |
+  {DecLongLiteral}               |
+  
+  {HexIntegerLiteral}            |
+  {HexLongLiteral}               |
+ 
+  {OctIntegerLiteral}            |
+  {OctLongLiteral}               |
+  
+  {FloatLiteral}                 |
+  {DoubleLiteral}                |
+  {DoubleLiteral}[dD]            { return token(TokenType.NUMBER); }
+  
+  // JavaDoc comments need a state so that we can highlight the @ controls
+  "/**"                          {  
+                                    yybegin(JDOC); 
+                                    tokenStart = yychar; 
+                                    tokenLength = 3; 
+                                 }
+
+  /* comments */
+  {Comment}                      { return token(TokenType.COMMENT); }
+
+  /* whitespace */
+  {WhiteSpace}                   { }
+
+  /* identifiers */ 
+  {Identifier}                   { return token(TokenType.IDENTIFIER); }
+}
+
+
+<STRING> {
+  \"                             { 
+                                     yybegin(YYINITIAL); 
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+  
+  {StringCharacter}+             { tokenLength += yylength(); }
+
+  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
+  
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+}
+
+<CHARLITERAL> {
+  \'                             { 
+                                     yybegin(YYINITIAL); 
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+  
+  {SingleCharacter}+             { tokenLength += yylength(); }
+  
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+}
+
+<JDOC> {
+  "*/"                           { 
+                                     yybegin(YYINITIAL); 
+                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
+                                 }
+
+  "@"                            {   
+                                     yybegin(JDOC_TAG); 
+                                     int start = tokenStart;
+                                     tokenStart = yychar;
+                                     int len = tokenLength;
+                                     tokenLength = 1;
+                                     return token(TokenType.COMMENT, start, len);
+                                 }
+
+  .|\n                           { tokenLength ++; }
+
+}
+
+<JDOC_TAG> {
+  ([:letter:])+ ":"?             { tokenLength += yylength(); }
+
+  "*/"                           { 
+                                     yybegin(YYINITIAL); 
+                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
+                                 }
+
+  .|\n                           {   
+                                     yybegin(JDOC); 
+                                     // length also includes the trailing quote
+                                     int start = tokenStart;
+                                     tokenStart = yychar;
+                                     int len = tokenLength;
+                                     tokenLength = 1;
+                                     return token(TokenType.COMMENT2, start, len);
+                                 }
+}
+
+
+/* error fallback */
+.|\n                             {  }
+<<EOF>>                          { return null; }
+
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/lua.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/lua.flex
index 7ddcdce35..1c9b391b9 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/lua.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/lua.flex
@@ -1,298 +1,298 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jsyntaxpane.lexers;
-
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
-
-%%
-
-%public
-%class LuaLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-
-
-%{
-    /**
-     * Create an empty lexer, yyrset will be called later to reset and assign
-     * the reader
-     */
-    public LuaLexer() {
-        super();
-    }
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-
-    private static final byte PARAN     = 1;
-    private static final byte BRACKET   = 2;
-    private static final byte CURLY     = 3;
-    private static final byte ENDBLOCK  = 4;
-    private static final byte REPEATBLOCK = 5;
-
-	TokenType longType;
-    int longLen;
-%}
-
-/* main character classes */
-LineTerminator = \r|\n|\r\n
-
-WhiteSpace = {LineTerminator} | [ \t\f]+
-
-LongStart = \[=*\[
-LongEnd = \]=*\]
-
-/* identifiers */
-Identifier = [:jletter:][:jletterdigit:]*
-
-/* integer literals */
-DecIntegerLiteral = [0-9]+
-HexDigit          = [0-9a-fA-F]
-
-HexIntegerLiteral = 0x{HexDigit}+
-
-/* floating point literals */        
-DoubleLiteral = ({FLit1}|{FLit2}) {Exponent}?
-
-FLit1    = [0-9]+(\.[0-9]*)?
-FLit2    = \.[0-9]+ 
-Exponent = [eE] [+-]? [0-9]+
-
-/* string and character literals */
-StringCharacter1 = [^\r\n\"\\]
-StringCharacter2 = [^\r\n\'\\]
-
-%state STRING1
-%state STRING2
-%state LONGSTRING
-
-%state COMMENT
-%state LINECOMMENT
-
-%%
-
-<YYINITIAL> {
-
-  /* keywords */
-  "and"                        	 |
-  "break"                        |
-  "for"                       	 |
-  "if"                         	 |
-  "in"                           |
-  "local"                        |
-  "not"                        	 |
-  "or"                         	 |
-  "return"                       |
-  "while"                        |
-  
-  /* boolean literals */
-  "true"                         |
-  "false"                        |
-  
-  /* nil literal */
-  "nil"                          { return token(TokenType.KEYWORD); }
-
-  "repeat"                       { return token(TokenType.KEYWORD, REPEATBLOCK); }
-  "until"                        { return token(TokenType.KEYWORD, -REPEATBLOCK); }
-  
-  "function"                     { return token(TokenType.KEYWORD, ENDBLOCK); }
-  "then"                     	 { return token(TokenType.KEYWORD, ENDBLOCK); }
-  "do"                           { return token(TokenType.KEYWORD, ENDBLOCK); }
-
-  "else"                         { return token(TokenType.KEYWORD); }
-  "elseif"                       { return token(TokenType.KEYWORD); }
-  
-  "end"                          { return token(TokenType.KEYWORD, -ENDBLOCK); }
-  
-  /* operators */
-
-  "+"                            |
-  "-"                            |
-  "*"                            | 
-  "/"                            | 
-  "%"                            | 
-  "^"                            | 
-  "#"                            | 
-  "=="                           | 
-  "~="                           | 
-  "<="                           | 
-  ">="                           | 
-  "<"                            |
-  ">"                            | 
-  "="                            | 
-  ";"                            | 
-  ":"                            | 
-  ","                            | 
-  "."                            | 
-  ".."                           | 
-  "..."                          { return token(TokenType.OPERATOR); } 
-  
-  "("                            { return token(TokenType.OPERATOR,  PARAN); }
-  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
-  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
-  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
-  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
-  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
-  
-
-  {LongStart}				     {
-                                   longType = TokenType.STRING;
-                                   yybegin(LONGSTRING);
-                                   tokenStart = yychar;
-                                   tokenLength = yylength();
-                                   longLen = tokenLength;
-                                 }
-
-  "--"							 {
-                                   yybegin(COMMENT);
-                                   tokenStart = yychar;
-                                   tokenLength = yylength();
-                                 }
-
-
-  /* string literal */
-  \"                             {  
-                                    yybegin(STRING1);
-                                    tokenStart = yychar; 
-                                    tokenLength = 1; 
-                                 }
-  \'                             {
-                                    yybegin(STRING2);
-                                    tokenStart = yychar;
-                                    tokenLength = 1;
-                                 }
-
-  /* numeric literals */
-
-  {DecIntegerLiteral}            |
-  
-  {HexIntegerLiteral}            |
- 
-  {DoubleLiteral}		         { return token(TokenType.NUMBER); }
-  
-  /* whitespace */
-  {WhiteSpace}                   { }
-
-  /* identifiers */ 
-  {Identifier}                   { return token(TokenType.IDENTIFIER); }
-}
-
-<LONGSTRING> {
-	{LongEnd}                    {
-                                     if (longLen == yylength()) {
-										tokenLength += yylength();
-	                                    yybegin(YYINITIAL);
-                                        return token(longType, tokenStart, tokenLength);
-									 } else {
-                                        tokenLength++;
-									    yypushback(yylength() - 1);
-                                     }
-
-	                             }
-    {LineTerminator}			 { tokenLength += yylength(); }	                             
-    .                            { tokenLength++; }
-	<<EOF>>	             		{
-									yybegin(YYINITIAL);
-                                    return token(longType, tokenStart, tokenLength);
-								}
-}
-
-<COMMENT> {
-	{LongStart}			         {
-	                               longType = TokenType.COMMENT;
-                                   yybegin(LONGSTRING);
-                                   tokenLength += yylength();
-                                   longLen = yylength();
-								}
-
-	{LineTerminator}			{
-									yybegin(YYINITIAL);
-                                    return token(TokenType.COMMENT, tokenStart, tokenLength);
-								}
-
-	.							{
-								   yybegin(LINECOMMENT);
-								   tokenLength += yylength();
-								}
-	<<EOF>>	             		{
-									yybegin(YYINITIAL);
-                                    return token(TokenType.COMMENT, tokenStart, tokenLength);
-								}
-
-}
-
-<LINECOMMENT> {
-	{LineTerminator}			{
-									yybegin(YYINITIAL);
-									tokenLength += yylength();
-                                    return token(TokenType.COMMENT, tokenStart, tokenLength);
-								}
-    {LineTerminator}			 { tokenLength += yylength(); }
-    .                            { tokenLength++; }
-	<<EOF>>	             		{
-									yybegin(YYINITIAL);
-                                    return token(TokenType.COMMENT, tokenStart, tokenLength);
-								}
-}
-
-<STRING1> {
-  \"                             { 
-                                     yybegin(YYINITIAL); 
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-  
-  {StringCharacter1}+             { tokenLength += yylength(); }
-
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-	<<EOF>>	             		{
-									yybegin(YYINITIAL);
-                                    return token(TokenType.STRING, tokenStart, tokenLength);
-								}
-}
-
-<STRING2> {
-  \'                             {
-                                     yybegin(YYINITIAL);
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-
-  {StringCharacter2}+             { tokenLength += yylength(); }
-
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-	<<EOF>>	             		{
-									yybegin(YYINITIAL);
-                                    return token(TokenType.STRING, tokenStart, tokenLength);
-								}
-}
-
-/* error fallback */
-.|\n                             {  }
-<<EOF>>                          { return null; }
-
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jsyntaxpane.lexers;
+
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+
+%%
+
+%public
+%class LuaLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+
+
+%{
+    /**
+     * Create an empty lexer, yyrset will be called later to reset and assign
+     * the reader
+     */
+    public LuaLexer() {
+        super();
+    }
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+
+    private static final byte PARAN     = 1;
+    private static final byte BRACKET   = 2;
+    private static final byte CURLY     = 3;
+    private static final byte ENDBLOCK  = 4;
+    private static final byte REPEATBLOCK = 5;
+
+	TokenType longType;
+    int longLen;
+%}
+
+/* main character classes */
+LineTerminator = \r|\n|\r\n
+
+WhiteSpace = {LineTerminator} | [ \t\f]+
+
+LongStart = \[=*\[
+LongEnd = \]=*\]
+
+/* identifiers */
+Identifier = [:jletter:][:jletterdigit:]*
+
+/* integer literals */
+DecIntegerLiteral = [0-9]+
+HexDigit          = [0-9a-fA-F]
+
+HexIntegerLiteral = 0x{HexDigit}+
+
+/* floating point literals */        
+DoubleLiteral = ({FLit1}|{FLit2}) {Exponent}?
+
+FLit1    = [0-9]+(\.[0-9]*)?
+FLit2    = \.[0-9]+ 
+Exponent = [eE] [+-]? [0-9]+
+
+/* string and character literals */
+StringCharacter1 = [^\r\n\"\\]
+StringCharacter2 = [^\r\n\'\\]
+
+%state STRING1
+%state STRING2
+%state LONGSTRING
+
+%state COMMENT
+%state LINECOMMENT
+
+%%
+
+<YYINITIAL> {
+
+  /* keywords */
+  "and"                        	 |
+  "break"                        |
+  "for"                       	 |
+  "if"                         	 |
+  "in"                           |
+  "local"                        |
+  "not"                        	 |
+  "or"                         	 |
+  "return"                       |
+  "while"                        |
+  
+  /* boolean literals */
+  "true"                         |
+  "false"                        |
+  
+  /* nil literal */
+  "nil"                          { return token(TokenType.KEYWORD); }
+
+  "repeat"                       { return token(TokenType.KEYWORD, REPEATBLOCK); }
+  "until"                        { return token(TokenType.KEYWORD, -REPEATBLOCK); }
+  
+  "function"                     { return token(TokenType.KEYWORD, ENDBLOCK); }
+  "then"                     	 { return token(TokenType.KEYWORD, ENDBLOCK); }
+  "do"                           { return token(TokenType.KEYWORD, ENDBLOCK); }
+
+  "else"                         { return token(TokenType.KEYWORD); }
+  "elseif"                       { return token(TokenType.KEYWORD); }
+  
+  "end"                          { return token(TokenType.KEYWORD, -ENDBLOCK); }
+  
+  /* operators */
+
+  "+"                            |
+  "-"                            |
+  "*"                            | 
+  "/"                            | 
+  "%"                            | 
+  "^"                            | 
+  "#"                            | 
+  "=="                           | 
+  "~="                           | 
+  "<="                           | 
+  ">="                           | 
+  "<"                            |
+  ">"                            | 
+  "="                            | 
+  ";"                            | 
+  ":"                            | 
+  ","                            | 
+  "."                            | 
+  ".."                           | 
+  "..."                          { return token(TokenType.OPERATOR); } 
+  
+  "("                            { return token(TokenType.OPERATOR,  PARAN); }
+  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
+  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
+  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
+  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
+  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
+  
+
+  {LongStart}				     {
+                                   longType = TokenType.STRING;
+                                   yybegin(LONGSTRING);
+                                   tokenStart = yychar;
+                                   tokenLength = yylength();
+                                   longLen = tokenLength;
+                                 }
+
+  "--"							 {
+                                   yybegin(COMMENT);
+                                   tokenStart = yychar;
+                                   tokenLength = yylength();
+                                 }
+
+
+  /* string literal */
+  \"                             {  
+                                    yybegin(STRING1);
+                                    tokenStart = yychar; 
+                                    tokenLength = 1; 
+                                 }
+  \'                             {
+                                    yybegin(STRING2);
+                                    tokenStart = yychar;
+                                    tokenLength = 1;
+                                 }
+
+  /* numeric literals */
+
+  {DecIntegerLiteral}            |
+  
+  {HexIntegerLiteral}            |
+ 
+  {DoubleLiteral}		         { return token(TokenType.NUMBER); }
+  
+  /* whitespace */
+  {WhiteSpace}                   { }
+
+  /* identifiers */ 
+  {Identifier}                   { return token(TokenType.IDENTIFIER); }
+}
+
+<LONGSTRING> {
+	{LongEnd}                    {
+                                     if (longLen == yylength()) {
+										tokenLength += yylength();
+	                                    yybegin(YYINITIAL);
+                                        return token(longType, tokenStart, tokenLength);
+									 } else {
+                                        tokenLength++;
+									    yypushback(yylength() - 1);
+                                     }
+
+	                             }
+    {LineTerminator}			 { tokenLength += yylength(); }	                             
+    .                            { tokenLength++; }
+	<<EOF>>	             		{
+									yybegin(YYINITIAL);
+                                    return token(longType, tokenStart, tokenLength);
+								}
+}
+
+<COMMENT> {
+	{LongStart}			         {
+	                               longType = TokenType.COMMENT;
+                                   yybegin(LONGSTRING);
+                                   tokenLength += yylength();
+                                   longLen = yylength();
+								}
+
+	{LineTerminator}			{
+									yybegin(YYINITIAL);
+                                    return token(TokenType.COMMENT, tokenStart, tokenLength);
+								}
+
+	.							{
+								   yybegin(LINECOMMENT);
+								   tokenLength += yylength();
+								}
+	<<EOF>>	             		{
+									yybegin(YYINITIAL);
+                                    return token(TokenType.COMMENT, tokenStart, tokenLength);
+								}
+
+}
+
+<LINECOMMENT> {
+	{LineTerminator}			{
+									yybegin(YYINITIAL);
+									tokenLength += yylength();
+                                    return token(TokenType.COMMENT, tokenStart, tokenLength);
+								}
+    {LineTerminator}			 { tokenLength += yylength(); }
+    .                            { tokenLength++; }
+	<<EOF>>	             		{
+									yybegin(YYINITIAL);
+                                    return token(TokenType.COMMENT, tokenStart, tokenLength);
+								}
+}
+
+<STRING1> {
+  \"                             { 
+                                     yybegin(YYINITIAL); 
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+  
+  {StringCharacter1}+             { tokenLength += yylength(); }
+
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+	<<EOF>>	             		{
+									yybegin(YYINITIAL);
+                                    return token(TokenType.STRING, tokenStart, tokenLength);
+								}
+}
+
+<STRING2> {
+  \'                             {
+                                     yybegin(YYINITIAL);
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+
+  {StringCharacter2}+             { tokenLength += yylength(); }
+
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+	<<EOF>>	             		{
+									yybegin(YYINITIAL);
+                                    return token(TokenType.STRING, tokenStart, tokenLength);
+								}
+}
+
+/* error fallback */
+.|\n                             {  }
+<<EOF>>                          { return null; }
+
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/properties.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/properties.flex
index 68fdaad14..2e06030af 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/properties.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/properties.flex
@@ -1,63 +1,63 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jsyntaxpane.lexers;
-
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
-
-%%
-
-%public
-%class PropertiesLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-
-
-%{
-    /**
-     * Create an empty lexer, yyrset will be called later to reset and assign
-     * the reader
-     */
-    public PropertiesLexer() {
-        super();
-    }
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-%}
-
-StartComment = #
-WhiteSpace = [ \t]
-LineTerminator = \r|\n|\r\n
-InputCharacter = [^\r\n]
-KeyCharacter = [a-zA-Z0-9._ ]
-
-%%
-
-<YYINITIAL> 
-{
-	{KeyCharacter}+{WhiteSpace}*=    { return token(TokenType.KEYWORD); }
-        {StartComment} {InputCharacter}* {LineTerminator}?         
-                                         { return token(TokenType.COMMENT); }
-        . | {LineTerminator}             { /* skip */ }
-}
-
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jsyntaxpane.lexers;
+
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+
+%%
+
+%public
+%class PropertiesLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+
+
+%{
+    /**
+     * Create an empty lexer, yyrset will be called later to reset and assign
+     * the reader
+     */
+    public PropertiesLexer() {
+        super();
+    }
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+%}
+
+StartComment = #
+WhiteSpace = [ \t]
+LineTerminator = \r|\n|\r\n
+InputCharacter = [^\r\n]
+KeyCharacter = [a-zA-Z0-9._ ]
+
+%%
+
+<YYINITIAL> 
+{
+	{KeyCharacter}+{WhiteSpace}*=    { return token(TokenType.KEYWORD); }
+        {StartComment} {InputCharacter}* {LineTerminator}?         
+                                         { return token(TokenType.COMMENT); }
+        . | {LineTerminator}             { /* skip */ }
+}
+
 <<EOF>>                   { return null; }
\ No newline at end of file
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/python.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/python.flex
index 5f32d45fe..fc417acdb 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/python.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/python.flex
@@ -1,386 +1,386 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jsyntaxpane.lexers;
-
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
-
-%%
-
-%public
-%class PythonLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-
-
-%{
-    /**
-     * Create an empty lexer, yyrset will be called later to reset and assign
-     * the reader
-     */
-    public PythonLexer() {
-        super();
-    }
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-
-    private static final byte PARAN     = 1;
-    private static final byte BRACKET   = 2;
-    private static final byte CURLY     = 3;
-
-%}
-
-/* main character classes */
-LineTerminator = \r|\n|\r\n
-InputCharacter = [^\r\n]
-
-WhiteSpace = {LineTerminator} | [ \t\f]+
-
-/* comments */
-Comment = "#" {InputCharacter}* {LineTerminator}?
-
-/* identifiers */
-Identifier = [a-zA-Z][a-zA-Z0-9_]*
-
-/* integer literals */
-DecIntegerLiteral = 0 | [1-9][0-9]*
-DecLongLiteral    = {DecIntegerLiteral} [lL]
-
-HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
-HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
-HexDigit          = [0-9a-fA-F]
-
-OctIntegerLiteral = 0+ [1-3]? {OctDigit} {1,15}
-OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
-OctDigit          = [0-7]
-    
-/* floating point literals */        
-FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
-DoubleLiteral = ({FLit1}|{FLit2}|{FLit3}) {Exponent}?
-
-FLit1    = [0-9]+ \. [0-9]* 
-FLit2    = \. [0-9]+ 
-FLit3    = [0-9]+ 
-Exponent = [eE] [+-]? [0-9]+
-
-/* string and character literals */
-StringCharacter = [^\r\n\"\\]
-SQStringCharacter = [^\r\n\'\\]
-
-%state STRING, ML_STRING, SQSTRING, SQML_STRING
-
-%%
-
-<YYINITIAL> {
-
-  /* keywords */
-  "and"                          |
-  "as"                           |
-  "assert"                       |
-  "break"                        |
-  "class"                        |
-  "continue"                     |
-  "def"                          |
-  "del"                          |
-  "elif"                         |
-  "else"                         |
-  "except"                       |
-  "exec"                         |
-  "finally"                      |
-  "for"                          |
-  "from"                         |
-  "global"                       |
-  "if"                           |
-  "import"                       |
-  "in"                           |
-  "is"                           |
-  "lambda"                       |
-  "not"                          |
-  "or"                           |
-  "pass"                         |
-  "print"                        |
-  "self"                         | /* not exactly keyword, but almost */
-  "raise"                        |
-  "return"                       |
-  "try"                          |
-  "while"                        |
-  "with"                         |
-  "yield"                        { return token(TokenType.KEYWORD); }
-
-  /* Built-in Types*/
-  "yield"                        |
-  "Ellipsis"                     |
-  "False"                        |
-  "None"                         |
-  "NotImplemented"               |
-  "True"                         |
-  "__import__"                   |
-  "__name__"                     |
-  "abs"                          |
-  "apply"                        |
-  "bool"                         |
-  "buffer"                       |
-  "callable"                     |
-  "chr"                          |
-  "classmethod"                  |
-  "cmp"                          |
-  "coerce"                       |
-  "compile"                      |
-  "complex"                      |
-  "delattr"                      |
-  "dict"                         |
-  "dir"                          |
-  "divmod"                       |
-  "enumerate"                    |
-  "eval"                         |
-  "execfile"                     |
-  "file"                         |
-  "filter"                       |
-  "float"                        |
-  "frozenset"                    |
-  "getattr"                      |
-  "globals"                      |
-  "hasattr"                      |
-  "hash"                         |
-  "help"                         |
-  "hex"                          |
-  "id"                           |
-  "input"                        |
-  "int"                          |
-  "intern"                       |
-  "isinstance"                   |
-  "issubclass"                   |
-  "iter"                         |
-  "len"                          |
-  "list"                         |
-  "locals"                       |
-  "long"                         |
-  "map"                          |
-  "max"                          |
-  "min"                          |
-  "object"                       |
-  "oct"                          |
-  "open"                         |
-  "ord"                          |
-  "pow"                          |
-  "property"                     |
-  "range"                        |
-  "raw_input"                    |
-  "reduce"                       |
-  "reload"                       |
-  "repr"                         |
-  "reversed"                     |
-  "round"                        |
-  "set"                          |
-  "setattr"                      |
-  "slice"                        |
-  "sorted"                       |
-  "staticmethod"                 |
-  "str"                          |
-  "sum"                          |
-  "super"                        |
-  "tuple"                        |
-  "type"                         |
-  "unichr"                       |
-  "unicode"                      |
-  "vars"                         |
-  "xrange"                       |
-  "zip"                          {  return token(TokenType.TYPE);  }
-
-
-  
-  /* operators */
-
-  "("                            { return token(TokenType.OPERATOR,  PARAN); }
-  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
-  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
-  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
-  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
-  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
-  "+"                            |
-  "-"                            |
-  "*"                            |
-  "**"                           |
-  "/"                            |
-  "//"                           |
-  "%"                            |
-  "<<"                           |
-  ">>"                           |
-  "&"                            |
-  "|"                            |
-  "^"                            |
-  "~"                            |
-  "<"                            |
-  ">"                            |
-  "<="                           |
-  ">="                           |
-  "=="                           |
-  "!="                           |
-  "<>"                           |
-  "@"                            |
-  ","                            |
-  ":"                            |
-  "."                            |
-  "`"                            |
-  "="                            |
-  ";"                            |
-  "+="                           |
-  "-="                           |
-  "*="                           |
-  "/="                           |
-  "//="                          |
-  "%="                           |
-  "&="                           |
-  "|="                           |
-  "^="                           |
-  ">>="                          |
-  "<<="                          |
-  "**="                          { return token(TokenType.OPERATOR); }
-  
-  /* string literal */
-  \"{3}                          {
-                                    yybegin(ML_STRING);
-                                    tokenStart = yychar;
-                                    tokenLength = 3;
-                                 }
-
-  \"                             {
-                                    yybegin(STRING);
-                                    tokenStart = yychar;
-                                    tokenLength = 1;
-                                 }
-
-  \'{3}                          {
-                                    yybegin(SQML_STRING);
-                                    tokenStart = yychar;
-                                    tokenLength = 3;
-                                 }
-
-  \'                             {
-                                    yybegin(SQSTRING);
-                                    tokenStart = yychar;
-                                    tokenLength = 1;
-                                 }
-
-  /* numeric literals */
-
-  {DecIntegerLiteral}            |
-  {DecLongLiteral}               |
-  
-  {HexIntegerLiteral}            |
-  {HexLongLiteral}               |
- 
-  {OctIntegerLiteral}            |
-  {OctLongLiteral}               |
-
-  {FloatLiteral}                 |
-  {DoubleLiteral}                |
-  {FloatLiteral}[jJ]             { return token(TokenType.NUMBER); }
-  
-  /* comments */
-  {Comment}                      { return token(TokenType.COMMENT); }
-
-  /* whitespace */
-  {WhiteSpace}                   { }
-
-  /* identifiers */ 
-  {Identifier}                   { return token(TokenType.IDENTIFIER); }
-
-  "$" | "?"                      { return token(TokenType.ERROR); }
-}
-
-<STRING> {
-  \"                             { 
-                                     yybegin(YYINITIAL); 
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-  
-  {StringCharacter}+             { tokenLength += yylength(); }
-
-  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
-  
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-}
-
-<ML_STRING> {
-  \"{3}                          {
-                                     yybegin(YYINITIAL);
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 3);
-                                 }
-
-  {StringCharacter}+             { tokenLength += yylength(); }
-
-  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
-
-  \"                             { tokenLength ++;  }
-
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { tokenLength ++;  }
-}
-
-<SQSTRING> {
-  "'"                            {
-                                     yybegin(YYINITIAL);
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-
-  {SQStringCharacter}+           { tokenLength += yylength(); }
-
-  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
-
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-}
-
-<SQML_STRING> {
-  \'{3}                          {
-                                     yybegin(YYINITIAL);
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 3);
-                                 }
-
-  {SQStringCharacter}+           { tokenLength += yylength(); }
-
-  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
-
-  \'                             { tokenLength ++;  }
-
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { tokenLength ++;  }
-}
-
-/* error fallback */
-.|\n                             {  }
-<<EOF>>                          { return null; }
-
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jsyntaxpane.lexers;
+
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+
+%%
+
+%public
+%class PythonLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+
+
+%{
+    /**
+     * Create an empty lexer, yyrset will be called later to reset and assign
+     * the reader
+     */
+    public PythonLexer() {
+        super();
+    }
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+
+    private static final byte PARAN     = 1;
+    private static final byte BRACKET   = 2;
+    private static final byte CURLY     = 3;
+
+%}
+
+/* main character classes */
+LineTerminator = \r|\n|\r\n
+InputCharacter = [^\r\n]
+
+WhiteSpace = {LineTerminator} | [ \t\f]+
+
+/* comments */
+Comment = "#" {InputCharacter}* {LineTerminator}?
+
+/* identifiers */
+Identifier = [a-zA-Z][a-zA-Z0-9_]*
+
+/* integer literals */
+DecIntegerLiteral = 0 | [1-9][0-9]*
+DecLongLiteral    = {DecIntegerLiteral} [lL]
+
+HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
+HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
+HexDigit          = [0-9a-fA-F]
+
+OctIntegerLiteral = 0+ [1-3]? {OctDigit} {1,15}
+OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
+OctDigit          = [0-7]
+    
+/* floating point literals */        
+FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
+DoubleLiteral = ({FLit1}|{FLit2}|{FLit3}) {Exponent}?
+
+FLit1    = [0-9]+ \. [0-9]* 
+FLit2    = \. [0-9]+ 
+FLit3    = [0-9]+ 
+Exponent = [eE] [+-]? [0-9]+
+
+/* string and character literals */
+StringCharacter = [^\r\n\"\\]
+SQStringCharacter = [^\r\n\'\\]
+
+%state STRING, ML_STRING, SQSTRING, SQML_STRING
+
+%%
+
+<YYINITIAL> {
+
+  /* keywords */
+  "and"                          |
+  "as"                           |
+  "assert"                       |
+  "break"                        |
+  "class"                        |
+  "continue"                     |
+  "def"                          |
+  "del"                          |
+  "elif"                         |
+  "else"                         |
+  "except"                       |
+  "exec"                         |
+  "finally"                      |
+  "for"                          |
+  "from"                         |
+  "global"                       |
+  "if"                           |
+  "import"                       |
+  "in"                           |
+  "is"                           |
+  "lambda"                       |
+  "not"                          |
+  "or"                           |
+  "pass"                         |
+  "print"                        |
+  "self"                         | /* not exactly keyword, but almost */
+  "raise"                        |
+  "return"                       |
+  "try"                          |
+  "while"                        |
+  "with"                         |
+  "yield"                        { return token(TokenType.KEYWORD); }
+
+  /* Built-in Types*/
+  "yield"                        |
+  "Ellipsis"                     |
+  "False"                        |
+  "None"                         |
+  "NotImplemented"               |
+  "True"                         |
+  "__import__"                   |
+  "__name__"                     |
+  "abs"                          |
+  "apply"                        |
+  "bool"                         |
+  "buffer"                       |
+  "callable"                     |
+  "chr"                          |
+  "classmethod"                  |
+  "cmp"                          |
+  "coerce"                       |
+  "compile"                      |
+  "complex"                      |
+  "delattr"                      |
+  "dict"                         |
+  "dir"                          |
+  "divmod"                       |
+  "enumerate"                    |
+  "eval"                         |
+  "execfile"                     |
+  "file"                         |
+  "filter"                       |
+  "float"                        |
+  "frozenset"                    |
+  "getattr"                      |
+  "globals"                      |
+  "hasattr"                      |
+  "hash"                         |
+  "help"                         |
+  "hex"                          |
+  "id"                           |
+  "input"                        |
+  "int"                          |
+  "intern"                       |
+  "isinstance"                   |
+  "issubclass"                   |
+  "iter"                         |
+  "len"                          |
+  "list"                         |
+  "locals"                       |
+  "long"                         |
+  "map"                          |
+  "max"                          |
+  "min"                          |
+  "object"                       |
+  "oct"                          |
+  "open"                         |
+  "ord"                          |
+  "pow"                          |
+  "property"                     |
+  "range"                        |
+  "raw_input"                    |
+  "reduce"                       |
+  "reload"                       |
+  "repr"                         |
+  "reversed"                     |
+  "round"                        |
+  "set"                          |
+  "setattr"                      |
+  "slice"                        |
+  "sorted"                       |
+  "staticmethod"                 |
+  "str"                          |
+  "sum"                          |
+  "super"                        |
+  "tuple"                        |
+  "type"                         |
+  "unichr"                       |
+  "unicode"                      |
+  "vars"                         |
+  "xrange"                       |
+  "zip"                          {  return token(TokenType.TYPE);  }
+
+
+  
+  /* operators */
+
+  "("                            { return token(TokenType.OPERATOR,  PARAN); }
+  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
+  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
+  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
+  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
+  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
+  "+"                            |
+  "-"                            |
+  "*"                            |
+  "**"                           |
+  "/"                            |
+  "//"                           |
+  "%"                            |
+  "<<"                           |
+  ">>"                           |
+  "&"                            |
+  "|"                            |
+  "^"                            |
+  "~"                            |
+  "<"                            |
+  ">"                            |
+  "<="                           |
+  ">="                           |
+  "=="                           |
+  "!="                           |
+  "<>"                           |
+  "@"                            |
+  ","                            |
+  ":"                            |
+  "."                            |
+  "`"                            |
+  "="                            |
+  ";"                            |
+  "+="                           |
+  "-="                           |
+  "*="                           |
+  "/="                           |
+  "//="                          |
+  "%="                           |
+  "&="                           |
+  "|="                           |
+  "^="                           |
+  ">>="                          |
+  "<<="                          |
+  "**="                          { return token(TokenType.OPERATOR); }
+  
+  /* string literal */
+  \"{3}                          {
+                                    yybegin(ML_STRING);
+                                    tokenStart = yychar;
+                                    tokenLength = 3;
+                                 }
+
+  \"                             {
+                                    yybegin(STRING);
+                                    tokenStart = yychar;
+                                    tokenLength = 1;
+                                 }
+
+  \'{3}                          {
+                                    yybegin(SQML_STRING);
+                                    tokenStart = yychar;
+                                    tokenLength = 3;
+                                 }
+
+  \'                             {
+                                    yybegin(SQSTRING);
+                                    tokenStart = yychar;
+                                    tokenLength = 1;
+                                 }
+
+  /* numeric literals */
+
+  {DecIntegerLiteral}            |
+  {DecLongLiteral}               |
+  
+  {HexIntegerLiteral}            |
+  {HexLongLiteral}               |
+ 
+  {OctIntegerLiteral}            |
+  {OctLongLiteral}               |
+
+  {FloatLiteral}                 |
+  {DoubleLiteral}                |
+  {FloatLiteral}[jJ]             { return token(TokenType.NUMBER); }
+  
+  /* comments */
+  {Comment}                      { return token(TokenType.COMMENT); }
+
+  /* whitespace */
+  {WhiteSpace}                   { }
+
+  /* identifiers */ 
+  {Identifier}                   { return token(TokenType.IDENTIFIER); }
+
+  "$" | "?"                      { return token(TokenType.ERROR); }
+}
+
+<STRING> {
+  \"                             { 
+                                     yybegin(YYINITIAL); 
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+  
+  {StringCharacter}+             { tokenLength += yylength(); }
+
+  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
+  
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+}
+
+<ML_STRING> {
+  \"{3}                          {
+                                     yybegin(YYINITIAL);
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 3);
+                                 }
+
+  {StringCharacter}+             { tokenLength += yylength(); }
+
+  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
+
+  \"                             { tokenLength ++;  }
+
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { tokenLength ++;  }
+}
+
+<SQSTRING> {
+  "'"                            {
+                                     yybegin(YYINITIAL);
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+
+  {SQStringCharacter}+           { tokenLength += yylength(); }
+
+  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
+
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+}
+
+<SQML_STRING> {
+  \'{3}                          {
+                                     yybegin(YYINITIAL);
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 3);
+                                 }
+
+  {SQStringCharacter}+           { tokenLength += yylength(); }
+
+  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
+
+  \'                             { tokenLength ++;  }
+
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { tokenLength ++;  }
+}
+
+/* error fallback */
+.|\n                             {  }
+<<EOF>>                          { return null; }
+
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/ruby.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/ruby.flex
index 61b49d3dd..d475642aa 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/ruby.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/ruby.flex
@@ -1,276 +1,276 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jsyntaxpane.lexers;
-
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
-
-%%
-
-%public
-%class RubyLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-
-
-%{
-    /**
-     * Create an empty lexer, yyrset will be called later to reset and assign
-     * the reader
-     */
-    public RubyLexer() {
-        super();
-    }
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-
-    private static final byte PARAN     = 1;
-    private static final byte BRACKET   = 2;
-    private static final byte CURLY     = 3;
-    private static final byte WORD      = 4;
-
-%}
-
-/* main character classes */
-LineTerminator = \r|\n|\r\n
-InputCharacter = [^\r\n]
-
-WhiteSpace = {LineTerminator} | [ \t\f]+
-
-/* comments */
-Comment = "#" {InputCharacter}* {LineTerminator}?
-
-/* identifiers */
-Identifier = [a-zA-Z][a-zA-Z0-9_]*
-
-/* integer literals */
-DecIntegerLiteral = 0 | [1-9][0-9]*
-DecLongLiteral    = {DecIntegerLiteral} [lL]
-
-HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
-HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
-HexDigit          = [0-9a-fA-F]
-
-OctIntegerLiteral = 0+ [1-3]? {OctDigit} {1,15}
-OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
-OctDigit          = [0-7]
-    
-/* floating point literals */        
-FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
-DoubleLiteral = ({FLit1}|{FLit2}|{FLit3}) {Exponent}?
-
-FLit1    = [0-9]+ \. [0-9]* 
-FLit2    = \. [0-9]+ 
-FLit3    = [0-9]+ 
-Exponent = [eE] [+-]? [0-9]+
-
-/* string and character literals */
-StringCharacter = [^\r\n\"\\]
-
-%state STRING, ML_STRING
-
-%%
-
-<YYINITIAL> {
-
-  /* keywords */
-  "BEGIN"                        |
-  "ensure"                       |
-  "assert"                       |
-  "nil"                          |
-  "self"                         |
-  "when"                         |
-  "END"                          |
-  "false"                        |
-  "not"                          |
-  "super"                        |
-  "alias"                        |
-  "defined"                      |
-  "or"                           |
-  "then"                         |
-  "yield"                        |
-  "and"                          |
-  "redo"                         |
-  "true"                         |
-  "else"                         |
-  "in"                           |
-  "rescue"                       |
-  "undef"                        |
-  "break"                        |
-  "elsif"                        |
-  "module"                       |
-  "retry"                        |
-  "unless"                       |
-  "next"                         |
-  "return"                       { return token(TokenType.KEYWORD); }
-
-  "begin"                        |
-  "case"                         |
-  "class"                        |
-  "def"                          |
-  "for"                          |
-  "while"                        |
-  "until"                        |
-  "do"                           |
-  "if"                           { return token(TokenType.KEYWORD,  WORD); }
-
-  "end"                          { return token(TokenType.KEYWORD, -WORD); }
-
-
-  /* Built-in Types*/
-  "self"                         |
-  "nil"                          |
-  "true"                         |
-  "false"                        |
-  "__FILE__"                     |
-  "__LINE__"                     {  return token(TokenType.TYPE);  }
-
-
-  
-  /* operators */
-
-  "("                            { return token(TokenType.OPERATOR,  PARAN); }
-  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
-  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
-  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
-  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
-  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
-  "+"                            |
-  "-"                            |
-  "*"                            |
-  "**"                           |
-  "/"                            |
-  "//"                           |
-  "%"                            |
-  "<<"                           |
-  ">>"                           |
-  "&"                            |
-  "|"                            |
-  "^"                            |
-  "~"                            |
-  "<"                            |
-  ">"                            |
-  "<="                           |
-  ">="                           |
-  "=="                           |
-  "!="                           |
-  "<>"                           |
-  "@"                            |
-  ","                            |
-  ":"                            |
-  "."                            |
-  ".."                           |
-  "`"                            |
-  "="                            |
-  ";"                            |
-  "+="                           |
-  "-="                           |
-  "*="                           |
-  "/="                           |
-  "//="                          |
-  "%="                           |
-  "&="                           |
-  "|="                           |
-  "^="                           |
-  ">>="                          |
-  "<<="                          |
-  "**="                          { return token(TokenType.OPERATOR); }
-  
-  /* string literal */
-  \"{3}                          {
-                                    yybegin(ML_STRING);
-                                    tokenStart = yychar;
-                                    tokenLength = 3;
-                                 }
-
-  \"                             {
-                                    yybegin(STRING);
-                                    tokenStart = yychar;
-                                    tokenLength = 1;
-                                 }
-
-
-  /* numeric literals */
-
-  {DecIntegerLiteral}            |
-  {DecLongLiteral}               |
-  
-  {HexIntegerLiteral}            |
-  {HexLongLiteral}               |
- 
-  {OctIntegerLiteral}            |
-  {OctLongLiteral}               |
-
-  {FloatLiteral}                 |
-  {DoubleLiteral}                |
-  {FloatLiteral}[jJ]             { return token(TokenType.NUMBER); }
-  
-  /* comments */
-  {Comment}                      { return token(TokenType.COMMENT); }
-
-  /* whitespace */
-  {WhiteSpace}                   { }
-
-  /* identifiers */ 
-  {Identifier}"?"                { return token(TokenType.TYPE2); }
-  {Identifier}                   { return token(TokenType.IDENTIFIER); }
-}
-
-<STRING> {
-  \"                             { 
-                                     yybegin(YYINITIAL); 
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-  
-  {StringCharacter}+             { tokenLength += yylength(); }
-
-  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
-  
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-}
-
-<ML_STRING> {
-  \"{3}                          {
-                                     yybegin(YYINITIAL);
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 3);
-                                 }
-
-  {StringCharacter}+             { tokenLength += yylength(); }
-
-  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
-
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { tokenLength ++;  }
-}
-
-
-/* error fallback */
-.|\n                             {  }
-<<EOF>>                          { return null; }
-
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jsyntaxpane.lexers;
+
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+
+%%
+
+%public
+%class RubyLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+
+
+%{
+    /**
+     * Create an empty lexer, yyrset will be called later to reset and assign
+     * the reader
+     */
+    public RubyLexer() {
+        super();
+    }
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+
+    private static final byte PARAN     = 1;
+    private static final byte BRACKET   = 2;
+    private static final byte CURLY     = 3;
+    private static final byte WORD      = 4;
+
+%}
+
+/* main character classes */
+LineTerminator = \r|\n|\r\n
+InputCharacter = [^\r\n]
+
+WhiteSpace = {LineTerminator} | [ \t\f]+
+
+/* comments */
+Comment = "#" {InputCharacter}* {LineTerminator}?
+
+/* identifiers */
+Identifier = [a-zA-Z][a-zA-Z0-9_]*
+
+/* integer literals */
+DecIntegerLiteral = 0 | [1-9][0-9]*
+DecLongLiteral    = {DecIntegerLiteral} [lL]
+
+HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
+HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
+HexDigit          = [0-9a-fA-F]
+
+OctIntegerLiteral = 0+ [1-3]? {OctDigit} {1,15}
+OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
+OctDigit          = [0-7]
+    
+/* floating point literals */        
+FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
+DoubleLiteral = ({FLit1}|{FLit2}|{FLit3}) {Exponent}?
+
+FLit1    = [0-9]+ \. [0-9]* 
+FLit2    = \. [0-9]+ 
+FLit3    = [0-9]+ 
+Exponent = [eE] [+-]? [0-9]+
+
+/* string and character literals */
+StringCharacter = [^\r\n\"\\]
+
+%state STRING, ML_STRING
+
+%%
+
+<YYINITIAL> {
+
+  /* keywords */
+  "BEGIN"                        |
+  "ensure"                       |
+  "assert"                       |
+  "nil"                          |
+  "self"                         |
+  "when"                         |
+  "END"                          |
+  "false"                        |
+  "not"                          |
+  "super"                        |
+  "alias"                        |
+  "defined"                      |
+  "or"                           |
+  "then"                         |
+  "yield"                        |
+  "and"                          |
+  "redo"                         |
+  "true"                         |
+  "else"                         |
+  "in"                           |
+  "rescue"                       |
+  "undef"                        |
+  "break"                        |
+  "elsif"                        |
+  "module"                       |
+  "retry"                        |
+  "unless"                       |
+  "next"                         |
+  "return"                       { return token(TokenType.KEYWORD); }
+
+  "begin"                        |
+  "case"                         |
+  "class"                        |
+  "def"                          |
+  "for"                          |
+  "while"                        |
+  "until"                        |
+  "do"                           |
+  "if"                           { return token(TokenType.KEYWORD,  WORD); }
+
+  "end"                          { return token(TokenType.KEYWORD, -WORD); }
+
+
+  /* Built-in Types*/
+  "self"                         |
+  "nil"                          |
+  "true"                         |
+  "false"                        |
+  "__FILE__"                     |
+  "__LINE__"                     {  return token(TokenType.TYPE);  }
+
+
+  
+  /* operators */
+
+  "("                            { return token(TokenType.OPERATOR,  PARAN); }
+  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
+  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
+  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
+  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
+  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
+  "+"                            |
+  "-"                            |
+  "*"                            |
+  "**"                           |
+  "/"                            |
+  "//"                           |
+  "%"                            |
+  "<<"                           |
+  ">>"                           |
+  "&"                            |
+  "|"                            |
+  "^"                            |
+  "~"                            |
+  "<"                            |
+  ">"                            |
+  "<="                           |
+  ">="                           |
+  "=="                           |
+  "!="                           |
+  "<>"                           |
+  "@"                            |
+  ","                            |
+  ":"                            |
+  "."                            |
+  ".."                           |
+  "`"                            |
+  "="                            |
+  ";"                            |
+  "+="                           |
+  "-="                           |
+  "*="                           |
+  "/="                           |
+  "//="                          |
+  "%="                           |
+  "&="                           |
+  "|="                           |
+  "^="                           |
+  ">>="                          |
+  "<<="                          |
+  "**="                          { return token(TokenType.OPERATOR); }
+  
+  /* string literal */
+  \"{3}                          {
+                                    yybegin(ML_STRING);
+                                    tokenStart = yychar;
+                                    tokenLength = 3;
+                                 }
+
+  \"                             {
+                                    yybegin(STRING);
+                                    tokenStart = yychar;
+                                    tokenLength = 1;
+                                 }
+
+
+  /* numeric literals */
+
+  {DecIntegerLiteral}            |
+  {DecLongLiteral}               |
+  
+  {HexIntegerLiteral}            |
+  {HexLongLiteral}               |
+ 
+  {OctIntegerLiteral}            |
+  {OctLongLiteral}               |
+
+  {FloatLiteral}                 |
+  {DoubleLiteral}                |
+  {FloatLiteral}[jJ]             { return token(TokenType.NUMBER); }
+  
+  /* comments */
+  {Comment}                      { return token(TokenType.COMMENT); }
+
+  /* whitespace */
+  {WhiteSpace}                   { }
+
+  /* identifiers */ 
+  {Identifier}"?"                { return token(TokenType.TYPE2); }
+  {Identifier}                   { return token(TokenType.IDENTIFIER); }
+}
+
+<STRING> {
+  \"                             { 
+                                     yybegin(YYINITIAL); 
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+  
+  {StringCharacter}+             { tokenLength += yylength(); }
+
+  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
+  
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+}
+
+<ML_STRING> {
+  \"{3}                          {
+                                     yybegin(YYINITIAL);
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 3);
+                                 }
+
+  {StringCharacter}+             { tokenLength += yylength(); }
+
+  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
+
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { tokenLength ++;  }
+}
+
+
+/* error fallback */
+.|\n                             {  }
+<<EOF>>                          { return null; }
+
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/scala.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/scala.flex
index 34376a318..8bbe9654e 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/scala.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/scala.flex
@@ -1,344 +1,344 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jsyntaxpane.lexers;
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
- 
-%% 
-
-%public
-%class ScalaLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-
-
-%{
-    /**
-     * Create an empty lexer, yyrset will be called later to reset and assign
-     * the reader
-     */
-    public ScalaLexer() {
-        super();
-    }
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-
-    private static final byte PARAN     = 1;
-    private static final byte BRACKET   = 2;
-    private static final byte CURLY     = 3;
-
-%}
-
-/* main character classes */
-LineTerminator = \r|\n|\r\n
-InputCharacter = [^\r\n]
-
-WhiteSpace = {LineTerminator} | [ \t\f]+
-
-/* comments */
-Comment = {TraditionalComment} | {EndOfLineComment} 
-
-TraditionalComment = "/*" [^*] ~"*/" | "/*" "*"+ "/"
-EndOfLineComment = "//" {InputCharacter}* {LineTerminator}?
-
-/* identifiers */
-Identifier = [:jletter:][:jletterdigit:]*
-
-/* integer literals */
-DecIntegerLiteral = 0 | [1-9][0-9]*
-DecLongLiteral    = {DecIntegerLiteral} [lL]
-
-HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
-HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
-HexDigit          = [0-9a-fA-F]
-
-OctIntegerLiteral = 0+ [1-3]? {OctDigit} {1,15}
-OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
-OctDigit          = [0-7]
-    
-/* floating point literals */        
-FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
-DoubleLiteral = ({FLit1}|{FLit2}|{FLit3}) {Exponent}?
-
-FLit1    = [0-9]+ \. [0-9]* 
-FLit2    = \. [0-9]+ 
-FLit3    = [0-9]+ 
-Exponent = [eE] [+-]? [0-9]+
-
-/* string and character literals */
-StringCharacter = [^\r\n\"\\]
-SingleCharacter = [^\r\n\'\\]
-
-%state STRING, CHARLITERAL, JDOC, JDOC_TAG
-
-%%
-
-<YYINITIAL> {
-
-  /* keywords */
-  "def"            |
-  "import"         |
-  "package"        |
-  "if"             |
-  "then"           |
-  "else"           |
-  "while"          |
-  "for"            |
-  "do"             |
-  "boolean"        |
-  "int"            |
-  "double"         |
-  "byte"           |
-  "short"          |
-  "char"           |
-  "long"           |
-  "float"          |
-  "unit"           |
-  "val"            |
-  "with"           |
-  "type"           |
-  "var"            |
-  "yield"          |
-  "return"         |
-  "true"           |
-  "false"          |
-  "null"           |
-  "this"           |
-  "super"          |
-  "String"         |
-  "Array"          |
-  "private"        |
-  "protected"      |
-  "override"       |
-  "abstract"       |
-  "final"          |
-  "sealed"         |
-  "throw"          |
-  "try"            |
-  "catch"          |
-  "finally"        |
-  "extends"        { return token(TokenType.KEYWORD); }
-
-  /* Java Built in types and wrappers */
-  "object"                       |
-  "Boolean"                      |
-  "Byte"                         |
-  "Character"                    |
-  "Double"                       |
-  "Float"                        |
-  "Integer"                      |
-  "Object"                       |
-  "Short"                        |
-  "Void"                         |
-  "Class"                        |
-  "Number"                       |
-  "Package"                      |
-  "StringBuffer"                 |
-  "StringBuilder"                |
-  "CharSequence"                 |
-  "Thread"                       |
-  "String"                       { return token(TokenType.TYPE); }
-
-  /* Some Scala predefines */
-  "println"                      { return token(TokenType.KEYWORD2); }
-
-  /* Some Java standard Library Types */
-  "Throwable"                    |
-  "Cloneable"                    |
-  "Comparable"                   |
-  "Serializable"                 |
-  "Runnable"                     { return token(TokenType.TYPE); }
-
-  "WARNING"                      { return token(TokenType.WARNING); }
-  "ERROR"                        { return token(TokenType.ERROR); }
-
-  /* operators */
-
-  "("                            { return token(TokenType.OPERATOR,  PARAN); }
-  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
-  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
-  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
-  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
-  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
-  ";"                            | 
-  ","                            | 
-  "."                            | 
-  "="                            | 
-  ">"                            | 
-  "<"                            |
-  "!"                            | 
-  "~"                            | 
-  "?"                            | 
-  ":"                            | 
-  "=="                           | 
-  "<="                           | 
-  ">="                           | 
-  "!="                           | 
-  "&&"                           | 
-  "||"                           | 
-  "++"                           | 
-  "--"                           | 
-  "+"                            | 
-  "-"                            | 
-  "*"                            | 
-  "/"                            | 
-  "&"                            | 
-  "|"                            | 
-  "^"                            | 
-  "%"                            | 
-  "<<"                           | 
-  ">>"                           | 
-  ">>>"                          | 
-  "+="                           | 
-  "-="                           | 
-  "*="                           | 
-  "/="                           | 
-  "&="                           | 
-  "|="                           | 
-  "^="                           | 
-  "%="                           | 
-  "<<="                          | 
-  ">>="                          | 
-  ">>>="                         { return token(TokenType.OPERATOR); } 
-  
-  /* string literal */
-  \"                             {  
-                                    yybegin(STRING); 
-                                    tokenStart = yychar; 
-                                    tokenLength = 1; 
-                                 }
-
-  /* character literal */
-  \'                             {  
-                                    yybegin(CHARLITERAL); 
-                                    tokenStart = yychar; 
-                                    tokenLength = 1; 
-                                 }
-
-  /* numeric literals */
-
-  {DecIntegerLiteral}            |
-  {DecLongLiteral}               |
-  
-  {HexIntegerLiteral}            |
-  {HexLongLiteral}               |
- 
-  {OctIntegerLiteral}            |
-  {OctLongLiteral}               |
-  
-  {FloatLiteral}                 |
-  {DoubleLiteral}                |
-  {DoubleLiteral}[dD]            { return token(TokenType.NUMBER); }
-  
-  // JavaDoc comments need a state so that we can highlight the @ controls
-  "/**"                          {  
-                                    yybegin(JDOC); 
-                                    tokenStart = yychar; 
-                                    tokenLength = 3; 
-                                 }
-
-  /* comments */
-  {Comment}                      { return token(TokenType.COMMENT); }
-
-  /* whitespace */
-  {WhiteSpace}                   { }
-
-  /* identifiers */ 
-  {Identifier}                   { return token(TokenType.IDENTIFIER); }
-}
-
-
-<STRING> {
-  \"                             { 
-                                     yybegin(YYINITIAL); 
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-  
-  {StringCharacter}+             { tokenLength += yylength(); }
-
-  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
-  
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-}
-
-<CHARLITERAL> {
-  \'                             { 
-                                     yybegin(YYINITIAL); 
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-  
-  {SingleCharacter}+             { tokenLength += yylength(); }
-  
-  /* escape sequences */
-
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-}
-
-<JDOC> {
-  "*/"                           { 
-                                     yybegin(YYINITIAL); 
-                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
-                                 }
-
-  "@"                            {   
-                                     yybegin(JDOC_TAG); 
-                                     int start = tokenStart;
-                                     tokenStart = yychar;
-                                     int len = tokenLength;
-                                     tokenLength = 1;
-                                     return token(TokenType.COMMENT, start, len);
-                                 }
-
-  .|\n                           { tokenLength ++; }
-
-}
-
-<JDOC_TAG> {
-  ([:letter:])+ ":"?             { tokenLength += yylength(); }
-
-  "*/"                           { 
-                                     yybegin(YYINITIAL); 
-                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
-                                 }
-
-  .|\n                           {   
-                                     yybegin(JDOC); 
-                                     // length also includes the trailing quote
-                                     int start = tokenStart;
-                                     tokenStart = yychar;
-                                     int len = tokenLength;
-                                     tokenLength = 1;
-                                     return token(TokenType.COMMENT2, start, len);
-                                 }
-}
-
-
-/* error fallback */
-.|\n                             {  }
-<<EOF>>                          { return null; }
-
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jsyntaxpane.lexers;
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+ 
+%% 
+
+%public
+%class ScalaLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+
+
+%{
+    /**
+     * Create an empty lexer, yyrset will be called later to reset and assign
+     * the reader
+     */
+    public ScalaLexer() {
+        super();
+    }
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+
+    private static final byte PARAN     = 1;
+    private static final byte BRACKET   = 2;
+    private static final byte CURLY     = 3;
+
+%}
+
+/* main character classes */
+LineTerminator = \r|\n|\r\n
+InputCharacter = [^\r\n]
+
+WhiteSpace = {LineTerminator} | [ \t\f]+
+
+/* comments */
+Comment = {TraditionalComment} | {EndOfLineComment} 
+
+TraditionalComment = "/*" [^*] ~"*/" | "/*" "*"+ "/"
+EndOfLineComment = "//" {InputCharacter}* {LineTerminator}?
+
+/* identifiers */
+Identifier = [:jletter:][:jletterdigit:]*
+
+/* integer literals */
+DecIntegerLiteral = 0 | [1-9][0-9]*
+DecLongLiteral    = {DecIntegerLiteral} [lL]
+
+HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
+HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
+HexDigit          = [0-9a-fA-F]
+
+OctIntegerLiteral = 0+ [1-3]? {OctDigit} {1,15}
+OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
+OctDigit          = [0-7]
+    
+/* floating point literals */        
+FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
+DoubleLiteral = ({FLit1}|{FLit2}|{FLit3}) {Exponent}?
+
+FLit1    = [0-9]+ \. [0-9]* 
+FLit2    = \. [0-9]+ 
+FLit3    = [0-9]+ 
+Exponent = [eE] [+-]? [0-9]+
+
+/* string and character literals */
+StringCharacter = [^\r\n\"\\]
+SingleCharacter = [^\r\n\'\\]
+
+%state STRING, CHARLITERAL, JDOC, JDOC_TAG
+
+%%
+
+<YYINITIAL> {
+
+  /* keywords */
+  "def"            |
+  "import"         |
+  "package"        |
+  "if"             |
+  "then"           |
+  "else"           |
+  "while"          |
+  "for"            |
+  "do"             |
+  "boolean"        |
+  "int"            |
+  "double"         |
+  "byte"           |
+  "short"          |
+  "char"           |
+  "long"           |
+  "float"          |
+  "unit"           |
+  "val"            |
+  "with"           |
+  "type"           |
+  "var"            |
+  "yield"          |
+  "return"         |
+  "true"           |
+  "false"          |
+  "null"           |
+  "this"           |
+  "super"          |
+  "String"         |
+  "Array"          |
+  "private"        |
+  "protected"      |
+  "override"       |
+  "abstract"       |
+  "final"          |
+  "sealed"         |
+  "throw"          |
+  "try"            |
+  "catch"          |
+  "finally"        |
+  "extends"        { return token(TokenType.KEYWORD); }
+
+  /* Java Built in types and wrappers */
+  "object"                       |
+  "Boolean"                      |
+  "Byte"                         |
+  "Character"                    |
+  "Double"                       |
+  "Float"                        |
+  "Integer"                      |
+  "Object"                       |
+  "Short"                        |
+  "Void"                         |
+  "Class"                        |
+  "Number"                       |
+  "Package"                      |
+  "StringBuffer"                 |
+  "StringBuilder"                |
+  "CharSequence"                 |
+  "Thread"                       |
+  "String"                       { return token(TokenType.TYPE); }
+
+  /* Some Scala predefines */
+  "println"                      { return token(TokenType.KEYWORD2); }
+
+  /* Some Java standard Library Types */
+  "Throwable"                    |
+  "Cloneable"                    |
+  "Comparable"                   |
+  "Serializable"                 |
+  "Runnable"                     { return token(TokenType.TYPE); }
+
+  "WARNING"                      { return token(TokenType.WARNING); }
+  "ERROR"                        { return token(TokenType.ERROR); }
+
+  /* operators */
+
+  "("                            { return token(TokenType.OPERATOR,  PARAN); }
+  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
+  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
+  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
+  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
+  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
+  ";"                            | 
+  ","                            | 
+  "."                            | 
+  "="                            | 
+  ">"                            | 
+  "<"                            |
+  "!"                            | 
+  "~"                            | 
+  "?"                            | 
+  ":"                            | 
+  "=="                           | 
+  "<="                           | 
+  ">="                           | 
+  "!="                           | 
+  "&&"                           | 
+  "||"                           | 
+  "++"                           | 
+  "--"                           | 
+  "+"                            | 
+  "-"                            | 
+  "*"                            | 
+  "/"                            | 
+  "&"                            | 
+  "|"                            | 
+  "^"                            | 
+  "%"                            | 
+  "<<"                           | 
+  ">>"                           | 
+  ">>>"                          | 
+  "+="                           | 
+  "-="                           | 
+  "*="                           | 
+  "/="                           | 
+  "&="                           | 
+  "|="                           | 
+  "^="                           | 
+  "%="                           | 
+  "<<="                          | 
+  ">>="                          | 
+  ">>>="                         { return token(TokenType.OPERATOR); } 
+  
+  /* string literal */
+  \"                             {  
+                                    yybegin(STRING); 
+                                    tokenStart = yychar; 
+                                    tokenLength = 1; 
+                                 }
+
+  /* character literal */
+  \'                             {  
+                                    yybegin(CHARLITERAL); 
+                                    tokenStart = yychar; 
+                                    tokenLength = 1; 
+                                 }
+
+  /* numeric literals */
+
+  {DecIntegerLiteral}            |
+  {DecLongLiteral}               |
+  
+  {HexIntegerLiteral}            |
+  {HexLongLiteral}               |
+ 
+  {OctIntegerLiteral}            |
+  {OctLongLiteral}               |
+  
+  {FloatLiteral}                 |
+  {DoubleLiteral}                |
+  {DoubleLiteral}[dD]            { return token(TokenType.NUMBER); }
+  
+  // JavaDoc comments need a state so that we can highlight the @ controls
+  "/**"                          {  
+                                    yybegin(JDOC); 
+                                    tokenStart = yychar; 
+                                    tokenLength = 3; 
+                                 }
+
+  /* comments */
+  {Comment}                      { return token(TokenType.COMMENT); }
+
+  /* whitespace */
+  {WhiteSpace}                   { }
+
+  /* identifiers */ 
+  {Identifier}                   { return token(TokenType.IDENTIFIER); }
+}
+
+
+<STRING> {
+  \"                             { 
+                                     yybegin(YYINITIAL); 
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+  
+  {StringCharacter}+             { tokenLength += yylength(); }
+
+  \\[0-3]?{OctDigit}?{OctDigit}  { tokenLength += yylength(); }
+  
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+}
+
+<CHARLITERAL> {
+  \'                             { 
+                                     yybegin(YYINITIAL); 
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+  
+  {SingleCharacter}+             { tokenLength += yylength(); }
+  
+  /* escape sequences */
+
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+}
+
+<JDOC> {
+  "*/"                           { 
+                                     yybegin(YYINITIAL); 
+                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
+                                 }
+
+  "@"                            {   
+                                     yybegin(JDOC_TAG); 
+                                     int start = tokenStart;
+                                     tokenStart = yychar;
+                                     int len = tokenLength;
+                                     tokenLength = 1;
+                                     return token(TokenType.COMMENT, start, len);
+                                 }
+
+  .|\n                           { tokenLength ++; }
+
+}
+
+<JDOC_TAG> {
+  ([:letter:])+ ":"?             { tokenLength += yylength(); }
+
+  "*/"                           { 
+                                     yybegin(YYINITIAL); 
+                                     return token(TokenType.COMMENT, tokenStart, tokenLength + 2);
+                                 }
+
+  .|\n                           {   
+                                     yybegin(JDOC); 
+                                     // length also includes the trailing quote
+                                     int start = tokenStart;
+                                     tokenStart = yychar;
+                                     int len = tokenLength;
+                                     tokenLength = 1;
+                                     return token(TokenType.COMMENT2, start, len);
+                                 }
+}
+
+
+/* error fallback */
+.|\n                             {  }
+<<EOF>>                          { return null; }
+
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/sql.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/sql.flex
index f3c20e2fb..cd762876d 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/sql.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/sql.flex
@@ -1,383 +1,383 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package jsyntaxpane.lexers;
-
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
-
-%%
-
-%public
-%class SqlLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-%caseless
-
-
-%{
-    /**
-     * Default constructor is needed as we will always call the yyreset
-     */
-    public SqlLexer() {
-        super();
-    }
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-
-%}
-
-/* main character classes */
-LineTerminator = \r|\n|\r\n
-InputCharacter = [^\r\n]
-
-WhiteSpace = {LineTerminator} | [ \t\f]
-
-/* comments */
-Comment = {TraditionalComment} | {EndOfLineComment} | {DocumentationComment}
-
-TraditionalComment = "/*" [^*] ~"*/" | "/*" "*"+ "/"
-DocumentationComment = "/**" {CommentContent} "*"+ "/"
-CommentContent       = ( [^*] | \*+ [^/*] )*
-EndOfLineComment = "--" {InputCharacter}* {LineTerminator}?
-
-/* identifiers */
-Identifier = [:jletter:][:jletterdigit:]*
-
-/* integer literals */
-DecIntegerLiteral = 0 | [1-9][0-9]*
-
-/* floating point literals */
-FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
-
-FLit1    = [0-9]+ \. [0-9]*
-FLit2    = \. [0-9]+
-FLit3    = [0-9]+
-Exponent = [eE] [+-]? [0-9]+
-
-/* string and character literals */
-StringCharacter = [^\r\n\"\\]
-SingleCharacter = [^\r\n\'\\]
-
-// Create states for Double Quoted and Single Quoted Strings
-%state DQ_STRING, SQ_STRING
-
-Reserved =
-   "ADD"                 |
-   "ALL"                 |
-   "ALLOW REVERSE SCANS" |
-   "ALTER"               |
-   "ANALYZE"             |
-   "AND"                 |
-   "AS"                  |
-   "ASC"                 |
-   "AUTOMATIC"           |
-   "BEGIN"		 |
-   "BEFORE"              |
-   "BETWEEN"             |
-   "BIGINT"              |
-   "BINARY"              |
-   "BLOB"                |
-   "BOTH"                |
-   "BUFFERPOOL"		 |
-   "BY"                  |
-   "CACHE"		 |
-   "CALL"                |
-   "CASCADE"             |
-   "CASE"                |
-   "CHANGE"              |
-   "CHAR"                |
-   "CHARACTER"           |
-   "CHECK"               |
-   "COLLATE"             |
-   "COLUMN"              |
-   "COMMIT"		 |
-   "CONDITION"           |
-   "CONSTANT"		 |
-   "CONSTRAINT"          |
-   "CONTINUE"            |
-   "CONVERT"             |
-   "CREATE"              |
-   "CROSS"               |
-   "CURSOR"              |
-   "DATE"		 |
-   "DATABASE"            |
-   "DATABASES"           |
-   "DEC"                 |
-   "DECIMAL"             |
-   "DECODE"		 |
-   "DECLARE"             |
-   "DEFAULT"             |
-   "DELAYED"             |
-   "DELETE"              |
-   "DESC"                |
-   "DESCRIBE"            |
-   "DETERMINISTIC"       |
-   "DISTINCT"            |
-   "DISTINCTROW"         |
-   "DIV"                 |
-   "DOUBLE"              |
-   "DROP"                |
-   "DUAL"                |
-   "EACH"                |
-   "ELSE"                |
-   "ELSEIF"              |
-   "ENCLOSED"            |
-   "END"		 |
-   "ESCAPED"             |
-   "EXCEPTION" 		 |
-   "EXISTS"              |
-   "EXIT"                |
-   "EXPLAIN"             |
-   "FALSE"               |
-   "FETCH"               |
-   "FLOAT"               |
-   "FLOAT4"              |
-   "FLOAT8"              |
-   "FOR"                 |
-   "FORCE"               |
-   "FOREIGN"             |
-   "FROM"                |
-   "FUNCTION"		 |
-   "FULLTEXT"            |
-   "GLOBAL TEMPORARY"	 |
-   "GRANT"               |
-   "GROUP"               |
-   "HAVING"              |
-   "IF"                  |
-   "IGNORE"              |
-   "IN"                  |
-   "INDEX"               |
-   "INFILE"              |
-   "INNER"               |
-   "INOUT"               |
-   "INSENSITIVE"         |
-   "INSERT"              |
-   "INT"                 |
-   "INTEGER"             |
-   "INTERVAL"            |
-   "INTO"                |
-   "IS"                  |
-   "IS REF CURSOR"	 |
-   "ITERATE"             |
-   "JOIN"                |
-   "KEY"                 |
-   "KEYS"                |
-   "KILL"                |
-   "LEADING"             |
-   "LEAVE"               |
-   "LEFT"                |
-   "LIKE"                |
-   "LIMIT"               |
-   "LINES"               |
-   "LOAD"                |
-   "LOCK"                |
-   "LONG"                |
-   "LOOP"                |
-   "MATCH"               |
-   "MERGE"               |
-   "MINVALUE"		 |
-   "MAXVALUE"		 |
-   "MOD"                 |
-   "MODIFIES"            |
-   "NATURAL"             |
-   "NOCYCLE"		 |
-   "NOORDER"		 |
-   "NOT"                 |
-   "NULL"                |
-   "NUMERIC"             |
-   "NUMBER"              |
-   "ON"                  |
-   "OPEN"		 |
-   "OPTIMIZE"            |
-   "OPTION"              |
-   "OPTIONALLY"          |
-   "OR"                  |
-   "ORDER"               |
-   "OTHERS"		 |
-   "OUT"                 |
-   "OUTER"               |
-   "OUTFILE"             |
-   "PACKAGE"		 |
-   "PACKAGE BODY"	 |
-   "PAGESIZE"		 |
-   "PLS_INTEGER"	 |
-   "PRAGMA"		 |
-   "PRECISION"           |
-   "PRIMARY"             |
-   "PROCEDURE"           |
-   "PURGE"               |
-   "RAISE"		 |
-   "READ"                |
-   "READS"               |
-   "REAL"                |
-   "REFERENCES"          |
-   "REGEXP"              |
-   "RELEASE"             |
-   "RENAME"              |
-   "REPEAT"              |
-   "REPLACE"             |
-   "REQUIRE"             |
-   "RESTRICT"            |
-   "RETURN"              |
-   "REVOKE"              |
-   "RIGHT"               |
-   "RLIKE"               |
-   "ROLLBACK"		 |
-   "ROWCOUNT"		 |
-   "ROWTYPE"		 |
-   "SIZE"		 |
-   "SCHEMA"              |
-   "SCHEMAS"             |
-   "SELECT"              |
-   "SENSITIVE"           |
-   "SEPARATOR"           |
-   "SEQUENCE"		 |
-   "SET"                 |
-   "SHOW"                |
-   "SMALLINT"            |
-   "SONAME"              |
-   "SPATIAL"             |
-   "SPECIFIC"            |
-   "SQL"                 |
-   "SQLEXCEPTION"        |
-   "SQLSTATE"            |
-   "SQLWARNING"          |
-   "STARTING"            |
-   "SYSDATE"		 |
-   "TABLE"               |
-   "TABLESPACE"		 |
-   "TERMINATED"          |
-   "THEN"                |
-   "TO"                  |
-   "TO_CHAR"		 |
-   "TO_DATE"		 |
-   "TRAILING"            |
-   "TRIGGER"             |
-   "TRUE"                |
-   "TRUNCATE"            |
-   "TYPE"		 |
-   "UNDO"                |
-   "UNION"               |
-   "UNIQUE"              |
-   "UNLOCK"              |
-   "UNSIGNED"            |
-   "UPDATE"              |
-   "USAGE"               |
-   "USE"                 |
-   "USER"		 |
-   "USING"               |
-   "VALUES"              |
-   "VARBINARY"           |
-   "VARCHAR"             |
-   "VARCHAR2"            |
-   "VARCHARACTER"        |
-   "VARYING"             |
-   "WHEN"                |
-   "WHERE"               |
-   "WHILE"               |
-   "WITH"                |
-   "WRITE"               |
-   "XOR"                 |
-   "ZEROFILL"
-%%
-
-<YYINITIAL> {
-
-  /* keywords */
-  {Reserved}                     { return token(TokenType.KEYWORD); }
-
-  /* operators */
-
-  "("                            |
-  ")"                            |
-  "{"                            |
-  "}"                            |
-  "["                            |
-  "]"                            |
-  ";"                            |
-  ","                            |
-  "."                            |
-  "@"                            |
-  "="                            |
-  ">"                            |
-  "<"                            |
-  "!"                            |
-  "~"                            |
-  "?"                            |
-  ":"                            { return token(TokenType.OPERATOR); }
-
-  /* string literal */
-  \"                             {
-                                    yybegin(DQ_STRING);
-                                    tokenStart = yychar;
-                                    tokenLength = 1;
-                                 }
-  \'                             {
-                                    yybegin(SQ_STRING);
-                                    tokenStart = yychar;
-                                    tokenLength = 1;
-                                 }
-
-  /* numeric literals */
-
-  {DecIntegerLiteral}            |
-
-  {FloatLiteral}                 { return token(TokenType.NUMBER); }
-
-  /* comments */
-  {Comment}                      { return token(TokenType.COMMENT); }
-
-  /* whitespace */
-  {WhiteSpace}+                  { /* skip */ }
-
-  /* identifiers */
-  {Identifier}                   { return token(TokenType.IDENTIFIER); }
-
-}
-
-<DQ_STRING> {
-  {StringCharacter}+             { tokenLength += yylength(); }
-  \"\"                           { tokenLength += 2; }
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-  \"                             {
-                                     yybegin(YYINITIAL);
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-}
-
-<SQ_STRING> {
-  {SingleCharacter}+             { tokenLength += yylength(); }
-  \'\'                           { tokenLength += 2; }
-  \\.                            { tokenLength += 2; }
-  {LineTerminator}               { yybegin(YYINITIAL);  }
-  \'                             {
-                                     yybegin(YYINITIAL);
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-}
-
-/* error fallback */
-.|\n                             {  }
-<<EOF>>                          { return null; }
-
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jsyntaxpane.lexers;
+
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+
+%%
+
+%public
+%class SqlLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+%caseless
+
+
+%{
+    /**
+     * Default constructor is needed as we will always call the yyreset
+     */
+    public SqlLexer() {
+        super();
+    }
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+
+%}
+
+/* main character classes */
+LineTerminator = \r|\n|\r\n
+InputCharacter = [^\r\n]
+
+WhiteSpace = {LineTerminator} | [ \t\f]
+
+/* comments */
+Comment = {TraditionalComment} | {EndOfLineComment} | {DocumentationComment}
+
+TraditionalComment = "/*" [^*] ~"*/" | "/*" "*"+ "/"
+DocumentationComment = "/**" {CommentContent} "*"+ "/"
+CommentContent       = ( [^*] | \*+ [^/*] )*
+EndOfLineComment = "--" {InputCharacter}* {LineTerminator}?
+
+/* identifiers */
+Identifier = [:jletter:][:jletterdigit:]*
+
+/* integer literals */
+DecIntegerLiteral = 0 | [1-9][0-9]*
+
+/* floating point literals */
+FloatLiteral  = ({FLit1}|{FLit2}|{FLit3}) {Exponent}? [fF]
+
+FLit1    = [0-9]+ \. [0-9]*
+FLit2    = \. [0-9]+
+FLit3    = [0-9]+
+Exponent = [eE] [+-]? [0-9]+
+
+/* string and character literals */
+StringCharacter = [^\r\n\"\\]
+SingleCharacter = [^\r\n\'\\]
+
+// Create states for Double Quoted and Single Quoted Strings
+%state DQ_STRING, SQ_STRING
+
+Reserved =
+   "ADD"                 |
+   "ALL"                 |
+   "ALLOW REVERSE SCANS" |
+   "ALTER"               |
+   "ANALYZE"             |
+   "AND"                 |
+   "AS"                  |
+   "ASC"                 |
+   "AUTOMATIC"           |
+   "BEGIN"		 |
+   "BEFORE"              |
+   "BETWEEN"             |
+   "BIGINT"              |
+   "BINARY"              |
+   "BLOB"                |
+   "BOTH"                |
+   "BUFFERPOOL"		 |
+   "BY"                  |
+   "CACHE"		 |
+   "CALL"                |
+   "CASCADE"             |
+   "CASE"                |
+   "CHANGE"              |
+   "CHAR"                |
+   "CHARACTER"           |
+   "CHECK"               |
+   "COLLATE"             |
+   "COLUMN"              |
+   "COMMIT"		 |
+   "CONDITION"           |
+   "CONSTANT"		 |
+   "CONSTRAINT"          |
+   "CONTINUE"            |
+   "CONVERT"             |
+   "CREATE"              |
+   "CROSS"               |
+   "CURSOR"              |
+   "DATE"		 |
+   "DATABASE"            |
+   "DATABASES"           |
+   "DEC"                 |
+   "DECIMAL"             |
+   "DECODE"		 |
+   "DECLARE"             |
+   "DEFAULT"             |
+   "DELAYED"             |
+   "DELETE"              |
+   "DESC"                |
+   "DESCRIBE"            |
+   "DETERMINISTIC"       |
+   "DISTINCT"            |
+   "DISTINCTROW"         |
+   "DIV"                 |
+   "DOUBLE"              |
+   "DROP"                |
+   "DUAL"                |
+   "EACH"                |
+   "ELSE"                |
+   "ELSEIF"              |
+   "ENCLOSED"            |
+   "END"		 |
+   "ESCAPED"             |
+   "EXCEPTION" 		 |
+   "EXISTS"              |
+   "EXIT"                |
+   "EXPLAIN"             |
+   "FALSE"               |
+   "FETCH"               |
+   "FLOAT"               |
+   "FLOAT4"              |
+   "FLOAT8"              |
+   "FOR"                 |
+   "FORCE"               |
+   "FOREIGN"             |
+   "FROM"                |
+   "FUNCTION"		 |
+   "FULLTEXT"            |
+   "GLOBAL TEMPORARY"	 |
+   "GRANT"               |
+   "GROUP"               |
+   "HAVING"              |
+   "IF"                  |
+   "IGNORE"              |
+   "IN"                  |
+   "INDEX"               |
+   "INFILE"              |
+   "INNER"               |
+   "INOUT"               |
+   "INSENSITIVE"         |
+   "INSERT"              |
+   "INT"                 |
+   "INTEGER"             |
+   "INTERVAL"            |
+   "INTO"                |
+   "IS"                  |
+   "IS REF CURSOR"	 |
+   "ITERATE"             |
+   "JOIN"                |
+   "KEY"                 |
+   "KEYS"                |
+   "KILL"                |
+   "LEADING"             |
+   "LEAVE"               |
+   "LEFT"                |
+   "LIKE"                |
+   "LIMIT"               |
+   "LINES"               |
+   "LOAD"                |
+   "LOCK"                |
+   "LONG"                |
+   "LOOP"                |
+   "MATCH"               |
+   "MERGE"               |
+   "MINVALUE"		 |
+   "MAXVALUE"		 |
+   "MOD"                 |
+   "MODIFIES"            |
+   "NATURAL"             |
+   "NOCYCLE"		 |
+   "NOORDER"		 |
+   "NOT"                 |
+   "NULL"                |
+   "NUMERIC"             |
+   "NUMBER"              |
+   "ON"                  |
+   "OPEN"		 |
+   "OPTIMIZE"            |
+   "OPTION"              |
+   "OPTIONALLY"          |
+   "OR"                  |
+   "ORDER"               |
+   "OTHERS"		 |
+   "OUT"                 |
+   "OUTER"               |
+   "OUTFILE"             |
+   "PACKAGE"		 |
+   "PACKAGE BODY"	 |
+   "PAGESIZE"		 |
+   "PLS_INTEGER"	 |
+   "PRAGMA"		 |
+   "PRECISION"           |
+   "PRIMARY"             |
+   "PROCEDURE"           |
+   "PURGE"               |
+   "RAISE"		 |
+   "READ"                |
+   "READS"               |
+   "REAL"                |
+   "REFERENCES"          |
+   "REGEXP"              |
+   "RELEASE"             |
+   "RENAME"              |
+   "REPEAT"              |
+   "REPLACE"             |
+   "REQUIRE"             |
+   "RESTRICT"            |
+   "RETURN"              |
+   "REVOKE"              |
+   "RIGHT"               |
+   "RLIKE"               |
+   "ROLLBACK"		 |
+   "ROWCOUNT"		 |
+   "ROWTYPE"		 |
+   "SIZE"		 |
+   "SCHEMA"              |
+   "SCHEMAS"             |
+   "SELECT"              |
+   "SENSITIVE"           |
+   "SEPARATOR"           |
+   "SEQUENCE"		 |
+   "SET"                 |
+   "SHOW"                |
+   "SMALLINT"            |
+   "SONAME"              |
+   "SPATIAL"             |
+   "SPECIFIC"            |
+   "SQL"                 |
+   "SQLEXCEPTION"        |
+   "SQLSTATE"            |
+   "SQLWARNING"          |
+   "STARTING"            |
+   "SYSDATE"		 |
+   "TABLE"               |
+   "TABLESPACE"		 |
+   "TERMINATED"          |
+   "THEN"                |
+   "TO"                  |
+   "TO_CHAR"		 |
+   "TO_DATE"		 |
+   "TRAILING"            |
+   "TRIGGER"             |
+   "TRUE"                |
+   "TRUNCATE"            |
+   "TYPE"		 |
+   "UNDO"                |
+   "UNION"               |
+   "UNIQUE"              |
+   "UNLOCK"              |
+   "UNSIGNED"            |
+   "UPDATE"              |
+   "USAGE"               |
+   "USE"                 |
+   "USER"		 |
+   "USING"               |
+   "VALUES"              |
+   "VARBINARY"           |
+   "VARCHAR"             |
+   "VARCHAR2"            |
+   "VARCHARACTER"        |
+   "VARYING"             |
+   "WHEN"                |
+   "WHERE"               |
+   "WHILE"               |
+   "WITH"                |
+   "WRITE"               |
+   "XOR"                 |
+   "ZEROFILL"
+%%
+
+<YYINITIAL> {
+
+  /* keywords */
+  {Reserved}                     { return token(TokenType.KEYWORD); }
+
+  /* operators */
+
+  "("                            |
+  ")"                            |
+  "{"                            |
+  "}"                            |
+  "["                            |
+  "]"                            |
+  ";"                            |
+  ","                            |
+  "."                            |
+  "@"                            |
+  "="                            |
+  ">"                            |
+  "<"                            |
+  "!"                            |
+  "~"                            |
+  "?"                            |
+  ":"                            { return token(TokenType.OPERATOR); }
+
+  /* string literal */
+  \"                             {
+                                    yybegin(DQ_STRING);
+                                    tokenStart = yychar;
+                                    tokenLength = 1;
+                                 }
+  \'                             {
+                                    yybegin(SQ_STRING);
+                                    tokenStart = yychar;
+                                    tokenLength = 1;
+                                 }
+
+  /* numeric literals */
+
+  {DecIntegerLiteral}            |
+
+  {FloatLiteral}                 { return token(TokenType.NUMBER); }
+
+  /* comments */
+  {Comment}                      { return token(TokenType.COMMENT); }
+
+  /* whitespace */
+  {WhiteSpace}+                  { /* skip */ }
+
+  /* identifiers */
+  {Identifier}                   { return token(TokenType.IDENTIFIER); }
+
+}
+
+<DQ_STRING> {
+  {StringCharacter}+             { tokenLength += yylength(); }
+  \"\"                           { tokenLength += 2; }
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+  \"                             {
+                                     yybegin(YYINITIAL);
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+}
+
+<SQ_STRING> {
+  {SingleCharacter}+             { tokenLength += yylength(); }
+  \'\'                           { tokenLength += 2; }
+  \\.                            { tokenLength += 2; }
+  {LineTerminator}               { yybegin(YYINITIAL);  }
+  \'                             {
+                                     yybegin(YYINITIAL);
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+}
+
+/* error fallback */
+.|\n                             {  }
+<<EOF>>                          { return null; }
+
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/tal.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/tal.flex
index 74cb7272e..973f5b108 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/tal.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/tal.flex
@@ -1,166 +1,166 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package jsyntaxpane.lexers;
-
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
-
-%%
-
-%public
-%class TALLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-%caseless
-
-
-%{
-    /**
-     * Create an empty lexer, yyrset will be called later to reset and assign
-     * the reader
-     */
-    public TALLexer() {
-        super();
-    }
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-%}
-
-/* main character classes */
-LineTerminator = \r|\n|\r\n
-InputCharacter = [^\r\n]
-
-WhiteSpace = {LineTerminator} | [ \t\f]+
-
-/* comments */
-Comment = {TraditionalComment} | {EndOfLineComment}
-
-TraditionalComment = "!" [^\r\n!]* ( "!" | {LineTerminator} )
-EndOfLineComment = "--" {InputCharacter}* {LineTerminator}?
-
-/* identifiers */
-Identifier = [A-Za-z_][A-Za-z0-9\^_]*
-
-/* integer literals */
-DecIntegerLiteral = 0 | [1-9][0-9]*
-
-HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
-HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
-HexDigit          = [0-9a-fA-F]
-
-OctIntegerLiteral = "%" [1-3]? {OctDigit} {1,15}
-OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
-OctDigit          = [0-7]
-    
-FixedLiteral  = DecIntegerLiteral [fF]
-DoubleLiteral = DecIntegerLiteral [dD]
-
-/* string and character literals */
-StringCharacter = [^\r\n\"\\]
-SingleCharacter = [^\r\n\'\\]
-
-%%
-
-<YYINITIAL> {
-
-  /* keywords */
-  "begin"                        |
-  "end"                          |
-  "struct"                       |
-  "fieldalign"                   |
-  "shared"                       |
-  "shared2"                      |
-  "literal"                      |
-  "for"                          |
-  "do"                           |
-  "while"                        |
-  "?page"                        |
-  "?section"                     { return token(TokenType.KEYWORD); }
-
-  "int"                          |
-  "string"                       |
-  "int(32)"                      |
-  "fixed"                        |
-  "byte"                         |
-  "float"                        |
-  "filler"                       { return token(TokenType.TYPE); }
-
-
-  "("                            |
-  ")"                            |
-  "{"                            | 
-  "}"                            | 
-  "["                            | 
-  "]"                            | 
-  ";"                            | 
-  ","                            | 
-  "."                            | 
-  "="                            | 
-  ">"                            | 
-  "<"                            |
-  "!"                            | 
-  "?"                            | 
-  ":"                            | 
-  ":="                           | 
-  "':='"                         | 
-  "'=:'"                         | 
-  "<>"                           | 
-  "+"                            | 
-  "-"                            | 
-  "*"                            | 
-  "/"                            | 
-  "<<"                           | 
-  ">>"                           { return token(TokenType.OPERATOR); } 
-  
-  /* string literal */
-  \"{StringCharacter}+\"         { return token(TokenType.STRING); }
-
-  /* character literal */
-  \'{SingleCharacter}\'          { return token(TokenType.STRING); }
-
-  /* numeric literals */
-
-  {DecIntegerLiteral}            |
-  
-  {HexIntegerLiteral}            |
-  {HexLongLiteral}               |
- 
-  {OctIntegerLiteral}            |
-  {OctLongLiteral}               |
-  
-  {FixedLiteral}                 |
-  {DoubleLiteral}                { return token(TokenType.NUMBER); }
-  
-  /* comments */
-  {Comment}                      { return token(TokenType.COMMENT); }
-
-  /* whitespace */
-  {WhiteSpace}                   { }
-
-  /* identifiers */ 
-  {Identifier}                   { return token(TokenType.IDENTIFIER); }
-}
-
-
-/* error fallback */
-.|\n                             {  }
-<<EOF>>                          { return null; }
-
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jsyntaxpane.lexers;
+
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+
+%%
+
+%public
+%class TALLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+%caseless
+
+
+%{
+    /**
+     * Create an empty lexer, yyrset will be called later to reset and assign
+     * the reader
+     */
+    public TALLexer() {
+        super();
+    }
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+%}
+
+/* main character classes */
+LineTerminator = \r|\n|\r\n
+InputCharacter = [^\r\n]
+
+WhiteSpace = {LineTerminator} | [ \t\f]+
+
+/* comments */
+Comment = {TraditionalComment} | {EndOfLineComment}
+
+TraditionalComment = "!" [^\r\n!]* ( "!" | {LineTerminator} )
+EndOfLineComment = "--" {InputCharacter}* {LineTerminator}?
+
+/* identifiers */
+Identifier = [A-Za-z_][A-Za-z0-9\^_]*
+
+/* integer literals */
+DecIntegerLiteral = 0 | [1-9][0-9]*
+
+HexIntegerLiteral = 0 [xX] 0* {HexDigit} {1,8}
+HexLongLiteral    = 0 [xX] 0* {HexDigit} {1,16} [lL]
+HexDigit          = [0-9a-fA-F]
+
+OctIntegerLiteral = "%" [1-3]? {OctDigit} {1,15}
+OctLongLiteral    = 0+ 1? {OctDigit} {1,21} [lL]
+OctDigit          = [0-7]
+    
+FixedLiteral  = DecIntegerLiteral [fF]
+DoubleLiteral = DecIntegerLiteral [dD]
+
+/* string and character literals */
+StringCharacter = [^\r\n\"\\]
+SingleCharacter = [^\r\n\'\\]
+
+%%
+
+<YYINITIAL> {
+
+  /* keywords */
+  "begin"                        |
+  "end"                          |
+  "struct"                       |
+  "fieldalign"                   |
+  "shared"                       |
+  "shared2"                      |
+  "literal"                      |
+  "for"                          |
+  "do"                           |
+  "while"                        |
+  "?page"                        |
+  "?section"                     { return token(TokenType.KEYWORD); }
+
+  "int"                          |
+  "string"                       |
+  "int(32)"                      |
+  "fixed"                        |
+  "byte"                         |
+  "float"                        |
+  "filler"                       { return token(TokenType.TYPE); }
+
+
+  "("                            |
+  ")"                            |
+  "{"                            | 
+  "}"                            | 
+  "["                            | 
+  "]"                            | 
+  ";"                            | 
+  ","                            | 
+  "."                            | 
+  "="                            | 
+  ">"                            | 
+  "<"                            |
+  "!"                            | 
+  "?"                            | 
+  ":"                            | 
+  ":="                           | 
+  "':='"                         | 
+  "'=:'"                         | 
+  "<>"                           | 
+  "+"                            | 
+  "-"                            | 
+  "*"                            | 
+  "/"                            | 
+  "<<"                           | 
+  ">>"                           { return token(TokenType.OPERATOR); } 
+  
+  /* string literal */
+  \"{StringCharacter}+\"         { return token(TokenType.STRING); }
+
+  /* character literal */
+  \'{SingleCharacter}\'          { return token(TokenType.STRING); }
+
+  /* numeric literals */
+
+  {DecIntegerLiteral}            |
+  
+  {HexIntegerLiteral}            |
+  {HexLongLiteral}               |
+ 
+  {OctIntegerLiteral}            |
+  {OctLongLiteral}               |
+  
+  {FixedLiteral}                 |
+  {DoubleLiteral}                { return token(TokenType.NUMBER); }
+  
+  /* comments */
+  {Comment}                      { return token(TokenType.COMMENT); }
+
+  /* whitespace */
+  {WhiteSpace}                   { }
+
+  /* identifiers */ 
+  {Identifier}                   { return token(TokenType.IDENTIFIER); }
+}
+
+
+/* error fallback */
+.|\n                             {  }
+<<EOF>>                          { return null; }
+
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xhtml.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xhtml.flex
index 07b9bb166..cdf456789 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xhtml.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xhtml.flex
@@ -1,371 +1,371 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jsyntaxpane.lexers;
-
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
-
-%%
-
-%public 
-%class XHTMLLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-%ignorecase
-
-%{
-    /**
-     * Create an empty lexer, yyrset will be called later to reset and assign
-     * the reader
-     */
-    public XHTMLLexer() {
-        super();
-    }
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-
-    private static final byte TAG_OPEN      =  1;
-    private static final byte TAG_CLOSE     = -1;
-
-    private static final byte INSTR_OPEN    =  2;
-    private static final byte INSTR_CLOSE   = -2;
-
-    private static final byte CDATA_OPEN    =  3;
-    private static final byte CDATA_CLOSE   = -3;
-
-    private static final byte COMMENT_OPEN  =  4;
-    private static final byte COMMENT_CLOSE = -4;
-%}
-
-%xstate COMMENT, CDATA, TAG, INSTR, DOCTYPE
-
-/* main character classes */
-
-/* white space */
-S = (\u0020 | \u0009 | \u000D | \u000A)+
-
-/* characters */
-// Char = \u0009 | \u000A | \u000D | [\u0020-\uD7FF] | [\uE000-\uFFFD] | [\u10000-\u10FFFF]
-
-/* comments */
-CommentStart = "<!--"
-CommentEnd = "-->"
-
-NameStartChar = ":" | [A-Z] | "_" | [a-z]
-NameChar = {NameStartChar} | "-" | "." | [0-9] | \u00B7
-Name = {NameStartChar} {NameChar}*
-
-/* XML Processing Instructions */
-InstrStart = "<?" {Name}
-InstrEnd   = "?>"
-
-DocTypeStart = "<!doctype"
-
-/* CDATA  */
-CDataStart = "<![CDATA["
-CDataEnd   = "]]>"
-
-/* Tags */
-OpenTagStart = "<" {Name}
-OpenTagClose = "/>"
-OpenTagEnd = ">"
-CloseTag = "</" {Name} {S}* ">"
-
-/* attribute */
-Attribute = {Name} "="
-
-/* HTML specifics */
-HTMLTagName = 
-    "address"        |
-    "applet"         |
-    "area"           |
-    "a"              |
-    "b"              |
-    "base"           |
-    "basefont"       |
-    "big"            |
-    "blockquote"     |
-    "body"           |
-    "br"             |
-    "caption"        |
-    "center"         |
-    "cite"           |
-    "code"           |
-    "dd"             |
-    "dfn"            |
-    "dir"            |
-    "div"            |
-    "dl"             |
-    "dt"             |
-    "font"           |
-    "form"           |
-    "h"[1-6]         |
-    "head"           |
-    "hr"             |
-    "html"           |
-    "img"            |
-    "input"          |
-    "isindex"        |
-    "kbd"            |
-    "li"             |
-    "link"           |
-    "LINK"           |
-    "map"            |
-    "META"           |
-    "menu"           |
-    "meta"           |
-    "ol"             |
-    "option"         |
-    "param"          |
-    "pre"            |
-    "p"              |
-    "samp"           |
-    "span"           |
-    "select"         |
-    "small"          |
-    "strike"         |
-    "sub"            |
-    "sup"            |
-    "table"          |
-    "td"             |
-    "textarea"       |
-    "th"             |
-    "title"          |
-    "tr"             |
-    "tt"             |
-    "ul"             |
-    "var"            |
-    "xmp"            |
-    "script"         |
-    "noscript"       |
-    "style"          
-
-HTMLAttrName = 
-    "action"            |
-    "align"             |
-    "alink"             |
-    "alt"               |
-    "archive"           |
-    "background"        |
-    "bgcolor"           |
-    "border"            |
-    "bordercolor"       |
-    "cellpadding"       |
-    "cellspacing"       |
-    "checked"           |
-    "class"             |
-    "clear"             |
-    "code"              |
-    "codebase"          |
-    "color"             |
-    "cols"              |
-    "colspan"           |
-    "content"           |
-    "coords"            |
-    "enctype"           |
-    "face"              |
-    "gutter"            |
-    "height"            |
-    "hspace"            |
-    "href"              |
-    "id"                |
-    "link"              |
-    "lowsrc"            |
-    "marginheight"      |
-    "marginwidth"       |
-    "maxlength"         |
-    "method"            |
-    "name"              |
-    "prompt"            |
-    "rel"               |
-    "rev"               |
-    "rows"              |
-    "rowspan"           |
-    "scrolling"         |
-    "selected"          |
-    "shape"             |
-    "size"              |
-    "src"               |
-    "start"             |
-    "target"            |
-    "text"              |
-    "type"              |
-    "url"               |
-    "usemap"            |
-    "ismap"             |
-    "valign"            |
-    "value"             |
-    "vlink"             |
-    "vspace"            |
-    "width"             |
-    "wrap"              |
-    "abbr"              |
-    "accept"            |
-    "accesskey"         |
-    "axis"              |
-    "char"              |
-    "charoff"           |
-    "charset"           |
-    "cite"              |
-    "classid"           |
-    "codetype"          |
-    "compact"           |
-    "data"              |
-    "datetime"          |
-    "declare"           |
-    "defer"             |
-    "dir"               |
-    "disabled"          |
-    "for"               |
-    "frame"             |
-    "headers"           |
-    "hreflang"          |
-    "lang"              |
-    "language"          |
-    "longdesc"          |
-    "multiple"          |
-    "nohref"            |
-    "nowrap"            |
-    "object"            |
-    "profile"           |
-    "readonly"          |
-    "rules"             |
-    "scheme"            |
-    "scope"             |
-    "span"              |
-    "standby"           |
-    "style"             |
-    "summary"           |
-    "tabindex"          |
-    "valuetype"         |
-    "version"
-
-HTMLOpenTagStart = "<" {HTMLTagName}
-HTMLCloseTag = "</" {HTMLTagName} {S}* ">"
-HTMLAttribute = {HTMLAttrName} "="
-
-/* string and character literals */
-DQuoteStringChar = [^\r\n\"]
-SQuoteStringChar = [^\r\n\']
-
-%%
-
-<YYINITIAL> {
-  
-  "&"  [a-z]+ ";"                |
-  "&#" [:digit:]+ ";"            { return token(TokenType.KEYWORD2); }
-
-  {InstrStart}                   {
-                                     yybegin(INSTR);
-                                     return token(TokenType.TYPE2, INSTR_OPEN);
-                                 }
-  {DocTypeStart}                 {
-                                     yybegin(DOCTYPE);
-                                     return token(TokenType.TYPE2, INSTR_OPEN);
-                                 }
-  {HTMLOpenTagStart}             {
-                                     yybegin(TAG);
-                                     return token(TokenType.KEYWORD2, TAG_OPEN);
-                                 }
-  {HTMLCloseTag}                 {   return token(TokenType.KEYWORD2, TAG_CLOSE); }
-  {OpenTagStart}                 {
-                                     yybegin(TAG);
-                                     return token(TokenType.KEYWORD, TAG_OPEN);
-                                 }
-  {CloseTag}                     {   return token(TokenType.KEYWORD, TAG_CLOSE); }
-  {CommentStart}                 {
-                                     yybegin(COMMENT);
-                                     return token(TokenType.COMMENT2, COMMENT_OPEN);
-                                 }
-  {CDataStart}                   {
-                                     yybegin(CDATA);
-                                     return token(TokenType.COMMENT2, CDATA_OPEN);
-                                 }
-}
-
-<INSTR> {
-  {Attribute}                    { return token(TokenType.IDENTIFIER); }
-
-  \"{DQuoteStringChar}*\"        |
-  \'{SQuoteStringChar}*\'        { return token(TokenType.STRING); }
-
-  {InstrEnd}                     {
-                                     yybegin(YYINITIAL);
-                                     return token(TokenType.TYPE2, INSTR_CLOSE);
-                                 }
-}
-
-<DOCTYPE> {
-  [^>]*                          { }
-
-  {OpenTagEnd}                   {
-                                     yybegin(YYINITIAL);
-                                     return token(TokenType.TYPE2, INSTR_CLOSE);
-                                 }
-}
-
-<TAG> {
-  {HTMLAttribute}                { return token(TokenType.KEYWORD2); }
-  {Attribute}                    { return token(TokenType.IDENTIFIER); }
-
-  \"{DQuoteStringChar}*\"        |
-  \'{SQuoteStringChar}*\'        { return token(TokenType.STRING); }
-
-
-  {OpenTagClose}                 {
-                                     yybegin(YYINITIAL);
-                                     return token(TokenType.KEYWORD, TAG_CLOSE);
-}
-
-  {OpenTagEnd}                   {
-                                     yybegin(YYINITIAL);
-                                     return token(TokenType.KEYWORD);
-                                 }
-}
-
-<COMMENT> {
-  {CommentEnd}                   {
-                                     yybegin(YYINITIAL);
-                                     return token(TokenType.COMMENT2, COMMENT_CLOSE);
-                                 }
-   ~{CommentEnd}                 {
-                                     yypushback(3);
-                                     return token(TokenType.COMMENT);
-                                 }
-}
-
-<CDATA> {
-  {CDataEnd}                     {
-                                     yybegin(YYINITIAL);
-                                     return token(TokenType.COMMENT2, CDATA_CLOSE);
-                                 }
-  ~{CDataEnd}                    {
-                                     yypushback(3);
-                                     return token(TokenType.COMMENT);
-                                 }
-}
-
-<YYINITIAL,TAG,INSTR,CDATA,COMMENT> {
-/* error fallback */
-   .|\n                          {  }
-   <<EOF>>                       { return null; }
-}
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jsyntaxpane.lexers;
+
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+
+%%
+
+%public 
+%class XHTMLLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+%ignorecase
+
+%{
+    /**
+     * Create an empty lexer, yyrset will be called later to reset and assign
+     * the reader
+     */
+    public XHTMLLexer() {
+        super();
+    }
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+
+    private static final byte TAG_OPEN      =  1;
+    private static final byte TAG_CLOSE     = -1;
+
+    private static final byte INSTR_OPEN    =  2;
+    private static final byte INSTR_CLOSE   = -2;
+
+    private static final byte CDATA_OPEN    =  3;
+    private static final byte CDATA_CLOSE   = -3;
+
+    private static final byte COMMENT_OPEN  =  4;
+    private static final byte COMMENT_CLOSE = -4;
+%}
+
+%xstate COMMENT, CDATA, TAG, INSTR, DOCTYPE
+
+/* main character classes */
+
+/* white space */
+S = (\u0020 | \u0009 | \u000D | \u000A)+
+
+/* characters */
+// Char = \u0009 | \u000A | \u000D | [\u0020-\uD7FF] | [\uE000-\uFFFD] | [\u10000-\u10FFFF]
+
+/* comments */
+CommentStart = "<!--"
+CommentEnd = "-->"
+
+NameStartChar = ":" | [A-Z] | "_" | [a-z]
+NameChar = {NameStartChar} | "-" | "." | [0-9] | \u00B7
+Name = {NameStartChar} {NameChar}*
+
+/* XML Processing Instructions */
+InstrStart = "<?" {Name}
+InstrEnd   = "?>"
+
+DocTypeStart = "<!doctype"
+
+/* CDATA  */
+CDataStart = "<![CDATA["
+CDataEnd   = "]]>"
+
+/* Tags */
+OpenTagStart = "<" {Name}
+OpenTagClose = "/>"
+OpenTagEnd = ">"
+CloseTag = "</" {Name} {S}* ">"
+
+/* attribute */
+Attribute = {Name} "="
+
+/* HTML specifics */
+HTMLTagName = 
+    "address"        |
+    "applet"         |
+    "area"           |
+    "a"              |
+    "b"              |
+    "base"           |
+    "basefont"       |
+    "big"            |
+    "blockquote"     |
+    "body"           |
+    "br"             |
+    "caption"        |
+    "center"         |
+    "cite"           |
+    "code"           |
+    "dd"             |
+    "dfn"            |
+    "dir"            |
+    "div"            |
+    "dl"             |
+    "dt"             |
+    "font"           |
+    "form"           |
+    "h"[1-6]         |
+    "head"           |
+    "hr"             |
+    "html"           |
+    "img"            |
+    "input"          |
+    "isindex"        |
+    "kbd"            |
+    "li"             |
+    "link"           |
+    "LINK"           |
+    "map"            |
+    "META"           |
+    "menu"           |
+    "meta"           |
+    "ol"             |
+    "option"         |
+    "param"          |
+    "pre"            |
+    "p"              |
+    "samp"           |
+    "span"           |
+    "select"         |
+    "small"          |
+    "strike"         |
+    "sub"            |
+    "sup"            |
+    "table"          |
+    "td"             |
+    "textarea"       |
+    "th"             |
+    "title"          |
+    "tr"             |
+    "tt"             |
+    "ul"             |
+    "var"            |
+    "xmp"            |
+    "script"         |
+    "noscript"       |
+    "style"          
+
+HTMLAttrName = 
+    "action"            |
+    "align"             |
+    "alink"             |
+    "alt"               |
+    "archive"           |
+    "background"        |
+    "bgcolor"           |
+    "border"            |
+    "bordercolor"       |
+    "cellpadding"       |
+    "cellspacing"       |
+    "checked"           |
+    "class"             |
+    "clear"             |
+    "code"              |
+    "codebase"          |
+    "color"             |
+    "cols"              |
+    "colspan"           |
+    "content"           |
+    "coords"            |
+    "enctype"           |
+    "face"              |
+    "gutter"            |
+    "height"            |
+    "hspace"            |
+    "href"              |
+    "id"                |
+    "link"              |
+    "lowsrc"            |
+    "marginheight"      |
+    "marginwidth"       |
+    "maxlength"         |
+    "method"            |
+    "name"              |
+    "prompt"            |
+    "rel"               |
+    "rev"               |
+    "rows"              |
+    "rowspan"           |
+    "scrolling"         |
+    "selected"          |
+    "shape"             |
+    "size"              |
+    "src"               |
+    "start"             |
+    "target"            |
+    "text"              |
+    "type"              |
+    "url"               |
+    "usemap"            |
+    "ismap"             |
+    "valign"            |
+    "value"             |
+    "vlink"             |
+    "vspace"            |
+    "width"             |
+    "wrap"              |
+    "abbr"              |
+    "accept"            |
+    "accesskey"         |
+    "axis"              |
+    "char"              |
+    "charoff"           |
+    "charset"           |
+    "cite"              |
+    "classid"           |
+    "codetype"          |
+    "compact"           |
+    "data"              |
+    "datetime"          |
+    "declare"           |
+    "defer"             |
+    "dir"               |
+    "disabled"          |
+    "for"               |
+    "frame"             |
+    "headers"           |
+    "hreflang"          |
+    "lang"              |
+    "language"          |
+    "longdesc"          |
+    "multiple"          |
+    "nohref"            |
+    "nowrap"            |
+    "object"            |
+    "profile"           |
+    "readonly"          |
+    "rules"             |
+    "scheme"            |
+    "scope"             |
+    "span"              |
+    "standby"           |
+    "style"             |
+    "summary"           |
+    "tabindex"          |
+    "valuetype"         |
+    "version"
+
+HTMLOpenTagStart = "<" {HTMLTagName}
+HTMLCloseTag = "</" {HTMLTagName} {S}* ">"
+HTMLAttribute = {HTMLAttrName} "="
+
+/* string and character literals */
+DQuoteStringChar = [^\r\n\"]
+SQuoteStringChar = [^\r\n\']
+
+%%
+
+<YYINITIAL> {
+  
+  "&"  [a-z]+ ";"                |
+  "&#" [:digit:]+ ";"            { return token(TokenType.KEYWORD2); }
+
+  {InstrStart}                   {
+                                     yybegin(INSTR);
+                                     return token(TokenType.TYPE2, INSTR_OPEN);
+                                 }
+  {DocTypeStart}                 {
+                                     yybegin(DOCTYPE);
+                                     return token(TokenType.TYPE2, INSTR_OPEN);
+                                 }
+  {HTMLOpenTagStart}             {
+                                     yybegin(TAG);
+                                     return token(TokenType.KEYWORD2, TAG_OPEN);
+                                 }
+  {HTMLCloseTag}                 {   return token(TokenType.KEYWORD2, TAG_CLOSE); }
+  {OpenTagStart}                 {
+                                     yybegin(TAG);
+                                     return token(TokenType.KEYWORD, TAG_OPEN);
+                                 }
+  {CloseTag}                     {   return token(TokenType.KEYWORD, TAG_CLOSE); }
+  {CommentStart}                 {
+                                     yybegin(COMMENT);
+                                     return token(TokenType.COMMENT2, COMMENT_OPEN);
+                                 }
+  {CDataStart}                   {
+                                     yybegin(CDATA);
+                                     return token(TokenType.COMMENT2, CDATA_OPEN);
+                                 }
+}
+
+<INSTR> {
+  {Attribute}                    { return token(TokenType.IDENTIFIER); }
+
+  \"{DQuoteStringChar}*\"        |
+  \'{SQuoteStringChar}*\'        { return token(TokenType.STRING); }
+
+  {InstrEnd}                     {
+                                     yybegin(YYINITIAL);
+                                     return token(TokenType.TYPE2, INSTR_CLOSE);
+                                 }
+}
+
+<DOCTYPE> {
+  [^>]*                          { }
+
+  {OpenTagEnd}                   {
+                                     yybegin(YYINITIAL);
+                                     return token(TokenType.TYPE2, INSTR_CLOSE);
+                                 }
+}
+
+<TAG> {
+  {HTMLAttribute}                { return token(TokenType.KEYWORD2); }
+  {Attribute}                    { return token(TokenType.IDENTIFIER); }
+
+  \"{DQuoteStringChar}*\"        |
+  \'{SQuoteStringChar}*\'        { return token(TokenType.STRING); }
+
+
+  {OpenTagClose}                 {
+                                     yybegin(YYINITIAL);
+                                     return token(TokenType.KEYWORD, TAG_CLOSE);
+}
+
+  {OpenTagEnd}                   {
+                                     yybegin(YYINITIAL);
+                                     return token(TokenType.KEYWORD);
+                                 }
+}
+
+<COMMENT> {
+  {CommentEnd}                   {
+                                     yybegin(YYINITIAL);
+                                     return token(TokenType.COMMENT2, COMMENT_CLOSE);
+                                 }
+   ~{CommentEnd}                 {
+                                     yypushback(3);
+                                     return token(TokenType.COMMENT);
+                                 }
+}
+
+<CDATA> {
+  {CDataEnd}                     {
+                                     yybegin(YYINITIAL);
+                                     return token(TokenType.COMMENT2, CDATA_CLOSE);
+                                 }
+  ~{CDataEnd}                    {
+                                     yypushback(3);
+                                     return token(TokenType.COMMENT);
+                                 }
+}
+
+<YYINITIAL,TAG,INSTR,CDATA,COMMENT> {
+/* error fallback */
+   .|\n                          {  }
+   <<EOF>>                       { return null; }
+}
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xml.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xml.flex
index 741b71773..5fbf40981 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xml.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xml.flex
@@ -1,196 +1,196 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package jsyntaxpane.lexers;
-
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
-
-%%
-
-%public 
-%class XmlLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-
-%{
-    /**
-     * Create an empty lexer, yyrset will be called later to reset and assign
-     * the reader
-     */
-    public XmlLexer() {
-        super();
-    }
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-
-    private static final byte TAG_OPEN      =  1;
-    private static final byte TAG_CLOSE     = -1;
-
-    private static final byte INSTR_OPEN    =  2;
-    private static final byte INSTR_CLOSE   = -2;
-
-    private static final byte CDATA_OPEN    =  3;
-    private static final byte CDATA_CLOSE   = -3;
-
-    private static final byte COMMENT_OPEN  =  4;
-    private static final byte COMMENT_CLOSE = -4;
-%}
-
-%xstate COMMENT, CDATA, TAG, INSTR
-
-/* main character classes */
-
-/* white space */
-S = (\u0020 | \u0009 | \u000D | \u000A)+
-
-/* characters */
-
-Char = \u0009 | \u000A | \u000D | [\u0020-\uD7FF] | [\uE000-\uFFFD] | [\u10000-\u10FFFF]
-
-/* comments */
-CommentStart = "<!--"
-CommentEnd = "-->"
-
-NameStartChar = ":" | [A-Z] | "_" | [a-z]
-NameStartCharUnicode = [\u00C0-\u00D6]   |
-        [\u00D8-\u00F6] |
-        [\u00F8-\u02FF] |
-        [\u0370-\u037D] |
-        [\u037F-\u1FFF] |
-        [\u200C-\u200D] |
-        [\u2070-\u218F] |
-        [\u2C00-\u2FEF] |
-        [\u3001-\uD7FF] |
-        [\uF900-\uFDCF] |
-        [\uFDF0-\uFFFD] |
-        [\u10000-\uEFFFF]
-
-NameChar = {NameStartChar} | "-" | "." | [0-9] | \u00B7
-NameCharUnicode = [\u0300-\u036F] | [\u0203F-\u2040]
-Name = {NameStartChar} {NameChar}*
-NameUnicode = ({NameStartChar}|{NameStartCharUnicode}) ({NameChar}|{NameCharUnicode})*
-
-/* XML Processing Instructions */
-InstrStart = "<?" {Name}
-InstrEnd   = "?>"
-
-/* CDATA  */
-CDataStart = "<![CDATA["
-CDataEnd   = "]]>"
-
-/* Tags */
-OpenTagStart = "<" {Name}
-OpenTagClose = "/>"
-OpenTagEnd = ">"
-
-CloseTag = "</" {Name} {S}* ">"
-
-/* attribute */
-Attribute = {Name} "="
-
-/* string and character literals */
-DQuoteStringChar = [^\r\n\"]
-SQuoteStringChar = [^\r\n\']
-
-%%
-
-<YYINITIAL> {
-  
-  "&"  [a-z]+ ";"                |
-  "&#" [:digit:]+ ";"            { return token(TokenType.KEYWORD2); }
-
-  {InstrStart}                   {
-                                     yybegin(INSTR);
-                                     return token(TokenType.TYPE2, INSTR_OPEN);
-                                 }
-  {OpenTagStart}                 {
-                                     yybegin(TAG);
-                                     return token(TokenType.TYPE, TAG_OPEN);
-                                 }
-  {CloseTag}                       {   return token(TokenType.TYPE, TAG_CLOSE); }
-  {CommentStart}                 {
-                                     yybegin(COMMENT);
-                                     return token(TokenType.COMMENT2, COMMENT_OPEN);
-                                 }
-  {CDataStart}                   {
-                                     yybegin(CDATA);
-                                     return token(TokenType.COMMENT2, CDATA_OPEN);
-                                 }
-}
-
-<INSTR> {
-  {Attribute}                    { return token(TokenType.IDENTIFIER); }
-
-  \"{DQuoteStringChar}*\"        |
-  \'{SQuoteStringChar}*\'        { return token(TokenType.STRING); }
-
-  {InstrEnd}                     {
-                                     yybegin(YYINITIAL);
-                                     return token(TokenType.TYPE2, INSTR_CLOSE);
-                                 }
-                                 }
-
-<TAG> {
-  {Attribute}                    { return token(TokenType.IDENTIFIER); }
-
-  \"{DQuoteStringChar}*\"        |
-  \'{SQuoteStringChar}*\'        { return token(TokenType.STRING); }
-
-
-  {OpenTagClose}                 {
-                                     yybegin(YYINITIAL);
-                                     return token(TokenType.TYPE, TAG_CLOSE);
-}
-
-  {OpenTagEnd}                   {
-                                     yybegin(YYINITIAL);
-                                     return token(TokenType.TYPE);
-                                 }
-}
-
-<COMMENT> {
-  {CommentEnd}                   {
-                                     yybegin(YYINITIAL);
-                                     return token(TokenType.COMMENT2, COMMENT_CLOSE);
-                                 }
-   ~{CommentEnd}                 {
-                                     yypushback(3);
-                                     return token(TokenType.COMMENT);
-                                 }
-}
-
-<CDATA> {
-  {CDataEnd}                     {
-                                     yybegin(YYINITIAL);
-                                     return token(TokenType.COMMENT2, CDATA_CLOSE);
-                                 }
-  ~{CDataEnd}                    {
-                                     yypushback(3);
-                                     return token(TokenType.COMMENT);
-                                 }
-}
-
-<YYINITIAL,TAG,INSTR,CDATA,COMMENT> {
-/* error fallback */
-   .|\n                          {  }
-   <<EOF>>                       { return null; }
-}
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jsyntaxpane.lexers;
+
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+
+%%
+
+%public 
+%class XmlLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+
+%{
+    /**
+     * Create an empty lexer, yyrset will be called later to reset and assign
+     * the reader
+     */
+    public XmlLexer() {
+        super();
+    }
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+
+    private static final byte TAG_OPEN      =  1;
+    private static final byte TAG_CLOSE     = -1;
+
+    private static final byte INSTR_OPEN    =  2;
+    private static final byte INSTR_CLOSE   = -2;
+
+    private static final byte CDATA_OPEN    =  3;
+    private static final byte CDATA_CLOSE   = -3;
+
+    private static final byte COMMENT_OPEN  =  4;
+    private static final byte COMMENT_CLOSE = -4;
+%}
+
+%xstate COMMENT, CDATA, TAG, INSTR
+
+/* main character classes */
+
+/* white space */
+S = (\u0020 | \u0009 | \u000D | \u000A)+
+
+/* characters */
+
+Char = \u0009 | \u000A | \u000D | [\u0020-\uD7FF] | [\uE000-\uFFFD] | [\u10000-\u10FFFF]
+
+/* comments */
+CommentStart = "<!--"
+CommentEnd = "-->"
+
+NameStartChar = ":" | [A-Z] | "_" | [a-z]
+NameStartCharUnicode = [\u00C0-\u00D6]   |
+        [\u00D8-\u00F6] |
+        [\u00F8-\u02FF] |
+        [\u0370-\u037D] |
+        [\u037F-\u1FFF] |
+        [\u200C-\u200D] |
+        [\u2070-\u218F] |
+        [\u2C00-\u2FEF] |
+        [\u3001-\uD7FF] |
+        [\uF900-\uFDCF] |
+        [\uFDF0-\uFFFD] |
+        [\u10000-\uEFFFF]
+
+NameChar = {NameStartChar} | "-" | "." | [0-9] | \u00B7
+NameCharUnicode = [\u0300-\u036F] | [\u0203F-\u2040]
+Name = {NameStartChar} {NameChar}*
+NameUnicode = ({NameStartChar}|{NameStartCharUnicode}) ({NameChar}|{NameCharUnicode})*
+
+/* XML Processing Instructions */
+InstrStart = "<?" {Name}
+InstrEnd   = "?>"
+
+/* CDATA  */
+CDataStart = "<![CDATA["
+CDataEnd   = "]]>"
+
+/* Tags */
+OpenTagStart = "<" {Name}
+OpenTagClose = "/>"
+OpenTagEnd = ">"
+
+CloseTag = "</" {Name} {S}* ">"
+
+/* attribute */
+Attribute = {Name} "="
+
+/* string and character literals */
+DQuoteStringChar = [^\r\n\"]
+SQuoteStringChar = [^\r\n\']
+
+%%
+
+<YYINITIAL> {
+  
+  "&"  [a-z]+ ";"                |
+  "&#" [:digit:]+ ";"            { return token(TokenType.KEYWORD2); }
+
+  {InstrStart}                   {
+                                     yybegin(INSTR);
+                                     return token(TokenType.TYPE2, INSTR_OPEN);
+                                 }
+  {OpenTagStart}                 {
+                                     yybegin(TAG);
+                                     return token(TokenType.TYPE, TAG_OPEN);
+                                 }
+  {CloseTag}                       {   return token(TokenType.TYPE, TAG_CLOSE); }
+  {CommentStart}                 {
+                                     yybegin(COMMENT);
+                                     return token(TokenType.COMMENT2, COMMENT_OPEN);
+                                 }
+  {CDataStart}                   {
+                                     yybegin(CDATA);
+                                     return token(TokenType.COMMENT2, CDATA_OPEN);
+                                 }
+}
+
+<INSTR> {
+  {Attribute}                    { return token(TokenType.IDENTIFIER); }
+
+  \"{DQuoteStringChar}*\"        |
+  \'{SQuoteStringChar}*\'        { return token(TokenType.STRING); }
+
+  {InstrEnd}                     {
+                                     yybegin(YYINITIAL);
+                                     return token(TokenType.TYPE2, INSTR_CLOSE);
+                                 }
+                                 }
+
+<TAG> {
+  {Attribute}                    { return token(TokenType.IDENTIFIER); }
+
+  \"{DQuoteStringChar}*\"        |
+  \'{SQuoteStringChar}*\'        { return token(TokenType.STRING); }
+
+
+  {OpenTagClose}                 {
+                                     yybegin(YYINITIAL);
+                                     return token(TokenType.TYPE, TAG_CLOSE);
+}
+
+  {OpenTagEnd}                   {
+                                     yybegin(YYINITIAL);
+                                     return token(TokenType.TYPE);
+                                 }
+}
+
+<COMMENT> {
+  {CommentEnd}                   {
+                                     yybegin(YYINITIAL);
+                                     return token(TokenType.COMMENT2, COMMENT_CLOSE);
+                                 }
+   ~{CommentEnd}                 {
+                                     yypushback(3);
+                                     return token(TokenType.COMMENT);
+                                 }
+}
+
+<CDATA> {
+  {CDataEnd}                     {
+                                     yybegin(YYINITIAL);
+                                     return token(TokenType.COMMENT2, CDATA_CLOSE);
+                                 }
+  ~{CDataEnd}                    {
+                                     yypushback(3);
+                                     return token(TokenType.COMMENT);
+                                 }
+}
+
+<YYINITIAL,TAG,INSTR,CDATA,COMMENT> {
+/* error fallback */
+   .|\n                          {  }
+   <<EOF>>                       { return null; }
+}
diff --git a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xpath.flex b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xpath.flex
index fe514e1c4..5c6b035ec 100644
--- a/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xpath.flex
+++ b/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xpath.flex
@@ -1,266 +1,266 @@
-/*
- * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License
- *       at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This flex file originally donated to the project by HeyChinaski 
- *
- */
-
-package jsyntaxpane.lexers;
-
-import jsyntaxpane.Token;
-import jsyntaxpane.TokenType;
-
-%%
-
-%public
-%class XPathLexer
-%extends DefaultJFlexLexer
-%final
-%unicode
-%char
-%type Token
-
-
-%{
-    /**
-     * Create an empty lexer, yyrset will be called later to reset and assign
-     * the reader
-     */
-    public XPathLexer() {
-        super();
-    }
-
-    @Override
-    public int yychar() {
-        return yychar;
-    }
-
-    private static final byte PARAN     = 1;
-    private static final byte BRACKET   = 2;
-    private static final byte CURLY     = 3;
-
-%}
-
-Digits = [0-9]+
-Letter = {BaseChar} | {Ideographic}
-BaseChar = [\u0041-\u005A] | [\u0061-\u007A] | [\u00C0-\u00D6] | [\u00D8-\u00F6] | [\u00F8-\u00FF] | [\u0100-\u0131] | [\u0134-\u013E] | [\u0141-\u0148] | [\u014A-\u017E] | [\u0180-\u01C3] | [\u01CD-\u01F0] | [\u01F4-\u01F5] | [\u01FA-\u0217] | [\u0250-\u02A8] | [\u02BB-\u02C1] | \u0386 | [\u0388-\u038A] | \u038C | [\u038E-\u03A1] | [\u03A3-\u03CE] | [\u03D0-\u03D6] | \u03DA | \u03DC | \u03DE | \u03E0 | [\u03E2-\u03F3] | [\u0401-\u040C] | [\u040E-\u044F] | [\u0451-\u045C] | [\u045E-\u0481] | [\u0490-\u04C4] | [\u04C7-\u04C8] | [\u04CB-\u04CC] | [\u04D0-\u04EB] | [\u04EE-\u04F5] | [\u04F8-\u04F9] | [\u0531-\u0556] | \u0559 | [\u0561-\u0586] | [\u05D0-\u05EA] | [\u05F0-\u05F2] | [\u0621-\u063A] | [\u0641-\u064A] | [\u0671-\u06B7] | [\u06BA-\u06BE] | [\u06C0-\u06CE] | [\u06D0-\u06D3] | \u06D5 | [\u06E5-\u06E6] | [\u0905-\u0939] | \u093D | [\u0958-\u0961] | [\u0985-\u098C] | [\u098F-\u0990] | [\u0993-\u09A8] | [\u09AA-\u09B0] | \u09B2 | [\u09B6-\u09B9] | [\u09DC-\u09DD] | [\u09DF-\u09E1] | [\u09F0-\u09F1] | [\u0A05-\u0A0A] | [\u0A0F-\u0A10] | [\u0A13-\u0A28] | [\u0A2A-\u0A30] | [\u0A32-\u0A33] | [\u0A35-\u0A36] | [\u0A38-\u0A39] | [\u0A59-\u0A5C] | \u0A5E | [\u0A72-\u0A74] | [\u0A85-\u0A8B] | \u0A8D | [\u0A8F-\u0A91] | [\u0A93-\u0AA8] | [\u0AAA-\u0AB0] | [\u0AB2-\u0AB3] | [\u0AB5-\u0AB9] | \u0ABD | \u0AE0 | [\u0B05-\u0B0C] | [\u0B0F-\u0B10] | [\u0B13-\u0B28] | [\u0B2A-\u0B30] | [\u0B32-\u0B33] | [\u0B36-\u0B39] | \u0B3D | [\u0B5C-\u0B5D] | [\u0B5F-\u0B61] | [\u0B85-\u0B8A] | [\u0B8E-\u0B90] | [\u0B92-\u0B95] | [\u0B99-\u0B9A] | \u0B9C | [\u0B9E-\u0B9F] | [\u0BA3-\u0BA4] | [\u0BA8-\u0BAA] | [\u0BAE-\u0BB5] | [\u0BB7-\u0BB9] | [\u0C05-\u0C0C] | [\u0C0E-\u0C10] | [\u0C12-\u0C28] | [\u0C2A-\u0C33] | [\u0C35-\u0C39] | [\u0C60-\u0C61] | [\u0C85-\u0C8C] | [\u0C8E-\u0C90] | [\u0C92-\u0CA8] | [\u0CAA-\u0CB3] | [\u0CB5-\u0CB9] | \u0CDE | [\u0CE0-\u0CE1] | [\u0D05-\u0D0C] | [\u0D0E-\u0D10] | [\u0D12-\u0D28] | [\u0D2A-\u0D39] | [\u0D60-\u0D61] | [\u0E01-\u0E2E] | \u0E30 | [\u0E32-\u0E33] | [\u0E40-\u0E45] | [\u0E81-\u0E82] | \u0E84 | [\u0E87-\u0E88] | \u0E8A | \u0E8D | [\u0E94-\u0E97] | [\u0E99-\u0E9F] | [\u0EA1-\u0EA3] | \u0EA5 | \u0EA7 | [\u0EAA-\u0EAB] | [\u0EAD-\u0EAE] | \u0EB0 | [\u0EB2-\u0EB3] | \u0EBD | [\u0EC0-\u0EC4] | [\u0F40-\u0F47] | [\u0F49-\u0F69] | [\u10A0-\u10C5] | [\u10D0-\u10F6] | \u1100 | [\u1102-\u1103] | [\u1105-\u1107] | \u1109 | [\u110B-\u110C] | [\u110E-\u1112] | \u113C | \u113E | \u1140 | \u114C | \u114E | \u1150 | [\u1154-\u1155] | \u1159 | [\u115F-\u1161] | \u1163 | \u1165 | \u1167 | \u1169 | [\u116D-\u116E] | [\u1172-\u1173] | \u1175 | \u119E | \u11A8 | \u11AB | [\u11AE-\u11AF] | [\u11B7-\u11B8] | \u11BA | [\u11BC-\u11C2] | \u11EB | \u11F0 | \u11F9 | [\u1E00-\u1E9B] | [\u1EA0-\u1EF9] | [\u1F00-\u1F15] | [\u1F18-\u1F1D] | [\u1F20-\u1F45] | [\u1F48-\u1F4D] | [\u1F50-\u1F57] | \u1F59 | \u1F5B | \u1F5D | [\u1F5F-\u1F7D] | [\u1F80-\u1FB4] | [\u1FB6-\u1FBC] | \u1FBE | [\u1FC2-\u1FC4] | [\u1FC6-\u1FCC] | [\u1FD0-\u1FD3] | [\u1FD6-\u1FDB] | [\u1FE0-\u1FEC] | [\u1FF2-\u1FF4] | [\u1FF6-\u1FFC] | \u2126 | [\u212A-\u212B] | \u212E | [\u2180-\u2182] | [\u3041-\u3094] | [\u30A1-\u30FA] | [\u3105-\u312C] | [\uAC00-\uD7A3]
-Ideographic = [\u4E00-\u9FA5] | \u3007 | [\u3021-\u3029]
-NCNameStartChar = {Letter} | "_"
-NameStartCharMinusColon = [A-Z] | "_" | [a-z] | [\uC0-\uD6] | [\uD8-\uF6] | [\uF8-\u2FF] | [\u370-\u37D] | [\u37F-\u1FFF] | [\u200C-\u200D] | [\u2070-\u218F] | [\u2C00-\u2FEF] | [\u3001-\uD7FF] | [\uF900-\uFDCF] | [\uFDF0-\uFFFD]
-NCNameChar = {NameStartCharMinusColon} | "-" | "." | [0-9] | \uB7 | [\u0300-\u036F] | [\u203F-\u2040]
-NCName = {NCNameStartChar} {NCNameChar}*
-LocalPart = {NCName}
-UnprefixedName = {LocalPart}
-Prefix = {NCName}
-PrefixedName = {Prefix} ":" {LocalPart}
-QName = {PrefixedName} | {UnprefixedName}
-NameTest = "*" | {NCName} ":" "*" | {QName}
-VariableReference = "$" {QName}
-LineTerminator = \r|\n|\r\n
-
-NodeType =  "comment"
-    			| "text"
-		    	| "processing-instruction"
-		    	| "node"
-
-OperatorName = "and" | "or" | "mod" | "div"
-
-Operator = {OperatorName} | "*" |  "/" | "//" | "|" | "+" | "-" | "=" | "!=" | "<" | "<=" | ">" | ">="
-
-FunctionName = {QName}
-
-XPathFunction = "default"
- | "node-name"
- | "nilled"
- | "data"
- | "base-uri"
- | "document-uri"
- | "error"
- | "trace"
- | "number"
- | "abs"
- | "ceiling"
- | "floor"
- | "round"
- | "round-half-to-even"
- | "string"
- | "codepoints-to-string"
- | "string-to-codepoints"
- | "codepoint-equal"
- | "compare"
- | "concat"
- | "string-join"
- | "substring"
- | "string-length"
- | "normalize-space"
- | "normalize-unicode"
- | "upper-case"
- | "lower-case"
- | "translate"
- | "escape-uri"
- | "contains"
- | "starts-with"
- | "ends-with"
- | "substring-before"
- | "substring-after"
- | "matches"
- | "replace"
- | "tokenize"
- | "resolve-uri"
- | "boolean"
- | "not"
- | "true"
- | "false"
- | "dateTime"
- | "years-from-duration"
- | "months-from-duration"
- | "days-from-duration"
- | "hours-from-duration"
- | "minutes-from-duration"
- | "seconds-from-duration"
- | "year-from-dateTime"
- | "month-from-dateTime"
- | "day-from-dateTime"
- | "hours-from-dateTime"
- | "minutes-from-dateTime"
- | "seconds-from-dateTime"
- | "timezone-from-dateTime"
- | "year-from-date"
- | "month-from-date"
- | "day-from-date"
- | "timezone-from-date"
- | "hours-from-time"
- | "minutes-from-time"
- | "seconds-from-time"
- | "timezone-from-time"
- | "adjust-dateTime-to-timezone"
- | "adjust-date-to-timezone"
- | "adjust-time-to-timezone"
- | "QName"
- | "local-name-from-QName"
- | "namespace-uri-from-QName"
- | "namespace-uri-for-prefix"
- | "in-scope-prefixes"
- | "resolve-QName"
- | "name"
- | "local-name"
- | "namespace-uri"
- | "lang"
- | "root"
- | "index-of"
- | "remove"
- | "empty"
- | "exists"
- | "distinct-values"
- | "insert-before"
- | "reverse"
- | "subsequence"
- | "unordered"
- | "zero-or-one"
- | "one-or-more"
- | "exactly-one"
- | "deep-equal"
- | "count"
- | "avg"
- | "max"
- | "min"
- | "sum"
- | "id"
- | "idref"
- | "doc"
- | "doc-available"
- | "collection"
- | "position"
- | "last"
- | "current-dateTime"
- | "current-date"
- | "current-time"
- | "implicit-timezone"
- | "default-collation"
- | "static-base-uri"
-
-AxisName =    "ancestor"
-			      | "ancestor-or-self"
-			      | "attribute"
-			      | "child"
-			      | "descendant"
-			      | "descendant-or-self"
-			      | "following"
-			      | "following-sibling"
-			      | "namespace"
-			      | "parent"
-			      | "preceding"
-			      | "preceding-sibling"
-			      | "self"
-
-Number = {Digits} | {Digits} "." {Digits}
-
-S	   =   	[\u20] | [\u9] | [\uD] | [\uA]
-
-%state STRING_DOUBLE, STRING_SINGLE
-
-%%
-
-<YYINITIAL> {
-  {VariableReference} { return token(TokenType.IDENTIFIER); }
-  {Number} { return token(TokenType.NUMBER); }
-  {AxisName} { return token(TokenType.TYPE); }
-  "("                            { return token(TokenType.OPERATOR,  PARAN); }
-  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
-  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
-  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
-  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
-  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
-  "." | ".." | "@" | "," | "::" { return token(TokenType.OPERATOR); }
-  {Operator} { return token(TokenType.OPERATOR); }
-  {NodeType} { return token(TokenType.KEYWORD); }
-  {XPathFunction} { return token(TokenType.KEYWORD2); }
-  {FunctionName} { return token(TokenType.IDENTIFIER); }
-  {NameTest} { return token(TokenType.IDENTIFIER); }
-
-  /* string literal */
-  \"                             {
-                                    yybegin(STRING_DOUBLE);
-                                    tokenStart = yychar;
-                                    tokenLength = 1;
-                                 }
-
-  /* string literal */
-  \'                             {
-                                    yybegin(STRING_SINGLE);
-                                    tokenStart = yychar;
-                                    tokenLength = 1;
-                                 }
-  ":" | {S} | "\""               {}
-  . | {LineTerminator}           { /* skip */ }
-}
-
-<STRING_DOUBLE> {
-  \"                             {
-                                     yybegin(YYINITIAL);
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-
-  [^\"]                           { tokenLength += yylength(); }
-}
-
-<STRING_SINGLE> {
-  \'                             {
-                                     yybegin(YYINITIAL);
-                                     // length also includes the trailing quote
-                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
-                                 }
-
-  [^\']                           { tokenLength += yylength(); }
-}
+/*
+ * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License
+ *       at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This flex file originally donated to the project by HeyChinaski 
+ *
+ */
+
+package jsyntaxpane.lexers;
+
+import jsyntaxpane.Token;
+import jsyntaxpane.TokenType;
+
+%%
+
+%public
+%class XPathLexer
+%extends DefaultJFlexLexer
+%final
+%unicode
+%char
+%type Token
+
+
+%{
+    /**
+     * Create an empty lexer, yyrset will be called later to reset and assign
+     * the reader
+     */
+    public XPathLexer() {
+        super();
+    }
+
+    @Override
+    public int yychar() {
+        return yychar;
+    }
+
+    private static final byte PARAN     = 1;
+    private static final byte BRACKET   = 2;
+    private static final byte CURLY     = 3;
+
+%}
+
+Digits = [0-9]+
+Letter = {BaseChar} | {Ideographic}
+BaseChar = [\u0041-\u005A] | [\u0061-\u007A] | [\u00C0-\u00D6] | [\u00D8-\u00F6] | [\u00F8-\u00FF] | [\u0100-\u0131] | [\u0134-\u013E] | [\u0141-\u0148] | [\u014A-\u017E] | [\u0180-\u01C3] | [\u01CD-\u01F0] | [\u01F4-\u01F5] | [\u01FA-\u0217] | [\u0250-\u02A8] | [\u02BB-\u02C1] | \u0386 | [\u0388-\u038A] | \u038C | [\u038E-\u03A1] | [\u03A3-\u03CE] | [\u03D0-\u03D6] | \u03DA | \u03DC | \u03DE | \u03E0 | [\u03E2-\u03F3] | [\u0401-\u040C] | [\u040E-\u044F] | [\u0451-\u045C] | [\u045E-\u0481] | [\u0490-\u04C4] | [\u04C7-\u04C8] | [\u04CB-\u04CC] | [\u04D0-\u04EB] | [\u04EE-\u04F5] | [\u04F8-\u04F9] | [\u0531-\u0556] | \u0559 | [\u0561-\u0586] | [\u05D0-\u05EA] | [\u05F0-\u05F2] | [\u0621-\u063A] | [\u0641-\u064A] | [\u0671-\u06B7] | [\u06BA-\u06BE] | [\u06C0-\u06CE] | [\u06D0-\u06D3] | \u06D5 | [\u06E5-\u06E6] | [\u0905-\u0939] | \u093D | [\u0958-\u0961] | [\u0985-\u098C] | [\u098F-\u0990] | [\u0993-\u09A8] | [\u09AA-\u09B0] | \u09B2 | [\u09B6-\u09B9] | [\u09DC-\u09DD] | [\u09DF-\u09E1] | [\u09F0-\u09F1] | [\u0A05-\u0A0A] | [\u0A0F-\u0A10] | [\u0A13-\u0A28] | [\u0A2A-\u0A30] | [\u0A32-\u0A33] | [\u0A35-\u0A36] | [\u0A38-\u0A39] | [\u0A59-\u0A5C] | \u0A5E | [\u0A72-\u0A74] | [\u0A85-\u0A8B] | \u0A8D | [\u0A8F-\u0A91] | [\u0A93-\u0AA8] | [\u0AAA-\u0AB0] | [\u0AB2-\u0AB3] | [\u0AB5-\u0AB9] | \u0ABD | \u0AE0 | [\u0B05-\u0B0C] | [\u0B0F-\u0B10] | [\u0B13-\u0B28] | [\u0B2A-\u0B30] | [\u0B32-\u0B33] | [\u0B36-\u0B39] | \u0B3D | [\u0B5C-\u0B5D] | [\u0B5F-\u0B61] | [\u0B85-\u0B8A] | [\u0B8E-\u0B90] | [\u0B92-\u0B95] | [\u0B99-\u0B9A] | \u0B9C | [\u0B9E-\u0B9F] | [\u0BA3-\u0BA4] | [\u0BA8-\u0BAA] | [\u0BAE-\u0BB5] | [\u0BB7-\u0BB9] | [\u0C05-\u0C0C] | [\u0C0E-\u0C10] | [\u0C12-\u0C28] | [\u0C2A-\u0C33] | [\u0C35-\u0C39] | [\u0C60-\u0C61] | [\u0C85-\u0C8C] | [\u0C8E-\u0C90] | [\u0C92-\u0CA8] | [\u0CAA-\u0CB3] | [\u0CB5-\u0CB9] | \u0CDE | [\u0CE0-\u0CE1] | [\u0D05-\u0D0C] | [\u0D0E-\u0D10] | [\u0D12-\u0D28] | [\u0D2A-\u0D39] | [\u0D60-\u0D61] | [\u0E01-\u0E2E] | \u0E30 | [\u0E32-\u0E33] | [\u0E40-\u0E45] | [\u0E81-\u0E82] | \u0E84 | [\u0E87-\u0E88] | \u0E8A | \u0E8D | [\u0E94-\u0E97] | [\u0E99-\u0E9F] | [\u0EA1-\u0EA3] | \u0EA5 | \u0EA7 | [\u0EAA-\u0EAB] | [\u0EAD-\u0EAE] | \u0EB0 | [\u0EB2-\u0EB3] | \u0EBD | [\u0EC0-\u0EC4] | [\u0F40-\u0F47] | [\u0F49-\u0F69] | [\u10A0-\u10C5] | [\u10D0-\u10F6] | \u1100 | [\u1102-\u1103] | [\u1105-\u1107] | \u1109 | [\u110B-\u110C] | [\u110E-\u1112] | \u113C | \u113E | \u1140 | \u114C | \u114E | \u1150 | [\u1154-\u1155] | \u1159 | [\u115F-\u1161] | \u1163 | \u1165 | \u1167 | \u1169 | [\u116D-\u116E] | [\u1172-\u1173] | \u1175 | \u119E | \u11A8 | \u11AB | [\u11AE-\u11AF] | [\u11B7-\u11B8] | \u11BA | [\u11BC-\u11C2] | \u11EB | \u11F0 | \u11F9 | [\u1E00-\u1E9B] | [\u1EA0-\u1EF9] | [\u1F00-\u1F15] | [\u1F18-\u1F1D] | [\u1F20-\u1F45] | [\u1F48-\u1F4D] | [\u1F50-\u1F57] | \u1F59 | \u1F5B | \u1F5D | [\u1F5F-\u1F7D] | [\u1F80-\u1FB4] | [\u1FB6-\u1FBC] | \u1FBE | [\u1FC2-\u1FC4] | [\u1FC6-\u1FCC] | [\u1FD0-\u1FD3] | [\u1FD6-\u1FDB] | [\u1FE0-\u1FEC] | [\u1FF2-\u1FF4] | [\u1FF6-\u1FFC] | \u2126 | [\u212A-\u212B] | \u212E | [\u2180-\u2182] | [\u3041-\u3094] | [\u30A1-\u30FA] | [\u3105-\u312C] | [\uAC00-\uD7A3]
+Ideographic = [\u4E00-\u9FA5] | \u3007 | [\u3021-\u3029]
+NCNameStartChar = {Letter} | "_"
+NameStartCharMinusColon = [A-Z] | "_" | [a-z] | [\uC0-\uD6] | [\uD8-\uF6] | [\uF8-\u2FF] | [\u370-\u37D] | [\u37F-\u1FFF] | [\u200C-\u200D] | [\u2070-\u218F] | [\u2C00-\u2FEF] | [\u3001-\uD7FF] | [\uF900-\uFDCF] | [\uFDF0-\uFFFD]
+NCNameChar = {NameStartCharMinusColon} | "-" | "." | [0-9] | \uB7 | [\u0300-\u036F] | [\u203F-\u2040]
+NCName = {NCNameStartChar} {NCNameChar}*
+LocalPart = {NCName}
+UnprefixedName = {LocalPart}
+Prefix = {NCName}
+PrefixedName = {Prefix} ":" {LocalPart}
+QName = {PrefixedName} | {UnprefixedName}
+NameTest = "*" | {NCName} ":" "*" | {QName}
+VariableReference = "$" {QName}
+LineTerminator = \r|\n|\r\n
+
+NodeType =  "comment"
+    			| "text"
+		    	| "processing-instruction"
+		    	| "node"
+
+OperatorName = "and" | "or" | "mod" | "div"
+
+Operator = {OperatorName} | "*" |  "/" | "//" | "|" | "+" | "-" | "=" | "!=" | "<" | "<=" | ">" | ">="
+
+FunctionName = {QName}
+
+XPathFunction = "default"
+ | "node-name"
+ | "nilled"
+ | "data"
+ | "base-uri"
+ | "document-uri"
+ | "error"
+ | "trace"
+ | "number"
+ | "abs"
+ | "ceiling"
+ | "floor"
+ | "round"
+ | "round-half-to-even"
+ | "string"
+ | "codepoints-to-string"
+ | "string-to-codepoints"
+ | "codepoint-equal"
+ | "compare"
+ | "concat"
+ | "string-join"
+ | "substring"
+ | "string-length"
+ | "normalize-space"
+ | "normalize-unicode"
+ | "upper-case"
+ | "lower-case"
+ | "translate"
+ | "escape-uri"
+ | "contains"
+ | "starts-with"
+ | "ends-with"
+ | "substring-before"
+ | "substring-after"
+ | "matches"
+ | "replace"
+ | "tokenize"
+ | "resolve-uri"
+ | "boolean"
+ | "not"
+ | "true"
+ | "false"
+ | "dateTime"
+ | "years-from-duration"
+ | "months-from-duration"
+ | "days-from-duration"
+ | "hours-from-duration"
+ | "minutes-from-duration"
+ | "seconds-from-duration"
+ | "year-from-dateTime"
+ | "month-from-dateTime"
+ | "day-from-dateTime"
+ | "hours-from-dateTime"
+ | "minutes-from-dateTime"
+ | "seconds-from-dateTime"
+ | "timezone-from-dateTime"
+ | "year-from-date"
+ | "month-from-date"
+ | "day-from-date"
+ | "timezone-from-date"
+ | "hours-from-time"
+ | "minutes-from-time"
+ | "seconds-from-time"
+ | "timezone-from-time"
+ | "adjust-dateTime-to-timezone"
+ | "adjust-date-to-timezone"
+ | "adjust-time-to-timezone"
+ | "QName"
+ | "local-name-from-QName"
+ | "namespace-uri-from-QName"
+ | "namespace-uri-for-prefix"
+ | "in-scope-prefixes"
+ | "resolve-QName"
+ | "name"
+ | "local-name"
+ | "namespace-uri"
+ | "lang"
+ | "root"
+ | "index-of"
+ | "remove"
+ | "empty"
+ | "exists"
+ | "distinct-values"
+ | "insert-before"
+ | "reverse"
+ | "subsequence"
+ | "unordered"
+ | "zero-or-one"
+ | "one-or-more"
+ | "exactly-one"
+ | "deep-equal"
+ | "count"
+ | "avg"
+ | "max"
+ | "min"
+ | "sum"
+ | "id"
+ | "idref"
+ | "doc"
+ | "doc-available"
+ | "collection"
+ | "position"
+ | "last"
+ | "current-dateTime"
+ | "current-date"
+ | "current-time"
+ | "implicit-timezone"
+ | "default-collation"
+ | "static-base-uri"
+
+AxisName =    "ancestor"
+			      | "ancestor-or-self"
+			      | "attribute"
+			      | "child"
+			      | "descendant"
+			      | "descendant-or-self"
+			      | "following"
+			      | "following-sibling"
+			      | "namespace"
+			      | "parent"
+			      | "preceding"
+			      | "preceding-sibling"
+			      | "self"
+
+Number = {Digits} | {Digits} "." {Digits}
+
+S	   =   	[\u20] | [\u9] | [\uD] | [\uA]
+
+%state STRING_DOUBLE, STRING_SINGLE
+
+%%
+
+<YYINITIAL> {
+  {VariableReference} { return token(TokenType.IDENTIFIER); }
+  {Number} { return token(TokenType.NUMBER); }
+  {AxisName} { return token(TokenType.TYPE); }
+  "("                            { return token(TokenType.OPERATOR,  PARAN); }
+  ")"                            { return token(TokenType.OPERATOR, -PARAN); }
+  "{"                            { return token(TokenType.OPERATOR,  CURLY); }
+  "}"                            { return token(TokenType.OPERATOR, -CURLY); }
+  "["                            { return token(TokenType.OPERATOR,  BRACKET); }
+  "]"                            { return token(TokenType.OPERATOR, -BRACKET); }
+  "." | ".." | "@" | "," | "::" { return token(TokenType.OPERATOR); }
+  {Operator} { return token(TokenType.OPERATOR); }
+  {NodeType} { return token(TokenType.KEYWORD); }
+  {XPathFunction} { return token(TokenType.KEYWORD2); }
+  {FunctionName} { return token(TokenType.IDENTIFIER); }
+  {NameTest} { return token(TokenType.IDENTIFIER); }
+
+  /* string literal */
+  \"                             {
+                                    yybegin(STRING_DOUBLE);
+                                    tokenStart = yychar;
+                                    tokenLength = 1;
+                                 }
+
+  /* string literal */
+  \'                             {
+                                    yybegin(STRING_SINGLE);
+                                    tokenStart = yychar;
+                                    tokenLength = 1;
+                                 }
+  ":" | {S} | "\""               {}
+  . | {LineTerminator}           { /* skip */ }
+}
+
+<STRING_DOUBLE> {
+  \"                             {
+                                     yybegin(YYINITIAL);
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+
+  [^\"]                           { tokenLength += yylength(); }
+}
+
+<STRING_SINGLE> {
+  \'                             {
+                                     yybegin(YYINITIAL);
+                                     // length also includes the trailing quote
+                                     return token(TokenType.STRING, tokenStart, tokenLength + 1);
+                                 }
+
+  [^\']                           { tokenLength += yylength(); }
+}

From 0121eb171b30e3249473223f86bc0fdcece5981d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sun, 14 Aug 2016 19:49:40 +0200
Subject: [PATCH 05/23] Normalize all the line endings

---
 git_eol_normalization.bat | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 git_eol_normalization.bat

diff --git a/git_eol_normalization.bat b/git_eol_normalization.bat
new file mode 100644
index 000000000..0675b4c1a
--- /dev/null
+++ b/git_eol_normalization.bat
@@ -0,0 +1,22 @@
+@echo This will normalize line endings in the GIT repository
+@pause
+git add . -u
+@if %errorlevel% neq 0 goto failed
+git commit -m "Saving files before refreshing line endings"
+@if %errorlevel% neq 0 goto failed
+git rm --cached -r .
+@if %errorlevel% neq 0 goto failed
+git reset --hard
+@if %errorlevel% neq 0 goto failed
+git add .
+@if %errorlevel% neq 0 goto failed
+git commit -m "Normalize all the line endings"
+@rem No errorlevel check here - the commit can be empty
+@goto okay
+:failed
+@echo ERROR: Something FAILED
+@goto finish
+:okay
+@echo SUCCESS
+:finish
+@pause
\ No newline at end of file

From a54af40085c139b1a655658da1e9d921033b30b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sun, 14 Aug 2016 21:41:18 +0200
Subject: [PATCH 06/23] Last merge fix. Fixed removing class/method => make
 MethodBody modified

---
 .../com/jpexs/decompiler/flash/abc/ABC.java   | 123 +++++++++++-------
 1 file changed, 74 insertions(+), 49 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
index 0b94e7080..d5bbfe1c7 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
@@ -55,9 +55,13 @@ import com.jpexs.decompiler.flash.abc.usages.MethodParamsMultinameUsage;
 import com.jpexs.decompiler.flash.abc.usages.MethodReturnTypeMultinameUsage;
 import com.jpexs.decompiler.flash.abc.usages.MultinameUsage;
 import com.jpexs.decompiler.flash.abc.usages.TypeNameMultinameUsage;
+import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.dumpview.DumpInfo;
 import com.jpexs.decompiler.flash.dumpview.DumpInfoSpecial;
 import com.jpexs.decompiler.flash.dumpview.DumpInfoSpecialType;
+import com.jpexs.decompiler.flash.exporters.script.LinkReportExporter;
+import com.jpexs.decompiler.flash.flexsdk.As3ScriptReplacer;
+import com.jpexs.decompiler.flash.flexsdk.MxmlcException;
 import com.jpexs.decompiler.flash.helpers.SWFDecompilerPlugin;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.flash.tags.Tag;
@@ -768,19 +772,11 @@ public class ABC {
             aos.writeU30(ci.cinit_index);
             aos.writeTraits(ci.static_traits);
         }
-        int numScripts = script_info.size();
-        for (ScriptInfo si : script_info) {
-            if (si.deleted) {
-                numScripts--;
-            }
-        }
 
-        aos.writeU30(numScripts);
+        aos.writeU30(script_info.size());
         for (ScriptInfo si : script_info) {
-            if (!si.deleted) {
-                aos.writeU30(si.init_index);
-                aos.writeTraits(si.traits);
-            }
+            aos.writeU30(si.init_index);
+            aos.writeTraits(si.traits);
         }
 
         aos.writeU30(bodies.size());
@@ -998,7 +994,9 @@ public class ABC {
     public List<ScriptPack> getScriptPacks(String packagePrefix, List<ABC> allAbcs) {
         List<ScriptPack> ret = new ArrayList<>();
         for (int i = 0; i < script_info.size(); i++) {
-            ret.addAll(script_info.get(i).getPacks(this, i, packagePrefix, allAbcs));
+            if (!script_info.get(i).deleted) {
+                ret.addAll(script_info.get(i).getPacks(this, i, packagePrefix, allAbcs));
+            }
         }
         return ret;
     }
@@ -1274,6 +1272,7 @@ public class ABC {
                     if (ins.definition.operands[i] == AVM2Code.DAT_CLASS_INDEX) {
                         if (ins.operands[i] > index) {
                             ins.operands[i]--;
+                            b.setModified();
                         }
                     }
                 }
@@ -1331,6 +1330,7 @@ public class ABC {
                     if (ins.definition.operands[i] == AVM2Code.DAT_METHOD_INDEX) {
                         if (ins.operands[i] > index) {
                             ins.operands[i]--;
+                            b.setModified();
                         }
                     }
                 }
@@ -1362,68 +1362,93 @@ public class ABC {
     }
 
     public boolean replaceScriptPack(ScriptPack pack, String as) throws AVM2ParseException, CompilationException, IOException, InterruptedException {
-        String scriptName = pack.getPathScriptName() + ".as";
-        int oldIndex = pack.scriptIndex;
-        int newIndex = script_info.size();
-        String documentClass = getSwf().getDocumentClass();
-        boolean isDocumentClass = documentClass != null && documentClass.equals(pack.getClassPath().toString());
+
+        final boolean USE_FLEX = true;
 
         boolean isSimple = pack.isSimple;
 
-        ScriptInfo si = script_info.get(oldIndex);
-        if (isSimple) {
-            si.delete(this, true);
+        if (USE_FLEX) {
+            if (!pack.isSimple) {
+                return false;
+            }
+            As3ScriptReplacer asr = new As3ScriptReplacer(Configuration.flexSdkLocation.get(), new LinkReportExporter());
+            try {
+                asr.replaceScript(pack.getSwf(), pack, as);
+            } catch (MxmlcException ex) {
+                throw new AVM2ParseException(ex.getMxmlcErrorOutput(), 0);
+            }
         } else {
+            String scriptName = pack.getPathScriptName() + ".as";
+            int oldIndex = pack.scriptIndex;
+            int newIndex = script_info.size();
+            String documentClass = getSwf().getDocumentClass();
+            boolean isDocumentClass = documentClass != null && documentClass.equals(pack.getClassPath().toString());
+
+            ScriptInfo si = script_info.get(oldIndex);
+            if (isSimple) {
+                si.delete(this, true);
+            } else {
+                for (int t : pack.traitIndices) {
+                    si.traits.traits.get(t).delete(this, true);
+                }
+            }
+
+            int newClassIndex = instance_info.size();
             for (int t : pack.traitIndices) {
-                si.traits.traits.get(t).delete(this, true);
+                if (si.traits.traits.get(t) instanceof TraitClass) {
+                    TraitClass tc = (TraitClass) si.traits.traits.get(t);
+                    newClassIndex = tc.class_info + 1;
+                }
+
             }
-        }
+            List<ABC> otherAbcs = new ArrayList<>(pack.allABCs);
+            otherAbcs.remove(this);
+            ActionScript3Parser.compile(as, this, otherAbcs, isDocumentClass, scriptName, newClassIndex, oldIndex);
 
-        int newClassIndex = instance_info.size();
-        for (int t : pack.traitIndices) {
-            if (si.traits.traits.get(t) instanceof TraitClass) {
-                TraitClass tc = (TraitClass) si.traits.traits.get(t);
-                newClassIndex = tc.class_info + 1;
+            if (isSimple) {
+                // Move newly added script to its position
+                script_info.set(oldIndex, script_info.get(newIndex));
+                script_info.remove(newIndex);
+            } else {
+                script_info.get(newIndex).setModified(true);
+                //Note: Is deleting traits safe?
+                List<Integer> todel = new ArrayList<>(new TreeSet<>(pack.traitIndices));
+                for (int i = todel.size() - 1; i >= 0; i--) {
+                    si.traits.traits.remove((int) todel.get(i));
+                }
             }
-
+            script_info.get(oldIndex).setModified(true);
         }
-        List<ABC> otherAbcs = new ArrayList<>(pack.allABCs);
-        otherAbcs.remove(this);
-        ActionScript3Parser.compile(as, this, otherAbcs, isDocumentClass, scriptName, newClassIndex, oldIndex);
-
-        if (isSimple) {
-            // Move newly added script to its position
-            script_info.set(oldIndex, script_info.get(newIndex));
-            script_info.remove(newIndex);
-        } else {
-            script_info.get(newIndex).setModified(true);
-            //Note: Is deleting traits safe?
-            List<Integer> todel = new ArrayList<>(new TreeSet<>(pack.traitIndices));
-            for (int i = todel.size() - 1; i >= 0; i--) {
-                si.traits.traits.remove((int) todel.get(i));
-            }
-        }
-
-        script_info.get(oldIndex).setModified(true);
-        pack(); // removes old classes/methods
         ((Tag) parentTag).setModified(true);
         return !isSimple;
     }
 
-    public void pack() {
+    private void packMethods() {
         for (int m = 0; m < method_info.size(); m++) {
             if (method_info.get(m).deleted) {
                 removeMethod(m);
                 m--;
             }
         }
+    }
+
+    public void pack() {
+        packMethods();
         for (int c = 0; c < instance_info.size(); c++) {
             if (instance_info.get(c).deleted) {
                 removeClass(c);
                 c--;
             }
         }
-
+        packMethods();
+        for (int s = 0; s < script_info.size(); s++) {
+            if (script_info.get(s).deleted) {
+                script_info.remove(s);
+                s--;
+            }
+        }
+        getSwf().clearAbcListCache();
+        getSwf().clearScriptCache();
         getMethodIndexing();
     }
 }

From ac7e0572c6644e08679d7a3276cc716cc44f0ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sun, 14 Aug 2016 21:42:00 +0200
Subject: [PATCH 07/23] Add only last ABCTag when flex compiling

---
 .../flash/flexsdk/As3ScriptReplacer.java      | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
index bbdedd249..a786965da 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
@@ -18,6 +18,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.ArrayList;
 import java.util.List;
 
 public class As3ScriptReplacer extends MxmlcRunner {
@@ -99,21 +100,29 @@ public class As3ScriptReplacer extends MxmlcRunner {
 
             //Make copy without the old script
             SWF swfCopy = recompileSWF(swf);
+            List<ABC> modAbcs = new ArrayList<>();
+
             List<ScriptPack> copyPacks = swfCopy.getAS3Packs();
             for (ScriptPack sp : copyPacks) {
                 if (sp.getClassPath().equals(oldPack.getClassPath())) {
                     sp.abc.script_info.get(sp.scriptIndex).delete(sp.abc, true);
                     ((Tag) sp.abc.parentTag).setModified(true);
+                    modAbcs.add(sp.abc);
                     break;
                 }
             }
+
             //remove all subclasses
             for (ScriptPack sp : copyPacks) {
                 DottedChain dc = sp.getPathPackage().add(sp.getPathScriptName());
                 if (isParentDeleted(sp.abc, sp.allABCs, dc)) {
                     sp.abc.script_info.get(sp.scriptIndex).delete(sp.abc, true);
+                    modAbcs.add(sp.abc);
                 }
             }
+            for (ABC a : modAbcs) {
+                a.pack();
+            }
             SwfToSwcExporter swcExport = new SwfToSwcExporter();
             swcExport.exportSwf(swfCopy, swcFile, true);
 
@@ -130,18 +139,15 @@ public class As3ScriptReplacer extends MxmlcRunner {
                     //NOO
                 }
                 int oldTagIndex = swf.getTags().indexOf((Tag) oldPack.abc.parentTag);
-                if (oldPack.abc.script_info.size() == 1) {
+                oldPack.abc.pack(); // removes old classes/methods/scripts
+                if (oldPack.abc.script_info.isEmpty()) {
                     swf.removeTag(oldTagIndex);
                 }
-
-                for (ABCContainerTag act : newTags) {
-                    ((Tag) act).setSwf(swf);
-                    swf.addTag(oldTagIndex + 1, (Tag) act);
-                    ((Tag) act).setModified(true);
-                }
+                ABCContainerTag lastTag = newTags.get(newTags.size() - 1);
+                ((Tag) lastTag).setSwf(swf);
+                swf.addTag(oldTagIndex + 1, (Tag) lastTag);
+                ((Tag) lastTag).setModified(true);
                 ((Tag) oldPack.abc.parentTag).setModified(true);
-                swf.clearAbcListCache();
-                swf.clearScriptCache();
             }
         } finally {
             if (tempDir != null && tempDir.exists()) {

From b750780cd909d51279f9b0a8d15b74a943e47459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sun, 14 Aug 2016 23:25:46 +0200
Subject: [PATCH 08/23] Export subclasses stubs to be compiled by Flex too.
 WIP: merging ABCs Test data (flexedit) with simple class hierarchy

---
 .../com/jpexs/decompiler/flash/abc/ABC.java   |  48 +++++++
 .../decompiler/flash/abc/ScriptPack.java      |  14 +-
 .../flash/abc/avm2/AVM2ConstantPool.java      | 122 ++++++++++++++++++
 .../flash/abc/types/MethodInfo.java           |  13 ++
 .../flash/abc/types/traits/TraitClass.java    |  24 ++--
 .../types/traits/TraitMethodGetterSetter.java |  35 ++++-
 .../abc/types/traits/TraitSlotConst.java      |  11 +-
 .../exporters/modes/ScriptExportMode.java     |   2 +-
 .../settings/ScriptExportSettings.java        |   1 +
 .../flash/flexsdk/As3ScriptReplacer.java      |  23 +++-
 libsrc/ffdec_lib/testdata/as3/as3.swf         | Bin 109671 -> 109834 bytes
 libsrc/ffdec_lib/testdata/flexedit/Main.as    |  24 ++++
 libsrc/ffdec_lib/testdata/flexedit/Main.fla   | Bin 0 -> 4425 bytes
 libsrc/ffdec_lib/testdata/flexedit/Main.html  |  49 +++++++
 libsrc/ffdec_lib/testdata/flexedit/Main.swf   | Bin 0 -> 1176 bytes
 .../testdata/flexedit/pkg/MyClass.as          |  17 +++
 .../testdata/flexedit/pkg/ParentClass.as      |  11 ++
 .../flexedit/pkg/ParentParentClass.as         |  22 ++++
 18 files changed, 388 insertions(+), 28 deletions(-)
 create mode 100644 libsrc/ffdec_lib/testdata/flexedit/Main.as
 create mode 100644 libsrc/ffdec_lib/testdata/flexedit/Main.fla
 create mode 100644 libsrc/ffdec_lib/testdata/flexedit/Main.html
 create mode 100644 libsrc/ffdec_lib/testdata/flexedit/Main.swf
 create mode 100644 libsrc/ffdec_lib/testdata/flexedit/pkg/MyClass.as
 create mode 100644 libsrc/ffdec_lib/testdata/flexedit/pkg/ParentClass.as
 create mode 100644 libsrc/ffdec_lib/testdata/flexedit/pkg/ParentParentClass.as

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
index d5bbfe1c7..034f30aac 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
@@ -37,6 +37,7 @@ import com.jpexs.decompiler.flash.abc.types.Multiname;
 import com.jpexs.decompiler.flash.abc.types.Namespace;
 import com.jpexs.decompiler.flash.abc.types.NamespaceSet;
 import com.jpexs.decompiler.flash.abc.types.ScriptInfo;
+import com.jpexs.decompiler.flash.abc.types.ValueKind;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitClass;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitFunction;
@@ -1451,4 +1452,51 @@ public class ABC {
         getSwf().clearScriptCache();
         getMethodIndexing();
     }
+
+    public void mergeABC(ABC secondABC) {
+        Map<Integer, Integer> namespaceMap = new HashMap<>();
+        Map<Integer, Integer> namespaceSetMap = new HashMap<>();
+        Map<Integer, Integer> multinameMap = new HashMap<>();
+        Map<Integer, Integer> methodInfoMap = new HashMap<>();
+
+        constants.merge(secondABC.constants, namespaceMap, namespaceSetMap, multinameMap);
+        for (int i = 0; i < secondABC.method_info.size(); i++) {
+            MethodInfo secondMethodInfo = secondABC.method_info.get(i);
+            int newParamTypes[] = new int[secondMethodInfo.param_types.length];
+            int newParamNames[] = new int[secondMethodInfo.paramNames.length];
+            int newRetType = multinameMap.get(secondMethodInfo.ret_type);
+            int newNameIndex = constants.getStringId(secondABC.constants.getString(secondMethodInfo.name_index), true);
+            ValueKind newOptional[] = new ValueKind[secondMethodInfo.optional.length];
+            for (int k = 0; k < secondMethodInfo.optional.length; k++) {
+                int vkind = secondMethodInfo.optional[k].value_kind;
+                int newValueIndex;
+                switch (vkind) {
+                    case ValueKind.CONSTANT_ExplicitNamespace:
+                    case ValueKind.CONSTANT_Namespace:
+                    case ValueKind.CONSTANT_PackageInternalNs:
+                    case ValueKind.CONSTANT_PackageNamespace:
+                    case ValueKind.CONSTANT_ProtectedNamespace:
+                    case ValueKind.CONSTANT_PrivateNs:
+                    case ValueKind.CONSTANT_StaticProtectedNs:
+                        newValueIndex = namespaceMap.get(secondMethodInfo.optional[k].value_index);
+                        break;
+                    default:
+                        newValueIndex = secondMethodInfo.optional[k].value_index;
+                }
+                newOptional[k] = new ValueKind(newValueIndex, vkind);
+            }
+
+            MethodInfo newMethodInfo = new MethodInfo(newParamTypes, newRetType, newNameIndex, secondMethodInfo.flags, newOptional, newParamNames);
+            int newIndex = addMethodInfo(newMethodInfo);
+            methodInfoMap.put(i, newIndex);
+        }
+        for (MethodBody secondBody : secondABC.bodies) {
+            //TODO!!!
+            //MethodBody newBody = new MethodBody(this, mergeTraits(secondBody.traits), codeBytes, exceptions)
+        }
+    }
+
+    private Traits mergeTraits(Traits secondTraits) {
+        return null; //TODO
+    }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
index 517152c1f..55317afe1 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
@@ -200,12 +200,14 @@ public class ScriptPack extends AS3ClassTreeItem {
             //TODO: handle this better in GUI(?)
             writer.startTrait(GraphTextWriter.TRAIT_SCRIPT_INITIALIZER);
             writer.startMethod(script_init);
-            if (!scriptInitializerIsEmpty) {
-                writer.startBlock();
-                abc.bodies.get(bodyIndex).toString(path +/*packageName +*/ "/.scriptinitializer", exportMode, abc, null, writer, new ArrayList<>());
-                writer.endBlock();
-            } else {
-                writer.append(" ");
+            if (exportMode != ScriptExportMode.AS_METHOD_STUBS) {
+                if (!scriptInitializerIsEmpty) {
+                    writer.startBlock();
+                    abc.bodies.get(bodyIndex).toString(path +/*packageName +*/ "/.scriptinitializer", exportMode, abc, null, writer, new ArrayList<>());
+                    writer.endBlock();
+                } else {
+                    writer.append(" ");
+                }
             }
             writer.endMethod();
             writer.endTrait();
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2ConstantPool.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2ConstantPool.java
index 1303e51f5..50ad462fc 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2ConstantPool.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2ConstantPool.java
@@ -377,6 +377,14 @@ public class AVM2ConstantPool implements Cloneable {
         return null;
     }
 
+    public int getDecimalId(Decimal val, boolean add) {
+        int id = getDecimalId(val);
+        if (add && id == -1) {
+            id = addDecimal(val);
+        }
+        return id;
+    }
+
     public Float getFloat(int index) {
         try {
             return constant_float.get(index);
@@ -514,6 +522,10 @@ public class AVM2ConstantPool implements Cloneable {
         return constant_float4.indexOf(value);
     }
 
+    private int getDecimalId(Decimal value) {
+        return constant_decimal.indexOf(value);
+    }
+
     private int getStringId(String value) {
         return constant_string.indexOf(value);
     }
@@ -755,4 +767,114 @@ public class AVM2ConstantPool implements Cloneable {
         }
         return null;
     }
+
+    /**
+     * Merges second constantpool into this one
+     *
+     * @param secondPool
+     * @param namespaceMap Output map of merged namespaces. Index in second pool
+     * to index in this pool.
+     * @param namespaceSetMap Output map of merged namespace sets. Index in
+     * second pool to index in this pool.
+     * @param multinameMap Output map of merged multinames. Index in second pool
+     * to index in this pool.
+     */
+    public void merge(AVM2ConstantPool secondPool, Map<Integer, Integer> namespaceMap, Map<Integer, Integer> namespaceSetMap, Map<Integer, Integer> multinameMap) {
+        for (String val : secondPool.constant_string) {
+            getStringId(val, true);
+        }
+        for (Long val : secondPool.constant_int) {
+            getIntId(val, true);
+        }
+        for (Long val : secondPool.constant_uint) {
+            getUIntId(val, true);
+        }
+        for (Double val : secondPool.constant_double) {
+            getDoubleId(val, true);
+        }
+        for (Float val : secondPool.constant_float) {
+            getFloatId(val, true);
+        }
+        for (Float4 val : secondPool.constant_float4) {
+            getFloat4Id(val, true);
+        }
+        for (Decimal val : secondPool.constant_decimal) {
+            getDecimalId(val, true);
+        }
+        namespaceMap.put(0, 0);
+        for (int i = 1; i < secondPool.constant_namespace.size(); i++) {
+            Namespace secondNamespace = secondPool.getNamespace(i);
+            String secondNsNameStr = secondNamespace.name_index == 0 ? null : secondPool.getString(secondNamespace.name_index);
+            int mappedId;
+            if (secondNamespace.kind == Namespace.KIND_PRIVATE) {//always add, this does not exists in this ABC. Conflicting private namespaces can have same names.
+                mappedId = addNamespace(secondNamespace.kind, getStringId(secondNsNameStr, true));
+            } else {
+                mappedId = getNamespaceId(secondNamespace.kind, secondNsNameStr, 0, true);
+            }
+            namespaceMap.put(i, mappedId);
+        }
+        namespaceSetMap.put(0, 0);
+        for (int i = 1; i < secondPool.constant_namespace_set.size(); i++) {
+            NamespaceSet secondNamespaceSet = secondPool.getNamespaceSet(i);
+            int mappedsNss[] = new int[secondNamespaceSet.namespaces.length];
+            for (int n = 0; n < secondNamespaceSet.namespaces.length; n++) {
+                mappedsNss[n] = namespaceMap.get(secondNamespaceSet.namespaces[n]);
+            }
+            int mappedId = getNamespaceSetId(mappedsNss, true);
+            namespaceSetMap.put(i, mappedId);
+        }
+        multinameMap.put(0, 0);
+        for (int i = 1; i < secondPool.constant_multiname.size(); i++) {
+            Multiname secondMultiname = secondPool.getMultiname(i);
+            Multiname importedMultiname = null;
+            int newNameIndex = secondMultiname.name_index <= 0 ? secondMultiname.name_index : getStringId(secondPool.getString(secondMultiname.name_index), true);
+            int newNsIndex = secondMultiname.namespace_index <= 0 ? secondMultiname.namespace_index : namespaceMap.get(secondMultiname.namespace_index);
+            int newNssIndex = secondMultiname.namespace_set_index <= 0 ? secondMultiname.namespace_set_index : namespaceSetMap.get(secondMultiname.namespace_set_index);
+
+            switch (secondMultiname.kind) {
+                case Multiname.MULTINAME:
+                    importedMultiname = Multiname.createMultiname(false, newNameIndex, newNssIndex);
+                    break;
+                case Multiname.MULTINAMEA:
+                    importedMultiname = Multiname.createMultiname(true, newNameIndex, newNssIndex);
+                    break;
+                case Multiname.MULTINAMEL:
+                    importedMultiname = Multiname.createMultinameL(false, newNssIndex);
+                    break;
+                case Multiname.MULTINAMELA:
+                    importedMultiname = Multiname.createMultinameL(true, newNssIndex);
+                    break;
+                case Multiname.QNAME:
+                    importedMultiname = Multiname.createQName(false, newNameIndex, newNsIndex);
+                    break;
+                case Multiname.QNAMEA:
+                    importedMultiname = Multiname.createQName(true, newNameIndex, newNsIndex);
+                    break;
+                case Multiname.RTQNAME:
+                    importedMultiname = Multiname.createRTQName(false, newNameIndex);
+                    break;
+                case Multiname.RTQNAMEA:
+                    importedMultiname = Multiname.createRTQName(true, newNameIndex);
+                    break;
+                case Multiname.RTQNAMEL:
+                    importedMultiname = Multiname.createRTQNameL(false);
+                    break;
+                case Multiname.RTQNAMELA:
+                    importedMultiname = Multiname.createRTQNameL(true);
+                    break;
+                case Multiname.TYPENAME:
+                    int newQnameIndex = multinameMap.get(secondMultiname.qname_index);
+                    int newParams[] = new int[secondMultiname.params.length];
+                    for (int p = 0; p < secondMultiname.params.length; p++) {
+                        newParams[p] = multinameMap.get(secondMultiname.params[p]);
+                    }
+                    importedMultiname = Multiname.createTypeName(newQnameIndex, newParams);
+                    break;
+            }
+
+            int mappedId = getMultinameId(importedMultiname, true);
+            multinameMap.put(i, mappedId);
+        }
+
+    }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/MethodInfo.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/MethodInfo.java
index 022b3dd2f..20f504f49 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/MethodInfo.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/MethodInfo.java
@@ -386,4 +386,17 @@ public class MethodInfo {
         }
         return writer.hilightSpecial(rname, HighlightSpecialType.RETURNS);
     }
+
+    public String getReturnTypeRaw(AVM2ConstantPool constants, List<DottedChain> fullyQualifiedNames) {
+        String rname = "*";
+        if (ret_type > 0) {
+            Multiname multiname = constants.getMultiname(ret_type);
+            if (multiname.kind != Multiname.TYPENAME && multiname.name_index > 0 && constants.getString(multiname.name_index).equals("void")) {
+                rname = "void";
+            } else {
+                rname = multiname.getName(constants, fullyQualifiedNames, false);
+            }
+        }
+        return rname;
+    }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
index 2eea9627c..f21028ecc 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
@@ -131,14 +131,16 @@ public class TraitClass extends Trait implements TraitWithSlot {
         if (bodyIndex != -1) {
             writer.startTrait(GraphTextWriter.TRAIT_CLASS_INITIALIZER);
             writer.startMethod(classInfo.cinit_index);
-            if (!classInitializerIsEmpty) {
-                writer.startBlock();
-                abc.bodies.get(bodyIndex).toString(path +/*packageName +*/ "/" + instanceInfoName + ".staticinitializer", exportMode, abc, this, writer, fullyQualifiedNames);
-                writer.endBlock();
-            } else {
-                //Note: There must be trait/method highlight even if the initializer is empty to TraitList in GUI to work correctly
-                //TODO: handle this better in GUI(?)
-                writer.append(" ").newLine();
+            if (exportMode != ScriptExportMode.AS_METHOD_STUBS) {
+                if (!classInitializerIsEmpty) {
+                    writer.startBlock();
+                    abc.bodies.get(bodyIndex).toString(path +/*packageName +*/ "/" + instanceInfoName + ".staticinitializer", exportMode, abc, this, writer, fullyQualifiedNames);
+                    writer.endBlock();
+                } else {
+                    //Note: There must be trait/method highlight even if the initializer is empty to TraitList in GUI to work correctly
+                    //TODO: handle this better in GUI(?)
+                    writer.append(" ").newLine();
+                }
             }
             writer.endMethod();
             writer.endTrait();
@@ -178,8 +180,10 @@ public class TraitClass extends Trait implements TraitWithSlot {
             MethodBody body = bodyIndex == -1 ? null : abc.bodies.get(bodyIndex);
             abc.method_info.get(instanceInfo.iinit_index).getParamStr(writer, abc.constants, body, abc, fullyQualifiedNames);
             writer.appendNoHilight(")").startBlock();
-            if (body != null) {
-                body.toString(path +/*packageName +*/ "/" + instanceInfoName + ".initializer", exportMode, abc, this, writer, fullyQualifiedNames);
+            if (exportMode != ScriptExportMode.AS_METHOD_STUBS) {
+                if (body != null) {
+                    body.toString(path +/*packageName +*/ "/" + instanceInfoName + ".initializer", exportMode, abc, this, writer, fullyQualifiedNames);
+                }
             }
 
             writer.endBlock().newLine();
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java
index 8b24560a3..1ed3656a0 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java
@@ -27,6 +27,7 @@ import com.jpexs.decompiler.flash.exporters.script.Dependency;
 import com.jpexs.decompiler.flash.exporters.script.DependencyParser;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
+import com.jpexs.decompiler.flash.helpers.hilight.HighlightData;
 import com.jpexs.decompiler.flash.helpers.hilight.HighlightSpecialType;
 import com.jpexs.decompiler.graph.DottedChain;
 import com.jpexs.decompiler.graph.ScopeStack;
@@ -112,9 +113,11 @@ public class TraitMethodGetterSetter extends Trait {
         path = path + "." + getName(abc).getName(abc.constants, fullyQualifiedNames, false);
         convertHeader(parent, convertData, path, abc, isStatic, exportMode, scriptIndex, classIndex, writer, fullyQualifiedNames, parallel);
         int bodyIndex = abc.findBodyIndex(method_info);
-        if (!(classIndex != -1 && abc.instance_info.get(classIndex).isInterface() || bodyIndex == -1)) {
-            if (bodyIndex != -1) {
-                abc.bodies.get(bodyIndex).convert(convertData, path, exportMode, isStatic, method_info, scriptIndex, classIndex, abc, this, new ScopeStack(), 0, writer, fullyQualifiedNames, null, true);
+        if (exportMode != ScriptExportMode.AS_METHOD_STUBS) {
+            if (!(classIndex != -1 && abc.instance_info.get(classIndex).isInterface() || bodyIndex == -1)) {
+                if (bodyIndex != -1) {
+                    abc.bodies.get(bodyIndex).convert(convertData, path, exportMode, isStatic, method_info, scriptIndex, classIndex, abc, this, new ScopeStack(), 0, writer, fullyQualifiedNames, null, true);
+                }
             }
         }
         writer.endMethod();
@@ -135,8 +138,30 @@ public class TraitMethodGetterSetter extends Trait {
             writer.appendNoHilight(";");
         } else {
             writer.startBlock();
-            if (bodyIndex != -1) {
-                abc.bodies.get(bodyIndex).toString(path, exportMode, abc, this, writer, fullyQualifiedNames);
+            if (exportMode != ScriptExportMode.AS_METHOD_STUBS) {
+                if (bodyIndex != -1) {
+                    abc.bodies.get(bodyIndex).toString(path, exportMode, abc, this, writer, fullyQualifiedNames);
+                }
+            } else {
+                String retTypeRaw = abc.method_info.get(method_info).getReturnTypeRaw(abc.constants, fullyQualifiedNames);
+                switch (retTypeRaw) {
+                    case "void":
+                        break;
+                    case "int":
+                    case "uint":
+                        writer.append("return 0; //autogenerated").newLine();
+                        break;
+                    case "double":
+                    case "float":
+                        writer.append("return 0.0; //autogenerated").newLine();
+                        break;
+                    case "String":
+                        writer.append("return \"\"; //autogenerated").newLine();
+                        break;
+                    default:
+                        writer.append("return null; //autogenerated").newLine();
+                        break;
+                }
             }
             writer.endBlock();
         }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java
index 2ee16f80f..29337bd30 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java
@@ -106,7 +106,7 @@ public class TraitSlotConst extends Trait implements TraitWithSlot {
         return writer;
     }
 
-    public void getValueStr(Trait parent, ConvertData convertData, GraphTextWriter writer, ABC abc, List<DottedChain> fullyQualifiedNames) throws InterruptedException {
+    public void getValueStr(ScriptExportMode exportMode, Trait parent, ConvertData convertData, GraphTextWriter writer, ABC abc, List<DottedChain> fullyQualifiedNames) throws InterruptedException {
         if (convertData.assignedValues.containsKey(this)) {
 
             AssignedValue assignment = convertData.assignedValues.get(this);
@@ -119,8 +119,9 @@ public class TraitSlotConst extends Trait implements TraitWithSlot {
                 writer.appendNoHilight(assignment.method);
                 writer.newLine();
             }
-
-            assignment.value.toString(writer, LocalData.create(abc.constants, new HashMap<>(), fullyQualifiedNames));
+            if (exportMode != ScriptExportMode.AS_METHOD_STUBS) {
+                assignment.value.toString(writer, LocalData.create(abc.constants, new HashMap<>(), fullyQualifiedNames));
+            }
             writer.endMethod();
             writer.endTrait();
             return;
@@ -165,7 +166,7 @@ public class TraitSlotConst extends Trait implements TraitWithSlot {
         getNameStr(writer, abc, fullyQualifiedNames);
         if (value_kind != 0 || convertData.assignedValues.containsKey(this)) {
             writer.appendNoHilight(" = ");
-            getValueStr(parent, convertData, writer, abc, fullyQualifiedNames);
+            getValueStr(exportMode, parent, convertData, writer, abc, fullyQualifiedNames);
         }
         return writer.appendNoHilight(";").newLine();
     }
@@ -174,7 +175,7 @@ public class TraitSlotConst extends Trait implements TraitWithSlot {
     public void convert(Trait parent, ConvertData convertData, String path, ABC abc, boolean isStatic, ScriptExportMode exportMode, int scriptIndex, int classIndex, NulWriter writer, List<DottedChain> fullyQualifiedNames, boolean parallel) throws InterruptedException {
         getNameStr(writer, abc, fullyQualifiedNames);
         if (value_kind != 0 || convertData.assignedValues.containsKey(this)) {
-            getValueStr(parent, convertData, writer, abc, fullyQualifiedNames);
+            getValueStr(exportMode, parent, convertData, writer, abc, fullyQualifiedNames);
         }
     }
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/modes/ScriptExportMode.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/modes/ScriptExportMode.java
index c89b0bc12..943310a33 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/modes/ScriptExportMode.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/modes/ScriptExportMode.java
@@ -22,5 +22,5 @@ package com.jpexs.decompiler.flash.exporters.modes;
  */
 public enum ScriptExportMode {
 
-    AS, PCODE, PCODE_HEX, HEX, CONSTANTS;
+    AS, PCODE, PCODE_HEX, HEX, CONSTANTS, AS_METHOD_STUBS;
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/settings/ScriptExportSettings.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/settings/ScriptExportSettings.java
index 3f2c8386b..d6f1b4aab 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/settings/ScriptExportSettings.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/settings/ScriptExportSettings.java
@@ -41,6 +41,7 @@ public class ScriptExportSettings {
     public String getFileExtension() {
         switch (mode) {
             case AS:
+            case AS_METHOD_STUBS:
                 return ".as";
             case PCODE:
             case PCODE_HEX:
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
index a786965da..809d8e96f 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
@@ -6,7 +6,10 @@ import com.jpexs.decompiler.flash.abc.ScriptPack;
 import com.jpexs.decompiler.flash.abc.types.InstanceInfo;
 import com.jpexs.decompiler.flash.abc.types.ScriptInfo;
 import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
+import com.jpexs.decompiler.flash.exporters.script.AS3ScriptExporter;
 import com.jpexs.decompiler.flash.exporters.script.LinkReportExporter;
+import com.jpexs.decompiler.flash.exporters.settings.ScriptExportSettings;
 import com.jpexs.decompiler.flash.exporters.swf.SwfToSwcExporter;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.flash.tags.Tag;
@@ -112,21 +115,38 @@ public class As3ScriptReplacer extends MxmlcRunner {
                 }
             }
 
-            //remove all subclasses
+            List<ScriptPack> removedPacks = new ArrayList<>();
+
+            //remove all subclasses from the SWC
             for (ScriptPack sp : copyPacks) {
                 DottedChain dc = sp.getPathPackage().add(sp.getPathScriptName());
                 if (isParentDeleted(sp.abc, sp.allABCs, dc)) {
                     sp.abc.script_info.get(sp.scriptIndex).delete(sp.abc, true);
                     modAbcs.add(sp.abc);
+                    removedPacks.add(sp);
                 }
             }
+
+            //Export subclasses so they can be compiled by Flex, but ONLY STUBS. 
+            //No method code to avoid code compilation problems.
+            //This compiled code won't be used at all in original SWF, 
+            //it is used only by Flex to properly compile current script
+            AS3ScriptExporter ex = new AS3ScriptExporter();
+            ex.exportActionScript3(swfCopy, null, tempDir.getAbsolutePath(), removedPacks, new ScriptExportSettings(ScriptExportMode.AS_METHOD_STUBS, false), false, null);
+
+            //now really remove the classes from SWF copy
             for (ABC a : modAbcs) {
                 a.pack();
             }
+            //Generate SWC file from the modified SWF file.
+            //Flex then uses the code already present in the SWC, no need to decompile it (hurray!)
             SwfToSwcExporter swcExport = new SwfToSwcExporter();
             swcExport.exportSwf(swfCopy, swcFile, true);
 
+            //Write new script
             Helper.writeFile(scriptFileToCompile.getAbsolutePath(), txt.getBytes("UTF-8"));
+
+            //Compile it (and subclasses stubs)
             mxmlc("-include-inheritance-dependencies-only", "-warnings=false", "-library-path", swcFile.getAbsolutePath(), "-source-path", tempDir.getAbsolutePath(), "-output", compiledSwfFile.getAbsolutePath(), "-debug=true", scriptFileToCompile.getAbsolutePath());
 
             try (FileInputStream fis = new FileInputStream(compiledSwfFile)) {
@@ -146,6 +166,7 @@ public class As3ScriptReplacer extends MxmlcRunner {
                 ABCContainerTag lastTag = newTags.get(newTags.size() - 1);
                 ((Tag) lastTag).setSwf(swf);
                 swf.addTag(oldTagIndex + 1, (Tag) lastTag);
+                //TODO: looks like ABCs need to be merged. Parent class needs to be defined earlier than used :-(
                 ((Tag) lastTag).setModified(true);
                 ((Tag) oldPack.abc.parentTag).setModified(true);
             }
diff --git a/libsrc/ffdec_lib/testdata/as3/as3.swf b/libsrc/ffdec_lib/testdata/as3/as3.swf
index 731abd8fd0ea3df58ffb9d4156a6cc54ce58d73c..3f191024a4e9af37d44a64129342d086714e1efd 100644
GIT binary patch
delta 27529
zcmV(rK<>Zi*anK)1_nb{QxQ_`fd;h(0cJvf)Zh0%o_(h%`&wk*m+YlT_Jk197=vNV
zFpGUjLZzr|WtWhB$rd6Bl{E>G7P4>I_xxWoDB|7w^ZorlACHHb`?~j>d(S!d+;gAj
z-WOWOtzo8Ku!qC6QN>G(k}0wMBcSK)c@~U4h*%QEpDb6_;^^EybZou=o)po1%4o!Y
zT03d_iFl~#8OPiUXCH39|4rNp#lHU?bl4kZ<6kHEvhCJS6Ir90zMA8r^&}^R>gFs8
zt1k0AVUjuYrRTmnBAe#ZF^60YnBIgpeakqH7l*muM1DiiL>V%~#C}qkZ+%?IVeVZ-
ziBVnXv7xR<mrH8IHT@WG_X}*8H}=1OTySj^IiA=WoHGABb4?N^F2EEW8#k-bcI(Sg
z$42~~d+to?5#h?uQWH0Hj`C`b+>ObhEbjKvHkk&?vOC#vq0p>p!;x2SeUQ<1zvs&#
z$WYp06fhBYDEiAtG`Hkw+t;I3C7$D=w!I9MK5{9&nX+fg>NA8xrqbvcBH?O(Novc3
zj*?P6H4EuoKRZKhou+iJv_F}Kp-yz>Ce5$kX=5mH5W46)u9C^8{=QYMH2z22!}RjX
zP@?u0)wrOyNe$0B`te46MGx`W9pRDvs&TpSDe8FBkznyWXXzH2CMuM3s7&m5&HYSW
z@thtPPjlp_o&uSIm4O<U^dcUAOttFgCpB`MR=wd?ryAvb8a4aMo8>JfPHNY6&Am`Q
z@o`d%(8t1Jn&IO~dx0y(5g|8@9r?0mV#D=SbtOy9G@%;V__d2DWL8d*2I}pZL^IEl
z?rt}Go6FnlY~oGu%6uUDiRtV6tW(#bU11hE^X7{gFBf=@NmH^*lJqlw6ml{NuUNA)
z-#tBhfM7invtZdd7yPv-f$_;Y^?6fIe1(8JMy|w9Gjy*ku8Tb4Rb1<HW3NGI&&08q
zBwRak|0Q<$eO|i}^vul9xx|~rN=&*lOVxe$XewVGP4C_A_4#g9?Vi4R228EGi+C1P
zWT?RVJSWTJ0scZ|amIRoB|0s$@1<F=%K_0`!Aug-fsJap(b59PH)f15&o5?~RQE3>
zhb~ykMn)qaY;<XiIrk$6MZ7P~&T2KXllgVR%FjP<M+*g;nknA)DWhwtaAa@*JvDf*
zHt~Yn$4B+!w>ggmyDKeckdsp0P0gLK+iu5$48}0&(k}>a;J-9~Y|is$E*?s+QY@Gw
zTU&Tm1Y@Ai@K#-EyhkA`Bw_sW{<O%X2hp2cOhGK>XeqqynB^%y@It)Qn{doMX9%n)
z9VFv>yn<x1S;LsE_=Jp1AIZrjyw4u96SG$3tt-J{6L552!4K;)L{|^2<tc(&D9o!i
z-=b@n?fO9elVI(Cwih<~$^4h+vMFMHKD3M(|IB{dbHS~@vZCGIhTY%4C!R;aSCxIN
z{?#>;Oz_cH3whoG#T1G(vKk@PSqyQVpV;e54#!2KAmQoMCsD12vWOop#aUs)ZypJY
z*s2d1`8GZcl?g3vOsA%W=EN7<e-L1=addQagSI#fbs~6w%^BuBt`}cAx>Eab;w8#T
zpyUqS#bcE-UGZoqhp@8?FWd}i#(9c-!p=LxLnqQIhL9HWgGW5tZdgrt4ko>cl~A9)
zJrM4gzA_s)2MrL0F}!qfv1g7If4Ok|27LLkeYO4~UQL)HCP)|qF*bp}L%``ZMp)?#
z<OXCM%w8*hGq)33U3Of_D7);?kyZWuO;|ppfxcp8bZn@k=S{_>d66G6L2vc#LcRUE
zL?jMa+)gi5_)f8S5Z2Q6DgN=iS>Q_0Axsx<O;P4`?MEqdAngdt)Y6*Nw;bedLlSKV
zzkAC1=-RslV|{Z{ULw=%d$@bnMJtVR3%hd)7d#(-J)ldL4;Oaue`s+e85RMC*~(SD
znF_W!^`wz#OuwT9>=T&2lHIyG^-;I4$f48f^<A#gsmj$Kbz{D=qQxZx!tKgG6o%&%
z+ajyH))tKKyNwo8PI5e~OAOM<QXrQz?WT`c5OC;~yfnUc;_{jNpB`N~jK#qw0<+*g
zkqg&<#^NU*O|ul|dE<5cTvPel<WE}atdT-6!CU*F_?1Tj0he1_Jns-e2S*A+PV%uw
zcfZW93tM^ES={U&kGi)CM`@p2*U#3_i8oj56m9K6^{mW~-P28T{_*u2#jN#F>cNnT
znDy+Qwy1Z!D8{8)N9Xq5KCAH+{CK5rgznXUDnHBIX6o3idp^1q@K8Rv426XrDy~Pd
z&oCVVmz;so^f26-@b{%uoO={7AZYxA(Z|q!m?D&Xc33DUP60M-Wt7m=Irj8fb87mJ
zlrV2upKE1)gE2pkEadaZHiuj5CxJ+G<!tWOw=m|KIT6)IxxZ8D!K*?JXuj%q_F9{N
z#;aHuooZ=8Y&gjcR*~FhHw;`T^jwy``zVz^tO|NZ1nI3~G00n%5zl1tYT_Ii_9eZo
zp57j9?hMnr5zTrn>hnXj<FwrqpjE5<^{OTU_FmH4jP8PC)4pd`i8Tw$8ADw@rKrS|
z`nxlH$@0NBv!JV2)hT?)?4fthoxi4k=tA+AC|2nJD4Ayiw--WCY)W?G>kqG3($UJ{
zQU^MxQ;NNEbb>TJT~>~Mt}uSKr^WR_7t1X~=UdpLsCu5sgtVDXKaT8w_9JEp(n(!9
z#PD`wzUb<~VSMzW`KLagIJnn)Oz?_H2-~pcwW8o~nE=O`+^|bwAsH>ubb0N6TP0KJ
zviXl_FKM!*WH#Q;v~Qgje@<cU*4ddIzGCkp&iQzbx`l3XamH3nT=e>c!c_LD0dIx#
z^9awoN_2qA<u}9!Ej;w5^Pg{+vn>8Re$z~Sore9(38UQFuFEw?TvO?U%~9{vjCzS#
zQHDzNi-$w_EE4NdYqRFPqG4};*wo3UsGDj)-3U2QCCci^rEoSHZ<cRm0R-xUtumo)
zC^ibq%Ngxb<Vuw-mQdK@{OW`9X1DM7LtiyzD^nvMj^FQhzkJswUSMd&QuWS-`q2xn
zO_PIf$_v;74nDFX<FD^bD-50`Afbo!IW`Mg<q6}@>PCI?3V9!coEVOO&sII37d{y9
zQTp4$r>fqk_h(`cr?omOM$n{6NjD!Mn2`=YN!3GF`1wwlx2pFQ1*PJ;)8$Gq%dB4I
zHL|Z&+6uSLY(F=x=M<~foP|(g9{DSvZeH{gmXx9#PdU`F>fR<_cuV<7c1%5MG;$@L
zk@Li7X)@mSE_a(n3D!e@5ARK?w-ySFrws)Sua83CCq;M%)az?J3rtmZeSdfA<MW@I
zV9)C2{J6=^2BD5##d5Mjy(MKg%X8yiO^pK28S-R|7R@5P&jeIti_N`{J~B+8nGS!`
z`Q5!Yaz65UNQI@OX5NO^gt4iy?vu20Y(z_k4|RmJyqsw+?(tTC;;z(XSQ;_y31v{p
zs9WtcguW&zBS~1|zgRNv;yg9~<mU3Rda%PMEAOO(0P;}lp13x3{~XIX>oCQ08Ds4C
z2k+(5QNIC$a&9NE)THX0yLdlOEUXpo7z5ubcgQRw7s+}==oZ!1q+jRjub%BEr|zMg
zG6tw~Fgb7H6ym*qT$)A3noxY!^C%b58?ATWO69b#P3H89uzN5Mxte<+D-X>tQ#Kst
z=}T1gHd03}c}Frhp>z6S{Lh?wEMxN6@A#G$8or^;=ggVqU+n$BKJ>+EBzDsMn}a=J
z^l;<xH1Fs@N|yZCNx3ysFP(D#3G^2*hqB)XPqt5&EMAs>C2|!9Wt*K@m!zj$$nVu3
zv(~rF&+If>Qklph(*Hz31J(~)hFvfIAm1t1Fg4nxmL&=|&H8xoLHOw*!(sIprDJaj
z%DXB@J|m^pofx{qJX<@aKjz0dNPTDfWWrVxs85t7M@5;VosUTMIned?h^*U{WwA=1
zOSQ&%4@FXcW%@B$Pjap9WLG`$xz?c*23=19eQ6_JOX+Czc;;;bs|{D7SZ=F=wmyfO
z-iV1w?UUE1xpTm%y;!-ll$Hk~EnB%}ll58D{z~T+y53jH?=ROSV+fXPB0I9rh)#&u
zJ(nK0bdpp;d}Z#kWGe~k1k1<OG=hSi-5_ihiQ<fZRShaNFTJ~@9UrvaxG0B!9jr2K
zKPsIPSF!ZOYs{1Csj17)obCa}f+ulJLCZmpM?@7R3G7=ESGc~`pVWAoE$();`n19w
zBe{+O`g&-GX3FKfi`nS9kxTEQQ70yn7~-m)EDK#E>wB*J-u0_TlAv}y>{8)@Y^|~B
z?;2r$oq1O5tpXkv4+xfTx+`NrgR?SI&}?YdsfLq3@bXB@edvoVWqIr5S!z^O%oX^)
zihQ|{81LWWIaPo%ZYGGIYMy(1HnHan@fp{ArTfnL$#kWT-@RUm_{VF1_2lAQ{V+jY
z>B=i>tIuiFlqfsaA1wRzU4XP*ylWt$MvEwaDrfq*5ZkAO#HO>o8DKBphPRb(*UmM3
zCZC!kk2gx|$UdsjS$olW!_}9BuEf-ic>~{go$rHYIBUO5JVW6v`|;Ri;e~*fPh>*r
z@V?c{RmDdF&8{d$xy&7xt?wWlYME|na{V@ZA(|pYq>g(9-W%TAB@Q9|V#|eUFytS9
zMdXy5F8@psDg36{)TcDp{A#71F*q(8EQSfbF=BY-%^|(f3%8msDVPimJLY{q)S>%Y
zq9rpY!(he(8gnhCo>D|{(Jb~-$L&!yUN`nG@~Vy#-a}pF!)f$SEpj6w-pYM_eZeq%
zUInT_kO#SxmqVJb1XDWF)0FtYcp*!Fy3%&zp|dbuSaX%GYx87DB-e6Cah#HalAwbR
zeRD<-OS|j^LXDoH?`36I66&W~QTZ0_9qywFuHbV<OfyWgGfUP>r^}W;J|SeUc;9zP
zRx{<EZF9NHp-Np}vL=d_*O%rWrH)K8nY5dSK5wYH**|OlZ75{gRq1p=n3kA-?pVMZ
zomu^=InK*TW6A-rsj}#xR>Ko42E`ek)g?bM+QKofy&?T`Hj@<oQRDS%XY;3sW6eLA
z$NIy>4Gt=EnB5pjVOEYkN$LLHYIW_$%cL%)O0vb)%1-vXgIBYNIN3%DXkZcbz0v{s
zVaC3NUn~ea`h!HSOd3V{%o93)O8H1WJsHVCT!(1tqsmV%zUWm|%vNQ*!l<Y7R@0(i
zlIVyiMy-tX<M5-27eAa8fE-$WLHGIaz|zu4^3%suNTl-d@W@#W@`;A1ROo{X&NQx8
z;6?5D+`?PkKv?Vm1ABdMRPAdByF7VWy9ZV5;{{XkWUl$ASIiT^>@q!nE##NU2x-Ml
zMl$s$UK7W&7k=(cb`5Z$AGFoWO3Z)6l_N{B`if6hEZ5}3vOx7hSM`9~pao~xr)rO?
zsQNF>6hhD9`{bnRbFAtG-jZuR=hvf!K4v|rYIQBy3tTW6z-Ct-?0CJ+?7p(JkvM09
zgB>A;cEEM~MTzLVYi;F!q(Dsdm;hVlVA*Z|m6hq#dq=E~_)J8pMzmPC>#bkwtP~A&
zcp80QJf$y(*!SI)f@HczXM5^*>jhU_&a>ZkO%@?FJ|Hzv^tC%bN1ov%<An8xX-O|G
zo-?O9vifC35m98LdJr1L9PJp^R0lf$dD|Nkpt1BW<*&{xq0dQwKRMT%Oy-`kuLrf|
zC<+vcGhUFOmMl~-@h!j2K0kLb{~cGibpZ$t_8m`5mA?P<EBl%Gm#!nvtF0*(UcMTF
zmXE4AnMGQ?Arrqy?pBa=ShiHP<3S>bTdFrL!te@XHfn5g-IyJ9P0}<;I@##N$OCVE
z<ICPgpw%IItqGNXi7b=Rfi8}3BUFz<BO-{z8T?{S*g^P21^pnV2?eQde7R0`C!8sx
z)1m^Fi7|5zA~x*hxMi9cywP#3EMxG{r);WwV4EI8SfVsSG&^>DA>w+^fSV4Zc1#+$
z88k9=SbFyQ#`nUmk$eoyb1LPKSQdz^^0Oib0kkplqW0H+XL#!Ld>^kwxywT4ycwBf
z3TM)yX2e6;%>(Y=A9EgmZ9e#RF+4W)U{85*mOzH5dvqEM{jGC$s^rQ0a1rb9CSR`j
zGH-p>gq8}Q(c>f%K%lgM!VvLsb-r;f%q2Rp&F&ihg`eI0JaQRD+j!&E5HIJV(iT)K
zpy`c*Ml!d5zp6=5J#6XM3uk<i(D`!h8qLTZM90aSqadv->}E7~#Nr*6Xt~|$2PHW!
zd#QI#xJEfhsjrb@7QLf7n%!CF2?wM4r5rztISSbe)CF{XK9=8G;Z=@muhEVpTEeUE
zRPuE^zv`vB(a@`!^-`v+9iJK-Ygl>$vcp@3{8__)zflF>o8lVcYX-mbi%&A>o$yG{
zK9$9Z`D7-^5IUg}H=Sp3L>SO%-VnB7-7wFn@V@pV>)TAco)hbdgq9oC7jIwkA-t#c
z!sU%?V<4LpKp8MmaK$t4=X@*J{)yS?$<|RO_QgpnPusKgy3CysM$EBVU*C}CXvnKx
z1=b{geR0c;iJ^AkVSct&g`N_3=_{V<v?dD^`dL$D(qk4<#lf=b!}rJlnL(>rT|a~A
zUW~0)yPp<$45u@Dt7-FLx@d(^_+?{;7u`eKzD^7J8S$401gh6?grnr%wW@pRGndtV
zCVuNGXv@$Hurd;?4qA|Fsbmjt`mlaWk;#~UU-l+r{J|!H!%h#1&v7K=&Ry{&E>2i>
zWAd5yyn+r33~5h!bs;;i*%??Y6g{?e3!|p=J~P++hy<ga_!ytkUGlUrHE#L9Gbke^
zOfz?a@wwx}l0MBO<%edY>6MwDubJ<UJuuMVu^1yb68^%nH!tWbo4N43`D_`tJcq@9
z%lV?DK>|04wDYfwLT`RlcY0W>0-g0oQ_B`;kJ_0g<QDZzd`gkJ8!Uh0J+%JVf*QEI
z29|QL7s##5x|CUp7kxj~5-2EsQXZwQi^wP&C@p_%+Ba0}TbmJTZk`))#bg$LFb5^D
z5;F3@m9q7%fLIp%Q2&nvQt!C_V7UZ;sA!S_q}O~-WFlBz=gdtR4cb$rWvk)FUn7bm
zPBqX<N#$G@mYq_MzjkruOm_~eZ2qkwLg+dRU)q#HPW99T=Bc7grG5!HPs(%WM-Y)0
zE~`UR>Z2mXwrWi2kF%c9RS{<ADULY=k{-13?0UKIG0(e|j@}00>{QQ|yu8kTWh8k1
zV$t;^i|>idN7dslQ?{pqUb;YBSEKK?>pKJrr7hBS)gxfml!zo-Dk+8=4DU5lLfFf-
z6$$8yNrnBSZ%^FmUi`{#sv}wL(75W^^pRi@yfQvaH=MC7Y(FEM_RKo-81Id;BnLUy
z!P`Y7L4(p@?j~NPTHdhRX66Kcayp@}Q<ki~a$LJk<7`P#Y^#0c^IH9nhJ@^|<|#2_
zk<JqiOf_?AH5LmWNa2^8bMwBYmfEC^#55K+J?lEE6zd@MR8oD|9W55D-~Fx4a;l4H
zWLBKYluTvVg_NI0-KQROB9ur^PtbzK{a~klx6OE_tD!e*V&|(ndA%)vQ6yg+eaiDX
zpSHO$ggQvN^24wIHw~=NUpUa2@TMR#D@%tTlSHXyYhiLIw~@cJ#0x}4e?cIRY9gwc
zPTAv-WKpA6{#lzkk<rqjic?ekwNEUsOz_1?e}AW@WimRY;i<@*aY92!LqDcxer%er
z{4;R{dtaFQH}wI=rRQINKqGP9cXhu5Zj`Tt4OUFBPO5@rjEp}~PC;b+45Eut>v~G6
zrB~O$1Y@)khhfq<?3@MOz$*Pu*6)s%R}WU6RcLpWyI?<TPVma`C)?m)sZ7rgG4FF|
zQ$5v{t3pP4I&~LQI?8WW*!oVss)qMWNTrs%+u+!66T36p3f~%klnYh@33!~iaOWlN
zU&Hh&yt&Ekg_%`x=a%VxmVAl4KVW?-U$2+M*Y8tt-)q@oruGtsS$~9Qa3?>Xqoa`x
zRfcjxjSrJYgOF1bk+au`e~G``b@zyC31HvK<;>oY6qf@HXLYMzOV>}&1p(&mVh8*%
zhq4&)nWUl(KL_-GRraDjM^C7ZM5lP#OHW!$f+o86)b<l>#x6y4hrfhj413MZKYSPa
z7-`!QGSD+@Jryj^X7!nLCS0i2#~K5RKLrD&2zonD_evQmkr*jR1qgl8ZuwDCZ*cqq
zo9TB2KNA2jAMC*%gG5v><SJ$L-)o|_5%o3i=$JKJ*W_(~I4*0*w$wd1KpPf7d{x-{
zm|Q*qSF>i%#Ow^K?Y!X~_it$oe9uEeBOz%z>`0xvkJcMB7wMnJRo@Nd{mzSikyJ#{
zYF^GPn|E%+g`vIsWxvU(rn|iQX%VldIJ{1OTpAWve5f7t%C*|B!Ue-wLk}qLAzw@r
zo!Or+{Ni<g&)K}{&yS6g9(^w#w`IV*Dr6EBlQB9WTHR4m&s@<{2jxpB^IwI6p&Z4%
z3~cz+Wb6$K4<8h=GzM^7EXNOmvUo45+UZcZC-_><=!Dycby+^G5xd)~NPcECYL@wh
zVjlGe$bgB@br*L#nLxV}pars+^^NY^6N;kkA4EBS4Zm=W^|Rjp<S{X+WHK{7l-bv7
z0n<~3M#}3{J^UPe9XnM(ye&W7^%)`aqm=@x%`6`2T=48CnfANrhyZU|bzs}IsJY-p
zIO5BDSY4|c@<qeDhP*f?K+ooVzG<r-A`x*j*ZRCs6?46st#T<LMmqB&hoxCL<NG4S
zv~s9_Z{cm1qL4gqP@;;H!MfFL{+M$dIjX3dur4iirc|oxrijd?SuQEdD;pP}nH-nz
z#1tKG?`T?#+c0MB2_vHszm)olRt6dM60w*#DnwCYM31b!Z;($`ViFv}Va})rRcOt4
zt%X`kI@S3Zm4a&ej^E0MjAWI30;x}fbh9>p{ZxgTr<tTRi^_iIS0W4r4-!3#bC9%+
z^yi7p)mIUeNqRO}R&YF_D|jHmBLqC)Gl4njLwDYB-HnQ)92ZPoZgzd1bEEf_PNv&X
z^pU4YuN#vZKR8KKesH+l?#T0eRG(#HnPClHg9`8W7l(_a0}Y#Ot#s5Z@5r<ygSw@E
zyi`{|6n<vBR6=ZdWImF#hb2(>^i3C~K>L9%UG<FC9PsT@_m{G;Sj{p2vA0(vmrL~p
zYvAGut#2sVRuq4#26el*ib}OA>R<d!@u9FvI!HVGT|N;ztjetBM<7qvoZQeVnxSXn
zhQD3&*<z(&uNY4<`MV-*FCBPZg#O5XcOoBe?8_3azvv7zUU{{oY`vsF>l%<NSm#da
zJ}^&vBtF|fBW0d5&Nz~H#)qfm^~D2Y7#?Oe59XX3&r2l~MFf-TxbXW6tf8tm$p)D2
zKK=P>+%&`TQ?^@PSvxiDPuUgYM^NPDtKZutD&N2FHIQm{c50XN98V~hk5s^a1zD?d
z+mUl})_2n0D@Kk5iil7P<fNP5Es`HUn(%2ztDx)lTfzHZ?sbb2hga99vVOc9NY}0b
z&$2ksa6VSetlRCluU-^0sNk0PNrtrtS7oOJWTziH^Vv%sA?>tozVA1C<DKufuFC#O
ziT2OsF^-FdY3}d3ezun~R$h*OsH^eUO-gT5X}ZJ9B|+q(bhqZ7?R{3d<(QvjW%R_A
zGOq`mB!*a7-+*2{kRo0{3|;ClN_PBYVtT4KIZfQ{yaHmjDEhip?4>7Zi=(SN;-#7$
z4=b}R^KIM_*|}MnM$QBYo~9oSz0}%8;wr-i$B|`C#Ot|9$rZOo7PZ5F$_~aqXc4^o
zMJBH5eStL}TivPji`R&RsU2r^<eP2k)--hn1s0PgYNH>|<ydq{WnXK7T}iGRGJgL3
zUgl{U$xZwh^p+Vzbj`DXJ#Y-gl6~!xVmUIq5vHMqw3dDTS~%pSfisNoORxTt2>lm%
z1IJs>bR%254;Q-!&a*0i<-8j_m*Ce*G^<_vu!Lt)p-u7|-)&L8&)RuU7%qhse>j$>
z6puQ;f#|ub@$7X<g;twiBVj<)NN10i!H-M@^qOyx#;0jkG5g4=;=GizPX$GnZYWqW
z&ORX*tP(J{7w1;ZdpVP4?;Jpv;e)2mZLM0Ag9?kzzF#xrpOnmh?&(TCw&3lgeESRv
zG)6o|=6s7eJ14r%(J%e_HEqmPJ|ydQjiGkk4_@kgs>@YtrQLAJST=)iWipeWpa(N}
z-xWLwTqqKLFc!sT@XV29u+@>uTLOTCDOTkTKeUeBtt&MVWq442RGQPV9;{?}Qt$Q5
zy-)O+&K4hh=-Bap<BBR?oh_T9C_da9m+*Ey7*jfzo8iTy7H)evBt~#hkzWbVHyz<V
z<CSAQCQ{tOJV&$C{e<_P?(hwsI{>OCF!JwT@+DCdUp6JdtoOOCl-@bnO62L26p&FS
zb=my~WiE($Rqn<QNeUXNS3kaLy-+yWD3)M1_ken#Hq@(s`K%6x*QYWH)>p0GHMuxT
z_iDB~u;1<4pr7Bo_yCFcyWsIrcia12HN#aboen8$A5SVXseJj|31U{6cFSfUPa8ZP
zv!E#OI@0$}vtD`5b-@Yy=bF=fZg(*K%tLIa+@VBo8?=@&WFJR6DazwKqU*-|@pInW
zSkXSug;KSDuH066Q<%;7P~Jl4Jh1qLVNus6+==q>VUFq^7T50#j6FTK@ucsl2Q7o*
zMc%v1$sW43i{#X+y56e|bGG<BBBRxwZ6wEFI>DLe8C5Q4TAX{cPEnPAWA-6DYRzEm
z7DLvsi;#3Ak9L~nAqJV%+MbD)&!5wC^5611K_r-e9AsKw@eaye&L};4`r%+O@1t%-
z*Mj0oo}$U#YZcbiW$kSe-@OY}W&GRSoURwECVu={pesok;eX2Yqd~q|*yQ!nG~K(F
zXC(_B`0FTJeLWVH02!!gVePIMKY6<RhPT_%CmC8*F*7X<;d1Uj`@s2zBNp<k#%Ch#
zV-FgC4D#0zlTG~z7yZ|3bXDv}$g3HdqO}W<QNy8UGUz2f-(vMWv#g~GyMu}tjvE~O
zpja#!%kehEBP7lucb?2^;po`N0q&|t6<Mk)E!m1RlgC#o^F}WBZro5@NFrL>xG?|@
z_BOiWc|B1ss%S)sf$f=AW<WMR4RYdG&i$!>7TQ@0E)vUQbRl#1da_26XIE~{A0-!A
z)w9-m-+epGpUfFEGW5eRtH$Wi;m(tJnS-d4fsY1BBET<Zt1clvrp__loR2)|EqjX+
z{PFx6qq;X|*tfQ7E^C))bS4v?dY~^!a%Jr_VW%W65fM4m<G_w@gAlmVcjFKx(|pZ;
z)GOB$eq!!IqYd>|s$V?c1$BIib|DC)yExS97hRbwUTGzjov`}VOggixx$UiIa)IFw
zPU<Ve*J?~=?iG~G^A+AF*G`^y^Iy=p93`qe_$c3*zao_W$~!K93$Xz-<-H+8*<$>f
zSJCS)E_7RpvOY%LKK;R`j66^22tTKP&PMVwzI@mu&yqE=(bBp(c*fCvoFR-_ii1w6
znQ|6CYtGy1Wuyz?@llr-5bKlWg3c%EXOX(inLb`CEt!6N6Pz5GJRK};31E$w-f6is
zxOkN5;9b*E$XWPXpQ4J}RhdP2V_JE~;|QK9HfVArTFec7ycI`>+m)eRKa13VubP?(
z->zEMWj8j`c`B}!8P@MqZz3emw@ib%Ge%k^UBUMQyvQgdt2z~B$9SRYzIe`bYEf2C
z<%dXR!fcoLxg<%Bg76=f9Z30O##4+Pg{(!_XD_|s&Y6CfJIK3avP7!eob>GRiQ*E)
zCKKN$oa=MOm)a`IyDkrNbEkBFvRRh|PqPh*SoCZq>^uG$iA+V{2ay`8rp)s8#7O7n
z<BpW66ITyA&lw)#DJWtdi=2_EDVhQw|G4`4E|I$vyC%z!m|h)iH271JD`*mQCHTb~
zf>Zs8?hjHUrk#u5m(O=oHiK%vVIGLs(FJu_u|1#8e|-f6zwNA+YrHsrvB26Wdv~h+
z-XtX!>;ntJ1(Ij+!-5t{a1(Zax~y!HYsB72`EmkTjkr$k!K?wcob}`MO95B1n<n*-
z*wV?A<?@W6IFceiwF-Y3Xy}?UU?NKBb;3MbSPW0_^QP)BstG$(R%x_|cvY}2@`#Cd
z8)_e^b|K3mMzL*t8d@2Da`MQ(Cmba=B0-~Xm#5XNrE>h(+bqpzaScu!-`@{~BV=xj
z%wO%WfK4?rJz4pwW%4r(|NgsQ`3Vy&>Uc?Qetyn7%><fnC+fvoJbL2>(=w5tn!;j9
ztCLZ^Cu?9WfqLm;<#rE$bSDM<_*xb`K|@`}<PVPtvba9>?lks)f4Bm9N3o#)#5Dtu
z7Li4*?OeVEW1AYsiTAy6!NGO~<EQR%rj;U1jk@^FVoxN_UGt6*!dzDDaZ^ebLzl?i
zWnwtnahhdaG5G`awjtH>y!(B=hI-<?5twXaU4$uI9$>V{>J@pE*oKH7u$6c}I4<q?
z#81F&(kI?w?YsSd&(fz~Eif*gx8qCRl`8Z69QuSa74{&FuxC}t=3BKeHND6K-U(=f
zb-n!9w0oQW(fCgB&UcG`F?p<PGySanm3gHBC*!JyGB)PySmlF0*qgt9;jBJNFD0$a
zum34RPN;7BqwJ*SmxC0XlNL405hPz<j&OBm_OQNw5Q08`EX!5+@<K=Lkcc}|ye*af
zF`g$>lX~H%MhMMO)z=fkZ=?r2lV*pG_cekT@GrAJrhnYNG*4mw45`FZjPVL7Z<M?W
zc49cV=2qW{w_xaPu09~%qkEpXvvah`%yh&dc~xj7VBk%^bA-ry%fcf?U(g{Hudc<~
zeFPacsXd8*JuZqVPR-|?wKb}{cm+ZFv$E@R!K|N;c-X)PaYsSRLVeb_`Qup6DGHf5
z(X0Vl$TeU*F(~6>VKhrR*%A0!yvR{NhLzX@I?xF2eEW7fn$dK_*RzwEt{!tXh={KK
zj-gR@`$oiyApG=;ygZ?=vfkg-ebtOu6=n!}s+aD6@nIs)-s|nqSi=X4$@-+EM;J~d
zaA(u?KM1mPHdBibkk&CLnH76*5MQQl+;hm=V`{PY;hmJ@FX<z=;)1V2Ty1P0KJ=V)
zt@5lyb)UGRmymTLI;i07naAv{eBR3<9A^hA5dBZJ9Qke*CP{c44i===9~UWk_V$B}
ziAfQEgIaW8YlZY{hN|q!=ZxW3oS=fvBjp|oN%gw<wqeR8c^1eJ2`I_OF_|{7t4Y-8
z3^P%v1Ajn3RtY#JBSdQ%^ejho_7q>#Y2DzUgcjOnh_?R>Ok6CrVJ)WlC=t2VM@d1h
zu?OL{A`avbGA&F%No6tb1<M~zIx84m!>0m&4l%J({W+QF;SX0{ph^#qQTu7yJv=5@
zb1Q3XRiN$AfM0D_L<BRDCY`MChGoMv$|L?~xj;Z*JY-Gkx%0aU%q_kR-4~>JN_Li>
zFw41uI~Eg6iqHDQUw(Z%N^i%bu0|QoJ(;W`ef<TkBae?Wer0O8j<|KKeY7=6kIBV<
zkoptw7l}*Y#9X3xGiONE7n4)VOvm4cczer>+;{>1a`pSGsaN)<p7v?)0$f2fY_(Sv
zJ-&!!jnO+BO~Gd_kGg&`J;pELNd28VZwQ<SS-z&w#(K5Q`ieTmfG?Mi*Vo$I$BSUT
z+b(<;qNFoM-tnJY)4AyYUR7I<UlkgEE97~fbqL{k>20x!tmxR~?01ACt;6T#oBO=2
zXzNF!)A*0`8lvA{Z>k&cuUzx{bTN(DFlD2|_3n}}nbydQ_YeA8`yZbSjC<^EPJh0e
z{=#**Nt1#0%#CO26rTEJOShJX4#-Y=J}51FbHust{Hj3bpd$UpM1~Qw=G=gPa4<<1
zdtt6palLAN@4E_`2?Xo$`)_M%gHY?$MSN`+A%pEFbq1<AF&!3=L2$asoyX9sC;eJ-
zp3fXli*r$RETlA#=UpV9h<eo3Hh;&b>*)u>ONA)1p8B+_LB%e~^Y<St-2SXwoW_^d
z_w_{v;bpIx<LoB)>hc9&d@)jg6t%EpX=YxkIY%BS_`!-WBaZH5kese^<|E&QXXo0M
zeN7dYSDfJHk!fppQckp%wyS=0snlI@qMbZ<_QS*JdD}}Fr5egN-baK6FFGtH79mb#
zWm4VFzHp|leLXhz!@A_K@d90L(U}gF*XEi-mkPt}pEPG)i0V>N&mJ6qlQPo;+c;U~
zmr_~uHRhbm3={E+sz^sOc(T8{vKVZV<Xh4;qePnn9V_`!+2!-7h&H&$<N9f{*YA7v
zrD>O}PcT0UuspReKGF6ZA4bz1`^x3kPwTjQqwOIte|&t$x&V$j)5T8L#qRS>Nzs!1
zr67Z(>-Tit{@zaG+sV#<M)X7D{8?*CnZ0G2_4;KY$7+L*mNmNHzCn_pY57sASzx&~
zd`3*uA9dm<{*AYmtY-4J*z~NO(Nb?1`TQ!PjLRh@2<c~KzS!1Ye8!bdVe|Ct<5x&i
zU!mYbiu{s@&)*h`Z$9fn+?@8%op9)9QyuMDK6Z{eoUuRVQFKCoLzG9GRAhM|$pW9!
zk3-#^*PSoa9=uZ<<M)2PLIg|!^UaN1NFSpYP3XRc;q^-+Ptfm9T|2orB}~8cdC<2k
zu=Y#byP}B$J^nIg`4(1XL1To%seT{vCwxRO)S%VKwxi+7A8)(~4<2)U8FmOXa3%$x
zvAI4kn=jx?w#LDK7xYG<AhRWT_8Z(kRNwGrTi(5Zs5|?(i}RDEkCgw+Etam85~0Y$
zkRRq6%sdeZU^O?*<(#~Y508-3t|fj$?AnPieR`g%ho_yFq7Pp>JK=Cj=N(}Pm7JU1
zH(3wMgjdD493+@@!Gy~qA0uaM-d@odQ)}}LYbh#6)F2gq&bgjzRuV81Q7JdBd5Vwf
z)I_8<<Q~n<2`fG+j3{Vs%5q4ZYyNJ_3d{Z`VZ(dOY0cCwrX}%ILrvL&F01g{`j+xj
zQzu3BjwvPMw?%g9vxoGx%m?sYdc^g3z<@f>pl+d0Y__xWvxnY8_|*xO)v6mk2r?Fn
zsAcM>iSO=z_BRUqcxrov*7ZMNJ|T|mU&vo?&0r*`uqDf;P{lYh2C7sXY}1r79qM$#
zH0$?Nbez*!w$`wKxDD9AMTU|xE2Ks=H7&DmU*a`dW${AyCBKag6%mW6^Ne~XO>sK9
z%FTf(mF7X<y#Wuh?;UPb8#A>>KGY`3-Bk3sz%%)OxQZ_PL}m(FMDB~oNoboTT>q(N
z9)a=wxd85#TQUQF)Pb0=WyQzhS?~GpZNywWe_x^c_z(dB;MbjOJsWOEmKu1G0*=lh
zZ8FHq%#lN82<HT``)@b=FjfTu&Ef8>$tWI-l84S<`>Gj~rMV}DQt7RLNWb$y?b>B4
za*VWp`r-lq!B5EY8{fOmO*l&?D}J;&S<C`{aecURMC0phS9{}h58F~_z_TYzmn0)>
zHIb%@LOh=q-L6rGb396;fc47L(4M$DHz*eSDHcz2toM8(qM59-t-KSv@?f<KZH~u_
z**o8%ovJJy!Y_DK9NvJ)9lxbYv!twfy&$rGM(fer+(PqAWAVPjxp%2$!cN90bP0S8
z#XoOlbC)LL4c=jA@ZoyX5Ilb*`W`DJNc@StbMQ>})1O0^J0$}qI*(hA!$Ib2x^*_X
zD9-GPS<29uiCKdS=H-ITdKcYkSLBf7kEm+Pzg1U@ZD@Vgvag=yR=M6vzx?p+{5d9n
z+j1A7VIjO?5=Uw)Pix*E7kKlK1NJX7crG29DUvTE`H~eA<UXc*lWCs&(Kq4>!NE7r
zi-Qd^rR_2m_)-NsCzC*lWnL#`FlDm5@na(=10|ma-IFaLTQZsHQMf|+{CdK{pOSSA
z1m|E?oPqZm`dm>6Vvd`xjScV5(?Pj^58k@yIOM(_A#-5RLdo*|;HeP#N1<tA{2cYR
z)IGuov?1iw`FRlX)2!_DjEBwZ1pjb0LR|$|60fOb{Nq7kjoimGa@OXH6^f;UyeVkk
zYo$sr780A(V4|Pl;8l$)ANvKLAc6#=^W<{FrC2eZhtG(hvW`VG4d3fJZQ*@?Q0XuY
zIZPCBOo&fV=_;Ocf5=!C6RL7Ur)yp3MXOKZ2Isr@_i^)LR8d9tuaw&wk~=R*NW0J*
z8x_l#=LfTz9y8KmP3e9;KxHFW+~Cz1AkGjc+887bZDcIgd%Y%Mvg$|HUz}Ur2+54C
zr|x{tKX{4$!{fK|2{BS)!_Ve_oll%N%lz{}q9C(Qq*T-!LF2}#=JU_*(V-);k&7gM
zJ)hw{5YH~Jq1PqDqrLM^ohf<aVCFo!5!OmR*dK=pxM3eK3?^px6g=WZkupHS&yY8K
z&tgfN^Ucd^h`ukww52|T@C^{Ry31>F54+hjPfp^+9vq$?j`uy(G50!uw$(fOMo)`M
z`4HJ*d**_pCPF!D(x<!e4bK)I;;1QYyISs;=Q4bEI2ZqwsKsdY@+?E8xuAB5ll)*`
zZs)817|Easju*+|w`6;5Zu{_5M9xjlFFH7T)E;XkKaphhfehI*=6I)1J1%gojKajH
z`BcAH=Z2;CKs`EMdRa+-^g72H`S<jRj8cxb$%Z*8_C;)OgLv$)K9~b4&pH-rtE!jU
zhoCqDQBd)+Zu{<JNZtEQ+DKhPmeyD0L$QH%T+-JbZq?W4S%>)~iu7{lp3NmbQqQn7
z&dnD&cXoi%>L+u;P|9K&hUN=K<oms2>Q4Q2R9;Kp)GcpL#F_bjUN;b@;5`njkoK2*
z2p<7E+M4K{owf{#RH9P8!)q5aT5x>LX&u_(Dff)nR;K+5YFRlYw{b;e1D0Lq^>X2$
zGpQv@;|<$>DfZVIS1Y2C+EHiHi=T+Uc!Zrd^?Wu{w&I8ZW>gXNkXyS<uu>GJW`6yi
za4m)_=V6<4QuwWZ%tH4FpP+t^^h;Vz>r^@V({2og95uO~^smjQ$WvmhmRGp@2wIuH
z^}@hl@PpXcS4&Hn(H6^yFw@csCat&R2NN`^4EyG5jmF`F_E&E<T2C`OT+EKjP^9ln
z6zFX#%>L1nc*)>QKAT)re?iEDbU1$S^PJC^SW|<sgI7F%Td%pqbm{V3m6_!`tUPvg
zDu~x8<ALYU-JfB`das!Ee;iO%xtiWFs9oohK5{OaTfkAP>?m|lvB#XIfdFsz-oUD)
zUfXH-x0V@~icCj0H_~a@#c$RU%PC#T5=6IoVcOhiZrfJZH|HJLoYT<*(e|-YjPKck
zb2u!-gN-eJ29D%Ebj!&xzTcb-7RNIWp^?aKHrHtAJSGM`TkCPTv0B`}nHG?7kh9n`
zx}q)9aL|yCp^q<tGR~PRv+vaVW1l}}g!Cej735~1=QDLEenIdd%g;uvlrJfR^1CVC
zJnv@iWDyEy&ysBLsDAyLbRLw;;R~H;dmNlj#xin$-A&P7j)@lk)ZJBT0E4T<uos{F
zahf=ElH{!9c#JKdu&L#3Rj8JcVM*TUn{Vd*<4NM9^k|GHYSX@U*Wjm5KjEx0##?&M
zC2VYY3_?Zhl6;iAbG9S@@{-!%D@qnt*XCkfF$-A24Xu#!kXPYzBM+VxwTH7jRtNTg
zORcGYp%aTI@D)De+Z$&m$@y@vD9RL>wVr0l=bJk`T9{S~9yGd6aprnCgs9<%p&b#u
z9ap$f#jOWjPZPf?&(W|4Mka*9ET6iqE8MUT?Yk^Yqd?+Udrzj#+p$vngTCEOkyC}^
zH<%AFzgon*UPQ!5`;<^Asx<-Cr7Xv<ydlkh(n(myYbypXQL?B>Bm&TMq7Fe%Rn;*+
zOBcL`$PX79EsUHAS&CMl=|1=5p|(V-!7Q%Y=}1;`{dj(6^3!u7o%Q3+!kYHfq@|tu
zMwLfu2&@ucqhF4E@yq&N3)Xx!F_Yc*g#Y9X&Fq8j-NZ9<FL)KsAL%{zL;Ma;-?Hz2
zoJ?|yi}Qzz6a@?8eMWi=J@v2p`^hL`7`%fEAvWYa<yk@(svTLdt|_Af6YZV+n$rKG
zEk#SNgch!%qDGMW^zGV>?_Aw7N4xE_d`W(;r0Tq#<X1h`^a>=@Vi^$ccie={;i{j_
z3on-Jqi0X@6vNr_4yJ#;DQyM2Tkgt#WP7#xm>~_%?94n77o+zbJ7#>5TejonRcMd;
zE+21!J2_<Mo0WVV2lLjY#2lo={pkTgY#di<D2`oEuR0)m;J^XW18&C%rUEW^zQ2mE
zva#{;)Bz%(R)yriW{H}#+Bok3=aHc=4DUZ5y5!c7{&mzgSncY8Kw@GdfcZdw)nOX+
zfdhB|&w+ynL=KSPZ2&(sM8ssI2MD4cVt=Nq4&Z*io~$H1z>bEX(B~a&&tl+U5fF-7
zTufFTTcw9VW2@-EFc1m_LCNnRJHAyX;^^)K0y}_gA>#6eK=T=FwS*{^@(c(DBQ`)I
zp>SKtzf(K9>w+91D4+=<zs)Is@&CXh$@`y4CBgT1y5B_tC>(uaTYVjO4LBNtv;l?`
z-KS0-x?R$NpzRRW9Q*O@D6{-(M<5}%;Y5Fxn17Y9^C5FW-T-5Tl}gkW!SPQ`Ti<Nk
z-Tu--^0z{gJbN^k{7v}FKznC*C)KYK$rc&;Z-cSy8C^mYjD&#DfKh0F_qOd7cBl1O
zu|-{+p0bj-Sq5~(dLJ5!fHUu8)kTRqVXO?$Ae_S<`?CoNbpa%h$9`|q@a&;Mpdny1
z#9AI(+NR?AgKGN`j@YK){)57CbAsU@m^>V{O~mjA5mpryG#W|2R|hOP$6w^%PpaLr
zV=37FQEqH2=ig+;5*+z|gJARP=&tG5a<|=<7yKuZeP%%TA8GfS36X!G-c|j3T7>?A
zeBbHe_y^+cX=49p#j)(X|AEq2I{yDiVJxM<f2J&!l<z-L6gTPrK=`Y~x@Rql<1BCv
z0)ru#_Gxs)g}J>;Sp4@A7AJH;K&^H5gcAuI^`3D0j|8~IzZq74B}D$Ux81D!gkg#O
z;<v=_04}jP6xY72J0JFjQ;B`T>E7+;PpU1|_QqX_{o?Lkdy4;?J;ndgp5lA$`Dbst
zo_58o-wv|Ndqn@(3fcB=+%hx6o*p&eU{wg1aZkM}!q^T9gD~yG0EZwAk?!n!T5t?!
z5O6dUj)Ac3X+DpCgn%K|5I7jJceG9Hg5ucIu-%<D#03IF?H$v=6^aJisX}Z(7#RBK
zo@O1O7V3nP${LE@%J%AW7J)ns?3xaAdo{J$$6PjQFcjqQe!Z~nSGg_!UJk&7Li<%3
z*dZ`5>vJF%$QclznjZ2j6o@P^_r0=g>b}=zhS*qy)N_J=AVFvZa<8#*Gq|5}7lF`-
zK<+isc_aep4DEhoPs;`1cb}OCAwiBf%(!=Oz$R)Su-&nLYS6Q?2c%FzB0=uF|3U+7
z7f>q<8nV~$H~~;+5EwWb&zf@|1Hhng$Tqs!$Ln;UC=}q2TW+<x|Lv^?jRcmJ2AX5v
zMq3CPH#!7=xmVFMb|7GMYZYJ!Teu?xjz;nAKLA$Y&AGn>K_WCUj!xqH&*d*oe#Kho
zcJ*G}c5|@pX$PVK3@{(Ab#DLyW<Uded{_0(?Qc6zu-=3Feu;*G@1`RAm0WP`OAnax
z7X|CzDA@OH#0rh$7yQTOGYCf@M7XKBIUymyqyTz<bN?gl4kG3~#!*4qVsI0B_|FN2
zqhW9=D<I^ffCf8xPIFGKJ>1#|TPPR=!%BkzVumftKY12l?!7A!h~pBRe{gJLo$YCr
z*t_I$&M5I`baF$R=xFba16zB7#NHNMy$al#<TL^SgMi>fxCOk|_pvi!tpZ2D|Kfm~
zdjSxCIKd$FKa2!~$-UO!ZjspA1k_%DpfN}|r482pBEV(>%o33r_KR2-<7l<tI@NQ+
z3J8MXf(Zoha1<VBZ#>(KnG*X1|IMYV2Zy=u)e#rkw<vbyYN80V9R#^|o-ROa0oU8R
znzurfE&{C$LZOfUOS?J}fpLOZ@7+dqKyVCy*7e{nK%Czvp8ndpO%Cm9#D44rW;-(c
zzW}p8skSiEe@eIyg4;>>t3-z_=^$L7o8SspBHr9V4*hPzO}Lf)k=-@etOW{|IJ{pi
z?cU+p{w9$G>9#4P?9gZ@l)R{@tE;Ps4H5zowuXR#RS&o?QUoZ7;+zyWl<2QmNw&>@
zE%B=)NwEVT|AH?&>S+GJhGf6aGk(qDuNs;^&N@i8k`;!3I0GTx3`oS-C<8*{+ai9S
zOi1oMeURL1ElILpt*m<+f3uQ+aQnRY*0;pgw<Ix^LKj87b1YpH36LmafdMI2ysZKP
z2Nj6n2<(?A*7#et2U#PmAUKOlh>6L6h=MjF5*P_}LW@G&K-gUYMGQyby1~VFpg^*f
ziIQ%onxxyAB=KgJNW7T?Qf|t#nFEsj%KYeeR{u^7e;ZGHukpl*H&rG?0n*`SAD0FY
zZzhF%Eh|A~2-%TEaPB48opey_SX7idQ?A4N_>{!KKXZz`v$rFY+B>-TKMpQ`PKa%x
z+^Ik5X7qu&Y!wh_e6%FKBba<^%L8^biXA%><u8B(MEpa)Hic~vPQ5#pQT*O*P_&ys
zU}v&{<KLBE9Kp%@XG%f2g^O@m1Tjtmn@#y}xdO>nGtJib_8=r%8xzOY_dnr&^50_M
zgxrnpDSm0ZHR$GkM7d=y9Be0l-P}M>=uQ29fpdy2iLj8Gen)u+1ZUn`y^XqQes#79
zwCOe_*@die0`CUXBwM(d{5M3V{{=*Lp<=onyXZCmrv0VvuQ3j8qnmBeO134l2Ap~~
z(mePl^rYO0ElIW>$hL6`YE!N~;1H+yj%O-dXxN5+BwJ|jFt+wjNJqSXiQY)J0UOyb
zWJdlQjFD{NFUp;ei*hH*qTe4%9sCnL{bmCEi)t4}qS^(E==aAv6gvP8%^#TN;GZyt
z2!~wAe}fg;z4(LaA0f%1Jt&0c58$yk%<R})$$st7RGSFT8j5m)f!v7=faySQt~J1a
zDRyk?<iE?L+sEb<Tj#5PSSP34K0w`i*gPM_K9FyoeQp*}+eL~UXS0+$4__&Fo~@Gq
zJ~t)*eJY9vCx(MOtU*XTClc`Hq9BFBQD_jLIGzJF3Mb`75E2Tqf<b6@KT1&SxSt{a
zos8jh-MT`e-BI4Ub;31o-8zwOyAaOiI}ZM>Rprf9fhb~ya5D#gqKPfw7zh^-9BQr!
zase5rnV&riIIlSjYK20A&24M|7-I=Mm}7gf2BAUbAe5xS*0h=bo;HOY0t3>R{PzY?
z_^m$BvFU%Y<J|@X|8MN_8!G~1;922;34j<wgbSE>;&>AOO?`Ik=)hRU|IMCv;6(;I
zEKuRJK_VPEf#m^zgKpi2P;4$zASS|4bU;i5LIM<y+e}a6Tmv5jV%*8Pnfq??{x{v_
zH$DY~wfbL7s^sr6fFa179Bd_Viv3Ttz`6}SNc`aD11A{R6VONu7;X4p9t?+H|0f!V
z1056N3?zXEwfSF6h=jr}_z8@6>3_4VB>q<}C9%h)Bybjg`=6Lge2=*<{Fmn)=#mI0
zKM~jtghUZR;nom0B0)hH5RwS^6%-^A7Tzig3j_5aB$9lKk6S{PYb%}moyw^gNN%Qc
zRv0LN)Zs(`1FjR`8(S6@CKnWR+JeU9+XX>Ea$(^;wZg)r0EZbwP|yNb5EO)1;DeN?
zccvNKV&rIlq&ue-!rGlvoB@nQL=bDv-w{m>i3DIe$Of<=Czep0YMTbvLS?fFpE#{x
z2(SaqAAEQaBHTC0W;7J1amFBk!R3$Qp1F=PV39Qp!nsw=$-7z4OACj%a$=!4Clxv8
zX5A4Rs14d3g+2P>bll8g+&Mv{Xgeqp4S~Q(0eCBi)NK$Le_Vka0=2b6yTbuyYU@p?
zh7G(J6oeQ7H$(!73jjGmKw`7GPUVT5KuEMW?o$HyDT(`(!hK4UZQ)FAG16@-QR6h?
z1ONaEa4>n2tpWuAhQJQE%}$;Q*b{J%hS*2SEriL5?U4Wix90knl!;pmAEHEPrKBW7
zXvKy7P*OU9e=VKBb0OY@vlNz=fS*`einu_)giaWg9ljluzz!-wYy(B2&`u=4zKeDN
z!N_rs*wjg$1O)-&skIX^)?n67gfJ)yO$b0sM<N^z@n$m-u9X;D&v}dxD<-iO4o~9=
z5rc3A3J?I<-5n7az<Y^-AutdLd@zv2Vim;^NF3QGf05!A+oTnz{!NI5==k>bcqmdd
zViWZr*(YNHIGwQ6;^YvV*`X*-c|cQ6d^-#Qusa;yn^19!k^Q<pAOuE*5xM|`gf2i@
zL*#-1K8am$>zBj@jypLeaY5iRLvmFpt^*L#oxmCj#)qQ_vFR2e9Iy<YJpr(Oh{3qD
zgcwMPe_#*@F$@B?Mcd)o;@ROL@z7*I)`J9T16t#Q?Z~!rAZ{@N;FAz!hp=Z*L?Eq!
zH3YR*Iw~V3byS&(oDBQJqG*LcH~@NC!Ih4ROGrvd|7s#5QA9)0Fo-g#qUdIUdaFfI
z6w9>zs3?l-S{WZ|O@T%L18$m=5KBV>JZj_Se;OEo2-klugW~2Pk@6-tm)RLr6+;!X
z&8}^>?8wK@>4~k`66Ne^6$4JCT~%Z#z{`!#Zsye*s`8w_SUFLyHrv&lKtE)E{A_oC
z>s4eYvC>Xfg>5=-A@V<2u~BB{hzKV%igQckt*%9|G<=*uLDN7_R|Ie)6yz5nzrvm_
zf3YmMBXtoJ#tLg8D}bCAghAVhpf+=5Ai;&(LU@ICj0>zZC&1|-yT;zs3*!WA7!U(j
z8-q>m-^APf?UceBc=%JIee?!weg*`00ijedXaumbp&pQ(W&or`7yxxboVa5y!2SO;
z$|g4;0s40j`}6(H{J+F7_(K3!s5RP7e+Y=#*eLwZV;kT`_1q+v-_0ez&F%en8DI!o
zDE!}i07ry%0$@Ub*|Ua0j8G6H_Fw}p^slb5&!8Y{Yn+c@*AxVZGCRk|UCaC_z#fmn
zQT>N5gxyD6ZTR@NMAt;&di&MKw)`mEdWYJ$@9OLi=lY9Me;7vo--LtO?BmNye@dKi
z3=H-kErd<N-|~?mapyQY1m3$kcMS@_8%Go;*M38aigE&*J#MD}Cf^nSDo{8lpdcpz
z^#I?t=0qVJA)MF_pqmF^BD;7udj^<6Kmy|E2;xLRup1DT5xZw{B5Zzjw4;yz^U@dk
zQ<q({1p)BM|KE7>_mzXd><piKe-{nVzTc_=s{aqJw0n^KeF=#7K-Aym?Fu^^w}tuZ
zs2J$Zad3cPcO(F|c-$zv*84Wyp14c4c{KrW0DK~w55I*1TLBIGYqeVs5e)RgRwLiv
z*QyZb)`<KHoZdTU0t4m4${@rE4Ek3KV8`5af`6FSU&|CL$#3eN*4|u%fBQ+g*T41`
z0T({7r-B&NKYQ11I=+96g!@LDT@?Q>>tml)_8&*9-&6E2fpyapew%`G+ckb;qCc%~
zjR50L;<08@gF&#x)9xD9TZ?fQu=-E%!k^mgLTTHf2mq@<S^}{?|2v>@?kD13*Xn+q
zC~@-b+xhRk;v^?8FQ@!|e?<ELG^{85b-TgFi(Oc4@8s>B_I;TCwgmRwcK4BA1my(7
z;!j>7UhHPPe{9|=cyG0BK3iDekh!Ah7EC8{bO%s80rrn1a3M=#^GlL(|9cc{u8K{h
zfM@ERmnPg|+pmvcGbt3Qn%-GlDoeBLW(7!}aLK+Uknhs$x@7^<e^MuLd?yKfCrNxK
zDSRhsd?%She_X3@ixB|;66p@$^R0sc+CMK^xW!1IaNHRJK1c%JN*v!xf_U@Bg~|*h
z>_J5?CM;)eZXrm6eKJRy!?&JE&47Z+X$wIDAgw0@esP<+G@caY=HUbicgOgvL5Aj6
zX_Jru1$85|fx18lf3ZgebelO6ACT~(_(e8Tx&O&=m-wFJE^*w!!}<ThU<$vkjexEx
zw(g89(Qasbv;_I)Tw@baGDG0wEEEE>ro`R6a~dO%Fl#PCY#R{{dXoaM_6*<w)_4f&
zoqckP9o}^xCBJze#l5>yb@O{OFk$b9u~(r;j@?AKGdS!ke+n*;O+uExbi%sxJtuh_
z=*70<4xTnIhc|D&0GHl&b=>{WACy$PIz6;U1p56Y|Lb4A{Q46j>Yek-ed4e0cmHCd
z*~KI-`PcWocfQK5{BLhT?9;x3{jV=M{gZSue|?u}=ZoS0DdFE=dXm^j5bQBDx1_{h
z+4lXTu>U*Df4}@q*zc~XcfC_2O~3nb`>hzJ{j23|5$yZ7Z2x@)zJxT>KU_SaP`dPZ
z^mO!oc=QkP7^Cq>WAR86@fefwh#uoHrs5H$;xT68(P!Z?=HM~XGte<U#Upx(M_P(U
z^a79ZB_7dBJjPde^l$J;8}LY*@fch2NZ;Wxw&M}Cf8#O6;nOGJGsfdHKgDByiAS1;
zPgI6a-+)gvgikt*&)kkjA4fp{gMdDgkSHFXD2|W;j~SqiCuB|_WKJYxP9kJ}L`aWE
zl!M2Rg~yzON0dQG)QZRO29LQFk0^_fr~!|$0gosSpWz`Ma~wWV9wAXQ-v3w1m%v9=
zByo3jf4?_xW`JY@;U*a1afMM(SrtVER6sykbx~Bp=8zb7!3%ZObv1<hzCl1Bgqv_I
zryz<P;<bvI#3YEQcr4;cqvC<$eE;e<GfdR|e!uVcu~r||)zwwi-PP6oCfjTw+1o68
zr)4jvX3$`l)nu2|Y?sxLBsC$6+ERe(QHaw0e=VuK40Xup7>F0LD2u4>`E)_&4z0SF
zH!VMPsCU_=Dcvqdp-J~EnqPSp3RbV4=UsEHDO_jw?n8Z1l%ebW{rdW-L*M=bZkQn*
zvK<OKGTouB4&CF>;|~4PQN`rYXuw=@EHo`5$F~@;1SsTkDLKwE<fY^UR+3X^H95gG
ze`s3^+&XgVZ9sVw;NO7F<b<{$-$qXT?c}8GK>b;A8tek@Ilyk<p9lU0;P(LkB01^%
z$Y})HhM-LcZ6mZdM0+~g<pK0L2zVLr3gA_8n!HX<(>KueCIyxfInCYzZUY5gC+G*f
zh4vN|Xs@Ken`m!YMNURF`qrR)7&&wyfApbu07n4t0*(US1H2FT0B{WOA>bpx$AC`&
z{{<Wed<r-L_zdtl;0wT)fUf{w15N@o;1u8+z_)<!0H-nj_kbTz{t@|4$j<<N2K)kB
zoP|w(1w;Ww(g}?M6az*>uQ7nJfN|1kIUe~0>10eqJ_#@xFa<CbFbyyrz;itle=rL$
z8!!hj7cdVnAMi9_0bn6u5#Sl=SjL9RA=r+VNGG!d_+@}nz;eI}z)I=VUnQN^t0C7K
z=`>gi+&bXOfLjmT2H-YIrx9q{fF>O@jnLKxZRu!hxe4@}k#9l16|fDk9k2uAKPw%%
z6R=A<ZFd9rJo>yK1G}Y_%1iN}e@tCWfpq1xdqW0FiLe&!z&hj`$QMYb)LoRiRtB*6
z0xw8^U?2Gd2TY@E9ta$yfI~ll=NZ7yY#-=3OF5y#GVqKFI$6)CjQ<c8ONS*Y@G6Ky
zo6xuhuokctutNoQDd2ab{32j1CJDla_MyBJGQFl!f2Fj*0U1brQ#l>Ve^np?a;m^M
zM^ws3Dv%-qfsa)n@Cl>;t5S|Lw>QxHGr;G7N|1hye7$lyokD&HuwSxRCi#{iX`SYE
zu~n@=rO`||;rSNk5wH-j$ZB5C>Ab>n)Jn_ATm@JSSYrha$`nAV)BO!X9tu=Y2zi>*
zcO@IKKFST8{@B$6)^L0Je@62DL|Our@X91e$~r|T)=gmeZ>STkiW(L*Lf*J2hHDbb
zn*y2vngdz@G5{?B=K(SStpKe7Z2)epPg_7cKzl$3Ku16ppc5brI3I8UpfjLLk~|l(
zlozp-7bmb1|1K>eR4zM5X>~__Wm3<pxaZYH#MC_ubx&Y>0j_}=f38J-9iTU$51=pL
zdO$xwf4~614S*W~13~|1z)dLM47dgG7r-DM;np#vc!=9D1jZN){Oy1{gu&j)SpHWu
zgwx_7LS%!}P`2-1VON<0+FXIAyy79i<ri_wUB$o-0~7%61{4Zm{|##W9p&MG5rBKq
zN!~YV2u_;&M?E0Ke}mvQ68MJz4+9<n{6h-)DDuaI@(JvbqU*1Rl21T_e*ya>@~1!n
z8~KEvFK#r3Civ>sg+_{e<Qq#QV*kc*X*{9F1WqP$brL6&Ihn%AR8FRGGCe*A40E86
z2+kwcc0QMhi`LW3CPqVREfngX>qKQhSQ{97MbZ>+v|`f4f5|p6*=A0*aMSGMaT&G(
zOWQfw!O62s6i8~X7t5dHhTWD|OREzM*kTn~bxD-s1Q*LGg~SR<C9#r1!WKSCBVpGM
z2K-_ziAgdT7$DY@nre2Jn#P%>uye|&aWGI912zf5S4_u=Pq2>)`cp+c)s%N*GftXw
z(jpj06D{gse=A9)TAK7clV+N<l}THZXw-&8W0ypewj`RiBhjoqiRK-Gfrg@EtaC?`
zW|_28?apn`*$tCudp?PF7m#R=&K)`j{f)&1Ru@Bbp%9L^h(!2e66be?u1^yVC=&DO
z5@FM&7tv)TF6<TzG^fkwkc2+7=n8_}yQB5;OXx}xe}BT&KZC9wL;ZUgj@We4R@iop
z#Wg&~VBYOo5|>{`;)>oRy7wV*WnU6kT~Ffbek6MIC(&~NiC#C5xaLL@*A66c-JePH
zzKKMin@RM&g~auLA<=ITiT<~e7;qbj8wQiO@pcje?;!E#J4xJxopf_HiCcz}_{(2O
z49X#Ke`_v@+w(}=kx$~zyGRTfMk2d_#L&A*<P?&~y@y2J-$>;Doy1+kNeml7qTpT<
zci%^%@O~2aJV4@a50d!%ND{*zA~E7&68Anr;=X^7xc^ZS4?ITV!N*CA{3nTrpCIwb
zzexP!NfM7fMdC5`K97$=^3P%<PmD(LuQ5oTf8-7J)HozXG#=?Fnt-&JCL$e8lPDNC
zk0#R+QZV!)ngZ-IZ0^N0m8Mak751aTs=|((fpj9xL^_#Pld!}(5*tYP#S9X4XcncZ
zx}o4~_V`N8VF#+zT!M#EY96SOVPo3Jo(5&w0!p*$FQhcP!6HiYr9VSyPQ#3N@5Ns4
ze<fb;rN8UlvIM=)TZZ15rRd#?d$;Z+77)BThU_XXQ_JC6gzH~HJ}G@_C36yBG>)uQ
zXn_}j2G~Puydl<lL)0%JTE`uIes~A+3DLl><a+jj2o?kmxMf6jED{cdEJ15X*0)Gb
zlIR<x#+I<A5;d{NP9bFpUzTcN31^enf3brl{GF+@B?9w^x>_Q5F<oMbI<RIpi|SrV
z-7QfM6Lpm(QWg?s#iCS9#Z=^>RqV}3`pdhVdQocXW6n(?->JP)*F{ZoYmjTIyo<Jh
zQ9#Ltpa(9P{cq|a3pWr~xHAM-iVF@?rGe^I^vu3Ab1)T#427Q{KX{=SAhPT_f8|}u
zuNSA@lA2LLbW_dH4Rt$vC*=gY<OBy>8HJ4*!~N@=>t7f1Xr-U3kUF)z%Soz~B2}lA
zM|u&C!g^9#b}McR#@d3q4hGV7v$s(AZ8>lYk*)_ODe)0OYGpqc8_}0hs2IZ|rg{dc
zl6o*|A&K#?XPzsis5f*rxpwYse}vboB&7_U!?ii6t(G!%=v=PNMQx2#p`r7*HV?J6
z(n=dTpKJ4(eHtqiWcF9W!dC-RKY{59%r(F?NMNo5rVlXb2@GV>{efwiz}x`LKwugv
z*!Nz>V7heU?DaHoJqg{k-1X&V=w{`vliN}^FL(X9=jj&ZZXh>PXO!oZe^HU`26K0l
zJ};*QC})$-M8Sbxx)ln3sH9t?5P&wiO-_q=kLO9Z#i)&WR*f9(F=|I(nj|otfH@zS
zrU^`EU@iovSpsu0Fn<E3c>;4OFx`M@!I-+<dI5SZTQ4JdI)>Gnj)I|!xwhDwj=P60
z;o1^!Itqs_<=RqjI_^oDe~y-H#=6XZHeuYkj5{xZdzx_z8JC&BJ;S&qjBAy^l`yW9
zajg@$6^vWOxHdd7!x%RLsC&KnxR2+fqrRW#BTGNP^U+B^m^>d3<#h1o<6#sWD5f7l
z!4IAEKTrrj9sOudhot#<9D}(DJN^rUJq1i#V@Jk}Vv$C(NbM51f3b`k&$#vp+(gDr
zW?Y8^ZYtxZGp^$w%u5z;t8Um<RlNUSh;1t;qp$^I24(M|9<2&D5m$y}zZh%wXB2i|
z%pG9R>D)dKOYm=Ws#@v*hOEOIxW?PS?4i!*o!*jLQ+OF1mLf%mnC4Y7G-<8_e{eyP
zuK{U8bnG18`PIDhfA_{@2xJs?W(+IQMUZ82;o`VAJHpyrojJHp;U$KmYn<Xzrl=2!
z_t<ewrp&?h3cDMU%Xo!0VbL~AsyB26x&FcxSa(~boNJ-Io2T9T627a8Zora%;AxkR
z*2`JDbZ%|LEXE>!(v2f7l|ZK};Qs8U+}14C*6bwhm()x*e~(l!LHG2aWq)ZgMavjP
zrlDwck`73jb&`gtt|#f3w0fMR52f8xXS#NAm2TyV;%eQRMfu1RrA=gJR&f=OE+aqo
zkZmImXU#O&c8vYR!?usi_DDN0^1mLkBS>c(Y?e!|bd_tl_N{htjqb!$$33cWWmdl9
z%B*~U!G7ACf0ZA|bMpLof!zJLH~SsGAKlMq^3Oc-3zEqp${*2pX8O-P`Yy@z`~Hyq
zg-rg1M}ARl_Ot(pzH4^pew{^ezNP=fJ-_sNUV?I-h28}RXeRn|zuW`l_xl~weks#_
z<<VZ2M9Vt-j<_2Wf9(-po<uzR4;Wv;v?o2<?zI@tfBrr3RZOfs;vU(K>-NL-%E`BN
zPggvY@6*@h*?B&Qgfbh#hTi%*?sLlP)0^98W|?Nc*UTr=l?p5NGG252Vry=I9^m?m
zt3tS$1oS}W@QsX=7#@F)U;*iyB5r!akD^h1Gx}d;S$4`gVg`fCyWEyl1t#B0F-YIZ
zJ-_qDf6fl!+Fsrz(&Y}3Rh`wP(+JXk<>u3-Im0h?E?2+zsPhxl6sI1>%|FDc-DoH?
zMj^ARy8u&M<BCvS2;4DH=~v2)GS7Rs(~qW8b3g7#pF`xo_fZWp+Pp*usX_mnUPhL7
zAKziG=6##XN{onE;XZvIZ>~@ew!(uEH;|4Se~x}A;`-AO3+hKg?U6ppc&<Jk!WBwC
z!2|x{De+{I-@8Bb9EL7p_tJySz22B>G{uG*OYq{@!&Q15&NbIp;yR_MjOPmWUI|ww
zm=-jYpfb_4l)92Dlep5<RV$cmGFO_k-6~60pf-iP-Mf4_DpO;XQm#xhl~UADnI5lj
zf6EN2HRCf`=$`EJ2C&R?_!OB(NnUThshssHPn*gEro6zEfAty`no88GEMlI$q+{7X
zC}z4COj{LKw<@k_g{=v&jahI!@~MwGSS^I{gDWVYmm5w+%5Yl2W~&Z`d5%_7g&RzF
zFb!)d<RU8rBGn)^P^bdgCLpK;ZeS$}e-|};9dojoLOZ$hR>O6a;Tq7}O|94)V+V!i
zGRaPZ9PJ@@QK*QKyA5)TL5A+d7$p?JUMwZITckA4*UZNcQlYESu!Y=uF$9G!0Ad@t
zDKUf$;U=x0CHM9iLh)J-amflvPW`^-bD~kp7mW^yM*kL#J{66kZjOaLr1!8He`-RD
zArYSu`$+F&OuiKwZct~W^%Ciq49*U5D6e0pJR575t@A2{Zb0@rW6}-g4GQ5n(uWx1
zH<)q?H9=NEMwge+FcYlMd{M*AFylVBE+DKt%Wc|l3J_JvOJomKvfXPcU4KJ}uixSM
zzlKl4<7Okg8{Y`;k$%sc@xQW+e;+1K^+y!i%E(V@&D8PanfjDMGnnMF<eB=MLjPps
zm&r4A50rSHBGvksnW&1`Jaq^9W6V=UY?`pH^nWo;6|q@@Thb>mOBMfPl4SD*n4|&G
zXl^umUo<)<8bw`y&FWq&;U`D3wmPouH)Iy|w`8XAJJR16-SxK!Ij~5-e<L@51NSsV
zTx(-invKA%!u4;=s?ViL*D0%?2628cYK`^Ost3f+1~JZ4{wxoD9lM+xc<5++=uwCz
zC3~Du2e!><8F6hh&ttu%I9@W7@hav7MoISj5jWT{0(~Y*Fzw9_^Fn4iS;m-7MUW|t
z2GhXLNoQ$h$aCW9S=_M?e|PL<d`Z0HJgMh-9p{^ltk(kh8@(3GB)yh0r@pLLcjmM#
z&S|;S%RRjsvtBD@Enl`gp#~pbtC`33%wv;Tg=^zX%A_vym`q|O8zejVA?!blnbJ|(
zY#2}QgxMlPgLyyK9&Ec&g^8av4HG@$oifx3xaSOR(mD0^7{p|ce`v3%Oz|pZlH*5D
zZY(OjpXKhyr|ySF?w4fz*qy4xOL7=?IS$NMxZt4hy5Tj=<MoE*omKlFJ|t_O#N{${
z#cz+_3PUqp4U@yE;1%*TtTf1(2HE>n5+(m{r*n<zK3gS@=g-(R7~~vJ+9R@$YTNk|
zKCIhzzJm|z*7Io*e?P;%#&1KSKa5Z}pKWk7VS~9!9F_WmB&FHBagDpE+Vau=md}Xv
zJw*CM_K}S;aiBD~_)>nSXTSB1vHbD)ia8<m3A2DhHyc+Yll<0KGPH`3CuOqVIwh0*
z);BUVnn}KsNq+0J<ntt8T-9e1uIdZ<TUYh9tnI3_tnI44f0h3?SG5YR>h@^#-e~lR
zXmn;Yin{)R*VYZnXW37&f<MI-{8<`T^@}vF>a65b=2vMBmZ;P}dz<$c>00nxXF03U
zze@K;4z!~(Qjy+Jh{`;RJ&a4mA%)EGGF6OYL>DPme4fg)WBx`#j2qd|v%N@3#UmwU
z<QS*)SY^f>f2Yit@Ko5DY=eoa!u1&sGTAVle{PFSH;AV_1pJ<!16t49%ri|3&e1M3
zh=tx%ELKU2atX^ekln@*7OljHwn&LmrAt-L>y$&cP%lyR236_hD#AzLn;fV>KoMT5
zIO<->!n*!axBaqkiNUPm0YHF@iy31zkMU;({d*hFe`LlOBFdosHc9K1E>qq`rb@3@
zuH*VSsM(-6+(~6Wr6LjBB3!$4;306^%-n9Wz^yZL+iJKiQ(`OFl`7h*^me1*axh>K
zygAsRB8UNQ=3}cJciR>3whP@>DB^6TlDm}Nt#Ey<<O}RA%C_ucGi7@~o>}BnA+9?~
ztCZLafAZCe4l2D*Wjp;Gfi}J0SY?f|!2y&hyw;RoLRp5_nesv9ikb+=GL5hu@~p}>
z(DfA~aG9#`WId=ZvQ*l!Xw+}{m41!&{fh-rmKjn06B7mC$?_&-S+A%<=|ksac`Hel
z@+4UzNwQSN$*c9-Y^*FsRwV>H4*~+qGIB#re_Y5Ut5z9FYhseV!;%hCF!5t14vGnC
zgnUow_s>c9L6UUGlBD}ENxF|9NOc5pAR@Iud1XbL!XEmQm<;6wJv;$EQWq(i_C5qq
z@WIDffLjRyv}OTL#OL^gH^(QuIX<EE=VmqBrlikz!AaVn#Ay?`e{U9Uc%v%Gc`K&j
ze-A3BoN^*$FcDrAgO&0*4>I{FbsHS+N&2^<Q)-yV96Le|6Oj=JfHo;{O6hNa3~yE=
zr2ZDAVPd!pZ&4+veupYEIIVg-ShSHwDE$+U%oJwOGiV>K?m|L6siXdxW#}u^Tl_dK
zA|xb<3KD7~iQAR5oj%O#D-}O8wkh$Ie;P&*hxADl!rK)}8YNHY9wT{7sm}s4T;7E}
z&4c_3+sSe>LM283?>pFIjWwN$EVkscN)%hV*m9|guZsaaj*EJ{6}p3K6D?Qb{$_;+
zaBYg^s;W>=?BCHA-2GUP#+^Mo^9dl1JNvjZm&Tb(IP?9{sDuOG7LB5$r}0D8f1Tb#
z8-$r*gxRUY3`@_lc*cy;W;4|gmbooc%?FiUU}dkQtg3>Qw6{7^k-L)o(vRDlm9vsx
z>9cLz*`6^9E(WzLs<7g)`dyK4c~>^e_~#PKoD<6|J|{{ob55+V^m5C!v+{i-tMYt)
z9~Y|Qg&Ho5#A&g@%2DC<s`o6Se<FpGVWpL4^Z&|w-z7kp+dS4Iw;305o9b0od7j<-
zZ4v|X;Wt^Mp_b3C`=b}qSv<wO;+|8q)*41;t?gD~t)<IQ#dH$Zpx$Wl#F{AJ&Uh5i
zSO41zwdFXWf<uQIFA&<o<_kYxD-g=?BVq`(j*(JU4MGY9f8d&<1l;m0f4^md3Z-|L
z{x5h($+NJBYo+tWYL_QLKCborg9z?q`|ZBrJxae|no77$CAT%l!KLnuM%PB8*v@CL
zqiuF7@`9dyIaKPz?;5hotj}t*1O6(dZ8zl!60ey@#{ZmK3vaOHa+I>20&dx#Fx*~6
z`z;ew#?6Om-f!vGQ0?)!f7y#B2xS@@raWk*#St8UR<AJDKf=;)G8X%jy#09yqggdZ
zw8Q*)PrT!8&LjNkP2`fFf9=L>%PoExsLCAct+I#mt<0j%`F4kVUuID--+?YlRPbU`
zREg{*CErGNP^l_pFDt7W*(=JfLH4Th9k%ol%k>pkVF&AXt+Cbmf2id;V5;A<++S++
z`<6LXc?A7|)mc7_oBT0!;QT`@L>^Lq#FomFI9)~=5kIlmX}?Q2UV=DYURUC{WsbT}
zEq%g@9}Nw>v#TX&^yh5$3S;&Y79R&6$Bu(9e@otm$-h2F{$(w4&64Ev(~Nmk{)YGO
zcUIE9`!o~Wl_2<me+hoFlHR4xFu^c>YENZ?Uzp%mE2oV2dO-p`$}aB`{+0A-8|b?g
zT);e|`8b>1%72uYV4tKn6iqbGHgb~9OH56+*#}rtZ9M_IcR0r?6Hyq!Pt}v`NRgd=
zl(3OeC^$-azMjJGL)18#TPp6)eveFE@E&mtImI@QqXqAKf8o(o+k7+0{(wwg@BwiU
zIgP(|7FsyVt}sr|jyovxkzp3ZIizT|t>@U0NF-}-RY_LO$SQ2~cs{aP&t(?(NQA#n
z8x7~%=0IlWc39E^!$K}Z_LfqMY`wsC?P|RcX^mcNSGaO{R=y3VhTWMcxKtLuyUVir
z99k~5BNYRWe<9A~d*Cv36XvG8+^)>pTQjmc#8<}EHa`X1CUD5Jdy0;JTd!l%GEBkW
z65kOv*s-{HgRM8&UYr4fzjNexBNJ>f1TQMF#n#){h!q7NQhC9HW!@Fl!+hjfb%&{)
z3qqf@6W(Db+hsV1g66jM9JscxF=l<<GwTbse%>|#fB6eGLi=jH2TG<i@Sg4DK3ng#
z-2l-0>~=N!fQ?utW|aurr@m(&QT9lUeu;+~!3t#ZP%mRB{i+>5l(LdeB`A7tO2D!Y
zc|l&>6mLSJA@r8bhmMSRYq7#xi*MWdO-#tG1UV1c5v;!Q-VX_Wa^Fw<lJ7H5?)&-4
z-RF1oe_OvH@t*r@6G5lQZ^-s${hq2uS72aX%9XbFQl{TF2wPX-bmQ+b`8H##S^fKX
zg3WX5VY7(66@0|jM_}VB{Vwe1l#Hy>M{U0KH0HM~l>Bw;vAuCYIA-f(w(G0bA7e7A
z^(V~peqPm{$2#t<>Z<nD?fIp(65$@Qw-tScf2>N$&yiIt^#!sTWqoDq&%vffe_``6
zufMceRX(e~hAJ*%JS?EPLB4+4I2TUY?W*;++#*tWS)b-r6h7=7ct5fv5BP9Uoi&o2
zvEw1wJ4&3f5rP$cOe1Xl3yR@)RWT0Svnc9OzMPLKd{l+sQ{nfOj@o>XJWvw;K$Vn)
ze~)qUp(^P`+!>cepE=lN!6#IVKyggG`d{jOoJ28Bqp@++r-ovjkI%Q780Jw-L(T~b
zQ!nx!me~(uFJg{c4E>D4pDIjq?q`(e_?`N=&{kCD@wb!=%(Knj`AyF|SNJ9Ko&et2
zko|<}_c4*D-9%p>VSmm)OcP(=^!wNxe}cFSf62e25nqw8fqIamw?XE8&BrTyn-o)h
zda4f#!22*W!-tT6rZ4``HXALG(vejmK6mGHWf@k;0$*fbm0k#{fO+m-<Z~tV%}8Eg
zw=wf2zSy=Y@tMeNnNOGS7<!q{4OW{s5xs&(TIs9USFKCIDYzlNVQEv^2mFxce{*p|
zS>tm9)p{*-6Awwt=VTcNW!NL&+5q-nDB|o(B{%r=CSN2+jW1~G+U(LEwxsR9h<lXz
z;!ENyCCYr@FpLI?7Coj@)-c&A_iM`Ng*h~<XEVk^Ji>N-#FDYQ^47Suw)^yUpX;yE
zJACCh5c%s#X$c33&zgE<wyErle>Il4K2zVt^8W*IP#tft>`sVtQi<I@?_GMIFO<Uh
z0iSuJ^xP$oU%(hI`x38bi5Iq4eHnhqpCtI%>vdnK*>9iM-Y^8pBY43VS_npO`TEEv
zU9Zpx<(hOI!V#T#l;wKc$Q4P*^^Fn{*r-)8mVTvK$uLi77Ry%?tD4uKe}H}`SzK-#
zE@u`GqfWSlambe5@Cb%I`UmpAZ^XOM6Ytm`$p4Wc2zdmbm|?#4c05ZooV;O7xb5E6
z@GcB<+?VvE@+nm9FeIN<?J#5vv99tpGq0!253?TQcfMmr@6Qr?f2YJ}KJT$}7`2D;
zU-|G~?Dg|&6xsoI(hTp4f0WL+F=et5zBPK+=R@{17J4xP%h3HMsK$=%t53m^KPJ+u
zAmUG^?_MLhK7)+|S_)lzj`kNHt6a-e|Lb*8{_b@V3rNn2M)yRc{Ki=9xK>};YC6p`
z+P7Ro>!H2$o;kmP5q#otLg00YiMt$L;-{4uhXD9{MV$ShBxgS=f5q8P%Hr&dvd1}k
zf`cXfPk#O}4_1?$*p8p#m>oaW(Ni3Lx59t&7Vq)uJ6uwyI@zbGz(cyK7iGD^4d#AN
z{DXjWlS{WH@}h64T2JFKp5SR3W2R|_6Q8D^aqD#SOoy)r?9XR&DZr&Uj`>>p|MNzx
z=NTSnYri2s?evkEe_b!bYV6Zr2&yqF>0d0|d?Vb#gmAwqvCz?r62dJ`2)86jIK9;2
zk0Q1AM2R7Ys^7nP|KH>-{Udo-7<sP{2Pxx@p$UPXr1<rHm6@?kQml6LYA3rzzZRmX
z1spEh{3(8MyPK)jIk6wkm0@0sELx9jlqEMJE4I`oN0&L-e?L%oj1@jC`~5(Y-wvG|
zV8$}07go34Xeh>6XeNX#n@saKtCtB}{>{S`5uY4uj2X8$F;BbI(OVriSX{-A(gD50
z=s4c;9=dm$+62q{YU+3oAG-~5qKACm30;TX$qygfoJe)Zd-7<_A5I+Cjz4+S=Z_}X
zCGq!de)tgBe@8Q;Q3+UT-ahmm!+4U%_(hg@l#zIkk$7KR;{A@^pCs|irq|?{#IKs#
z6pzPij`0rqKgklm;qWs-=r)LS;GD#N5+Xd+(g&Tm$Z+`KX_kJ)iOY<5I6U3buRHNa
z`M45KMxzRV|E5Hv%b>@hWIf(uJ&K8cgcdfwA8P0de?u|Dqp0LcHkJ1#ibwNrbEnb7
zPx-fVr|S5&ukp71VaGhtyyNf_%@M~u(Y)*E8plNOhaGlz`W?qrSO`a)NJZu9mAnex
zMR8^2Y7ShF@(5!n>BnRk<^x9J5*Yib7BK$oA7ek&O35g^iZT36avVA25A<i5wn`Bk
zx{Atse~H3XWa8I4Ls#=T<@&<=rR#(bNH;J@<*r8Kb}3s9UBf^ATZ7sTsm>d^mTTrW
zY~$e}1Ho~0YPO{zk*)`sPSPApq;Nb-^-t1VOE%Og*=MNV84^Wj;N?;y;is+KpGk)z
zZP&}(Ur48ApT(``EKFEG`>K9diK45jb%Tn5e-{azUd}?<ER>Ihat5h^(?QoTyH3A4
zqNq-dZWO8PT~{!>#(m7+EyzHy8H>}D6@A7MO?C6crK&|A{;LK_fnZ}MX$6Vf+%=pE
z))1#_%}>TAfkiObfUno015;(8EmH6+Uw$T&C4+S@VQjm&LtAc%cDlnb>VbRlMjByE
ze-Y+~Qk-OWg}2L|-r_hPfm0M-W+P4ko-2P>%oRxe!vs%Nk?fK)3Q!Cf4VXp@gF_kS
zU*S~4mII}!W}-voU9xw@=Ge|CY|@ASD1%=exM7S8N94dUl92V~Kh)s$;xp?7bTjDO
z&jx2EnC*)(tD8~CzayQMU^Z5UkII2#f5Gf1Gn;LgdA;Y<W;{2kX&y6{LG-^ob8xV*
zD^LsgXVS`RUTDTmL-S9uaZ@u2C-H(>lo)ut49~I#j>o{WEDZb%OKrQc9hGi2RHO2u
z?p2Y26Qn3F>RO%MtzS2R99$OHB5q-bTmCQNCAHO9nxsYv8KF&iS;AJ^Vls=2f5JLw
zC^b9&$=F~iX0TMV(?cieC8^Rgize|?Rk!NQq9!%jlc?V$>;#}Z8M;+xH|f_zpecfd
zTmdNI6<t!^J5`kAtm8+Q&4kO4DHd!tZxepIWNf~bJyGUa11Cz#V*@RZs}X*gCu#-p
zZ3Yg(W3d&Nd5^<Zihu#H=9P&abk8$`RkiJ~I%%D(F}k;e?mJ?-%Z$SM*^{MLQJ6gb
zin%sEdEk&eMTTFn22PPYtLu_@l@b5ivn_aSr|_F{;C7<y=`wss4xBEj9Ih~Tsw{VX
k#ktd%<$BXIA=HMXMRaw8l-OVPB>v9;L=V*d51tK^8mqDj{r~^~

delta 27365
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

diff --git a/libsrc/ffdec_lib/testdata/flexedit/Main.as b/libsrc/ffdec_lib/testdata/flexedit/Main.as
new file mode 100644
index 000000000..ad4e8e444
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/flexedit/Main.as
@@ -0,0 +1,24 @@
+package  {
+	
+	import flash.display.MovieClip;
+	import flash.text.TextField;
+	import pkg.MyClass;
+
+	
+	public class Main extends MovieClip {
+		
+		private var mc:MyClass;
+		
+		
+		public function Main() {
+			this.mc = new MyClass(5);
+			var display_txt:TextField = new TextField();
+			display_txt.text = "Hello myclass: "+this.mc.getVal()+" char:"+this.mc.getAChar();
+			display_txt.width = 300;
+			addChild(display_txt);
+			
+
+		}
+	}
+	
+}
diff --git a/libsrc/ffdec_lib/testdata/flexedit/Main.fla b/libsrc/ffdec_lib/testdata/flexedit/Main.fla
new file mode 100644
index 0000000000000000000000000000000000000000..fe5d67f1e85a4bd9bfc49f47c8008695cdaf44e1
GIT binary patch
literal 4425
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

literal 0
HcmV?d00001

diff --git a/libsrc/ffdec_lib/testdata/flexedit/Main.html b/libsrc/ffdec_lib/testdata/flexedit/Main.html
new file mode 100644
index 000000000..31d8258de
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/flexedit/Main.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+	<head>
+		<title>Main</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<style type="text/css" media="screen">
+		html, body { height:100%; background-color: #ffffff;}
+		body { margin:0; padding:0; overflow:hidden; }
+		#flashContent { width:100%; height:100%; }
+		</style>
+	</head>
+	<body>
+		<div id="flashContent">
+			<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="550" height="400" id="Main" align="middle">
+				<param name="movie" value="Main.swf" />
+				<param name="quality" value="high" />
+				<param name="bgcolor" value="#ffffff" />
+				<param name="play" value="true" />
+				<param name="loop" value="true" />
+				<param name="wmode" value="window" />
+				<param name="scale" value="showall" />
+				<param name="menu" value="true" />
+				<param name="devicefont" value="false" />
+				<param name="salign" value="" />
+				<param name="allowScriptAccess" value="sameDomain" />
+				<!--[if !IE]>-->
+				<object type="application/x-shockwave-flash" data="Main.swf" width="550" height="400">
+					<param name="movie" value="Main.swf" />
+					<param name="quality" value="high" />
+					<param name="bgcolor" value="#ffffff" />
+					<param name="play" value="true" />
+					<param name="loop" value="true" />
+					<param name="wmode" value="window" />
+					<param name="scale" value="showall" />
+					<param name="menu" value="true" />
+					<param name="devicefont" value="false" />
+					<param name="salign" value="" />
+					<param name="allowScriptAccess" value="sameDomain" />
+				<!--<![endif]-->
+					<a href="http://www.adobe.com/go/getflash">
+						<img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" />
+					</a>
+				<!--[if !IE]>-->
+				</object>
+				<!--<![endif]-->
+			</object>
+		</div>
+	</body>
+</html>
diff --git a/libsrc/ffdec_lib/testdata/flexedit/Main.swf b/libsrc/ffdec_lib/testdata/flexedit/Main.swf
new file mode 100644
index 0000000000000000000000000000000000000000..d8f1d7414998732b02ef523de629c2e839c595fb
GIT binary patch
literal 1176
zcmV;J1ZVq0S5pxO2><|ioTXLWQrkup-d+8y<sZyXaGa#HDzwv!#+Gcr#2P{iHg3p_
zhfH8P+%WYbt+5(e(ntc#Rr@I1^``HTS1=cSp7cmEKM6EV(;Zpb-Sd6lS$$`<9wF%$
zgo+mkl`(41lo3L|%}q-Ptp`@$c-`)(qoL!528^CB4x-36H0|u{ta`Rw^@3xq)@(L4
zy{^^k6+l$Nb2nn6iW@F1Zm5Yun}=p#`;qOrYCL8~-bwU)ad9F$8v56=ZdhfOcf_lv
zH`GSV*J@Q=i**2Gv;xi|FWC1yXJa!)sU3%f1NBwl^?4YAJag36UPG;@M<=#psjJIt
z>)MCRTUxvgzm2+HYgF`SmD<XFt!b>T87r&b>vcodZ*fy(O6~H9SuA27lIzPxy=LfZ
zx5@8eCv?xU`{$oTzCo(%+6PX4nzxpDZLNP2I7z)MQ{xUFayJUW-dbX>Wg2}i7_w-C
z`MzVDEEd#8m2lvhZ_d~$uk>T9*R>nq=Pn7}tlRx~!G}Zb3LQqTdH>_+aR1!r+G`$q
zCxOWUzBJh|-LA3Yh7og3zSG`-iK=Z|#&)ZrZ*4cXR_l%WcB59?YOJhnH@4bqtDWU%
zo%(X({rl7_wYF!T#J)|`tpA{Pi+ZKD8`#G-Y}tEMS87|$=H}Mw%CnEF-Xn3nRvy@=
z-0B40FsXvif{@2fJzu=CDz+){*Rb!}^zTc!L%mY7KIet*P_NXy|6|iXN~qU`x$)`#
zEv-!s!3`C)$h&v%-p=RXfW&Ce<Stih2)%vqhY(Ldn?}|6u_X9!j&rYA0J&Q5-GoTq
zivrs{7Hl_~N#}1x<=vxSxf#s^$+#1gylB9KOvt0%q;t%p&DMYg#T#^jquul5nTzKq
zec_ZjG7x@dj@V_kTSz`)urBl+cCK{2Q=7LO+b2U4Z)VeA#7B{`54VoZ9jo|)JC3Ig
z&&^oRP-WGG+=dvVq%+%!1{r2qtpS|2`IOI3<AbHR9Y5NTh(#tWyU<Q^rf)j4<3>DS
zW(3ZsGo|<9Ef4-eY?lY}o*&o|FO+aeC}$*8&X=boRGKZ%z`ayjAQ(TPm{1~8B2g?;
zLaC@wlBFa^ae>kzCDWA5(99goK2T(=5Udn1%{`>#F(pqZ`GV%Zq?xa1Mx~jrX=bsA
zCJiSQCFtIk6dMWmL_|?i1cU`S22qSi1|tEBiiBjOU<Ga@8#8klW%C6^K?OX8kOE8z
zWl$dYSQHU3v50UED<UFOI4@$Mh%gpJVXXfI$`F<0u|D2GFd~GA5{1zvlVK>tL20Z%
zoqqw#0f&U*SU)WGB)umcpoM`57%9f2S~A9xe62+RFU|peI>w7|9pHt90ftZ}2BsW^
z5SeBZ&iHbWg_$e{^JA5M7P96*MS2J-GZPgI*8y1oB?Z8FjFoJvR1iouXQWDp$~V$W
z1rMeUXJ5{u-)H~2d|Dp&r#d-w@$}I}+{>T~Hh1~$pM*U)oWI<ikC!zCxs>n5I!AG?
qlHPl$_sV+jk=}c(_X=<w2n%T&<N^M}oHD6j{6U}}q4PKIEo%_X%t#IZ

literal 0
HcmV?d00001

diff --git a/libsrc/ffdec_lib/testdata/flexedit/pkg/MyClass.as b/libsrc/ffdec_lib/testdata/flexedit/pkg/MyClass.as
new file mode 100644
index 000000000..9a683daa3
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/flexedit/pkg/MyClass.as
@@ -0,0 +1,17 @@
+package pkg {
+	
+	public class MyClass extends ParentClass {
+
+		private var val:int;
+
+		public function MyClass(val) {
+			this.val = val;
+		}
+		
+		public function getVal():int{
+			return this.val;
+		}
+
+	}
+	
+}
diff --git a/libsrc/ffdec_lib/testdata/flexedit/pkg/ParentClass.as b/libsrc/ffdec_lib/testdata/flexedit/pkg/ParentClass.as
new file mode 100644
index 000000000..1dedf44d8
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/flexedit/pkg/ParentClass.as
@@ -0,0 +1,11 @@
+package pkg {
+	
+	public class ParentClass extends ParentParentClass {				
+
+		public function ParentClass() {
+			// constructor code
+		}
+
+	}
+	
+}
diff --git a/libsrc/ffdec_lib/testdata/flexedit/pkg/ParentParentClass.as b/libsrc/ffdec_lib/testdata/flexedit/pkg/ParentParentClass.as
new file mode 100644
index 000000000..8325f3168
--- /dev/null
+++ b/libsrc/ffdec_lib/testdata/flexedit/pkg/ParentParentClass.as
@@ -0,0 +1,22 @@
+package pkg {
+	
+	public class ParentParentClass {
+
+		//Reference to subclass:  (circular reference)
+		private var other:ParentClass;
+
+		public function ParentParentClass() {
+			// constructor code
+		}
+		
+		public function setOther(other:ParentClass){
+			this.other = other;
+		}				
+
+		public function getAChar():String{
+			return "A";
+		}
+
+	}
+	
+}

From 9262eff627d6c3239a97a61b5d448822fad5dfa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Mon, 15 Aug 2016 21:15:53 +0200
Subject: [PATCH 09/23] ABC merging

---
 .../com/jpexs/decompiler/flash/abc/ABC.java   | 394 +++++++++++++++++-
 .../decompiler/flash/abc/ABCVersion.java      |  23 +
 .../decompiler/flash/abc/avm2/AVM2Code.java   |  38 ++
 .../flash/abc/avm2/AVM2ConstantPool.java      | 100 +++--
 .../avm2/instructions/AVM2Instruction.java    |  39 ++
 .../flash/abc/types/MethodBody.java           |  11 +-
 .../decompiler/flash/abc/types/ValueKind.java |   8 +-
 .../console/CommandLineArgumentParser.java    |  33 +-
 8 files changed, 575 insertions(+), 71 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
index 034f30aac..bce340f03 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
@@ -1237,7 +1237,7 @@ public class ABC {
                 for (int i = 0; i < ins.definition.operands.length; i++) {
                     if (ins.definition.operands[i] == AVM2Code.DAT_CLASS_INDEX) {
                         if (ins.operands[i] >= index) {
-                            ins.operands[i]++;
+                            ins.setOperand(i, ins.operands[i] + 1, b.getCode(), b);
                         }
                     }
                 }
@@ -1272,8 +1272,7 @@ public class ABC {
                 for (int i = 0; i < ins.definition.operands.length; i++) {
                     if (ins.definition.operands[i] == AVM2Code.DAT_CLASS_INDEX) {
                         if (ins.operands[i] > index) {
-                            ins.operands[i]--;
-                            b.setModified();
+                            ins.setOperand(i, ins.operands[i] - 1, b.getCode(), b);
                         }
                     }
                 }
@@ -1330,8 +1329,7 @@ public class ABC {
                 for (int i = 0; i < ins.definition.operands.length; i++) {
                     if (ins.definition.operands[i] == AVM2Code.DAT_METHOD_INDEX) {
                         if (ins.operands[i] > index) {
-                            ins.operands[i]--;
-                            b.setModified();
+                            ins.setOperand(i, ins.operands[i] - 1, b.getCode(), b);
                         }
                     }
                 }
@@ -1453,24 +1451,137 @@ public class ABC {
         getMethodIndexing();
     }
 
+    /**
+     * Merges second ABC to this one.
+     *
+     * @param secondABC
+     */
     public void mergeABC(ABC secondABC) {
-        Map<Integer, Integer> namespaceMap = new HashMap<>();
-        Map<Integer, Integer> namespaceSetMap = new HashMap<>();
-        Map<Integer, Integer> multinameMap = new HashMap<>();
-        Map<Integer, Integer> methodInfoMap = new HashMap<>();
+        Map<Integer, Integer> mergeStringMap = new HashMap<>();
+        Map<Integer, Integer> mergeIntMap = new HashMap<>();
+        Map<Integer, Integer> mergeUIntMap = new HashMap<>();
+        Map<Integer, Integer> mergeDoubleMap = new HashMap<>();
+        Map<Integer, Integer> mergeFloatMap = new HashMap<>();
+        Map<Integer, Integer> mergeFloat4Map = new HashMap<>();
+        Map<Integer, Integer> mergeDecimalMap = new HashMap<>();
 
-        constants.merge(secondABC.constants, namespaceMap, namespaceSetMap, multinameMap);
+        Map<Integer, Integer> mergeNamespaceMap = new HashMap<>();
+        Map<Integer, Integer> mergeNamespaceSetMap = new HashMap<>();
+        Map<Integer, Integer> mergeMultinameMap = new HashMap<>();
+        Map<Integer, Integer> mergeMethodInfoMap = new HashMap<>();
+        Map<Integer, Integer> mergeMethodBodyMap = new HashMap<>();
+        Map<Integer, Integer> mergeClassIndexMap = new HashMap<>();
+        Map<Integer, Integer> mergeMetaDataMap = new HashMap<>();
+        Map<Integer, Integer> mergeScriptInfoMap = new HashMap<>();
+
+        mergeABC(secondABC, mergeStringMap, mergeIntMap, mergeUIntMap, mergeDoubleMap, mergeFloatMap, mergeFloat4Map, mergeDecimalMap, mergeNamespaceMap, mergeNamespaceSetMap, mergeMultinameMap, mergeMethodInfoMap, mergeMethodBodyMap, mergeClassIndexMap, mergeMetaDataMap, mergeScriptInfoMap);
+    }
+
+    /**
+     * Merges second ABC to this one. Gets mapping of indices.
+     *
+     * @param secondABC
+     * @param mergeStringMap
+     * @param mergeIntMap
+     * @param mergeUIntMap
+     * @param mergeDoubleMap
+     * @param mergeFloatMap
+     * @param mergeFloat4Map
+     * @param mergeDecimalMap
+     * @param mergeNamespaceMap
+     * @param mergeNamespaceSetMap
+     * @param mergeMultinameMap
+     * @param mergeMethodInfoMap
+     * @param mergeMethodBodyMap
+     * @param mergeClassIndexMap
+     * @param mergeMetaDataMap
+     * @param mergeScriptInfoMap
+     */
+    public void mergeABC(ABC secondABC,
+            Map<Integer, Integer> mergeStringMap,
+            Map<Integer, Integer> mergeIntMap,
+            Map<Integer, Integer> mergeUIntMap,
+            Map<Integer, Integer> mergeDoubleMap,
+            Map<Integer, Integer> mergeFloatMap,
+            Map<Integer, Integer> mergeFloat4Map,
+            Map<Integer, Integer> mergeDecimalMap,
+            Map<Integer, Integer> mergeNamespaceMap,
+            Map<Integer, Integer> mergeNamespaceSetMap,
+            Map<Integer, Integer> mergeMultinameMap,
+            Map<Integer, Integer> mergeMethodInfoMap,
+            Map<Integer, Integer> mergeMethodBodyMap,
+            Map<Integer, Integer> mergeClassIndexMap,
+            Map<Integer, Integer> mergeMetaDataMap,
+            Map<Integer, Integer> mergeScriptInfoMap
+    ) {
+
+        if (!version.equals(secondABC.version)) {
+            throw new RuntimeException("ABC versions mismatch");
+        }
+        //Constants
+        constants.merge(secondABC.constants, mergeStringMap, mergeIntMap, mergeUIntMap, mergeDoubleMap, mergeFloatMap, mergeFloat4Map, mergeDecimalMap, mergeNamespaceMap, mergeNamespaceSetMap, mergeMultinameMap);
+
+        //Metadata
+        for (int m = 0; m < secondABC.metadata_info.size(); m++) {
+            MetadataInfo secondMetadataInfo = secondABC.metadata_info.get(m);
+            MetadataInfo newMetadataInfo = new MetadataInfo();
+            newMetadataInfo.name_index = mergeStringMap.get(secondMetadataInfo.name_index);
+            newMetadataInfo.keys = new int[secondMetadataInfo.keys.length];
+            newMetadataInfo.values = new int[secondMetadataInfo.values.length];
+            for (int i = 0; i < secondMetadataInfo.keys.length; i++) {
+                newMetadataInfo.keys[i] = mergeStringMap.get(secondMetadataInfo.keys[i]);
+                newMetadataInfo.values[i] = mergeStringMap.get(secondMetadataInfo.values[i]);
+            }
+            int newIndex = metadata_info.size();
+            metadata_info.add(newMetadataInfo);
+            mergeMetaDataMap.put(m, newIndex);
+        }
+
+        //Method Info
         for (int i = 0; i < secondABC.method_info.size(); i++) {
             MethodInfo secondMethodInfo = secondABC.method_info.get(i);
             int newParamTypes[] = new int[secondMethodInfo.param_types.length];
+            for (int t = 0; t < secondMethodInfo.param_types.length; t++) {
+                newParamTypes[t] = mergeMultinameMap.get(secondMethodInfo.param_types[t]);
+            }
             int newParamNames[] = new int[secondMethodInfo.paramNames.length];
-            int newRetType = multinameMap.get(secondMethodInfo.ret_type);
-            int newNameIndex = constants.getStringId(secondABC.constants.getString(secondMethodInfo.name_index), true);
+            for (int n = 0; n < secondMethodInfo.paramNames.length; n++) {
+                newParamNames[n] = mergeStringMap.get(secondMethodInfo.paramNames[n]);
+            }
+            int newRetType = mergeMultinameMap.get(secondMethodInfo.ret_type);
+            int newNameIndex = mergeStringMap.get(secondMethodInfo.name_index);
             ValueKind newOptional[] = new ValueKind[secondMethodInfo.optional.length];
             for (int k = 0; k < secondMethodInfo.optional.length; k++) {
                 int vkind = secondMethodInfo.optional[k].value_kind;
-                int newValueIndex;
+                Map<Integer, Integer> valueMergeMap = null;
                 switch (vkind) {
+                    case ValueKind.CONSTANT_Utf8:
+                        valueMergeMap = mergeStringMap;
+                        break;
+                    case ValueKind.CONSTANT_Int:
+                        valueMergeMap = mergeIntMap;
+                        break;
+                    case ValueKind.CONSTANT_UInt:
+                        valueMergeMap = mergeUIntMap;
+                        break;
+                    case ValueKind.CONSTANT_Double:
+                        valueMergeMap = mergeDoubleMap;
+                        break;
+                    case ValueKind.CONSTANT_DecimalOrFloat:
+                        //assuming the second ABC has same decimal/float support
+                        if (hasDecimalSupport()) {
+                            valueMergeMap = mergeDecimalMap;
+                        } else if (hasFloatSupport()) {
+                            valueMergeMap = mergeFloatMap;
+                        } else {
+                            //should not happen
+                        }
+                        break;
+                    case ValueKind.CONSTANT_Float4:
+                        if (hasFloatSupport()) {
+                            valueMergeMap = mergeFloat4Map;
+                        }
+                        break;
                     case ValueKind.CONSTANT_ExplicitNamespace:
                     case ValueKind.CONSTANT_Namespace:
                     case ValueKind.CONSTANT_PackageInternalNs:
@@ -1478,25 +1589,264 @@ public class ABC {
                     case ValueKind.CONSTANT_ProtectedNamespace:
                     case ValueKind.CONSTANT_PrivateNs:
                     case ValueKind.CONSTANT_StaticProtectedNs:
-                        newValueIndex = namespaceMap.get(secondMethodInfo.optional[k].value_index);
+                        valueMergeMap = mergeNamespaceMap;
                         break;
-                    default:
-                        newValueIndex = secondMethodInfo.optional[k].value_index;
                 }
+
+                int newValueIndex = valueMergeMap != null ? valueMergeMap.get(secondMethodInfo.optional[k].value_index) : secondMethodInfo.optional[k].value_index;
                 newOptional[k] = new ValueKind(newValueIndex, vkind);
             }
 
             MethodInfo newMethodInfo = new MethodInfo(newParamTypes, newRetType, newNameIndex, secondMethodInfo.flags, newOptional, newParamNames);
             int newIndex = addMethodInfo(newMethodInfo);
-            methodInfoMap.put(i, newIndex);
+            mergeMethodInfoMap.put(i, newIndex);
         }
-        for (MethodBody secondBody : secondABC.bodies) {
-            //TODO!!!
-            //MethodBody newBody = new MethodBody(this, mergeTraits(secondBody.traits), codeBytes, exceptions)
+
+        int classFirstIndex = class_info.size();
+        //Class/Instance
+        for (int c = 0; c < secondABC.class_info.size(); c++) {
+            ClassInfo secondClassInfo = secondABC.class_info.get(c);
+            ClassInfo newClassInfo = new ClassInfo();
+            int newIndex = class_info.size();
+            class_info.add(newClassInfo);
+            mergeClassIndexMap.put(c, newIndex);
+            newClassInfo.cinit_index = mergeMethodInfoMap.get(secondClassInfo.cinit_index);
+
+            newClassInfo.lastDispId = secondClassInfo.lastDispId;
+            InstanceInfo secondInstanceInfo = secondABC.instance_info.get(c);
+            InstanceInfo newInstanceInfo = new InstanceInfo();
+            newInstanceInfo.iinit_index = mergeMethodInfoMap.get(secondInstanceInfo.iinit_index);
+            newInstanceInfo.super_index = mergeMultinameMap.get(secondInstanceInfo.super_index);
+            newInstanceInfo.interfaces = new int[secondInstanceInfo.interfaces.length];
+            for (int i = 0; i < secondInstanceInfo.interfaces.length; i++) {
+                newInstanceInfo.interfaces[i] = mergeMultinameMap.get(secondInstanceInfo.interfaces[i]);
+            }
+            newInstanceInfo.protectedNS = mergeNamespaceMap.get(secondInstanceInfo.protectedNS);
+            newInstanceInfo.name_index = mergeMultinameMap.get(secondInstanceInfo.name_index);
+            newInstanceInfo.flags = secondInstanceInfo.flags;
+            instance_info.add(newInstanceInfo);
+
+            //do traits in second step as some classes may depend on other classes
         }
+
+        //Class/Instance traits
+        for (int c = 0; c < secondABC.class_info.size(); c++) {
+            ClassInfo secondClassInfo = secondABC.class_info.get(c);
+            InstanceInfo secondInstanceInfo = secondABC.instance_info.get(c);
+            ClassInfo newClassInfo = class_info.get(classFirstIndex + c);
+            InstanceInfo newInstanceInfo = instance_info.get(classFirstIndex + c);
+            newClassInfo.static_traits = mergeTraits(secondClassInfo.static_traits, mergeMultinameMap, mergeStringMap, mergeIntMap, mergeUIntMap, mergeDoubleMap, mergeFloatMap, mergeFloat4Map, mergeDecimalMap, mergeNamespaceMap, mergeMetaDataMap, mergeMethodInfoMap, mergeClassIndexMap);
+            newInstanceInfo.instance_traits = mergeTraits(secondInstanceInfo.instance_traits, mergeMultinameMap, mergeStringMap, mergeIntMap, mergeUIntMap, mergeDoubleMap, mergeFloatMap, mergeFloat4Map, mergeDecimalMap, mergeNamespaceMap, mergeMetaDataMap, mergeMethodInfoMap, mergeClassIndexMap);
+        }
+
+        //Scripts
+        for (int s = 0; s < secondABC.script_info.size(); s++) {
+            ScriptInfo secondScriptInfo = secondABC.script_info.get(s);
+            ScriptInfo newScriptInfo = new ScriptInfo();
+            newScriptInfo.init_index = mergeMethodInfoMap.get(secondScriptInfo.init_index);
+            newScriptInfo.traits = mergeTraits(secondScriptInfo.traits, mergeMultinameMap, mergeStringMap, mergeIntMap, mergeUIntMap, mergeDoubleMap, mergeFloatMap, mergeFloat4Map, mergeDecimalMap, mergeNamespaceMap, mergeMetaDataMap, mergeMethodInfoMap, mergeClassIndexMap);
+            int newIndex = script_info.size();
+            script_info.add(newScriptInfo);
+            mergeScriptInfoMap.put(s, newIndex);
+        }
+
+        //Method bodies
+        for (int b = 0; b < secondABC.bodies.size(); b++) {
+            MethodBody secondBody = secondABC.bodies.get(b);
+            MethodBody newBody = secondBody.clone(true);
+            newBody.method_info = mergeMethodInfoMap.get(secondBody.method_info);
+            for (int e = 0; e < secondBody.exceptions.length; e++) {
+                newBody.exceptions[e].name_index = mergeMultinameMap.get(secondBody.exceptions[e].name_index);
+                newBody.exceptions[e].type_index = mergeMultinameMap.get(secondBody.exceptions[e].type_index);
+            }
+            AVM2Code newCode = newBody.getCode();
+            for (AVM2Instruction newIns : newCode.code) {
+                int newOperands[] = newIns.operands == null ? null : newIns.operands.clone();
+                boolean modified = false;
+                if (newIns.operands != null) {
+                    for (int i = 0; i < newIns.definition.operands.length; i++) {
+                        Map<Integer, Integer> mergeMap = null;
+                        switch (newIns.definition.operands[i]) {
+                            case AVM2Code.DAT_CLASS_INDEX:
+                                mergeMap = mergeClassIndexMap;
+                                break;
+                            case AVM2Code.DAT_STRING_INDEX:
+                                mergeMap = mergeStringMap;
+                                break;
+                            case AVM2Code.DAT_INT_INDEX:
+                                mergeMap = mergeIntMap;
+                                break;
+                            case AVM2Code.DAT_UINT_INDEX:
+                                mergeMap = mergeUIntMap;
+                                break;
+                            case AVM2Code.DAT_DOUBLE_INDEX:
+                                mergeMap = mergeDoubleMap;
+                                break;
+                            case AVM2Code.DAT_DECIMAL_INDEX:
+                                mergeMap = mergeDecimalMap;
+                                break;
+                            case AVM2Code.DAT_FLOAT_INDEX:
+                                mergeMap = mergeFloatMap;
+                                break;
+                            case AVM2Code.DAT_FLOAT4_INDEX:
+                                mergeMap = mergeFloat4Map;
+                                break;
+                            case AVM2Code.DAT_NAMESPACE_INDEX:
+                                mergeMap = mergeNamespaceMap;
+                                break;
+                            case AVM2Code.DAT_METHOD_INDEX:
+                                mergeMap = mergeMethodInfoMap;
+                                break;
+                            case AVM2Code.DAT_MULTINAME_INDEX:
+                                mergeMap = mergeMultinameMap;
+                                break;
+                        }
+                        if (mergeMap != null) {
+                            newOperands[i] = mergeMap.get(newIns.operands[i]);
+                            modified = true;
+                        }
+                    }
+                }
+                if (modified) {
+                    newIns.setOperands(newOperands, newCode, newBody);
+                }
+                newBody.traits = mergeTraits(secondBody.traits, mergeMultinameMap, mergeStringMap, mergeIntMap, mergeUIntMap, mergeDoubleMap, mergeFloatMap, mergeFloat4Map, mergeDecimalMap, mergeNamespaceMap, mergeMetaDataMap, mergeMethodInfoMap, mergeClassIndexMap);
+            }
+            newBody.setModified();
+            int newIndex = bodies.size();
+            bodies.add(newBody);
+            mergeMethodBodyMap.put(b, newIndex);
+        }
+
+        //clear caches
+        abcMethodIndexing = null;
+        getSwf().clearScriptCache();
+        ((Tag) parentTag).setModified(true);
     }
 
-    private Traits mergeTraits(Traits secondTraits) {
-        return null; //TODO
+    private Traits mergeTraits(Traits secondTraits, Map<Integer, Integer> mergeMultinameMap,
+            Map<Integer, Integer> mergeStringMap,
+            Map<Integer, Integer> mergeIntMap,
+            Map<Integer, Integer> mergeUIntMap,
+            Map<Integer, Integer> mergeDoubleMap,
+            Map<Integer, Integer> mergeFloatMap,
+            Map<Integer, Integer> mergeFloat4Map,
+            Map<Integer, Integer> mergeDecimalMap,
+            Map<Integer, Integer> mergeNamespaceMap,
+            Map<Integer, Integer> mergeMetaDataMap,
+            Map<Integer, Integer> mergeMethodInfoMap,
+            Map<Integer, Integer> mergeClassIndexMap) {
+        Traits newTraits = new Traits();
+        for (Trait t : secondTraits.traits) {
+            Trait newTrait = null;
+            if (t instanceof TraitMethodGetterSetter) {
+                newTrait = mergeTrait((TraitMethodGetterSetter) t, mergeMultinameMap, mergeMethodInfoMap, mergeMetaDataMap);
+            } else if (t instanceof TraitSlotConst) {
+                newTrait = mergeTrait((TraitSlotConst) t, mergeMultinameMap, mergeStringMap, mergeIntMap, mergeUIntMap, mergeDoubleMap, mergeFloatMap, mergeFloat4Map, mergeDecimalMap, mergeNamespaceMap, mergeMetaDataMap);
+            } else if (t instanceof TraitFunction) {
+                newTrait = mergeTrait((TraitFunction) t, mergeMultinameMap, mergeMethodInfoMap, mergeMetaDataMap);
+            } else if (t instanceof TraitClass) {
+                newTrait = mergeTrait((TraitClass) t, mergeClassIndexMap, mergeMultinameMap, mergeMetaDataMap);
+            } else {
+                //should not happen
+            }
+
+            newTraits.addTrait(newTrait);
+
+        }
+        return newTraits;
+    }
+
+    private TraitMethodGetterSetter mergeTrait(TraitMethodGetterSetter secondTrait, Map<Integer, Integer> mergeMultinameMap, Map<Integer, Integer> mergeMethodInfoMap, Map<Integer, Integer> mergeMetaDataMap) {
+        TraitMethodGetterSetter newTrait = secondTrait.clone();
+        newTrait.method_info = mergeMethodInfoMap.get(secondTrait.method_info);
+        newTrait.name_index = mergeMultinameMap.get(secondTrait.name_index);
+        for (int m = 0; m < secondTrait.metadata.length; m++) {
+            newTrait.metadata[m] = mergeMetaDataMap.get(secondTrait.metadata[m]);
+        }
+        return newTrait;
+    }
+
+    private TraitSlotConst mergeTrait(TraitSlotConst secondTrait, Map<Integer, Integer> mergeMultinameMap,
+            Map<Integer, Integer> mergeStringMap,
+            Map<Integer, Integer> mergeIntMap,
+            Map<Integer, Integer> mergeUIntMap,
+            Map<Integer, Integer> mergeDoubleMap,
+            Map<Integer, Integer> mergeFloatMap,
+            Map<Integer, Integer> mergeFloat4Map,
+            Map<Integer, Integer> mergeDecimalMap,
+            Map<Integer, Integer> mergeNamespaceMap,
+            Map<Integer, Integer> mergeMetaDataMap
+    ) {
+        TraitSlotConst newTrait = secondTrait.clone();
+        newTrait.name_index = mergeMultinameMap.get(secondTrait.name_index);
+        for (int m = 0; m < secondTrait.metadata.length; m++) {
+            newTrait.metadata[m] = mergeMetaDataMap.get(secondTrait.metadata[m]);
+        }
+        newTrait.type_index = mergeMultinameMap.get(secondTrait.type_index);
+        Map<Integer, Integer> valueMergeMap = null;
+
+        switch (newTrait.value_kind) {
+            case ValueKind.CONSTANT_Utf8:
+                valueMergeMap = mergeStringMap;
+                break;
+            case ValueKind.CONSTANT_Int:
+                valueMergeMap = mergeIntMap;
+                break;
+            case ValueKind.CONSTANT_UInt:
+                valueMergeMap = mergeUIntMap;
+                break;
+            case ValueKind.CONSTANT_Double:
+                valueMergeMap = mergeDoubleMap;
+                break;
+            case ValueKind.CONSTANT_DecimalOrFloat:
+                //assuming the second ABC has same decimal/float support
+                if (hasDecimalSupport()) {
+                    valueMergeMap = mergeDecimalMap;
+                } else if (hasFloatSupport()) {
+                    valueMergeMap = mergeFloatMap;
+                } else {
+                    //should not happen
+                }
+                break;
+            case ValueKind.CONSTANT_Float4:
+                if (hasFloatSupport()) {
+                    valueMergeMap = mergeFloat4Map;
+                }
+                break;
+            case ValueKind.CONSTANT_ExplicitNamespace:
+            case ValueKind.CONSTANT_Namespace:
+            case ValueKind.CONSTANT_PackageInternalNs:
+            case ValueKind.CONSTANT_PackageNamespace:
+            case ValueKind.CONSTANT_PrivateNs:
+            case ValueKind.CONSTANT_ProtectedNamespace:
+            case ValueKind.CONSTANT_StaticProtectedNs:
+                valueMergeMap = mergeNamespaceMap;
+                break;
+        }
+        if (valueMergeMap != null) {
+            newTrait.value_index = valueMergeMap.get(secondTrait.value_index);
+        }
+        return newTrait; //TODO
+    }
+
+    private TraitFunction mergeTrait(TraitFunction secondTrait, Map<Integer, Integer> mergeMultinameMap, Map<Integer, Integer> mergeMethodInfoMap, Map<Integer, Integer> mergeMetaDataMap) {
+        TraitFunction newTrait = secondTrait.clone();
+        newTrait.method_info = mergeMethodInfoMap.get(secondTrait.method_info);
+        newTrait.name_index = mergeMultinameMap.get(secondTrait.name_index);
+        for (int m = 0; m < secondTrait.metadata.length; m++) {
+            newTrait.metadata[m] = mergeMetaDataMap.get(secondTrait.metadata[m]);
+        }
+        return newTrait;
+    }
+
+    private TraitClass mergeTrait(TraitClass secondTrait, Map<Integer, Integer> mergeClassMap, Map<Integer, Integer> mergeMultinameMap, Map<Integer, Integer> mergeMetaDataMap) {
+        TraitClass newTrait = secondTrait.clone();
+        newTrait.class_info = mergeClassMap.get(secondTrait.class_info);
+        newTrait.name_index = mergeMultinameMap.get(secondTrait.name_index);
+        for (int m = 0; m < secondTrait.metadata.length; m++) {
+            newTrait.metadata[m] = mergeMetaDataMap.get(secondTrait.metadata[m]);
+        }
+        return newTrait;
     }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABCVersion.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABCVersion.java
index 8671c40b0..0e5f3fb18 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABCVersion.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABCVersion.java
@@ -27,4 +27,27 @@ public class ABCVersion implements Comparable<ABCVersion> {
         return "" + major + "." + minor;
     }
 
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 53 * hash + this.major;
+        hash = 53 * hash + this.minor;
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final ABCVersion other = (ABCVersion) obj;
+        return true;
+    }
+
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
index c1013919a..ac7f5079a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
@@ -1100,6 +1100,11 @@ public class AVM2Code implements Cloneable {
         }
     }
 
+    public void setInstructionOperand(int ip, int operandIndex, int value, MethodBody body) {
+        int oldVal = code.get(ip).operands[ip];
+        code.get(ip).operands[ip] = value;
+    }
+
     public byte[] getBytes() {
         return getBytes(null);
     }
@@ -2145,6 +2150,38 @@ public class AVM2Code implements Cloneable {
         return list;
     }
 
+    public void updateInstructionByteCountByAddr(long instructionAddress, int byteDelta, MethodBody body) {
+        if (byteDelta != 0) {
+            updateOffsets(new OffsetUpdater() {
+
+                @Override
+                public long updateInstructionOffset(long address) {
+                    if (address > instructionAddress) {
+                        return address + byteDelta;
+                    }
+                    return address;
+                }
+
+                @Override
+                public int updateOperandOffset(long insAddr, long targetAddress, int offset) {
+                    if (targetAddress > instructionAddress && insAddr <= instructionAddress) {
+                        return offset + byteDelta;
+                    }
+                    if (targetAddress <= instructionAddress && insAddr > instructionAddress) {
+                        return offset - byteDelta;
+                    }
+                    return offset;
+                }
+            }, body);
+            body.setModified();
+        }
+    }
+
+    public void updateInstructionByteCount(int pos, int byteDelta, MethodBody body) {
+        AVM2Instruction instruction = code.get(pos);
+        updateInstructionByteCountByAddr(instruction.getAddress(), byteDelta, body);
+    }
+
     public void updateOffsets(OffsetUpdater updater, MethodBody body) {
         for (int i = 0; i < code.size(); i++) {
             AVM2Instruction ins = code.get(i);
@@ -2172,6 +2209,7 @@ public class AVM2Code implements Cloneable {
                 }
             }
             ins.setAddress(updater.updateInstructionOffset(ins.getAddress()));
+            //Note: changing operands here does not change instruction byte length as offsets are always S24 (not variable length)
         }
 
         for (ABCException ex : body.exceptions) {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2ConstantPool.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2ConstantPool.java
index 50ad462fc..4a51f9ff2 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2ConstantPool.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2ConstantPool.java
@@ -772,50 +772,68 @@ public class AVM2ConstantPool implements Cloneable {
      * Merges second constantpool into this one
      *
      * @param secondPool
-     * @param namespaceMap Output map of merged namespaces. Index in second pool
-     * to index in this pool.
-     * @param namespaceSetMap Output map of merged namespace sets. Index in
-     * second pool to index in this pool.
-     * @param multinameMap Output map of merged multinames. Index in second pool
-     * to index in this pool.
+     * @param stringMap
+     * @param intMap
+     * @param uintMap
+     * @param doubleMap
+     * @param floatMap
+     * @param float4Map
+     * @param decimalMap
+     * @param namespaceMap
+     * @param namespaceSetMap
+     * @param multinameMap
      */
-    public void merge(AVM2ConstantPool secondPool, Map<Integer, Integer> namespaceMap, Map<Integer, Integer> namespaceSetMap, Map<Integer, Integer> multinameMap) {
-        for (String val : secondPool.constant_string) {
-            getStringId(val, true);
+    public void merge(AVM2ConstantPool secondPool, Map<Integer, Integer> stringMap, Map<Integer, Integer> intMap, Map<Integer, Integer> uintMap, Map<Integer, Integer> doubleMap, Map<Integer, Integer> floatMap, Map<Integer, Integer> float4Map, Map<Integer, Integer> decimalMap, Map<Integer, Integer> namespaceMap, Map<Integer, Integer> namespaceSetMap, Map<Integer, Integer> multinameMap) {
+        stringMap.put(0, 0);
+        for (int i = 1; i < secondPool.constant_string.size(); i++) {
+            String val = secondPool.constant_string.get(i);
+            stringMap.put(i, getStringId(val, true));
         }
-        for (Long val : secondPool.constant_int) {
-            getIntId(val, true);
+        intMap.put(0, 0);
+        for (int i = 1; i < secondPool.constant_int.size(); i++) {
+            Long val = secondPool.constant_int.get(i);
+            intMap.put(i, getIntId(val, true));
         }
-        for (Long val : secondPool.constant_uint) {
-            getUIntId(val, true);
+        uintMap.put(0, 0);
+        for (int i = 1; i < secondPool.constant_uint.size(); i++) {
+            Long val = secondPool.constant_uint.get(i);
+            uintMap.put(i, getUIntId(val, true));
         }
-        for (Double val : secondPool.constant_double) {
-            getDoubleId(val, true);
+        doubleMap.put(0, 0);
+        for (int i = 1; i < secondPool.constant_double.size(); i++) {
+            Double val = secondPool.constant_double.get(i);
+            doubleMap.put(i, getDoubleId(val, true));
         }
-        for (Float val : secondPool.constant_float) {
-            getFloatId(val, true);
+        floatMap.put(0, 0);
+        for (int i = 1; i < secondPool.constant_float.size(); i++) {
+            Float val = secondPool.constant_float.get(i);
+            floatMap.put(i, getFloatId(val, true));
         }
-        for (Float4 val : secondPool.constant_float4) {
-            getFloat4Id(val, true);
+        float4Map.put(0, 0);
+        for (int i = 1; i < secondPool.constant_float4.size(); i++) {
+            Float4 val = secondPool.constant_float4.get(i);
+            float4Map.put(i, getFloat4Id(val, true));
         }
-        for (Decimal val : secondPool.constant_decimal) {
-            getDecimalId(val, true);
+        decimalMap.put(0, 0);
+        for (int i = 1; i < secondPool.constant_decimal.size(); i++) {
+            Decimal val = secondPool.constant_decimal.get(i);
+            decimalMap.put(i, getDecimalId(val, true));
         }
         namespaceMap.put(0, 0);
         for (int i = 1; i < secondPool.constant_namespace.size(); i++) {
-            Namespace secondNamespace = secondPool.getNamespace(i);
-            String secondNsNameStr = secondNamespace.name_index == 0 ? null : secondPool.getString(secondNamespace.name_index);
+            Namespace secondNamespace = secondPool.constant_namespace.get(i);
             int mappedId;
+            int newNameIndex = stringMap.get(secondNamespace.name_index);
             if (secondNamespace.kind == Namespace.KIND_PRIVATE) {//always add, this does not exists in this ABC. Conflicting private namespaces can have same names.
-                mappedId = addNamespace(secondNamespace.kind, getStringId(secondNsNameStr, true));
+                mappedId = addNamespace(secondNamespace.kind, newNameIndex);
             } else {
-                mappedId = getNamespaceId(secondNamespace.kind, secondNsNameStr, 0, true);
+                mappedId = getNamespaceId(secondNamespace.kind, newNameIndex, 0, true);
             }
             namespaceMap.put(i, mappedId);
         }
         namespaceSetMap.put(0, 0);
         for (int i = 1; i < secondPool.constant_namespace_set.size(); i++) {
-            NamespaceSet secondNamespaceSet = secondPool.getNamespaceSet(i);
+            NamespaceSet secondNamespaceSet = secondPool.constant_namespace_set.get(i);
             int mappedsNss[] = new int[secondNamespaceSet.namespaces.length];
             for (int n = 0; n < secondNamespaceSet.namespaces.length; n++) {
                 mappedsNss[n] = namespaceMap.get(secondNamespaceSet.namespaces[n]);
@@ -825,42 +843,42 @@ public class AVM2ConstantPool implements Cloneable {
         }
         multinameMap.put(0, 0);
         for (int i = 1; i < secondPool.constant_multiname.size(); i++) {
-            Multiname secondMultiname = secondPool.getMultiname(i);
-            Multiname importedMultiname = null;
-            int newNameIndex = secondMultiname.name_index <= 0 ? secondMultiname.name_index : getStringId(secondPool.getString(secondMultiname.name_index), true);
+            Multiname secondMultiname = secondPool.constant_multiname.get(i);
+            Multiname newMultiname = null;
+            int newNameIndex = secondMultiname.name_index <= 0 ? secondMultiname.name_index : stringMap.get(secondMultiname.name_index);
             int newNsIndex = secondMultiname.namespace_index <= 0 ? secondMultiname.namespace_index : namespaceMap.get(secondMultiname.namespace_index);
             int newNssIndex = secondMultiname.namespace_set_index <= 0 ? secondMultiname.namespace_set_index : namespaceSetMap.get(secondMultiname.namespace_set_index);
 
             switch (secondMultiname.kind) {
                 case Multiname.MULTINAME:
-                    importedMultiname = Multiname.createMultiname(false, newNameIndex, newNssIndex);
+                    newMultiname = Multiname.createMultiname(false, newNameIndex, newNssIndex);
                     break;
                 case Multiname.MULTINAMEA:
-                    importedMultiname = Multiname.createMultiname(true, newNameIndex, newNssIndex);
+                    newMultiname = Multiname.createMultiname(true, newNameIndex, newNssIndex);
                     break;
                 case Multiname.MULTINAMEL:
-                    importedMultiname = Multiname.createMultinameL(false, newNssIndex);
+                    newMultiname = Multiname.createMultinameL(false, newNssIndex);
                     break;
                 case Multiname.MULTINAMELA:
-                    importedMultiname = Multiname.createMultinameL(true, newNssIndex);
+                    newMultiname = Multiname.createMultinameL(true, newNssIndex);
                     break;
                 case Multiname.QNAME:
-                    importedMultiname = Multiname.createQName(false, newNameIndex, newNsIndex);
+                    newMultiname = Multiname.createQName(false, newNameIndex, newNsIndex);
                     break;
                 case Multiname.QNAMEA:
-                    importedMultiname = Multiname.createQName(true, newNameIndex, newNsIndex);
+                    newMultiname = Multiname.createQName(true, newNameIndex, newNsIndex);
                     break;
                 case Multiname.RTQNAME:
-                    importedMultiname = Multiname.createRTQName(false, newNameIndex);
+                    newMultiname = Multiname.createRTQName(false, newNameIndex);
                     break;
                 case Multiname.RTQNAMEA:
-                    importedMultiname = Multiname.createRTQName(true, newNameIndex);
+                    newMultiname = Multiname.createRTQName(true, newNameIndex);
                     break;
                 case Multiname.RTQNAMEL:
-                    importedMultiname = Multiname.createRTQNameL(false);
+                    newMultiname = Multiname.createRTQNameL(false);
                     break;
                 case Multiname.RTQNAMELA:
-                    importedMultiname = Multiname.createRTQNameL(true);
+                    newMultiname = Multiname.createRTQNameL(true);
                     break;
                 case Multiname.TYPENAME:
                     int newQnameIndex = multinameMap.get(secondMultiname.qname_index);
@@ -868,11 +886,11 @@ public class AVM2ConstantPool implements Cloneable {
                     for (int p = 0; p < secondMultiname.params.length; p++) {
                         newParams[p] = multinameMap.get(secondMultiname.params[p]);
                     }
-                    importedMultiname = Multiname.createTypeName(newQnameIndex, newParams);
+                    newMultiname = Multiname.createTypeName(newQnameIndex, newParams);
                     break;
             }
 
-            int mappedId = getMultinameId(importedMultiname, true);
+            int mappedId = getMultinameId(newMultiname, true);
             multinameMap.put(i, mappedId);
         }
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java
index f53b17d80..79a1a003a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java
@@ -27,6 +27,7 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ReturnValueIns;
 import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ReturnVoidIns;
 import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ThrowIns;
 import com.jpexs.decompiler.flash.abc.types.Float4;
+import com.jpexs.decompiler.flash.abc.types.MethodBody;
 import com.jpexs.decompiler.flash.abc.types.Multiname;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.graph.DottedChain;
@@ -488,4 +489,42 @@ public class AVM2Instruction implements Cloneable, GraphSourceItem {
     public String getFile() {
         return file;
     }
+
+    /**
+     * Set operand value the right way - update offsets neccessarily. Because
+     * some operand types are variable length (like U30)
+     *
+     * @param operandIndex
+     * @param newValue
+     * @param code
+     * @param body
+     */
+    public void setOperand(int operandIndex, int newValue, AVM2Code code, MethodBody body) {
+        int oldByteCount = getBytesLength();
+        operands[operandIndex] = newValue;
+        int newByteCount = getBytesLength();
+        int byteDelta = newByteCount - oldByteCount;
+        if (byteDelta != 0) {
+            code.updateInstructionByteCountByAddr(address, byteDelta, body);
+        }
+    }
+
+    /**
+     * Set operand values the right way - update offsets neccessarily. Because
+     * some operand types are variable length (like U30)
+     *
+     * @param operands
+     * @param code
+     * @param body
+     */
+    public void setOperands(int operands[], AVM2Code code, MethodBody body) {
+        int oldByteCount = getBytesLength();
+        this.operands = operands;
+        int newByteCount = getBytesLength();
+        int byteDelta = newByteCount - oldByteCount;
+        if (byteDelta != 0) {
+            code.updateInstructionByteCountByAddr(address, byteDelta, body);
+        }
+    }
+
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java
index dcfde7578..de2f8c1da 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java
@@ -424,6 +424,10 @@ public final class MethodBody implements Cloneable {
 
     @Override
     public MethodBody clone() {
+        return clone(false);
+    }
+
+    public MethodBody clone(boolean deepTraits) {
         try {
             MethodBody ret = (MethodBody) super.clone();
             if (code != null) {
@@ -437,10 +441,9 @@ public final class MethodBody implements Cloneable {
                 }
             }
 
-            // maybe deep clone traits
-            /*if (traits != null) {
-             ret.traits = traits.clone();
-             }*/
+            if (deepTraits && traits != null) {
+                ret.traits = traits.clone();
+            }
             ret.convertedItems = null;
             ret.convertException = null;
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/ValueKind.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/ValueKind.java
index 98a4cdc45..3e27a2714 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/ValueKind.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/ValueKind.java
@@ -25,7 +25,7 @@ import com.jpexs.helpers.Helper;
  */
 public class ValueKind {
 
-    public static final int CONSTANT_Decimal = 0x02; //decimal
+    public static final int CONSTANT_DecimalOrFloat = 0x02; //decimal or float depending on ABC version
 
     public static final int CONSTANT_Int = 0x03;// integer
 
@@ -57,6 +57,8 @@ public class ValueKind {
 
     public static final int CONSTANT_PrivateNs = 0x05;// namespace
 
+    public static final int CONSTANT_Float4 = 0x1E;// float4
+
     private static final int[] optionalKinds = new int[]{0x03, 0x04, 0x06, 0x02, 0x01, 0x0B, 0x0A, 0x0C, 0x00, 0x08, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x05};
 
     private static final String[] optionalKindNames = new String[]{"Int", "UInt", "Double", "Decimal", "Utf8", "True", "False", "Null", "Undefined", "Namespace", "PackageNamespace", "PackageInternalNs", "ProtectedNamespace", "ExplicitNamespace", "StaticProtectedNs", "PrivateNamespace"};
@@ -137,7 +139,7 @@ public class ValueKind {
             case CONSTANT_Double:
                 ret = "" + constants.getDouble(value_index);
                 break;
-            case CONSTANT_Decimal:
+            case CONSTANT_DecimalOrFloat:
                 ret = "" + constants.getDecimal(value_index);
                 break;
             case CONSTANT_Utf8:
@@ -179,7 +181,7 @@ public class ValueKind {
             case CONSTANT_Double:
                 ret = "Double(" + constants.getDouble(value_index) + ")";
                 break;
-            case CONSTANT_Decimal:
+            case CONSTANT_DecimalOrFloat:
                 ret = "Decimal(" + constants.getDecimal(value_index) + ")";
                 break;
             case CONSTANT_Utf8:
diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
index ef8c1134b..7c97ca182 100644
--- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
+++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
@@ -110,6 +110,7 @@ import com.jpexs.decompiler.flash.importers.SwfXmlImporter;
 import com.jpexs.decompiler.flash.importers.TextImporter;
 import com.jpexs.decompiler.flash.importers.amf.amf3.Amf3Importer;
 import com.jpexs.decompiler.flash.importers.amf.amf3.Amf3ParseException;
+import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.flash.tags.DefineBinaryDataTag;
 import com.jpexs.decompiler.flash.tags.DefineBitsJPEG2Tag;
 import com.jpexs.decompiler.flash.tags.DefineBitsJPEG3Tag;
@@ -595,6 +596,13 @@ public class CommandLineArgumentParser {
             out.println("  ...<swffile>: Input SWF file");
         }
 
+        if (filter == null || filter.equals("abcmerge")) {
+            out.println(" " + (cnt++) + ") -abcmerge <outfile> <swffile>");
+            out.println("  ...merge all ABC tags in SWF file to one");
+            out.println("  ...<outfile>: Where to save merged file");
+            out.println("  ...<swffile>: Input SWF file");
+        }
+
         printCmdLineUsageExamples(out, filter);
     }
 
@@ -810,7 +818,9 @@ public class CommandLineArgumentParser {
             command = nextParam.substring(1);
         }
 
-        if (command.equals("swf2swc")) {
+        if (command.equals("abcmerge")) {
+            parseAbcMerge(args);
+        } else if (command.equals("swf2swc")) {
             parseSwf2Swc(args);
         } else if (command.equals("linkreport")) {
             parseLinkReport(selectionClasses, args);
@@ -1009,6 +1019,27 @@ public class CommandLineArgumentParser {
         setConfigurations(args.pop());
     }
 
+    private static void parseAbcMerge(Stack<String> args) {
+        if (args.size() < 2) {
+            badArguments("abcmerge");
+        }
+        final File outFile = new File(args.pop());
+        final File swfFile = new File(args.pop());
+        processModifySWF(swfFile, outFile, null, (SWF swf, OutputStream stdout) -> {
+            List<ABCContainerTag> abcList = swf.getAbcList();
+            if (!abcList.isEmpty() && abcList.size() > 1) {
+                ABC firstAbc = abcList.get(0).getABC();
+                for (int i = 1; i < abcList.size(); i++) {
+                    firstAbc.mergeABC(abcList.get(i).getABC());
+                }
+                for (int i = 1; i < abcList.size(); i++) {
+                    swf.removeTag((Tag) abcList.get(i));
+                }
+            }
+        });
+
+    }
+
     private static void parseSwf2Swc(Stack<String> args) {
         if (args.size() < 2) {
             badArguments("swf2swc");

From 0705a90aa0c371ac71617ab9ac008dc82824c689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Mon, 15 Aug 2016 21:16:24 +0200
Subject: [PATCH 10/23] AS with method stubs export

---
 .../jpexs/decompiler/flash/gui/locales/ExportDialog.properties   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog.properties
index abf6fc82d..61e11cdec 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog.properties
@@ -44,6 +44,7 @@ scripts.pcode = P-code
 scripts.pcode_hex = P-code with Hex
 scripts.hex = Hex
 scripts.constants = Constants
+scripts.as_method_stubs = ActionScript method stubs
 
 binaryData = Binary data
 binaryData.raw = Raw

From 7c5d5eac58c8b61dd7e5d86b0c414997ee14ad51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Tue, 16 Aug 2016 06:44:48 +0200
Subject: [PATCH 11/23] Merge ABCs on compile TODO: reorder correctly

---
 .../abc/avm2/instructions/AVM2Instruction.java      |  2 ++
 .../decompiler/flash/flexsdk/As3ScriptReplacer.java | 13 ++++---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java
index 79a1a003a..ce3524922 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java
@@ -507,6 +507,7 @@ public class AVM2Instruction implements Cloneable, GraphSourceItem {
         if (byteDelta != 0) {
             code.updateInstructionByteCountByAddr(address, byteDelta, body);
         }
+        body.setModified();
     }
 
     /**
@@ -525,6 +526,7 @@ public class AVM2Instruction implements Cloneable, GraphSourceItem {
         if (byteDelta != 0) {
             code.updateInstructionByteCountByAddr(address, byteDelta, body);
         }
+        body.setModified();
     }
 
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
index 809d8e96f..4cee8e3fa 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
@@ -158,16 +158,11 @@ public class As3ScriptReplacer extends MxmlcRunner {
                 } else {
                     //NOO
                 }
-                int oldTagIndex = swf.getTags().indexOf((Tag) oldPack.abc.parentTag);
                 oldPack.abc.pack(); // removes old classes/methods/scripts
-                if (oldPack.abc.script_info.isEmpty()) {
-                    swf.removeTag(oldTagIndex);
-                }
-                ABCContainerTag lastTag = newTags.get(newTags.size() - 1);
-                ((Tag) lastTag).setSwf(swf);
-                swf.addTag(oldTagIndex + 1, (Tag) lastTag);
-                //TODO: looks like ABCs need to be merged. Parent class needs to be defined earlier than used :-(
-                ((Tag) lastTag).setModified(true);
+                ABCContainerTag newTagsLast = newTags.get(newTags.size() - 1);
+                ABC newLastAbc = newTagsLast.getABC();
+                oldPack.abc.mergeABC(newLastAbc);
+                //TODO: reorder classes
                 ((Tag) oldPack.abc.parentTag).setModified(true);
             }
         } finally {

From db294e7a70fa769e6b9a83a9019bf338365da68c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Tue, 16 Aug 2016 07:59:59 +0200
Subject: [PATCH 12/23] Reorder scripts and classes to be in position as
 original script.

---
 .../com/jpexs/decompiler/flash/abc/ABC.java   | 44 +++++++++++
 .../flash/flexsdk/As3ScriptReplacer.java      | 77 ++++++++++++++++++-
 2 files changed, 119 insertions(+), 2 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
index bce340f03..99425e1ab 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
@@ -1266,6 +1266,50 @@ public class ABC {
         }
     }
 
+    public void reorganizeClasses(Map<Integer, Integer> classIndexMap) {
+        for (MethodBody b : bodies) {
+            for (AVM2Instruction ins : b.getCode().code) {
+                for (int i = 0; i < ins.definition.operands.length; i++) {
+                    if (ins.definition.operands[i] == AVM2Code.DAT_CLASS_INDEX) {
+                        if (classIndexMap.containsKey(ins.operands[i])) {
+                            ins.setOperand(i, classIndexMap.get(ins.operands[i]), b.getCode(), b);
+                        }
+                    }
+                }
+            }
+        }
+        for (ScriptInfo si : script_info) {
+            reorganizeClassesInTraits(si.traits, classIndexMap);
+        }
+        for (MethodBody b : bodies) {
+            reorganizeClassesInTraits(b.traits, classIndexMap);
+        }
+        Map<Integer, InstanceInfo> backupInstanceInfos = new HashMap<>();
+        Map<Integer, ClassInfo> backupClassInfos = new HashMap<>();
+        for (int from : classIndexMap.keySet()) {
+            backupInstanceInfos.put(from, instance_info.get(from));
+            backupClassInfos.put(from, class_info.get(from));
+        }
+        for (int from : classIndexMap.keySet()) {
+            int to = classIndexMap.get(from);
+            instance_info.set(to, backupInstanceInfos.get(from));
+            class_info.set(to, backupClassInfos.get(from));
+        }
+    }
+
+    private void reorganizeClassesInTraits(Traits traits, Map<Integer, Integer> classIndexMap) {
+        for (Trait t : traits.traits) {
+            if (t instanceof TraitClass) {
+                TraitClass tc = (TraitClass) t;
+                reorganizeClassesInTraits(instance_info.get(tc.class_info).instance_traits, classIndexMap);
+                reorganizeClassesInTraits(class_info.get(tc.class_info).static_traits, classIndexMap);
+                if (classIndexMap.containsKey(tc.class_info)) {
+                    tc.class_info = classIndexMap.get(tc.class_info);
+                }
+            }
+        }
+    }
+
     public void removeClass(int index) {
         for (MethodBody b : bodies) {
             for (AVM2Instruction ins : b.getCode().code) {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
index 4cee8e3fa..06a1a54d9 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
@@ -5,6 +5,8 @@ import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
 import com.jpexs.decompiler.flash.abc.types.InstanceInfo;
 import com.jpexs.decompiler.flash.abc.types.ScriptInfo;
+import com.jpexs.decompiler.flash.abc.types.traits.Trait;
+import com.jpexs.decompiler.flash.abc.types.traits.TraitClass;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
 import com.jpexs.decompiler.flash.exporters.script.AS3ScriptExporter;
@@ -22,7 +24,10 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class As3ScriptReplacer extends MxmlcRunner {
 
@@ -152,7 +157,18 @@ public class As3ScriptReplacer extends MxmlcRunner {
             try (FileInputStream fis = new FileInputStream(compiledSwfFile)) {
                 SWF newSWF = new SWF(fis, false, false);
                 List<ABCContainerTag> newTags = newSWF.getAbcList();
+                int oldScriptIndex = oldPack.scriptIndex;
+                int oldClassIndex = -1;
+
                 ScriptInfo oldScriptInfo = oldPack.abc.script_info.get(oldPack.scriptIndex);
+                for (Trait t : oldScriptInfo.traits.traits) {
+                    if (t instanceof TraitClass) {
+                        int traitClassIndex = ((TraitClass) t).class_info;
+                        if (oldClassIndex == -1 || traitClassIndex < oldClassIndex) {
+                            oldClassIndex = traitClassIndex;
+                        }
+                    }
+                }
                 if (oldPack.isSimple) {
                     oldScriptInfo.delete(oldPack.abc, true);
                 } else {
@@ -161,8 +177,65 @@ public class As3ScriptReplacer extends MxmlcRunner {
                 oldPack.abc.pack(); // removes old classes/methods/scripts
                 ABCContainerTag newTagsLast = newTags.get(newTags.size() - 1);
                 ABC newLastAbc = newTagsLast.getABC();
-                oldPack.abc.mergeABC(newLastAbc);
-                //TODO: reorder classes
+                Map<Integer, Integer> classesMap = new HashMap<>();
+                Map<Integer, Integer> scriptsMap = new HashMap<>();
+
+                oldPack.abc.mergeABC(newLastAbc,
+                        new HashMap<>(),
+                        new HashMap<>(),
+                        new HashMap<>(),
+                        new HashMap<>(),
+                        new HashMap<>(),
+                        new HashMap<>(),
+                        new HashMap<>(),
+                        new HashMap<>(),
+                        new HashMap<>(),
+                        new HashMap<>(),
+                        new HashMap<>(),
+                        new HashMap<>(),
+                        classesMap,
+                        new HashMap<>(),
+                        scriptsMap
+                );
+
+                //Reorder newly created scripts to be in place
+                //where old script was
+                List<Integer> addedScriptIndices = new ArrayList<>(scriptsMap.values());
+                Collections.sort(addedScriptIndices);
+                List<ScriptInfo> addedScripts = new ArrayList<>();
+                for (int i = addedScriptIndices.size() - 1; i >= 0; i--) {
+                    int newScriptIndex = addedScriptIndices.get(i);
+                    addedScripts.add(0, oldPack.abc.script_info.remove(newScriptIndex));
+                }
+                for (int i = 0; i < addedScripts.size(); i++) {
+                    oldPack.abc.script_info.add(oldScriptIndex + i, addedScripts.get(i));
+                }
+
+                //IMPORTANT: Map newly created classes to their position as they
+                //were in original script because FlashPlayer needs
+                //parent class to be defined earlier
+                if (oldClassIndex > -1) {
+                    List<Integer> addedClassIndices = new ArrayList<>(classesMap.values());
+                    Collections.sort(addedClassIndices);
+                    int totalClassCount = oldPack.abc.class_info.size();
+                    Map<Integer, Integer> classesRemap = new HashMap<>();
+                    for (int i = 0; i < addedClassIndices.size(); i++) {
+                        classesRemap.put(addedClassIndices.get(i), oldClassIndex + i);
+                    }
+                    int mappingStart = oldClassIndex;
+                    for (int i = oldClassIndex; i < totalClassCount; i++) {
+                        if (!classesRemap.containsKey(i)) {
+                            for (int j = mappingStart; j < totalClassCount; j++) {
+                                if (!classesRemap.containsValue(j)) {
+                                    classesRemap.put(i, j);
+                                    mappingStart = j + 1;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    oldPack.abc.reorganizeClasses(classesRemap);
+                }
                 ((Tag) oldPack.abc.parentTag).setModified(true);
             }
         } finally {

From aaa236edde5f86eae82fe52583900fae33cbf2a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Tue, 16 Aug 2016 20:40:17 +0200
Subject: [PATCH 13/23] Imports from same package fixed

---
 .../jpexs/decompiler/flash/abc/types/traits/Trait.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
index 0c1446dc4..a7f082a54 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
@@ -53,6 +53,7 @@ import com.jpexs.helpers.Helper;
 import java.io.Serializable;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -230,10 +231,16 @@ public abstract class Trait implements Cloneable, Serializable {
 
         List<String> importnames = new ArrayList<>();
         importnames.addAll(namesInThisPackage);
+        importnames.addAll(Arrays.asList(builtInClasses));
         for (int i = 0; i < imports.size(); i++) {
             DottedChain ipath = imports.get(i);
+            if (ipath.getWithoutLast().equals(ignorePackage)) { //do not check classes from same package, they are imported automatically
+                imports.remove(i);
+                i--;
+                continue;
+            }
             String name = ipath.getLast();
-            if (importnames.contains(name) || isBuiltInClass(name)) {
+            if (importnames.contains(name)) {
                 imports.remove(i);
                 i--;
                 fullyQualifiedNames.add(new DottedChain(name));

From 5024093c54273f59a915ebd33a7c493db24d7169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Tue, 16 Aug 2016 20:44:43 +0200
Subject: [PATCH 14/23] SwcExporter file close fix

---
 .../flash/exporters/swf/SwfToSwcExporter.java | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/SwfToSwcExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/SwfToSwcExporter.java
index 039748896..69fed58d3 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/SwfToSwcExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/SwfToSwcExporter.java
@@ -235,8 +235,11 @@ public class SwfToSwcExporter {
         String catalogStr = generateCatalog(swf, swfBytes, skipDependencies);
 
         File tempFile = new File((outSwcFile.getAbsolutePath()) + ".tmp");
-        try (FileOutputStream fos = new FileOutputStream(tempFile);
-                ZipOutputStream zos = new ZipOutputStream(fos)) {
+        FileOutputStream fos = null;
+        ZipOutputStream zos = null;
+        try {
+            fos = new FileOutputStream(tempFile);
+            zos = new ZipOutputStream(fos);
 
             ZipEntry libraryEntry = new ZipEntry("library.swf");
             zos.putNextEntry(libraryEntry);
@@ -249,9 +252,27 @@ public class SwfToSwcExporter {
             zos.closeEntry();
 
             zos.close();
+            zos = null;
+            fos.close();
+            fos = null;
             outSwcFile.delete();
             tempFile.renameTo(outSwcFile);
         } finally {
+            if (zos != null) {
+                try {
+                    zos.close();
+                } catch (IOException ex) {
+                    //ignore
+                }
+
+            }
+            if (fos != null) {
+                try {
+                    fos.close();
+                } catch (IOException ex) {
+                    //ignore
+                }
+            }
             if (tempFile.exists()) {
                 tempFile.delete();
             }

From ebedbd9523399f5b9f5eec57179b5844b41c8fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Tue, 16 Aug 2016 20:45:43 +0200
Subject: [PATCH 15/23] Issue #1189 Sort imports to have same order always

---
 .../com/jpexs/decompiler/flash/abc/types/traits/Trait.java | 2 ++
 .../src/com/jpexs/decompiler/graph/DottedChain.java        | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
index a7f082a54..6c93a773d 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
@@ -54,6 +54,7 @@ import java.io.Serializable;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -264,6 +265,7 @@ public abstract class Trait implements Cloneable, Serializable {
         }
 
         boolean hasImport = false;
+        Collections.sort(imports);
         for (DottedChain imp : imports) {
             if (imp.size() > 1) {  //No imports from root package
                 writer.appendNoHilight("import " + imp.toPrintableString(true) + ";").newLine();
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/DottedChain.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/DottedChain.java
index b2f27a692..83831c68a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/DottedChain.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/DottedChain.java
@@ -28,7 +28,7 @@ import java.util.List;
  *
  * @author JPEXS
  */
-public class DottedChain implements Serializable {
+public class DottedChain implements Serializable, Comparable<DottedChain> {
 
     public static final DottedChain EMPTY = new DottedChain(true);
 
@@ -278,4 +278,9 @@ public class DottedChain implements Serializable {
 
         return true;
     }
+
+    @Override
+    public int compareTo(DottedChain o) {
+        return toRawString().compareTo(o.toRawString());
+    }
 }

From 95785ba2185f0bd8616c262a22467163d370ec6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Tue, 16 Aug 2016 20:47:29 +0200
Subject: [PATCH 16/23] Flex script replacer - disable strict mode

---
 .../jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
index 06a1a54d9..7751f3cc9 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
@@ -131,7 +131,9 @@ public class As3ScriptReplacer extends MxmlcRunner {
                     removedPacks.add(sp);
                 }
             }
-
+            for (ScriptPack sp : removedPacks) {
+                System.out.println("Removing class " + sp.getClassPath());
+            }
             //Export subclasses so they can be compiled by Flex, but ONLY STUBS. 
             //No method code to avoid code compilation problems.
             //This compiled code won't be used at all in original SWF, 
@@ -152,7 +154,7 @@ public class As3ScriptReplacer extends MxmlcRunner {
             Helper.writeFile(scriptFileToCompile.getAbsolutePath(), txt.getBytes("UTF-8"));
 
             //Compile it (and subclasses stubs)
-            mxmlc("-include-inheritance-dependencies-only", "-warnings=false", "-library-path", swcFile.getAbsolutePath(), "-source-path", tempDir.getAbsolutePath(), "-output", compiledSwfFile.getAbsolutePath(), "-debug=true", scriptFileToCompile.getAbsolutePath());
+            mxmlc("-strict=false", "-include-inheritance-dependencies-only", "-warnings=false", "-library-path", swcFile.getAbsolutePath(), "-source-path", tempDir.getAbsolutePath(), "-output", compiledSwfFile.getAbsolutePath(), "-debug=true", scriptFileToCompile.getAbsolutePath());
 
             try (FileInputStream fis = new FileInputStream(compiledSwfFile)) {
                 SWF newSWF = new SWF(fis, false, false);

From c4e1879b793be091852f6f9fe2c126872bda3f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Tue, 16 Aug 2016 23:31:12 +0200
Subject: [PATCH 17/23] As3ScriptReplacer as interface Better handling missing
 directories Tip for directories in advanced setting refactored - link to Flex
 SDK Use Flex SDK switch in Advanced settings

---
 .../com/jpexs/decompiler/flash/abc/ABC.java   | 65 ++---------------
 .../flash/configuration/Configuration.java    |  4 ++
 ...lacer.java => MxmlcAs3ScriptReplacer.java} | 60 ++++++++++------
 .../decompiler/flash/flexsdk/MxmlcRunner.java |  4 +-
 .../flash/importers/AS3ScriptImporter.java    |  4 +-
 .../importers/As3ScriptReplacerFactory.java   | 24 +++++++
 .../importers/As3ScriptReplacerInterface.java | 13 ++++
 .../importers/FFDecAs3ScriptReplacer.java     | 72 +++++++++++++++++++
 .../decompiler/flash/DirectEditingTest.java   |  3 +-
 .../flash/flexsdk/As3ScriptReplacerTest.java  |  6 +-
 .../console/CommandLineArgumentParser.java    | 35 ++++++---
 .../flash/gui/AdvancedSettingsDialog.java     | 20 +++---
 .../jpexs/decompiler/flash/gui/HtmlLabel.java | 63 ++++++++++++++++
 .../jpexs/decompiler/flash/gui/MainPanel.java | 41 +++++++----
 .../decompiler/flash/gui/abc/ABCPanel.java    | 15 +---
 .../locales/AdvancedSettingsDialog.properties |  8 ++-
 .../AdvancedSettingsDialog_cs.properties      |  5 +-
 .../AdvancedSettingsDialog_es.properties      |  7 +-
 .../AdvancedSettingsDialog_fr.properties      |  7 +-
 .../AdvancedSettingsDialog_hu.properties      |  7 +-
 .../AdvancedSettingsDialog_it.properties      |  7 +-
 21 files changed, 316 insertions(+), 154 deletions(-)
 rename libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/{As3ScriptReplacer.java => MxmlcAs3ScriptReplacer.java} (79%)
 create mode 100644 libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerFactory.java
 create mode 100644 libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerInterface.java
 create mode 100644 libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/FFDecAs3ScriptReplacer.java
 create mode 100644 src/com/jpexs/decompiler/flash/gui/HtmlLabel.java

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
index 99425e1ab..6a9ffdacf 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
@@ -61,9 +61,10 @@ import com.jpexs.decompiler.flash.dumpview.DumpInfo;
 import com.jpexs.decompiler.flash.dumpview.DumpInfoSpecial;
 import com.jpexs.decompiler.flash.dumpview.DumpInfoSpecialType;
 import com.jpexs.decompiler.flash.exporters.script.LinkReportExporter;
-import com.jpexs.decompiler.flash.flexsdk.As3ScriptReplacer;
+import com.jpexs.decompiler.flash.flexsdk.MxmlcAs3ScriptReplacer;
 import com.jpexs.decompiler.flash.flexsdk.MxmlcException;
 import com.jpexs.decompiler.flash.helpers.SWFDecompilerPlugin;
+import com.jpexs.decompiler.flash.importers.As3ScriptReplacerInterface;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.flash.tags.Tag;
 import com.jpexs.decompiler.flash.types.annotations.Internal;
@@ -1404,66 +1405,10 @@ public class ABC {
         method_info.remove(index);
     }
 
-    public boolean replaceScriptPack(ScriptPack pack, String as) throws AVM2ParseException, CompilationException, IOException, InterruptedException {
-
-        final boolean USE_FLEX = true;
-
-        boolean isSimple = pack.isSimple;
-
-        if (USE_FLEX) {
-            if (!pack.isSimple) {
-                return false;
-            }
-            As3ScriptReplacer asr = new As3ScriptReplacer(Configuration.flexSdkLocation.get(), new LinkReportExporter());
-            try {
-                asr.replaceScript(pack.getSwf(), pack, as);
-            } catch (MxmlcException ex) {
-                throw new AVM2ParseException(ex.getMxmlcErrorOutput(), 0);
-            }
-        } else {
-            String scriptName = pack.getPathScriptName() + ".as";
-            int oldIndex = pack.scriptIndex;
-            int newIndex = script_info.size();
-            String documentClass = getSwf().getDocumentClass();
-            boolean isDocumentClass = documentClass != null && documentClass.equals(pack.getClassPath().toString());
-
-            ScriptInfo si = script_info.get(oldIndex);
-            if (isSimple) {
-                si.delete(this, true);
-            } else {
-                for (int t : pack.traitIndices) {
-                    si.traits.traits.get(t).delete(this, true);
-                }
-            }
-
-            int newClassIndex = instance_info.size();
-            for (int t : pack.traitIndices) {
-                if (si.traits.traits.get(t) instanceof TraitClass) {
-                    TraitClass tc = (TraitClass) si.traits.traits.get(t);
-                    newClassIndex = tc.class_info + 1;
-                }
-
-            }
-            List<ABC> otherAbcs = new ArrayList<>(pack.allABCs);
-            otherAbcs.remove(this);
-            ActionScript3Parser.compile(as, this, otherAbcs, isDocumentClass, scriptName, newClassIndex, oldIndex);
-
-            if (isSimple) {
-                // Move newly added script to its position
-                script_info.set(oldIndex, script_info.get(newIndex));
-                script_info.remove(newIndex);
-            } else {
-                script_info.get(newIndex).setModified(true);
-                //Note: Is deleting traits safe?
-                List<Integer> todel = new ArrayList<>(new TreeSet<>(pack.traitIndices));
-                for (int i = todel.size() - 1; i >= 0; i--) {
-                    si.traits.traits.remove((int) todel.get(i));
-                }
-            }
-            script_info.get(oldIndex).setModified(true);
-        }
+    public boolean replaceScriptPack(As3ScriptReplacerInterface replacer, ScriptPack pack, String as) throws AVM2ParseException, CompilationException, IOException, InterruptedException {
+        replacer.replaceScript(pack, as);
         ((Tag) parentTag).setModified(true);
-        return !isSimple;
+        return pack.isSimple;
     }
 
     private void packMethods() {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
index 069800f3c..b23c62052 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
@@ -613,6 +613,10 @@ public class Configuration {
     @ConfigurationInternal
     public static final ConfigurationItem<Double> guiAvm2DocsSplitPaneDividerLocationPercent = null;
 
+    @ConfigurationDefaultBoolean(false)
+    @ConfigurationCategory("script")
+    public static final ConfigurationItem<Boolean> useFlexAs3Compiler = null;
+
     private enum OSId {
 
         WINDOWS, OSX, UNIX
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcAs3ScriptReplacer.java
similarity index 79%
rename from libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
rename to libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcAs3ScriptReplacer.java
index 7751f3cc9..d0048d253 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcAs3ScriptReplacer.java
@@ -3,6 +3,7 @@ package com.jpexs.decompiler.flash.flexsdk;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
+import com.jpexs.decompiler.flash.abc.avm2.parser.AVM2ParseException;
 import com.jpexs.decompiler.flash.abc.types.InstanceInfo;
 import com.jpexs.decompiler.flash.abc.types.ScriptInfo;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
@@ -15,6 +16,7 @@ import com.jpexs.decompiler.flash.exporters.settings.ScriptExportSettings;
 import com.jpexs.decompiler.flash.exporters.swf.SwfToSwcExporter;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.flash.tags.Tag;
+import com.jpexs.decompiler.graph.CompilationException;
 import com.jpexs.decompiler.graph.DottedChain;
 import com.jpexs.helpers.Helper;
 import java.io.ByteArrayInputStream;
@@ -28,12 +30,13 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import com.jpexs.decompiler.flash.importers.As3ScriptReplacerInterface;
 
-public class As3ScriptReplacer extends MxmlcRunner {
+public class MxmlcAs3ScriptReplacer extends MxmlcRunner implements As3ScriptReplacerInterface {
 
     private LinkReportExporter linkReporter;
 
-    public As3ScriptReplacer(String flexSdkPath, LinkReportExporter linkReporter) {
+    public MxmlcAs3ScriptReplacer(String flexSdkPath, LinkReportExporter linkReporter) {
         super(flexSdkPath);
         this.linkReporter = linkReporter;
     }
@@ -87,8 +90,9 @@ public class As3ScriptReplacer extends MxmlcRunner {
         return false;
     }
 
-    public void replaceScript(SWF swf, ScriptPack oldPack, String txt) throws IOException, MxmlcException, InterruptedException {
-        if (!oldPack.isSimple) {
+    @Override
+    public void replaceScript(ScriptPack pack, String text) throws AVM2ParseException, CompilationException, IOException, InterruptedException {
+        if (!pack.isSimple) {
             throw new IOException("Cannot compile such file"); //Alchemy, etc.
         }
 
@@ -96,23 +100,23 @@ public class As3ScriptReplacer extends MxmlcRunner {
         try {
             tempDir = Files.createTempDirectory("ffdec-mxmlc-replace").toFile();
             File pkgDir = tempDir;
-            for (String pkgPart : oldPack.getClassPath().packageStr.toList()) {
+            for (String pkgPart : pack.getClassPath().packageStr.toList()) {
                 if (!pkgPart.isEmpty()) {
                     pkgDir = new File(pkgDir, pkgPart);
                 }
             }
             pkgDir.mkdirs();
-            File scriptFileToCompile = new File(pkgDir, oldPack.getClassPath().className + ".as");
+            File scriptFileToCompile = new File(pkgDir, pack.getClassPath().className + ".as");
             File compiledSwfFile = new File(pkgDir, "out.swf");
             File swcFile = new File(pkgDir, "out.swc");
 
             //Make copy without the old script
-            SWF swfCopy = recompileSWF(swf);
+            SWF swfCopy = recompileSWF(pack.getSwf());
             List<ABC> modAbcs = new ArrayList<>();
 
             List<ScriptPack> copyPacks = swfCopy.getAS3Packs();
             for (ScriptPack sp : copyPacks) {
-                if (sp.getClassPath().equals(oldPack.getClassPath())) {
+                if (sp.getClassPath().equals(pack.getClassPath())) {
                     sp.abc.script_info.get(sp.scriptIndex).delete(sp.abc, true);
                     ((Tag) sp.abc.parentTag).setModified(true);
                     modAbcs.add(sp.abc);
@@ -151,18 +155,22 @@ public class As3ScriptReplacer extends MxmlcRunner {
             swcExport.exportSwf(swfCopy, swcFile, true);
 
             //Write new script
-            Helper.writeFile(scriptFileToCompile.getAbsolutePath(), txt.getBytes("UTF-8"));
+            Helper.writeFile(scriptFileToCompile.getAbsolutePath(), text.getBytes("UTF-8"));
 
-            //Compile it (and subclasses stubs)
-            mxmlc("-strict=false", "-include-inheritance-dependencies-only", "-warnings=false", "-library-path", swcFile.getAbsolutePath(), "-source-path", tempDir.getAbsolutePath(), "-output", compiledSwfFile.getAbsolutePath(), "-debug=true", scriptFileToCompile.getAbsolutePath());
+            try {
+                //Compile it (and subclasses stubs)
+                mxmlc("-strict=false", "-include-inheritance-dependencies-only", "-warnings=false", "-library-path", swcFile.getAbsolutePath(), "-source-path", tempDir.getAbsolutePath(), "-output", compiledSwfFile.getAbsolutePath(), "-debug=true", scriptFileToCompile.getAbsolutePath());
+            } catch (MxmlcException ex1) {
+                throw new AVM2ParseException(ex1.getMxmlcErrorOutput(), 0);
+            }
 
             try (FileInputStream fis = new FileInputStream(compiledSwfFile)) {
                 SWF newSWF = new SWF(fis, false, false);
                 List<ABCContainerTag> newTags = newSWF.getAbcList();
-                int oldScriptIndex = oldPack.scriptIndex;
+                int oldScriptIndex = pack.scriptIndex;
                 int oldClassIndex = -1;
 
-                ScriptInfo oldScriptInfo = oldPack.abc.script_info.get(oldPack.scriptIndex);
+                ScriptInfo oldScriptInfo = pack.abc.script_info.get(pack.scriptIndex);
                 for (Trait t : oldScriptInfo.traits.traits) {
                     if (t instanceof TraitClass) {
                         int traitClassIndex = ((TraitClass) t).class_info;
@@ -171,18 +179,18 @@ public class As3ScriptReplacer extends MxmlcRunner {
                         }
                     }
                 }
-                if (oldPack.isSimple) {
-                    oldScriptInfo.delete(oldPack.abc, true);
+                if (pack.isSimple) {
+                    oldScriptInfo.delete(pack.abc, true);
                 } else {
                     //NOO
                 }
-                oldPack.abc.pack(); // removes old classes/methods/scripts
+                pack.abc.pack(); // removes old classes/methods/scripts
                 ABCContainerTag newTagsLast = newTags.get(newTags.size() - 1);
                 ABC newLastAbc = newTagsLast.getABC();
                 Map<Integer, Integer> classesMap = new HashMap<>();
                 Map<Integer, Integer> scriptsMap = new HashMap<>();
 
-                oldPack.abc.mergeABC(newLastAbc,
+                pack.abc.mergeABC(newLastAbc,
                         new HashMap<>(),
                         new HashMap<>(),
                         new HashMap<>(),
@@ -207,10 +215,10 @@ public class As3ScriptReplacer extends MxmlcRunner {
                 List<ScriptInfo> addedScripts = new ArrayList<>();
                 for (int i = addedScriptIndices.size() - 1; i >= 0; i--) {
                     int newScriptIndex = addedScriptIndices.get(i);
-                    addedScripts.add(0, oldPack.abc.script_info.remove(newScriptIndex));
+                    addedScripts.add(0, pack.abc.script_info.remove(newScriptIndex));
                 }
                 for (int i = 0; i < addedScripts.size(); i++) {
-                    oldPack.abc.script_info.add(oldScriptIndex + i, addedScripts.get(i));
+                    pack.abc.script_info.add(oldScriptIndex + i, addedScripts.get(i));
                 }
 
                 //IMPORTANT: Map newly created classes to their position as they
@@ -219,7 +227,7 @@ public class As3ScriptReplacer extends MxmlcRunner {
                 if (oldClassIndex > -1) {
                     List<Integer> addedClassIndices = new ArrayList<>(classesMap.values());
                     Collections.sort(addedClassIndices);
-                    int totalClassCount = oldPack.abc.class_info.size();
+                    int totalClassCount = pack.abc.class_info.size();
                     Map<Integer, Integer> classesRemap = new HashMap<>();
                     for (int i = 0; i < addedClassIndices.size(); i++) {
                         classesRemap.put(addedClassIndices.get(i), oldClassIndex + i);
@@ -236,14 +244,20 @@ public class As3ScriptReplacer extends MxmlcRunner {
                             }
                         }
                     }
-                    oldPack.abc.reorganizeClasses(classesRemap);
+                    pack.abc.reorganizeClasses(classesRemap);
                 }
-                ((Tag) oldPack.abc.parentTag).setModified(true);
+                ((Tag) pack.abc.parentTag).setModified(true);
             }
         } finally {
             if (tempDir != null && tempDir.exists()) {
-                //deleteFolder(tempDir);
+                deleteFolder(tempDir);
             }
         }
     }
+
+    @Override
+    public boolean isAvailable() {
+        String flexLocation = Configuration.flexSdkLocation.get();
+        return !(flexLocation.isEmpty() || (!new File(MxmlcRunner.getMxmlcPath(flexLocation)).exists()));
+    }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcRunner.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcRunner.java
index 63a709e74..8d47fadb6 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcRunner.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcRunner.java
@@ -15,14 +15,14 @@ public class MxmlcRunner {
         this.flexSdkPath = flexSdkPath;
     }
 
-    public String getMxmlcPath() {
+    public static String getMxmlcPath(String flexSdkPath) {
         boolean isWin = System.getProperty("os.name").toLowerCase().contains("win");
         return flexSdkPath + File.separator + "bin" + File.separator + "mxmlc" + (isWin ? ".exe" : "");
     }
 
     public void mxmlc(String... arguments) throws MxmlcException, InterruptedException, IOException {
         String runArgs[] = new String[arguments.length + 1];
-        runArgs[0] = getMxmlcPath();
+        runArgs[0] = getMxmlcPath(flexSdkPath);
         System.arraycopy(arguments, 0, runArgs, 1, arguments.length);
         System.out.println("" + String.join(" ", runArgs));
         Process proc = null;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/AS3ScriptImporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/AS3ScriptImporter.java
index c00596ff9..e43ed93c2 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/AS3ScriptImporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/AS3ScriptImporter.java
@@ -36,7 +36,7 @@ public class AS3ScriptImporter {
 
     private static final Logger logger = Logger.getLogger(AS3ScriptImporter.class.getName());
 
-    public int importScripts(String scriptsFolder, List<ScriptPack> packs) {
+    public int importScripts(As3ScriptReplacerInterface scriptReplacer, String scriptsFolder, List<ScriptPack> packs) {
         if (!scriptsFolder.endsWith(File.separator)) {
             scriptsFolder += File.separator;
         }
@@ -50,7 +50,7 @@ public class AS3ScriptImporter {
                     String txt = Helper.readTextFile(fileName);
 
                     try {
-                        pack.abc.replaceScriptPack(pack, txt);
+                        pack.abc.replaceScriptPack(scriptReplacer, pack, txt);
                     } catch (AVM2ParseException ex) {
                         logger.log(Level.SEVERE, "%error% on line %line%, file: %file%".replace("%error%", ex.text).replace("%line%", Long.toString(ex.line)).replace("%file%", fileName));
                     } catch (CompilationException ex) {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerFactory.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerFactory.java
new file mode 100644
index 000000000..d28c38213
--- /dev/null
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerFactory.java
@@ -0,0 +1,24 @@
+package com.jpexs.decompiler.flash.importers;
+
+import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.exporters.script.LinkReportExporter;
+import com.jpexs.decompiler.flash.flexsdk.MxmlcAs3ScriptReplacer;
+
+public class As3ScriptReplacerFactory {
+
+    public static As3ScriptReplacerInterface createByConfig() {
+        if (Configuration.useFlexAs3Compiler.get()) {
+            return createFlex();
+        } else {
+            return createFFDec();
+        }
+    }
+
+    public static As3ScriptReplacerInterface createFlex() {
+        return new MxmlcAs3ScriptReplacer(Configuration.flexSdkLocation.get(), new LinkReportExporter());
+    }
+
+    public static As3ScriptReplacerInterface createFFDec() {
+        return new FFDecAs3ScriptReplacer();
+    }
+}
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerInterface.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerInterface.java
new file mode 100644
index 000000000..d14863048
--- /dev/null
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerInterface.java
@@ -0,0 +1,13 @@
+package com.jpexs.decompiler.flash.importers;
+
+import com.jpexs.decompiler.flash.abc.ScriptPack;
+import com.jpexs.decompiler.flash.abc.avm2.parser.AVM2ParseException;
+import com.jpexs.decompiler.graph.CompilationException;
+import java.io.IOException;
+
+public interface As3ScriptReplacerInterface {
+
+    public boolean isAvailable();
+
+    public void replaceScript(ScriptPack pack, String text) throws AVM2ParseException, CompilationException, IOException, InterruptedException;
+}
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/FFDecAs3ScriptReplacer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/FFDecAs3ScriptReplacer.java
new file mode 100644
index 000000000..cf3c2ca9a
--- /dev/null
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/FFDecAs3ScriptReplacer.java
@@ -0,0 +1,72 @@
+package com.jpexs.decompiler.flash.importers;
+
+import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.abc.ABC;
+import com.jpexs.decompiler.flash.abc.ScriptPack;
+import com.jpexs.decompiler.flash.abc.avm2.parser.AVM2ParseException;
+import com.jpexs.decompiler.flash.abc.avm2.parser.script.ActionScript3Parser;
+import com.jpexs.decompiler.flash.abc.types.ScriptInfo;
+import com.jpexs.decompiler.flash.abc.types.traits.TraitClass;
+import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.graph.CompilationException;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeSet;
+import javax.swing.JOptionPane;
+
+public class FFDecAs3ScriptReplacer implements As3ScriptReplacerInterface {
+
+    @Override
+    public void replaceScript(ScriptPack pack, String text) throws AVM2ParseException, CompilationException, IOException, InterruptedException {
+        ABC abc = pack.abc;
+        SWF swf = pack.abc.getSwf();
+        String scriptName = pack.getPathScriptName() + ".as";
+        int oldIndex = pack.scriptIndex;
+        int newIndex = abc.script_info.size();
+        String documentClass = swf.getDocumentClass();
+        boolean isDocumentClass = documentClass != null && documentClass.equals(pack.getClassPath().toString());
+
+        ScriptInfo si = abc.script_info.get(oldIndex);
+        if (pack.isSimple) {
+            si.delete(abc, true);
+        } else {
+            for (int t : pack.traitIndices) {
+                si.traits.traits.get(t).delete(abc, true);
+            }
+        }
+
+        int newClassIndex = abc.instance_info.size();
+        for (int t : pack.traitIndices) {
+            if (si.traits.traits.get(t) instanceof TraitClass) {
+                TraitClass tc = (TraitClass) si.traits.traits.get(t);
+                newClassIndex = tc.class_info + 1;
+            }
+
+        }
+        List<ABC> otherAbcs = new ArrayList<>(pack.allABCs);
+        otherAbcs.remove(abc);
+        ActionScript3Parser.compile(text, abc, otherAbcs, isDocumentClass, scriptName, newClassIndex, oldIndex);
+        if (pack.isSimple) {
+            // Move newly added script to its position
+            abc.script_info.set(oldIndex, abc.script_info.get(newIndex));
+            abc.script_info.remove(newIndex);
+        } else {
+            abc.script_info.get(newIndex).setModified(true);
+            //Note: Is deleting traits safe?
+            List<Integer> todel = new ArrayList<>(new TreeSet<>(pack.traitIndices));
+            for (int i = todel.size() - 1; i >= 0; i--) {
+                si.traits.traits.remove((int) todel.get(i));
+            }
+        }
+        abc.script_info.get(oldIndex).setModified(true);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        File swc = Configuration.getPlayerSWC();
+        return !(swc == null || !swc.exists());
+    }
+
+}
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/DirectEditingTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/DirectEditingTest.java
index becd84602..70319b3db 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/DirectEditingTest.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/DirectEditingTest.java
@@ -27,6 +27,7 @@ import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
 import com.jpexs.decompiler.flash.helpers.CodeFormatting;
 import com.jpexs.decompiler.flash.helpers.HighlightedTextWriter;
+import com.jpexs.decompiler.flash.importers.FFDecAs3ScriptReplacer;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.flash.tags.base.ASMSource;
 import com.jpexs.decompiler.graph.CompilationException;
@@ -90,7 +91,7 @@ public class DirectEditingTest extends FileTestBase {
                         try {
                             en.toSource(htw, abc.script_info.get(s).traits.traits, new ConvertData(), ScriptExportMode.AS, false);
                             String original = htw.toString();
-                            abc.replaceScriptPack(en, original);
+                            abc.replaceScriptPack(new FFDecAs3ScriptReplacer() /*TODO: test the otherone*/, en, original);
                         } catch (Exception ex) {
                             fail("Exception during decompilation - file: " + filePath + " class: " + classPathString, ex);
                             throw ex;
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacerTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacerTest.java
index 40dcb7677..c966864cd 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacerTest.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacerTest.java
@@ -9,15 +9,13 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.testng.annotations.Test;
 
 public class As3ScriptReplacerTest {
 
     @Test
     public void testReplace() throws IOException, InterruptedException, Exception {
-        As3ScriptReplacer replacer = new As3ScriptReplacer(Configuration.flexSdkLocation.get(), new LinkReportExporter());
+        MxmlcAs3ScriptReplacer replacer = new MxmlcAs3ScriptReplacer(Configuration.flexSdkLocation.get(), new LinkReportExporter());
         SWF swf = new SWF(new BufferedInputStream(new FileInputStream("testdata/as3/as3.swf")), false);
         String replacement = "package classes\n"
                 + "{\n"
@@ -43,7 +41,7 @@ public class As3ScriptReplacerTest {
         classNames.add("classes.TestClass1");
         List<ScriptPack> packs = swf.getScriptPacksByClassNames(classNames);
         for (ScriptPack sp : packs) {
-            replacer.replaceScript(swf, sp, replacement);
+            replacer.replaceScript(sp, replacement);
             return;
         }
     }
diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
index 7c97ca182..cc5bbea58 100644
--- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
+++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
@@ -90,6 +90,7 @@ import com.jpexs.decompiler.flash.exporters.settings.SpriteExportSettings;
 import com.jpexs.decompiler.flash.exporters.settings.TextExportSettings;
 import com.jpexs.decompiler.flash.exporters.swf.SwfToSwcExporter;
 import com.jpexs.decompiler.flash.exporters.swf.SwfXmlExporter;
+import com.jpexs.decompiler.flash.flexsdk.MxmlcAs3ScriptReplacer;
 import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.gui.Main;
 import com.jpexs.decompiler.flash.gui.SearchInMemory;
@@ -101,7 +102,10 @@ import com.jpexs.decompiler.flash.helpers.FileTextWriter;
 import com.jpexs.decompiler.flash.helpers.SWFDecompilerPlugin;
 import com.jpexs.decompiler.flash.importers.AS2ScriptImporter;
 import com.jpexs.decompiler.flash.importers.AS3ScriptImporter;
+import com.jpexs.decompiler.flash.importers.As3ScriptReplacerFactory;
+import com.jpexs.decompiler.flash.importers.As3ScriptReplacerInterface;
 import com.jpexs.decompiler.flash.importers.BinaryDataImporter;
+import com.jpexs.decompiler.flash.importers.FFDecAs3ScriptReplacer;
 import com.jpexs.decompiler.flash.importers.FontImporter;
 import com.jpexs.decompiler.flash.importers.ImageImporter;
 import com.jpexs.decompiler.flash.importers.MorphShapeImporter;
@@ -3421,7 +3425,7 @@ public class CommandLineArgumentParser {
                 SWF swf = new SWF(is, Configuration.parallelSpeedUp.get());
                 String scriptsFolder = Path.combine(args.pop(), ScriptExportSettings.EXPORT_FOLDER_NAME);
                 new AS2ScriptImporter().importScripts(scriptsFolder, swf.getASMs(true));
-                new AS3ScriptImporter().importScripts(scriptsFolder, swf.getAS3Packs());
+                new AS3ScriptImporter().importScripts(As3ScriptReplacerFactory.createByConfig(), scriptsFolder, swf.getAS3Packs());
 
                 try {
                     try (OutputStream fos = new BufferedOutputStream(new FileOutputStream(outFile))) {
@@ -3552,18 +3556,31 @@ public class CommandLineArgumentParser {
     private static void replaceAS3(String as, ScriptPack pack) throws IOException, InterruptedException {
         System.out.println("Replace AS3");
         System.out.println("Warning: This feature is EXPERIMENTAL");
-        File swc = Configuration.getPlayerSWC();
-        if (swc == null) {
-            final String adobePage = "http://www.adobe.com/support/flashplayer/downloads.html";
-            System.err.println("For ActionScript 3 direct editation, a library called \"PlayerGlobal.swc\" needs to be downloaded from Adobe homepage:");
-            System.err.println(adobePage);
-            System.err.println("Download the library called PlayerGlobal(.swc), and place it to directory");
-            System.err.println(Configuration.getFlashLibPath().getAbsolutePath());
+        As3ScriptReplacerInterface scriptReplacer = As3ScriptReplacerFactory.createByConfig();
+        if (!scriptReplacer.isAvailable()) {
+            System.err.println("Current script replacer is not available.");
+            if (scriptReplacer instanceof FFDecAs3ScriptReplacer) {
+                System.err.println("Current replacer: FFDec");
+                final String adobePage = "http://www.adobe.com/support/flashplayer/downloads.html";
+                System.err.println("For ActionScript 3 direct editation, a library called \"PlayerGlobal.swc\" needs to be downloaded from Adobe homepage:");
+                System.err.println(adobePage);
+                System.err.println("Download the library called PlayerGlobal(.swc), and place it to directory");
+                System.err.println(Configuration.getFlashLibPath().getAbsolutePath());
+            } else if (scriptReplacer instanceof MxmlcAs3ScriptReplacer) {
+                System.err.println("Current replacer: Flex SDK");
+                final String flexPage = "http://www.adobe.com/devnet/flex/flex-sdk-download.html";
+                System.err.println("For ActionScript 3 direct editation, Flex SDK needs to be download");
+                System.err.println(flexPage);
+                System.err.println("Download FLEX Sdk, unzip it to some directory and set its directory path in the configuration");
+
+            } else {
+
+            }
             System.exit(1);
         }
 
         try {
-            pack.abc.replaceScriptPack(pack, as);
+            pack.abc.replaceScriptPack(scriptReplacer, pack, as);
         } catch (AVM2ParseException ex) {
             System.err.println("%error% on line %line%".replace("%error%", ex.text).replace("%line%", Long.toString(ex.line)));
             System.exit(1);
diff --git a/src/com/jpexs/decompiler/flash/gui/AdvancedSettingsDialog.java b/src/com/jpexs/decompiler/flash/gui/AdvancedSettingsDialog.java
index dfe518f9a..8007dcb05 100644
--- a/src/com/jpexs/decompiler/flash/gui/AdvancedSettingsDialog.java
+++ b/src/com/jpexs/decompiler/flash/gui/AdvancedSettingsDialog.java
@@ -57,6 +57,7 @@ import javax.swing.Icon;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
+import javax.swing.JEditorPane;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -68,6 +69,8 @@ import javax.swing.JTabbedPane;
 import javax.swing.JTextField;
 import javax.swing.SpringLayout;
 import javax.swing.WindowConstants;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
 import javax.swing.filechooser.FileFilter;
 import javax.swing.table.DefaultTableModel;
 import org.pushingpixels.substance.api.ColorSchemeAssociationKind;
@@ -479,24 +482,19 @@ public class AdvancedSettingsDialog extends AppDialog {
                     itemCount, 2, //rows, cols
                     6, 6, //initX, initY
                     6, 6);       //xPad, yPad
-            //https://www.adobe.com/support/flashplayer/debug_downloads.html
             if (resourceBundle.containsKey("config.group.tip." + cat)) {
                 String tip = resourceBundle.getString("config.group.tip." + cat);
-                String url = null;
+                String urls[] = new String[0];
                 if (resourceBundle.containsKey("config.group.link." + cat)) {
-                    url = resourceBundle.getString("config.group.link." + cat);
+                    urls = resourceBundle.getString("config.group.link." + cat).split(" ");
+                }
+                for (int i = 0; i < urls.length; i++) {
+                    tip = tip.replace("%link" + (i + 1) + "%", urls[i]);
                 }
                 JPanel p = new JPanel(new BorderLayout());
                 p.add(configPanel, BorderLayout.CENTER);
                 JPanel tipPanel = new JPanel(new FlowLayout());
-                tipPanel.add(new JLabel("<html><b>" + resourceBundle.getString("tip") + "</b>" + tip + "</html>"));
-                if (url != null) {
-                    String linkText = url;
-                    if (resourceBundle.containsKey("config.group.linkText." + cat)) {
-                        linkText = resourceBundle.getString("config.group.linkText." + cat);
-                    }
-                    tipPanel.add(new LinkLabel(linkText, url));
-                }
+                tipPanel.add(new HtmlLabel("<b>" + resourceBundle.getString("tip") + "</b>" + tip));
                 p.add(tipPanel, BorderLayout.SOUTH);
                 configPanel = p;
             }
diff --git a/src/com/jpexs/decompiler/flash/gui/HtmlLabel.java b/src/com/jpexs/decompiler/flash/gui/HtmlLabel.java
new file mode 100644
index 000000000..8d147156f
--- /dev/null
+++ b/src/com/jpexs/decompiler/flash/gui/HtmlLabel.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2016 Jindra
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.jpexs.decompiler.flash.gui;
+
+import java.awt.Color;
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.event.HyperlinkEvent;
+
+public class HtmlLabel extends JEditorPane {
+
+    private JLabel label = new JLabel();
+    private String rawText;
+
+    public HtmlLabel() {
+        this("");
+    }
+
+    public HtmlLabel(String text) {
+        super("text/html", "");
+        setText(text);
+        setEditable(false);
+        setFocusable(false);
+        setOpaque(false);
+        addHyperlinkListener((HyperlinkEvent hle) -> {
+            if (HyperlinkEvent.EventType.ACTIVATED.equals(hle.getEventType())) {
+                View.navigateUrl(hle.getURL().toString());
+            }
+        });
+    }
+
+    @Override
+    public void setText(String t) {
+        String modText = t;
+        if (!t.equals("")) {
+            Color fgColor = label.getForeground();
+
+            modText = "<body style=\"font-size:" + label.getFont().getSize() + "pt; font-family: " + label.getFont().getFamily() + "; color:rgb(" + fgColor.getRed() + "," + fgColor.getGreen() + "," + fgColor.getBlue() + ");\">" + t + "</body>";
+        }
+        this.rawText = t;
+        super.setText(modText);
+    }
+
+    @Override
+    public String getText() {
+        return rawText;
+    }
+
+}
diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
index bfd69ac4b..1cdc81599 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -73,6 +73,7 @@ import com.jpexs.decompiler.flash.exporters.settings.SpriteExportSettings;
 import com.jpexs.decompiler.flash.exporters.settings.TextExportSettings;
 import com.jpexs.decompiler.flash.exporters.swf.SwfJavaExporter;
 import com.jpexs.decompiler.flash.exporters.swf.SwfXmlExporter;
+import com.jpexs.decompiler.flash.flexsdk.MxmlcAs3ScriptReplacer;
 import com.jpexs.decompiler.flash.gui.abc.ABCPanel;
 import com.jpexs.decompiler.flash.gui.abc.ABCPanelSearchResult;
 import com.jpexs.decompiler.flash.gui.abc.ClassesListTreeModel;
@@ -94,7 +95,10 @@ import com.jpexs.decompiler.flash.helpers.FileTextWriter;
 import com.jpexs.decompiler.flash.helpers.Freed;
 import com.jpexs.decompiler.flash.importers.AS2ScriptImporter;
 import com.jpexs.decompiler.flash.importers.AS3ScriptImporter;
+import com.jpexs.decompiler.flash.importers.As3ScriptReplacerFactory;
+import com.jpexs.decompiler.flash.importers.As3ScriptReplacerInterface;
 import com.jpexs.decompiler.flash.importers.BinaryDataImporter;
+import com.jpexs.decompiler.flash.importers.FFDecAs3ScriptReplacer;
 import com.jpexs.decompiler.flash.importers.ImageImporter;
 import com.jpexs.decompiler.flash.importers.ShapeImporter;
 import com.jpexs.decompiler.flash.importers.SwfXmlImporter;
@@ -861,11 +865,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
                 ? translate("message.confirm.closeAll")
                 : translate("message.confirm.close").replace("{swfName}", swfList.toString());
 
-        if (View.showConfirmDialog(this, message, translate("message.warning"), JOptionPane.OK_CANCEL_OPTION, Configuration.showCloseConfirmation, JOptionPane.OK_OPTION) != JOptionPane.OK_OPTION) {
-            return false;
-        }
-
-        return true;
+        return View.showConfirmDialog(this, message, translate("message.warning"), JOptionPane.OK_CANCEL_OPTION, Configuration.showCloseConfirmation, JOptionPane.OK_OPTION) == JOptionPane.OK_OPTION;
     }
 
     public boolean isModified() {
@@ -2143,15 +2143,32 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
         }
     }
 
-    public void importScript(final SWF swf) {
+    public As3ScriptReplacerInterface getAs3ScriptReplacer() {
+        As3ScriptReplacerInterface r = As3ScriptReplacerFactory.createByConfig();
+        if (!r.isAvailable()) {
+            if (r instanceof MxmlcAs3ScriptReplacer) {
+                if (View.showConfirmDialog(null, AppStrings.translate("message.flexpath.notset"), AppStrings.translate("error"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.OK_OPTION) {
+                    Main.advancedSettings("paths");
+                }
+            } else if (r instanceof FFDecAs3ScriptReplacer) {
+                if (View.showConfirmDialog(this, AppStrings.translate("message.playerpath.lib.notset"), AppStrings.translate("message.action.playerglobal.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.OK_OPTION) {
+                    Main.advancedSettings("paths");
+                }
+            } else {
+                //Not translated yet - just in case there are more Script replacers in the future. Unused now.
+                View.showConfirmDialog(this, "Current script replacer is not available", "Script replacer not available", JOptionPane.OK_OPTION, JOptionPane.ERROR_MESSAGE);
+            }
+            return null;
+        }
+        return r;
+    }
 
-        String flexLocation = Configuration.flexSdkLocation.get();
-        if (flexLocation.isEmpty() || (!new File(flexLocation).exists())) {
-            View.showMessageDialog(null, AppStrings.translate("message.flexpath.notset"), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
-            Main.advancedSettings("paths");
+    public void importScript(final SWF swf) {
+        As3ScriptReplacerInterface as3ScriptReplacer = getAs3ScriptReplacer();
+        if (as3ScriptReplacer == null) {
             return;
         }
-
+        String flexLocation = Configuration.flexSdkLocation.get();
         JFileChooser chooser = new JFileChooser();
         chooser.setCurrentDirectory(new File(Configuration.lastExportDir.get()));
         chooser.setDialogTitle(translate("import.select.directory"));
@@ -2162,7 +2179,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
             String scriptsFolder = Path.combine(selFile, ScriptExportSettings.EXPORT_FOLDER_NAME);
 
             int countAs2 = new AS2ScriptImporter().importScripts(scriptsFolder, swf.getASMs(true));
-            int countAs3 = new AS3ScriptImporter().importScripts(scriptsFolder, swf.getAS3Packs());
+            int countAs3 = new AS3ScriptImporter().importScripts(as3ScriptReplacer, scriptsFolder, swf.getAS3Packs());
 
             if (countAs3 > 0) {
                 updateClassesList();
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index 083b1238f..3e9d20a93 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -69,6 +69,7 @@ import com.jpexs.decompiler.flash.gui.abc.tablemodels.UIntTableModel;
 import com.jpexs.decompiler.flash.gui.controls.JPersistentSplitPane;
 import com.jpexs.decompiler.flash.gui.editor.LinkHandler;
 import com.jpexs.decompiler.flash.gui.tagtree.TagTreeModel;
+import com.jpexs.decompiler.flash.importers.As3ScriptReplacerFactory;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.flash.tags.Tag;
 import com.jpexs.decompiler.flash.treeitems.TreeItem;
@@ -1150,17 +1151,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
     }
 
     private void editDecompiledButtonActionPerformed(ActionEvent evt) {
-        File swc = Configuration.getPlayerSWC();
-        if (swc == null || !swc.exists()) {
-            if (View.showConfirmDialog(this, AppStrings.translate("message.playerpath.lib.notset"), AppStrings.translate("message.action.playerglobal.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION) {
-                Main.advancedSettings("paths");
-                return;
-            }
-        }
-        String flexLocation = Configuration.flexSdkLocation.get();
-        if (flexLocation.isEmpty() || (!new File(flexLocation).exists())) {
-            View.showMessageDialog(null, AppStrings.translate("message.flexpath.notset"), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
-            Main.advancedSettings("paths");
+        if (mainPanel.getAs3ScriptReplacer() == null) {
             return;
         }
         if (View.showConfirmDialog(null, AppStrings.translate("message.confirm.experimental.function"), AppStrings.translate("message.warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, Configuration.warningExperimentalAS3Edit, JOptionPane.OK_OPTION) == JOptionPane.OK_OPTION) {
@@ -1180,7 +1171,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
         try {
             String oldSp = pack.getClassPath().toRawString();
             String as = decompiledTextArea.getText();
-            abc.replaceScriptPack(pack, as);
+            abc.replaceScriptPack(mainPanel.getAs3ScriptReplacer(), pack, as);
             lastDecompiled = as;
             setDecompiledEditMode(false);
             mainPanel.updateClassesList();
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
index 08d2a876c..a0d3573ac 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties
@@ -379,9 +379,8 @@ config.description.lastSessionFileTitles = Contains the opened file titles from
 
 config.group.name.paths = Paths
 config.group.description.paths = Location of needed files
-config.group.tip.paths = You can download these files on adobe webpage
-config.group.link.paths = https://www.adobe.com/support/flashplayer/debug_downloads.html
-config.group.linkText.paths = [visit]
+config.group.tip.paths = Download projector and Playerglobal on <a href="%link1%">adobe webpage</a>. Flex SDK can be downloaded on <a href="%link2%">adobe devnet</a>.
+config.group.link.paths = https://www.adobe.com/support/flashplayer/debug_downloads.html http://www.adobe.com/devnet/flex/flex-sdk-download.html
 
 config.name.playerLocation = 1) Flash Player projector path
 config.description.playerLocation = Location of standalone flash player executable. Used for Run action.
@@ -435,3 +434,6 @@ config.description.resetLetterSpacingOnTextImport = Useful for cyrillic fonts, b
 
 config.name.flexSdkLocation = 4) Flex SDK directory path
 config.description.flexSdkLocation = Location of Adobe Flex SDK. It is used mostly for AS3 compilation.
+
+config.name.useFlexAs3Compiler = Use Flex SDK AS3 compiler
+config.description.useFlexAs3Compiler = Use AS3 compiler from Flex SDK while ActionScript direct editation (Flex SDK directory needs to be set)
\ No newline at end of file
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties
index 6cb05bc47..81c03232a 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_cs.properties
@@ -363,9 +363,8 @@ config.description.lastSessionFileTitles = Obsahuje titulky souboru z naposledy
 config.group.name.paths = Cesty
 config.group.description.paths = Um\u00edst\u011bn\u00ed pot\u0159ebn\u00fdch soubor\u016f
 
-config.group.tip.paths = Tyto soubory m\u016f\u017eete st\u00e1hnout na str\u00e1nk\u00e1ch adobe
-config.group.link.paths = https://www.adobe.com/support/flashplayer/debug_downloads.html
-config.group.linkText.paths = [nav\u0161t\u00edvit]
+config.group.tip.paths = Stahn\u011bte si projector a Playerglobal na <a href="%link1%">str\u00e1nk\u00e1ch adobe</a>. Flex SDK lze stahnout na <a href="%link2%">webu adobe devnet</a>.
+config.group.link.paths = https://www.adobe.com/support/flashplayer/debug_downloads.html http://www.adobe.com/devnet/flex/flex-sdk-download.html
 
 config.name.playerLocation = 1) Cesta k Flash Player projectoru
 config.description.playerLocation = Um\u00edst\u011bn\u00ed spustiteln\u00e9ho flash playeru. Pou\u017e\u00edvan\u00e9 pro akci Spustit.
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_es.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_es.properties
index 745e9ace5..5ea3bbb28 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_es.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_es.properties
@@ -379,9 +379,10 @@ config.description.lastSessionFileTitles = Contiene los t\u00edtulos de archivoa
 
 config.group.name.paths = Rutas
 config.group.description.paths = Ubicaci\u00f3n de los archivos necesarios
-config.group.tip.paths = Usted puede bajar estos archivos desde la p\u00e1gina web de Adobe
-config.group.link.paths = https://www.adobe.com/support/flashplayer/debug_downloads.html
-config.group.linkText.paths = [visita]
+#config.group.tip.paths = Usted puede bajar estos archivos desde la p\u00e1gina web de Adobe
+#TODO: translate again:
+config.group.tip.paths = Download projector and Playerglobal on <a href="%link1%">adobe webpage</a>. Flex SDK can be downloaded on <a href="%link2%">adobe devnet</a>.
+config.group.link.paths = https://www.adobe.com/support/flashplayer/debug_downloads.html http://www.adobe.com/devnet/flex/flex-sdk-download.html
 
 config.name.playerLocation = 1) Ruta de Flash Player projector
 config.description.playerLocation = Ubicaci\u00f3n del ejecutable aut\u00f3nomo de Flash Player. Utilizado para la acci\u00f3n Correr.
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties
index aec34d531..02ea745dd 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties
@@ -379,9 +379,10 @@ config.description.lastSessionFileTitles = Comprend les titres des fichiers ouve
 
 config.group.name.paths = Chemins
 config.group.description.paths = Location des fichiers demand\u00e9s
-config.group.tip.paths = Vous pouvez t\u00e9l\u00e9charger ces fichiers depuis le site web d'Adobe
-config.group.link.paths = https://www.adobe.com/support/flashplayer/debug_downloads.html
-config.group.linkText.paths = [visiter]
+#config.group.tip.paths = Vous pouvez t\u00e9l\u00e9charger ces fichiers depuis le site web d'Adobe
+#TODO: translate again:
+config.group.tip.paths = Download projector and Playerglobal on <a href="%link1%">adobe webpage</a>. Flex SDK can be downloaded on <a href="%link2%">adobe devnet</a>.
+config.group.link.paths = https://www.adobe.com/support/flashplayer/debug_downloads.html http://www.adobe.com/devnet/flex/flex-sdk-download.html
 
 config.name.playerLocation = 1) Chemin du lecteur Flash
 config.description.playerLocation = Location du lecteur autonome de fichier ex\u00e9cutable Flash. Used for Run action.
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties
index 203d82ba1..c1106f911 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_hu.properties
@@ -379,9 +379,10 @@ config.description.lastSessionFileTitles = Tartalmazza az utols\u00f3 munkamenet
 
 config.group.name.paths = \u00datvonalak
 config.group.description.paths = A sz\u00fcks\u00e9ges f\u00e1jlok el\u00e9rhet\u0151s\u00e9gei
-config.group.tip.paths = Ezeket a f\u00e1jlokat az Adobe honlapj\u00e1r\u00f3l t\u00f6ltheti le
-config.group.link.paths = https://www.adobe.com/support/flashplayer/debug_downloads.html
-config.group.linkText.paths = [visit]
+#config.group.tip.paths = Ezeket a f\u00e1jlokat az Adobe honlapj\u00e1r\u00f3l t\u00f6ltheti le
+#TODO: translate again:
+config.group.tip.paths = Download projector and Playerglobal on <a href="%link1%">adobe webpage</a>. Flex SDK can be downloaded on <a href="%link2%">adobe devnet</a>.
+config.group.link.paths = https://www.adobe.com/support/flashplayer/debug_downloads.html http://www.adobe.com/devnet/flex/flex-sdk-download.html
 
 config.name.playerLocation = 1) Flash Player projector \u00fatvonal
 config.description.playerLocation = Standalone flash player helye. A Futtat\u00e1shoz sz\u00fcks\u00e9ges.
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_it.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_it.properties
index 7dfb6ca68..174149b9d 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_it.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_it.properties
@@ -379,9 +379,10 @@ config.description.lastSessionFileTitles = Contiene i titoli dei file aperti nel
 
 config.group.name.paths = Percorsi
 config.group.description.paths = Ubicazione dei file richiesti
-config.group.tip.paths = \ufffd possibile ottenere questi file dal sito Adobe
-config.group.link.paths = https://www.adobe.com/support/flashplayer/debug_downloads.html
-config.group.linkText.paths = [apri]
+#config.group.tip.paths =  possibile ottenere questi file dal sito Adobe
+#TODO: translate again:
+config.group.tip.paths = Download projector and Playerglobal on <a href="%link1%">adobe webpage</a>. Flex SDK can be downloaded on <a href="%link2%">adobe devnet</a>.
+config.group.link.paths = https://www.adobe.com/support/flashplayer/debug_downloads.html http://www.adobe.com/devnet/flex/flex-sdk-download.html
 
 config.name.playerLocation = 1) Percorso Flash Player
 config.description.playerLocation = Posizione eseguibile Flash Player. Utilizzato per l'azione Esegui.

From 25dc014e1d9bd3e5843d9fde9111485d757e41e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Tue, 16 Aug 2016 23:31:55 +0200
Subject: [PATCH 18/23] Mxmlc print to console removed

---
 .../jpexs/decompiler/flash/flexsdk/MxmlcAs3ScriptReplacer.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcAs3ScriptReplacer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcAs3ScriptReplacer.java
index d0048d253..22c09859a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcAs3ScriptReplacer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcAs3ScriptReplacer.java
@@ -135,9 +135,6 @@ public class MxmlcAs3ScriptReplacer extends MxmlcRunner implements As3ScriptRepl
                     removedPacks.add(sp);
                 }
             }
-            for (ScriptPack sp : removedPacks) {
-                System.out.println("Removing class " + sp.getClassPath());
-            }
             //Export subclasses so they can be compiled by Flex, but ONLY STUBS. 
             //No method code to avoid code compilation problems.
             //This compiled code won't be used at all in original SWF, 

From a8ba7268168065723a744ac1f7b9485c1af63886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Tue, 16 Aug 2016 23:32:30 +0200
Subject: [PATCH 19/23] Printing mxmlc arguments removed

---
 .../src/com/jpexs/decompiler/flash/flexsdk/MxmlcRunner.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcRunner.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcRunner.java
index 8d47fadb6..24964026b 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcRunner.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcRunner.java
@@ -24,7 +24,7 @@ public class MxmlcRunner {
         String runArgs[] = new String[arguments.length + 1];
         runArgs[0] = getMxmlcPath(flexSdkPath);
         System.arraycopy(arguments, 0, runArgs, 1, arguments.length);
-        System.out.println("" + String.join(" ", runArgs));
+        //System.out.println("" + String.join(" ", runArgs));
         Process proc = null;
         try {
             proc = Runtime.getRuntime().exec(runArgs);

From 5c4e07ec1b39435cbee6bf286586116f872746d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sat, 20 Aug 2016 18:23:09 +0200
Subject: [PATCH 20/23] Parsing Flex SDK errors init swf to flex before editig

---
 .../src/com/jpexs/decompiler/flash/SWF.java   |   5 +-
 .../com/jpexs/decompiler/flash/abc/ABC.java   |   8 +-
 .../flash/exporters/swf/SwfToSwcExporter.java |  36 ++-
 .../flash/flexsdk/MxmlcAs3ScriptReplacer.java | 275 +++++++++++-------
 .../flash/importers/AS3ScriptImporter.java    |   8 +-
 .../importers/As3ScriptReplaceException.java  |  27 ++
 .../As3ScriptReplaceExceptionItem.java        |  44 +++
 .../importers/As3ScriptReplacerFactory.java   |   3 +-
 .../importers/As3ScriptReplacerInterface.java |   8 +-
 .../importers/FFDecAs3ScriptReplacer.java     |  93 +++---
 .../flash/flexsdk/As3ScriptReplacerTest.java  |   8 +-
 .../console/CommandLineArgumentParser.java    |  11 +-
 .../decompiler/flash/gui/abc/ABCPanel.java    |  61 ++--
 13 files changed, 389 insertions(+), 198 deletions(-)
 create mode 100644 libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplaceException.java
 create mode 100644 libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplaceExceptionItem.java

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
index c0211c047..1c4880084 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
@@ -2502,6 +2502,7 @@ public final class SWF implements SWFContainerItem, Timelined {
     }
 
     public void clearImageCache() {
+        jtt = null;
         frameCache.clear();
         rectCache.clear();
         for (Tag tag : getTags()) {
@@ -2898,8 +2899,7 @@ public final class SWF implements SWFContainerItem, Timelined {
             timelined.setModified(true);
             timelined.resetTimeline();
         } else // timeline should be always the swf here
-        {
-            if (removeDependencies) {
+         if (removeDependencies) {
                 removeTagWithDependenciesFromTimeline(tag, timelined.getTimeline());
                 timelined.setModified(true);
             } else {
@@ -2908,7 +2908,6 @@ public final class SWF implements SWFContainerItem, Timelined {
                     timelined.setModified(true);
                 }
             }
-        }
     }
 
     @Override
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
index 6a9ffdacf..fef18dfc8 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
@@ -56,19 +56,15 @@ import com.jpexs.decompiler.flash.abc.usages.MethodParamsMultinameUsage;
 import com.jpexs.decompiler.flash.abc.usages.MethodReturnTypeMultinameUsage;
 import com.jpexs.decompiler.flash.abc.usages.MultinameUsage;
 import com.jpexs.decompiler.flash.abc.usages.TypeNameMultinameUsage;
-import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.dumpview.DumpInfo;
 import com.jpexs.decompiler.flash.dumpview.DumpInfoSpecial;
 import com.jpexs.decompiler.flash.dumpview.DumpInfoSpecialType;
-import com.jpexs.decompiler.flash.exporters.script.LinkReportExporter;
-import com.jpexs.decompiler.flash.flexsdk.MxmlcAs3ScriptReplacer;
-import com.jpexs.decompiler.flash.flexsdk.MxmlcException;
 import com.jpexs.decompiler.flash.helpers.SWFDecompilerPlugin;
+import com.jpexs.decompiler.flash.importers.As3ScriptReplaceException;
 import com.jpexs.decompiler.flash.importers.As3ScriptReplacerInterface;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.flash.tags.Tag;
 import com.jpexs.decompiler.flash.types.annotations.Internal;
-import com.jpexs.decompiler.graph.CompilationException;
 import com.jpexs.decompiler.graph.DottedChain;
 import com.jpexs.helpers.utf8.Utf8PrintWriter;
 import java.io.IOException;
@@ -1405,7 +1401,7 @@ public class ABC {
         method_info.remove(index);
     }
 
-    public boolean replaceScriptPack(As3ScriptReplacerInterface replacer, ScriptPack pack, String as) throws AVM2ParseException, CompilationException, IOException, InterruptedException {
+    public boolean replaceScriptPack(As3ScriptReplacerInterface replacer, ScriptPack pack, String as) throws As3ScriptReplaceException, IOException, InterruptedException {
         replacer.replaceScript(pack, as);
         ((Tag) parentTag).setModified(true);
         return pack.isSimple;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/SwfToSwcExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/SwfToSwcExporter.java
index 69fed58d3..7622c807a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/SwfToSwcExporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/swf/SwfToSwcExporter.java
@@ -6,6 +6,7 @@ import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.ClassPath;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
+import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.exporters.script.Dependency;
 import com.jpexs.decompiler.flash.exporters.script.DependencyType;
 import com.jpexs.decompiler.flash.importers.SwfXmlImporter;
@@ -127,14 +128,15 @@ public class SwfToSwcExporter {
                 String defId = dottedChainToId(cp.packageStr.add(cp.className));
 
                 sb.append("        <def id=\"").append(defId).append("\" />\n");
-                List<Dependency> dependencies = new ArrayList<>();
-                List<String> uses = new ArrayList<>();
-                pack.abc.script_info.get(pack.scriptIndex).traits.getDependencies(null, pack.abc, dependencies, uses, new DottedChain("NO:PACKAGE"), new ArrayList<>());
 
                 Set<DottedChain> allDeps = new HashSet<>();
                 allDeps.add(new DottedChain("AS3"));
                 sb.append("        <dep id=\"AS3\" type=\"").append(DEPENDENCY_NAMESPACE).append("\" />\n");
                 if (!skipDependencies) {
+                    List<Dependency> dependencies = new ArrayList<>();
+                    List<String> uses = new ArrayList<>();
+                    pack.abc.script_info.get(pack.scriptIndex).traits.getDependencies(null, pack.abc, dependencies, uses, new DottedChain("NO:PACKAGE"), new ArrayList<>());
+
                     for (Dependency d : dependencies) {
                         if ("*".equals(d.getId().getLast())) {
                             continue;
@@ -185,14 +187,22 @@ public class SwfToSwcExporter {
     private SWF recompileSWF(SWF swf) throws IOException, InterruptedException {
         ByteArrayOutputStream swfOrigBaos = new ByteArrayOutputStream();
         swf.saveTo(swfOrigBaos);
-        return new SWF(new ByteArrayInputStream(swfOrigBaos.toByteArray()), false, false);
+        return new SWF(new ByteArrayInputStream(swfOrigBaos.toByteArray()), Configuration.parallelSpeedUp.get(), false);
+    }
+
+    private static void printDelay(String title, long t1, long t2) {
+        //System.out.println("time " + title + ": " + (t2 - t1));
     }
 
     public void exportSwf(SWF swf, File outSwcFile, boolean skipDependencies) throws IOException {
-
+        long t4 = 0;
         //Make local copy of SWF so we do not modify original
         try {
+            long t1 = System.currentTimeMillis();
             swf = recompileSWF(swf);
+            long t2 = System.currentTimeMillis();
+            printDelay("swc.recompile", t1, t2);
+
             final String HASH = "myhash";
             String abcTagXml = new String(Helper.readStream(SwfToSwcExporter.class.getResourceAsStream("/com/jpexs/decompiler/flash/exporters/swf/swc_main_abctag.xml")), "UTF-8");
             abcTagXml = abcTagXml.replace("%hash%", HASH);
@@ -208,6 +218,7 @@ public class SwfToSwcExporter {
                     break;
                 }
             }
+
             for (int i = 0; i < list.size(); i++) {
                 if (list.get(i) instanceof SymbolClassTag) {
                     SymbolClassTag sct = (SymbolClassTag) list.get(i);
@@ -220,20 +231,33 @@ public class SwfToSwcExporter {
                     }
                 }
             }
+            long t3 = System.currentTimeMillis();
+            printDelay("swc.documentTag", t2, t3);
+
             if (!documentClassSet) {
                 throw new IOException("Original document class not found!");
             }
             swf = recompileSWF(swf);
+            t4 = System.currentTimeMillis();
+            printDelay("swc.recompile2", t3, t4);
 
         } catch (Exception ex) {
+            ex.printStackTrace();
+            System.exit(0);
             throw new RuntimeException(ex);
         }
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         swf.saveTo(baos);
         byte[] swfBytes = baos.toByteArray();
+        long t5 = System.currentTimeMillis();
+        printDelay("swc.getBytes", t4, t5);
+
         String catalogStr = generateCatalog(swf, swfBytes, skipDependencies);
 
+        long t6 = System.currentTimeMillis();
+        printDelay("swc.generateCatalog", t5, t6);
+
         File tempFile = new File((outSwcFile.getAbsolutePath()) + ".tmp");
         FileOutputStream fos = null;
         ZipOutputStream zos = null;
@@ -277,6 +301,8 @@ public class SwfToSwcExporter {
                 tempFile.delete();
             }
         }
+        long t7 = System.currentTimeMillis();
+        printDelay("swc.zip", t6, t7);
 
     }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcAs3ScriptReplacer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcAs3ScriptReplacer.java
index 22c09859a..f450c2e16 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcAs3ScriptReplacer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/flexsdk/MxmlcAs3ScriptReplacer.java
@@ -14,6 +14,8 @@ import com.jpexs.decompiler.flash.exporters.script.AS3ScriptExporter;
 import com.jpexs.decompiler.flash.exporters.script.LinkReportExporter;
 import com.jpexs.decompiler.flash.exporters.settings.ScriptExportSettings;
 import com.jpexs.decompiler.flash.exporters.swf.SwfToSwcExporter;
+import com.jpexs.decompiler.flash.importers.As3ScriptReplaceException;
+import com.jpexs.decompiler.flash.importers.As3ScriptReplaceExceptionItem;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.flash.tags.Tag;
 import com.jpexs.decompiler.graph.CompilationException;
@@ -31,14 +33,22 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import com.jpexs.decompiler.flash.importers.As3ScriptReplacerInterface;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class MxmlcAs3ScriptReplacer extends MxmlcRunner implements As3ScriptReplacerInterface {
 
-    private LinkReportExporter linkReporter;
+    private ScriptPack initedPack;
+    private File tempDir;
+    private File pkgDir;
+    private File swcFile;
 
-    public MxmlcAs3ScriptReplacer(String flexSdkPath, LinkReportExporter linkReporter) {
+    public MxmlcAs3ScriptReplacer(String flexSdkPath) {
         super(flexSdkPath);
-        this.linkReporter = linkReporter;
+    }
+
+    private synchronized boolean isInited(ScriptPack pack) {
+        return tempDir != null && initedPack == pack;
     }
 
     private static void deleteFolder(File folder) {
@@ -58,7 +68,7 @@ public class MxmlcAs3ScriptReplacer extends MxmlcRunner implements As3ScriptRepl
     private SWF recompileSWF(SWF swf) throws IOException, InterruptedException {
         ByteArrayOutputStream swfOrigBaos = new ByteArrayOutputStream();
         swf.saveTo(swfOrigBaos);
-        return new SWF(new ByteArrayInputStream(swfOrigBaos.toByteArray()), false, false);
+        return new SWF(new ByteArrayInputStream(swfOrigBaos.toByteArray()), Configuration.parallelSpeedUp.get(), false);
     }
 
     private boolean isParentDeleted(ABC abc, List<ABC> allAbcs, DottedChain className) {
@@ -91,27 +101,157 @@ public class MxmlcAs3ScriptReplacer extends MxmlcRunner implements As3ScriptRepl
     }
 
     @Override
-    public void replaceScript(ScriptPack pack, String text) throws AVM2ParseException, CompilationException, IOException, InterruptedException {
+    public synchronized void replaceScript(ScriptPack pack, String text) throws As3ScriptReplaceException, IOException, InterruptedException {
         if (!pack.isSimple) {
-            throw new IOException("Cannot compile such file"); //Alchemy, etc.
+            throw new IOException("Cannot compile such file"); //Alchemy, etc.  TODO: handle better            
         }
 
-        File tempDir = null;
+        if (!isInited(pack)) {
+            initReplacement(pack);
+        }
+
+        File scriptFileToCompile = new File(pkgDir, pack.getClassPath().className + ".as");
+        //Write new script
+        Helper.writeFile(scriptFileToCompile.getAbsolutePath(), text.getBytes("UTF-8"));
+        File compiledSwfFile = new File(pkgDir, "out.swf");
+
+        try {
+            //Compile it (and subclasses stubs)
+            mxmlc("-strict=false", "-include-inheritance-dependencies-only", "-warnings=false", "-library-path", swcFile.getAbsolutePath(), "-source-path", tempDir.getAbsolutePath(), "-output", compiledSwfFile.getAbsolutePath(), "-debug=true", scriptFileToCompile.getAbsolutePath());
+        } catch (MxmlcException ex1) {
+            //String compiledFilePath = scriptFileToCompile.getAbsolutePath();
+            Pattern errPattern = Pattern.compile("^" + Pattern.quote(tempDir.getAbsolutePath()) + "(?<file>.*)\\((?<line>[0-9]+)\\): col: (?<col>[0-9]+) (?<message>.*)$");
+            String err = ex1.getMxmlcErrorOutput();
+            String errLines[] = err.split("\r?\n");
+            List<As3ScriptReplaceExceptionItem> errorItems = new ArrayList<>();
+            for (int i = 0; i < errLines.length; i++) {
+                String line = errLines[i].trim();
+                Matcher m = errPattern.matcher(line);
+                if (m.matches()) {
+                    String errFile = m.group("file");
+                    int errLine = Integer.parseInt(m.group("line"));
+                    int errCol = Integer.parseInt(m.group("col"));
+                    String errMsg = m.group("message");
+                    errorItems.add(new As3ScriptReplaceExceptionItem(errFile, errMsg, errLine, errCol));
+                }
+            }
+            throw new As3ScriptReplaceException(errorItems);
+        }
+
+        try (FileInputStream fis = new FileInputStream(compiledSwfFile)) {
+            SWF newSWF = new SWF(fis, false, false);
+            List<ABCContainerTag> newTags = newSWF.getAbcList();
+            int oldScriptIndex = pack.scriptIndex;
+            int oldClassIndex = -1;
+
+            ScriptInfo oldScriptInfo = pack.abc.script_info.get(pack.scriptIndex);
+            for (Trait t : oldScriptInfo.traits.traits) {
+                if (t instanceof TraitClass) {
+                    int traitClassIndex = ((TraitClass) t).class_info;
+                    if (oldClassIndex == -1 || traitClassIndex < oldClassIndex) {
+                        oldClassIndex = traitClassIndex;
+                    }
+                }
+            }
+            if (pack.isSimple) {
+                oldScriptInfo.delete(pack.abc, true);
+            } else {
+                //NOO
+            }
+            pack.abc.pack(); // removes old classes/methods/scripts
+            ABCContainerTag newTagsLast = newTags.get(newTags.size() - 1);
+            ABC newLastAbc = newTagsLast.getABC();
+            Map<Integer, Integer> classesMap = new HashMap<>();
+            Map<Integer, Integer> scriptsMap = new HashMap<>();
+
+            pack.abc.mergeABC(newLastAbc,
+                    new HashMap<>(),
+                    new HashMap<>(),
+                    new HashMap<>(),
+                    new HashMap<>(),
+                    new HashMap<>(),
+                    new HashMap<>(),
+                    new HashMap<>(),
+                    new HashMap<>(),
+                    new HashMap<>(),
+                    new HashMap<>(),
+                    new HashMap<>(),
+                    new HashMap<>(),
+                    classesMap,
+                    new HashMap<>(),
+                    scriptsMap
+            );
+
+            //Reorder newly created scripts to be in place
+            //where old script was
+            List<Integer> addedScriptIndices = new ArrayList<>(scriptsMap.values());
+            Collections.sort(addedScriptIndices);
+            List<ScriptInfo> addedScripts = new ArrayList<>();
+            for (int i = addedScriptIndices.size() - 1; i >= 0; i--) {
+                int newScriptIndex = addedScriptIndices.get(i);
+                addedScripts.add(0, pack.abc.script_info.remove(newScriptIndex));
+            }
+            for (int i = 0; i < addedScripts.size(); i++) {
+                pack.abc.script_info.add(oldScriptIndex + i, addedScripts.get(i));
+            }
+
+            //IMPORTANT: Map newly created classes to their position as they
+            //were in original script because FlashPlayer needs
+            //parent class to be defined earlier
+            if (oldClassIndex > -1) {
+                List<Integer> addedClassIndices = new ArrayList<>(classesMap.values());
+                Collections.sort(addedClassIndices);
+                int totalClassCount = pack.abc.class_info.size();
+                Map<Integer, Integer> classesRemap = new HashMap<>();
+                for (int i = 0; i < addedClassIndices.size(); i++) {
+                    classesRemap.put(addedClassIndices.get(i), oldClassIndex + i);
+                }
+                int mappingStart = oldClassIndex;
+                for (int i = oldClassIndex; i < totalClassCount; i++) {
+                    if (!classesRemap.containsKey(i)) {
+                        for (int j = mappingStart; j < totalClassCount; j++) {
+                            if (!classesRemap.containsValue(j)) {
+                                classesRemap.put(i, j);
+                                mappingStart = j + 1;
+                                break;
+                            }
+                        }
+                    }
+                }
+                pack.abc.reorganizeClasses(classesRemap);
+            }
+            ((Tag) pack.abc.parentTag).setModified(true);
+            deinitReplacement(pack);//successfull finish
+        }
+
+    }
+
+    @Override
+    public boolean isAvailable() {
+        String flexLocation = Configuration.flexSdkLocation.get();
+        return !(flexLocation.isEmpty() || (!new File(MxmlcRunner.getMxmlcPath(flexLocation)).exists()));
+    }
+
+    @Override
+    public synchronized void initReplacement(ScriptPack pack) {
+        if (tempDir != null) {
+            deinitReplacement(pack);
+        }
         try {
             tempDir = Files.createTempDirectory("ffdec-mxmlc-replace").toFile();
-            File pkgDir = tempDir;
+            pkgDir = tempDir;
             for (String pkgPart : pack.getClassPath().packageStr.toList()) {
                 if (!pkgPart.isEmpty()) {
                     pkgDir = new File(pkgDir, pkgPart);
                 }
             }
             pkgDir.mkdirs();
-            File scriptFileToCompile = new File(pkgDir, pack.getClassPath().className + ".as");
-            File compiledSwfFile = new File(pkgDir, "out.swf");
-            File swcFile = new File(pkgDir, "out.swc");
+
+            swcFile = new File(pkgDir, "out.swc");
 
             //Make copy without the old script
             SWF swfCopy = recompileSWF(pack.getSwf());
+
             List<ABC> modAbcs = new ArrayList<>();
 
             List<ScriptPack> copyPacks = swfCopy.getAS3Packs();
@@ -135,6 +275,7 @@ public class MxmlcAs3ScriptReplacer extends MxmlcRunner implements As3ScriptRepl
                     removedPacks.add(sp);
                 }
             }
+
             //Export subclasses so they can be compiled by Flex, but ONLY STUBS. 
             //No method code to avoid code compilation problems.
             //This compiled code won't be used at all in original SWF, 
@@ -146,115 +287,25 @@ public class MxmlcAs3ScriptReplacer extends MxmlcRunner implements As3ScriptRepl
             for (ABC a : modAbcs) {
                 a.pack();
             }
+
             //Generate SWC file from the modified SWF file.
             //Flex then uses the code already present in the SWC, no need to decompile it (hurray!)
             SwfToSwcExporter swcExport = new SwfToSwcExporter();
             swcExport.exportSwf(swfCopy, swcFile, true);
 
-            //Write new script
-            Helper.writeFile(scriptFileToCompile.getAbsolutePath(), text.getBytes("UTF-8"));
-
-            try {
-                //Compile it (and subclasses stubs)
-                mxmlc("-strict=false", "-include-inheritance-dependencies-only", "-warnings=false", "-library-path", swcFile.getAbsolutePath(), "-source-path", tempDir.getAbsolutePath(), "-output", compiledSwfFile.getAbsolutePath(), "-debug=true", scriptFileToCompile.getAbsolutePath());
-            } catch (MxmlcException ex1) {
-                throw new AVM2ParseException(ex1.getMxmlcErrorOutput(), 0);
-            }
-
-            try (FileInputStream fis = new FileInputStream(compiledSwfFile)) {
-                SWF newSWF = new SWF(fis, false, false);
-                List<ABCContainerTag> newTags = newSWF.getAbcList();
-                int oldScriptIndex = pack.scriptIndex;
-                int oldClassIndex = -1;
-
-                ScriptInfo oldScriptInfo = pack.abc.script_info.get(pack.scriptIndex);
-                for (Trait t : oldScriptInfo.traits.traits) {
-                    if (t instanceof TraitClass) {
-                        int traitClassIndex = ((TraitClass) t).class_info;
-                        if (oldClassIndex == -1 || traitClassIndex < oldClassIndex) {
-                            oldClassIndex = traitClassIndex;
-                        }
-                    }
-                }
-                if (pack.isSimple) {
-                    oldScriptInfo.delete(pack.abc, true);
-                } else {
-                    //NOO
-                }
-                pack.abc.pack(); // removes old classes/methods/scripts
-                ABCContainerTag newTagsLast = newTags.get(newTags.size() - 1);
-                ABC newLastAbc = newTagsLast.getABC();
-                Map<Integer, Integer> classesMap = new HashMap<>();
-                Map<Integer, Integer> scriptsMap = new HashMap<>();
-
-                pack.abc.mergeABC(newLastAbc,
-                        new HashMap<>(),
-                        new HashMap<>(),
-                        new HashMap<>(),
-                        new HashMap<>(),
-                        new HashMap<>(),
-                        new HashMap<>(),
-                        new HashMap<>(),
-                        new HashMap<>(),
-                        new HashMap<>(),
-                        new HashMap<>(),
-                        new HashMap<>(),
-                        new HashMap<>(),
-                        classesMap,
-                        new HashMap<>(),
-                        scriptsMap
-                );
-
-                //Reorder newly created scripts to be in place
-                //where old script was
-                List<Integer> addedScriptIndices = new ArrayList<>(scriptsMap.values());
-                Collections.sort(addedScriptIndices);
-                List<ScriptInfo> addedScripts = new ArrayList<>();
-                for (int i = addedScriptIndices.size() - 1; i >= 0; i--) {
-                    int newScriptIndex = addedScriptIndices.get(i);
-                    addedScripts.add(0, pack.abc.script_info.remove(newScriptIndex));
-                }
-                for (int i = 0; i < addedScripts.size(); i++) {
-                    pack.abc.script_info.add(oldScriptIndex + i, addedScripts.get(i));
-                }
-
-                //IMPORTANT: Map newly created classes to their position as they
-                //were in original script because FlashPlayer needs
-                //parent class to be defined earlier
-                if (oldClassIndex > -1) {
-                    List<Integer> addedClassIndices = new ArrayList<>(classesMap.values());
-                    Collections.sort(addedClassIndices);
-                    int totalClassCount = pack.abc.class_info.size();
-                    Map<Integer, Integer> classesRemap = new HashMap<>();
-                    for (int i = 0; i < addedClassIndices.size(); i++) {
-                        classesRemap.put(addedClassIndices.get(i), oldClassIndex + i);
-                    }
-                    int mappingStart = oldClassIndex;
-                    for (int i = oldClassIndex; i < totalClassCount; i++) {
-                        if (!classesRemap.containsKey(i)) {
-                            for (int j = mappingStart; j < totalClassCount; j++) {
-                                if (!classesRemap.containsValue(j)) {
-                                    classesRemap.put(i, j);
-                                    mappingStart = j + 1;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    pack.abc.reorganizeClasses(classesRemap);
-                }
-                ((Tag) pack.abc.parentTag).setModified(true);
-            }
-        } finally {
-            if (tempDir != null && tempDir.exists()) {
-                deleteFolder(tempDir);
-            }
+        } catch (IOException iex) {
+            //ignore
+        } catch (InterruptedException ex) {
+            //ignore
         }
+        this.initedPack = pack;
     }
 
     @Override
-    public boolean isAvailable() {
-        String flexLocation = Configuration.flexSdkLocation.get();
-        return !(flexLocation.isEmpty() || (!new File(MxmlcRunner.getMxmlcPath(flexLocation)).exists()));
+    public synchronized void deinitReplacement(ScriptPack pack) {
+        if (tempDir != null && tempDir.exists()) {
+            deleteFolder(tempDir);
+        }
+        tempDir = null;
     }
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/AS3ScriptImporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/AS3ScriptImporter.java
index e43ed93c2..b423df89a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/AS3ScriptImporter.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/AS3ScriptImporter.java
@@ -51,10 +51,10 @@ public class AS3ScriptImporter {
 
                     try {
                         pack.abc.replaceScriptPack(scriptReplacer, pack, txt);
-                    } catch (AVM2ParseException ex) {
-                        logger.log(Level.SEVERE, "%error% on line %line%, file: %file%".replace("%error%", ex.text).replace("%line%", Long.toString(ex.line)).replace("%file%", fileName));
-                    } catch (CompilationException ex) {
-                        logger.log(Level.SEVERE, "%error% on line %line%, file: %file%".replace("%error%", ex.text).replace("%line%", Long.toString(ex.line)).replace("%file%", fileName));
+                    } catch (As3ScriptReplaceException asre) {
+                        for (As3ScriptReplaceExceptionItem item : asre.getExceptionItems()) {
+                            logger.log(Level.SEVERE, "%error% on line %line%, column %col%, file: %file%".replace("%error%", item.getMessage()).replace("%line%", Long.toString(item.getLine())).replace("%file%", fileName).replace("%col%", "" + item.getCol()));
+                        }
                     } catch (InterruptedException ex) {
                         logger.log(Level.SEVERE, "error during script import, file: %file%".replace("%file%", fileName), ex);
                     }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplaceException.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplaceException.java
new file mode 100644
index 000000000..a283ce9ee
--- /dev/null
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplaceException.java
@@ -0,0 +1,27 @@
+package com.jpexs.decompiler.flash.importers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @author JPEXS
+ */
+public class As3ScriptReplaceException extends Exception {
+
+    private List<As3ScriptReplaceExceptionItem> exceptionItems;
+
+    public As3ScriptReplaceException(List<As3ScriptReplaceExceptionItem> exceptionItems) {
+        this.exceptionItems = exceptionItems;
+    }
+
+    public As3ScriptReplaceException(As3ScriptReplaceExceptionItem exceptionItem) {
+        this.exceptionItems = new ArrayList<>();
+        this.exceptionItems.add(exceptionItem);
+    }
+
+    public List<As3ScriptReplaceExceptionItem> getExceptionItems() {
+        return exceptionItems;
+    }
+
+}
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplaceExceptionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplaceExceptionItem.java
new file mode 100644
index 000000000..771a29a72
--- /dev/null
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplaceExceptionItem.java
@@ -0,0 +1,44 @@
+package com.jpexs.decompiler.flash.importers;
+
+public class As3ScriptReplaceExceptionItem {
+
+    private String file;
+    private int line;
+    private int col;
+    private String message;
+
+    public static final int COL_UNKNOWN = -1;
+    public static final int LINE_UNKNOWN = -1;
+
+    public As3ScriptReplaceExceptionItem(String file, String message, int line) {
+        this(file, message, line, COL_UNKNOWN);
+    }
+
+    public As3ScriptReplaceExceptionItem(String file, String message) {
+        this(file, message, LINE_UNKNOWN, COL_UNKNOWN);
+    }
+
+    public As3ScriptReplaceExceptionItem(String file, String message, int line, int col) {
+        this.file = file;
+        this.line = line;
+        this.col = col;
+        this.message = message;
+    }
+
+    public String getFile() {
+        return file;
+    }
+
+    public int getLine() {
+        return line;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public int getCol() {
+        return col;
+    }
+
+}
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerFactory.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerFactory.java
index d28c38213..ad7d0a718 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerFactory.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerFactory.java
@@ -1,7 +1,6 @@
 package com.jpexs.decompiler.flash.importers;
 
 import com.jpexs.decompiler.flash.configuration.Configuration;
-import com.jpexs.decompiler.flash.exporters.script.LinkReportExporter;
 import com.jpexs.decompiler.flash.flexsdk.MxmlcAs3ScriptReplacer;
 
 public class As3ScriptReplacerFactory {
@@ -15,7 +14,7 @@ public class As3ScriptReplacerFactory {
     }
 
     public static As3ScriptReplacerInterface createFlex() {
-        return new MxmlcAs3ScriptReplacer(Configuration.flexSdkLocation.get(), new LinkReportExporter());
+        return new MxmlcAs3ScriptReplacer(Configuration.flexSdkLocation.get());
     }
 
     public static As3ScriptReplacerInterface createFFDec() {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerInterface.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerInterface.java
index d14863048..de7de53ad 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerInterface.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/As3ScriptReplacerInterface.java
@@ -1,13 +1,15 @@
 package com.jpexs.decompiler.flash.importers;
 
 import com.jpexs.decompiler.flash.abc.ScriptPack;
-import com.jpexs.decompiler.flash.abc.avm2.parser.AVM2ParseException;
-import com.jpexs.decompiler.graph.CompilationException;
 import java.io.IOException;
 
 public interface As3ScriptReplacerInterface {
 
     public boolean isAvailable();
 
-    public void replaceScript(ScriptPack pack, String text) throws AVM2ParseException, CompilationException, IOException, InterruptedException;
+    public void initReplacement(ScriptPack pack);
+
+    public void replaceScript(ScriptPack pack, String text) throws As3ScriptReplaceException, IOException, InterruptedException;
+
+    public void deinitReplacement(ScriptPack pack);
 }
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/FFDecAs3ScriptReplacer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/FFDecAs3ScriptReplacer.java
index cf3c2ca9a..723dcdf12 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/FFDecAs3ScriptReplacer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/FFDecAs3ScriptReplacer.java
@@ -14,53 +14,62 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeSet;
-import javax.swing.JOptionPane;
 
 public class FFDecAs3ScriptReplacer implements As3ScriptReplacerInterface {
 
     @Override
-    public void replaceScript(ScriptPack pack, String text) throws AVM2ParseException, CompilationException, IOException, InterruptedException {
-        ABC abc = pack.abc;
-        SWF swf = pack.abc.getSwf();
-        String scriptName = pack.getPathScriptName() + ".as";
-        int oldIndex = pack.scriptIndex;
-        int newIndex = abc.script_info.size();
-        String documentClass = swf.getDocumentClass();
-        boolean isDocumentClass = documentClass != null && documentClass.equals(pack.getClassPath().toString());
+    public void replaceScript(ScriptPack pack, String text) throws As3ScriptReplaceException, IOException, InterruptedException {
+        try {
+            ABC abc = pack.abc;
+            SWF swf = pack.abc.getSwf();
+            String scriptName = pack.getPathScriptName() + ".as";
+            int oldIndex = pack.scriptIndex;
+            int newIndex = abc.script_info.size();
+            String documentClass = swf.getDocumentClass();
+            boolean isDocumentClass = documentClass != null && documentClass.equals(pack.getClassPath().toString());
 
-        ScriptInfo si = abc.script_info.get(oldIndex);
-        if (pack.isSimple) {
-            si.delete(abc, true);
-        } else {
+            ScriptInfo si = abc.script_info.get(oldIndex);
+            if (pack.isSimple) {
+                si.delete(abc, true);
+            } else {
+                for (int t : pack.traitIndices) {
+                    si.traits.traits.get(t).delete(abc, true);
+                }
+            }
+
+            int newClassIndex = abc.instance_info.size();
             for (int t : pack.traitIndices) {
-                si.traits.traits.get(t).delete(abc, true);
-            }
-        }
+                if (si.traits.traits.get(t) instanceof TraitClass) {
+                    TraitClass tc = (TraitClass) si.traits.traits.get(t);
+                    newClassIndex = tc.class_info + 1;
+                }
 
-        int newClassIndex = abc.instance_info.size();
-        for (int t : pack.traitIndices) {
-            if (si.traits.traits.get(t) instanceof TraitClass) {
-                TraitClass tc = (TraitClass) si.traits.traits.get(t);
-                newClassIndex = tc.class_info + 1;
+            }
+            List<ABC> otherAbcs = new ArrayList<>(pack.allABCs);
+
+            otherAbcs.remove(abc);
+
+            ActionScript3Parser.compile(text, abc, otherAbcs, isDocumentClass, scriptName, newClassIndex, oldIndex);
+            if (pack.isSimple) {
+                // Move newly added script to its position
+                abc.script_info.set(oldIndex, abc.script_info.get(newIndex));
+                abc.script_info.remove(newIndex);
+            } else {
+                abc.script_info.get(newIndex).setModified(true);
+                //Note: Is deleting traits safe?
+                List<Integer> todel = new ArrayList<>(new TreeSet<>(pack.traitIndices));
+                for (int i = todel.size() - 1; i >= 0; i--) {
+                    si.traits.traits.remove((int) todel.get(i));
+                }
             }
 
+            abc.script_info.get(oldIndex)
+                    .setModified(true);
+        } catch (AVM2ParseException ex) {
+            throw new As3ScriptReplaceException(new As3ScriptReplaceExceptionItem(null, ex.text, (int) ex.line));
+        } catch (CompilationException ex) {
+            throw new As3ScriptReplaceException(new As3ScriptReplaceExceptionItem(null, ex.text, ex.line));
         }
-        List<ABC> otherAbcs = new ArrayList<>(pack.allABCs);
-        otherAbcs.remove(abc);
-        ActionScript3Parser.compile(text, abc, otherAbcs, isDocumentClass, scriptName, newClassIndex, oldIndex);
-        if (pack.isSimple) {
-            // Move newly added script to its position
-            abc.script_info.set(oldIndex, abc.script_info.get(newIndex));
-            abc.script_info.remove(newIndex);
-        } else {
-            abc.script_info.get(newIndex).setModified(true);
-            //Note: Is deleting traits safe?
-            List<Integer> todel = new ArrayList<>(new TreeSet<>(pack.traitIndices));
-            for (int i = todel.size() - 1; i >= 0; i--) {
-                si.traits.traits.remove((int) todel.get(i));
-            }
-        }
-        abc.script_info.get(oldIndex).setModified(true);
     }
 
     @Override
@@ -69,4 +78,14 @@ public class FFDecAs3ScriptReplacer implements As3ScriptReplacerInterface {
         return !(swc == null || !swc.exists());
     }
 
+    @Override
+    public void initReplacement(ScriptPack pack) {
+        //empty
+    }
+
+    @Override
+    public void deinitReplacement(ScriptPack pack) {
+        //empty
+    }
+
 }
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacerTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacerTest.java
index c966864cd..5b0f32869 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacerTest.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/flexsdk/As3ScriptReplacerTest.java
@@ -3,9 +3,10 @@ package com.jpexs.decompiler.flash.flexsdk;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
 import com.jpexs.decompiler.flash.configuration.Configuration;
-import com.jpexs.decompiler.flash.exporters.script.LinkReportExporter;
+import com.jpexs.helpers.Helper;
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -13,9 +14,10 @@ import org.testng.annotations.Test;
 
 public class As3ScriptReplacerTest {
 
-    @Test
+    //Commented out yet... there's no Flex SDK on build server
+    //@Test
     public void testReplace() throws IOException, InterruptedException, Exception {
-        MxmlcAs3ScriptReplacer replacer = new MxmlcAs3ScriptReplacer(Configuration.flexSdkLocation.get(), new LinkReportExporter());
+        MxmlcAs3ScriptReplacer replacer = new MxmlcAs3ScriptReplacer(Configuration.flexSdkLocation.get());
         SWF swf = new SWF(new BufferedInputStream(new FileInputStream("testdata/as3/as3.swf")), false);
         String replacement = "package classes\n"
                 + "{\n"
diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
index cc5bbea58..c7a8d6284 100644
--- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
+++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
@@ -102,6 +102,8 @@ import com.jpexs.decompiler.flash.helpers.FileTextWriter;
 import com.jpexs.decompiler.flash.helpers.SWFDecompilerPlugin;
 import com.jpexs.decompiler.flash.importers.AS2ScriptImporter;
 import com.jpexs.decompiler.flash.importers.AS3ScriptImporter;
+import com.jpexs.decompiler.flash.importers.As3ScriptReplaceException;
+import com.jpexs.decompiler.flash.importers.As3ScriptReplaceExceptionItem;
 import com.jpexs.decompiler.flash.importers.As3ScriptReplacerFactory;
 import com.jpexs.decompiler.flash.importers.As3ScriptReplacerInterface;
 import com.jpexs.decompiler.flash.importers.BinaryDataImporter;
@@ -3581,11 +3583,10 @@ public class CommandLineArgumentParser {
 
         try {
             pack.abc.replaceScriptPack(scriptReplacer, pack, as);
-        } catch (AVM2ParseException ex) {
-            System.err.println("%error% on line %line%".replace("%error%", ex.text).replace("%line%", Long.toString(ex.line)));
-            System.exit(1);
-        } catch (CompilationException ex) {
-            System.err.println("%error% on line %line%".replace("%error%", ex.text).replace("%line%", Long.toString(ex.line)));
+        } catch (As3ScriptReplaceException asre) {
+            for (As3ScriptReplaceExceptionItem item : asre.getExceptionItems()) {
+                logger.log(Level.SEVERE, "%error% on line %line%, column %col%, file: %file%".replace("%error%", item.getMessage()).replace("%line%", Long.toString(item.getLine())).replace("%file%", item.getFile()).replace("%col%", "" + item.getCol()));
+            }
             System.exit(1);
         }
     }
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index 3e9d20a93..411382eb3 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -27,7 +27,6 @@ import com.jpexs.decompiler.flash.abc.ScriptPack;
 import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
 import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
 import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instructions;
-import com.jpexs.decompiler.flash.abc.avm2.parser.AVM2ParseException;
 import com.jpexs.decompiler.flash.abc.avm2.parser.script.Reference;
 import com.jpexs.decompiler.flash.abc.types.ABCException;
 import com.jpexs.decompiler.flash.abc.types.MethodBody;
@@ -69,11 +68,12 @@ import com.jpexs.decompiler.flash.gui.abc.tablemodels.UIntTableModel;
 import com.jpexs.decompiler.flash.gui.controls.JPersistentSplitPane;
 import com.jpexs.decompiler.flash.gui.editor.LinkHandler;
 import com.jpexs.decompiler.flash.gui.tagtree.TagTreeModel;
-import com.jpexs.decompiler.flash.importers.As3ScriptReplacerFactory;
+import com.jpexs.decompiler.flash.importers.As3ScriptReplaceException;
+import com.jpexs.decompiler.flash.importers.As3ScriptReplaceExceptionItem;
+import com.jpexs.decompiler.flash.importers.As3ScriptReplacerInterface;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.decompiler.flash.tags.Tag;
 import com.jpexs.decompiler.flash.treeitems.TreeItem;
-import com.jpexs.decompiler.graph.CompilationException;
 import com.jpexs.helpers.CancellableWorker;
 import com.jpexs.helpers.Helper;
 import de.hameister.treetable.MyTreeTable;
@@ -117,6 +117,7 @@ import javax.swing.JTabbedPane;
 import javax.swing.JTable;
 import javax.swing.JToggleButton;
 import javax.swing.SwingConstants;
+import javax.swing.SwingWorker;
 import javax.swing.border.BevelBorder;
 import javax.swing.event.EventListenerList;
 import javax.swing.event.TableModelListener;
@@ -135,6 +136,9 @@ import jsyntaxpane.TokenType;
  */
 public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABCPanelSearchResult>, TagEditorPanel {
 
+    private As3ScriptReplacerInterface scriptReplacer = null;
+    private ScriptPack pack = null;
+
     private final MainPanel mainPanel;
 
     public final TraitsList navigator;
@@ -1151,27 +1155,40 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
     }
 
     private void editDecompiledButtonActionPerformed(ActionEvent evt) {
-        if (mainPanel.getAs3ScriptReplacer() == null) {
+        scriptReplacer = mainPanel.getAs3ScriptReplacer();
+        if (scriptReplacer == null) {
             return;
         }
+
         if (View.showConfirmDialog(null, AppStrings.translate("message.confirm.experimental.function"), AppStrings.translate("message.warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, Configuration.warningExperimentalAS3Edit, JOptionPane.OK_OPTION) == JOptionPane.OK_OPTION) {
+            pack = decompiledTextArea.getScriptLeaf();
             setDecompiledEditMode(true);
+            SwingWorker initReplaceWorker = new SwingWorker() {
+                @Override
+                protected Object doInBackground() throws Exception {
+                    scriptReplacer.initReplacement(pack);
+                    return null;
+                }
+            };
+            initReplaceWorker.execute();
         }
     }
 
     private void cancelDecompiledButtonActionPerformed(ActionEvent evt) {
         setDecompiledEditMode(false);
+        if (scriptReplacer != null) {
+            scriptReplacer.deinitReplacement(pack);
+        }
     }
 
     private void saveDecompiledButtonActionPerformed(ActionEvent evt) {
-        ScriptPack pack = decompiledTextArea.getScriptLeaf();
         int oldIndex = pack.scriptIndex;
         SWF.uncache(pack);
-
         try {
             String oldSp = pack.getClassPath().toRawString();
             String as = decompiledTextArea.getText();
-            abc.replaceScriptPack(mainPanel.getAs3ScriptReplacer(), pack, as);
+            abc.replaceScriptPack(scriptReplacer, pack, as);
+            scriptReplacer.deinitReplacement(pack);
             lastDecompiled = as;
             setDecompiledEditMode(false);
             mainPanel.updateClassesList();
@@ -1182,20 +1199,28 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
 
             reload();
             View.showMessageDialog(this, AppStrings.translate("message.action.saved"), AppStrings.translate("dialog.message.title"), JOptionPane.INFORMATION_MESSAGE, Configuration.showCodeSavedMessage);
-        } catch (AVM2ParseException ex) {
+        } catch (As3ScriptReplaceException asre) {
+            StringBuilder sb = new StringBuilder();
+            int firstErrorLine = As3ScriptReplaceExceptionItem.LINE_UNKNOWN;
             abc.script_info.get(oldIndex).delete(abc, false);
-            decompiledTextArea.gotoLine((int) ex.line);
-            decompiledTextArea.markError();
-            View.showMessageDialog(this, AppStrings.translate("error.action.save").replace("%error%", ex.text).replace("%line%", Long.toString(ex.line)), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
-        } catch (CompilationException ex) {
-            abc.script_info.get(oldIndex).delete(abc, false);
-            decompiledTextArea.gotoLine((int) ex.line);
-            decompiledTextArea.markError();
-            View.showMessageDialog(this, AppStrings.translate("error.action.save").replace("%error%", ex.text).replace("%line%", Long.toString(ex.line)), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
 
+            for (As3ScriptReplaceExceptionItem item : asre.getExceptionItems()) {
+                if (firstErrorLine == As3ScriptReplaceExceptionItem.LINE_UNKNOWN) {
+                    firstErrorLine = item.getLine();
+                }
+                sb.append(item.getFile()).append(":").append(item.getLine()).append(" (column ").append(item.getCol()).append(")").append(":").append("\n");
+                sb.append("  ").append(item.getMessage());
+                sb.append("\n");
+                sb.append("\n");
+            }
+            if (firstErrorLine != As3ScriptReplaceExceptionItem.LINE_UNKNOWN) {
+                decompiledTextArea.gotoLine((int) firstErrorLine);
+                decompiledTextArea.markError();
+            }
+            //View.showMessageDialog(this, AppStrings.translate("error.action.save").replace("%error%", ex.text).replace("%line%", Long.toString(ex.line)), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
+            View.showMessageDialog(this, sb.toString(), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
         } catch (Throwable ex) {
-            Logger.getLogger(ABCPanel.class
-                    .getName()).log(Level.SEVERE, null, ex);
+            Logger.getLogger(ABCPanel.class.getName()).log(Level.SEVERE, null, ex);
         }
     }
 

From e9f20112a7d6642453c4296fa552b8c8427a1024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sat, 20 Aug 2016 18:35:29 +0200
Subject: [PATCH 21/23] Go to column on Flex error

---
 src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java     | 9 ++++++++-
 .../flash/gui/editor/LineMarkedEditorPane.java           | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index 411382eb3..4653932f1 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -1202,11 +1202,13 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
         } catch (As3ScriptReplaceException asre) {
             StringBuilder sb = new StringBuilder();
             int firstErrorLine = As3ScriptReplaceExceptionItem.LINE_UNKNOWN;
+            int firstErrorCol = As3ScriptReplaceExceptionItem.COL_UNKNOWN;
             abc.script_info.get(oldIndex).delete(abc, false);
 
             for (As3ScriptReplaceExceptionItem item : asre.getExceptionItems()) {
                 if (firstErrorLine == As3ScriptReplaceExceptionItem.LINE_UNKNOWN) {
                     firstErrorLine = item.getLine();
+                    firstErrorCol = item.getCol();
                 }
                 sb.append(item.getFile()).append(":").append(item.getLine()).append(" (column ").append(item.getCol()).append(")").append(":").append("\n");
                 sb.append("  ").append(item.getMessage());
@@ -1214,11 +1216,16 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
                 sb.append("\n");
             }
             if (firstErrorLine != As3ScriptReplaceExceptionItem.LINE_UNKNOWN) {
-                decompiledTextArea.gotoLine((int) firstErrorLine);
+                if (firstErrorCol != As3ScriptReplaceExceptionItem.COL_UNKNOWN) {
+                    decompiledTextArea.gotoLineCol(firstErrorLine, firstErrorCol);
+                } else {
+                    decompiledTextArea.gotoLine(firstErrorLine);
+                }
                 decompiledTextArea.markError();
             }
             //View.showMessageDialog(this, AppStrings.translate("error.action.save").replace("%error%", ex.text).replace("%line%", Long.toString(ex.line)), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
             View.showMessageDialog(this, sb.toString(), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
+            decompiledTextArea.requestFocus();
         } catch (Throwable ex) {
             Logger.getLogger(ABCPanel.class.getName()).log(Level.SEVERE, null, ex);
         }
diff --git a/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java b/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java
index aab919ccc..90b135d66 100644
--- a/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java
+++ b/src/com/jpexs/decompiler/flash/gui/editor/LineMarkedEditorPane.java
@@ -218,6 +218,10 @@ public class LineMarkedEditorPane extends UndoFixedEditorPane implements LinkHan
         setCaretPosition(ActionUtils.getDocumentPosition(this, line, 0));
     }
 
+    public void gotoLineCol(int line, int column) {
+        setCaretPosition(ActionUtils.getDocumentPosition(this, line, column));
+    }
+
     public Point getLineLocation(int line) {
         int pos = ActionUtils.getDocumentPosition(this, line + 1, 0);
         if (pos < 0) {

From 7af743ff0b87702b25db863ca98b6ae0620d908a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sat, 20 Aug 2016 19:09:32 +0200
Subject: [PATCH 22/23] Fix metadata compiling in FFDec AS3 compiler

---
 .../parser/script/AVM2SourceGenerator.java    | 5375 +++++++++--------
 1 file changed, 2693 insertions(+), 2682 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/AVM2SourceGenerator.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/AVM2SourceGenerator.java
index e7f86c494..3afe103d9 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/AVM2SourceGenerator.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/AVM2SourceGenerator.java
@@ -1,2682 +1,2693 @@
-/*
- *  Copyright (C) 2010-2016 JPEXS, All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3.0 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
- */
-package com.jpexs.decompiler.flash.abc.avm2.parser.script;
-
-import com.jpexs.decompiler.flash.SWFInputStream;
-import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
-import com.jpexs.decompiler.flash.abc.ABC;
-import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
-import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool;
-import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
-import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instructions;
-import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition;
-import com.jpexs.decompiler.flash.abc.avm2.instructions.construction.ConstructSuperIns;
-import com.jpexs.decompiler.flash.abc.avm2.instructions.jumps.JumpIns;
-import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ReturnValueIns;
-import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ReturnVoidIns;
-import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.ApplyTypeAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.BooleanAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.FloatValueAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.GetDescendantsAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.IntegerValueAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.NameValuePair;
-import com.jpexs.decompiler.flash.abc.avm2.model.NanAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.NewObjectAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.NullAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.ReturnValueAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.ReturnVoidAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.StringAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.ThrowAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.UndefinedAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.WithAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.WithObjectAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.clauses.ForEachInAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.clauses.ForInAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.clauses.TryAVM2Item;
-import com.jpexs.decompiler.flash.abc.avm2.model.operations.IfCondition;
-import com.jpexs.decompiler.flash.abc.avm2.parser.AVM2ParseException;
-import com.jpexs.decompiler.flash.abc.avm2.parser.script.AbcIndexing.ClassIndex;
-import com.jpexs.decompiler.flash.abc.types.ABCException;
-import com.jpexs.decompiler.flash.abc.types.ClassInfo;
-import com.jpexs.decompiler.flash.abc.types.ConvertData;
-import com.jpexs.decompiler.flash.abc.types.InstanceInfo;
-import com.jpexs.decompiler.flash.abc.types.MetadataInfo;
-import com.jpexs.decompiler.flash.abc.types.MethodBody;
-import com.jpexs.decompiler.flash.abc.types.MethodInfo;
-import com.jpexs.decompiler.flash.abc.types.Multiname;
-import com.jpexs.decompiler.flash.abc.types.Namespace;
-import com.jpexs.decompiler.flash.abc.types.ScriptInfo;
-import com.jpexs.decompiler.flash.abc.types.ValueKind;
-import com.jpexs.decompiler.flash.abc.types.traits.Trait;
-import com.jpexs.decompiler.flash.abc.types.traits.TraitClass;
-import com.jpexs.decompiler.flash.abc.types.traits.TraitFunction;
-import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter;
-import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst;
-import com.jpexs.decompiler.flash.abc.types.traits.Traits;
-import com.jpexs.decompiler.flash.configuration.Configuration;
-import com.jpexs.decompiler.flash.ecma.EcmaScript;
-import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
-import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
-import com.jpexs.decompiler.flash.helpers.NulWriter;
-import com.jpexs.decompiler.graph.CompilationException;
-import com.jpexs.decompiler.graph.DottedChain;
-import com.jpexs.decompiler.graph.GraphSourceItem;
-import com.jpexs.decompiler.graph.GraphTargetItem;
-import com.jpexs.decompiler.graph.Loop;
-import com.jpexs.decompiler.graph.ScopeStack;
-import com.jpexs.decompiler.graph.SourceGenerator;
-import com.jpexs.decompiler.graph.TypeItem;
-import com.jpexs.decompiler.graph.model.AndItem;
-import com.jpexs.decompiler.graph.model.BreakItem;
-import com.jpexs.decompiler.graph.model.CommaExpressionItem;
-import com.jpexs.decompiler.graph.model.ContinueItem;
-import com.jpexs.decompiler.graph.model.DefaultItem;
-import com.jpexs.decompiler.graph.model.DoWhileItem;
-import com.jpexs.decompiler.graph.model.DuplicateItem;
-import com.jpexs.decompiler.graph.model.FalseItem;
-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.PopItem;
-import com.jpexs.decompiler.graph.model.PushItem;
-import com.jpexs.decompiler.graph.model.SwitchItem;
-import com.jpexs.decompiler.graph.model.TernarOpItem;
-import com.jpexs.decompiler.graph.model.TrueItem;
-import com.jpexs.decompiler.graph.model.UnboundedTypeItem;
-import com.jpexs.decompiler.graph.model.WhileItem;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- *
- * @author JPEXS
- */
-public class AVM2SourceGenerator implements SourceGenerator {
-
-    public final AbcIndexing abcIndex;
-
-    public static final int MARK_E_START = 0;
-
-    public static final int MARK_E_END = 1;
-
-    public static final int MARK_E_TARGET = 2;
-
-    public static final int MARK_E_FINALLYPART = 3;
-
-    private AVM2Instruction ins(int instructionCode, int... operands) {
-        return new AVM2Instruction(0, instructionCode, operands);
-    }
-
-    private AVM2Instruction ins(InstructionDefinition def, int... operands) {
-        return new AVM2Instruction(0, def, operands);
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, FalseItem item) throws CompilationException {
-        return GraphTargetItem.toSourceMerge(localData, this, ins(AVM2Instructions.PushFalse));
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, TrueItem item) throws CompilationException {
-        return GraphTargetItem.toSourceMerge(localData, this, ins(AVM2Instructions.PushTrue));
-    }
-
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, GetDescendantsAVM2Item item) throws CompilationException {
-
-        AVM2ConstantPool constants = abcIndex.getSelectedAbc().constants;
-        int[] nssa = new int[item.openedNamespaces.size()];
-        for (int i = 0; i < item.openedNamespaces.size(); i++) {
-            nssa[i] = item.openedNamespaces.get(i).getCpoolIndex(abcIndex);
-        }
-
-        int nsset = constants.getNamespaceSetId(nssa, true);
-
-        return GraphTargetItem.toSourceMerge(localData, this,
-                item.object,
-                ins(AVM2Instructions.GetDescendants, constants.getMultinameId(Multiname.createMultiname(false, constants.getStringId(item.nameStr, true), nsset), true))
-        );
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, AndItem item) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        ret.addAll(generateToActionList(localData, item.leftSide));
-        ret.add(ins(AVM2Instructions.Dup));
-        if (!("" + item.leftSide.returnType()).equals("Boolean")) {
-            ret.add(ins(AVM2Instructions.ConvertB));
-        }
-        List<AVM2Instruction> andExpr = generateToActionList(localData, item.rightSide);
-        andExpr.add(0, ins(AVM2Instructions.Pop));
-        int andExprLen = insToBytes(andExpr).length;
-        ret.add(ins(AVM2Instructions.IfFalse, andExprLen));
-        ret.addAll(andExpr);
-        return ret;
-
-    }
-
-    private byte[] insToBytes(List<AVM2Instruction> code) {
-        try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            for (AVM2Instruction instruction : code) {
-
-                baos.write(instruction.getBytes());
-
-            }
-            return baos.toByteArray();
-        } catch (IOException ex) {
-            Logger.getLogger(AVM2SourceGenerator.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        return SWFInputStream.BYTE_ARRAY_EMPTY;
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, OrItem item) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        ret.addAll(generateToActionList(localData, item.leftSide));
-        ret.add(ins(AVM2Instructions.Dup));
-        if (!("" + item.leftSide.returnType()).equals("Boolean")) {
-            ret.add(ins(AVM2Instructions.ConvertB));
-        }
-        List<AVM2Instruction> orExpr = generateToActionList(localData, item.rightSide);
-        orExpr.add(0, ins(AVM2Instructions.Pop));
-        int orExprLen = insToBytes(orExpr).length;
-        ret.add(ins(AVM2Instructions.IfTrue, orExprLen));
-        ret.addAll(orExpr);
-        return ret;
-    }
-
-    public ArrayList<AVM2Instruction> toInsList(List<GraphSourceItem> items) {
-        ArrayList<AVM2Instruction> ret = new ArrayList<>();
-        for (GraphSourceItem s : items) {
-            if (s instanceof AVM2Instruction) {
-                ret.add((AVM2Instruction) s);
-            }
-        }
-        return ret;
-    }
-
-    private List<AVM2Instruction> nonempty(List<AVM2Instruction> list) {
-        if (list == null) {
-            return new ArrayList<>();
-        }
-        return list;
-    }
-
-    private List<GraphSourceItem> condition(SourceGeneratorLocalData localData, GraphTargetItem t, int offset) throws CompilationException {
-        if (t instanceof IfCondition) {
-            IfCondition ic = (IfCondition) t;
-            return GraphTargetItem.toSourceMerge(localData, this, ic.getLeftSide(), ic.getRightSide(), ins(ic.getIfDefinition(), offset));
-        }
-        return GraphTargetItem.toSourceMerge(localData, this, t, ins(AVM2Instructions.IfTrue, offset));
-    }
-
-    private List<GraphSourceItem> notCondition(SourceGeneratorLocalData localData, GraphTargetItem t, int offset) throws CompilationException {
-        if (t instanceof IfCondition) {
-            IfCondition ic = (IfCondition) t;
-            return GraphTargetItem.toSourceMerge(localData, this, ic.getLeftSide(), ic.getRightSide(), ins(ic.getIfNotDefinition(), offset));
-        }
-        return GraphTargetItem.toSourceMerge(localData, this, t, ins(AVM2Instructions.IfFalse, offset));
-    }
-
-    private List<GraphSourceItem> generateIf(SourceGeneratorLocalData localData, GraphTargetItem expression, List<GraphTargetItem> onTrueCmds, List<GraphTargetItem> onFalseCmds, boolean ternar) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        //ret.addAll(notCondition(localData, expression));
-        List<AVM2Instruction> onTrue;
-        List<AVM2Instruction> onFalse = null;
-        if (ternar) {
-            onTrue = toInsList(onTrueCmds.get(0).toSource(localData, this));
-        } else {
-            onTrue = generateToInsList(localData, onTrueCmds);
-        }
-
-        if (onFalseCmds != null && !onFalseCmds.isEmpty()) {
-            if (ternar) {
-                onFalse = toInsList(onFalseCmds.get(0).toSource(localData, this));
-            } else {
-                onFalse = generateToInsList(localData, onFalseCmds);
-            }
-        }
-        AVM2Instruction ajmp = null;
-        if (onFalse != null) {
-            if (!((!nonempty(onTrue).isEmpty())
-                    && ((onTrue.get(onTrue.size() - 1).definition instanceof ContinueJumpIns)
-                    || ((onTrue.get(onTrue.size() - 1).definition instanceof BreakJumpIns))))) {
-                ajmp = ins(AVM2Instructions.Jump, 0);
-                onTrue.add(ajmp);
-            }
-        }
-
-        byte[] onTrueBytes = insToBytes(onTrue);
-        int onTrueLen = onTrueBytes.length;
-
-        ret.addAll(notCondition(localData, expression, onTrueLen));
-        ret.addAll(onTrue);
-
-        if (onFalse != null) {
-            byte[] onFalseBytes = insToBytes(onFalse);
-            int onFalseLen = onFalseBytes.length;
-            if (ajmp != null) {
-                ajmp.operands[0] = onFalseLen;
-            }
-            ret.addAll(onFalse);
-        }
-        return ret;
-    }
-
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, XMLFilterAVM2Item item) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        final Reference<Integer> counterReg = new Reference<>(0);
-        final Reference<Integer> collectionReg = new Reference<>(0);
-        final Reference<Integer> xmlListReg = new Reference<>(0);
-        List<GraphSourceItem> xmlListSetTemp = AssignableAVM2Item.setTemp(localData, this, xmlListReg);
-        AVM2ConstantPool constants = abcIndex.getSelectedAbc().constants;
-        ret.addAll(GraphTargetItem.toSourceMerge(localData, this,
-                ins(AVM2Instructions.PushByte, 0),
-                AssignableAVM2Item.setTemp(localData, this, counterReg),
-                item.object,
-                ins(AVM2Instructions.CheckFilter),
-                NameAVM2Item.generateCoerce(localData, this, TypeItem.UNBOUNDED),
-                AssignableAVM2Item.setTemp(localData, this, collectionReg),
-                ins(AVM2Instructions.GetLex, constants.getMultinameId(Multiname.createQName(false, constants.getStringId("XMLList", true), constants.getNamespaceId(Namespace.KIND_PACKAGE, "", 0, true)), true)),
-                ins(AVM2Instructions.PushString, constants.getStringId("", true)),
-                ins(AVM2Instructions.Construct, 1),
-                xmlListSetTemp
-        ));
-        final Reference<Integer> tempVal1 = new Reference<>(0);
-        final Reference<Integer> tempVal2 = new Reference<>(0);
-
-        List<AVM2Instruction> forBody = toInsList(GraphTargetItem.toSourceMerge(localData, this,
-                ins(AVM2Instructions.Label),
-                AssignableAVM2Item.getTemp(localData, this, collectionReg),
-                AssignableAVM2Item.getTemp(localData, this, counterReg),
-                ins(AVM2Instructions.NextValue),
-                AssignableAVM2Item.dupSetTemp(localData, this, tempVal1),
-                AssignableAVM2Item.dupSetTemp(localData, this, tempVal2),
-                ins(AVM2Instructions.PushWith)
-        ));
-        localData.scopeStack.add(new LocalRegAVM2Item(null, null, tempVal2.getVal(), null));
-        forBody.addAll(toInsList(item.value.toSource(localData, this)));
-        List<AVM2Instruction> trueBody = new ArrayList<>();
-        trueBody.addAll(toInsList(AssignableAVM2Item.getTemp(localData, this, xmlListReg)));
-        trueBody.addAll(toInsList(AssignableAVM2Item.getTemp(localData, this, counterReg)));
-        trueBody.addAll(toInsList(AssignableAVM2Item.getTemp(localData, this, tempVal1)));
-        trueBody.add(ins(AVM2Instructions.SetProperty, constants.getMultinameId(Multiname.createMultinameL(false, NamespaceItem.getCpoolSetIndex(abcIndex, item.openedNamespaces)), true)));
-        forBody.add(ins(AVM2Instructions.IfFalse, insToBytes(trueBody).length));
-        forBody.addAll(trueBody);
-        forBody.add(ins(AVM2Instructions.PopScope));
-        localData.scopeStack.remove(localData.scopeStack.size() - 1);
-        forBody.addAll(toInsList(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(tempVal2, tempVal1))));
-
-        int forBodyLen = insToBytes(forBody).length;
-        AVM2Instruction forwardJump = ins(AVM2Instructions.Jump, forBodyLen);
-        ret.add(forwardJump);
-
-        List<AVM2Instruction> expr = new ArrayList<>();
-        expr.add(ins(AVM2Instructions.HasNext2, collectionReg.getVal(), counterReg.getVal()));
-        AVM2Instruction backIf = ins(AVM2Instructions.IfTrue, 0);
-        expr.add(backIf);
-
-        int exprLen = insToBytes(expr).length;
-        backIf.operands[0] = -(exprLen + forBodyLen);
-
-        ret.addAll(forBody);
-        ret.addAll(expr);
-        ret.addAll(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(collectionReg, counterReg)));
-        ret.addAll(AssignableAVM2Item.getTemp(localData, this, xmlListReg));
-        ret.addAll(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(xmlListReg)));
-        return ret;
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, IfItem item) throws CompilationException {
-        return generateIf(localData, item.expression, item.onTrue, item.onFalse, false);
-    }
-
-    private void fixSwitch(List<AVM2Instruction> code, int breakOffset, long loopId) {
-        fixLoop(code, breakOffset, Integer.MAX_VALUE, loopId);
-    }
-
-    private void fixLoop(List<AVM2Instruction> code, int breakOffset, int continueOffset, long loopId) {
-        int pos = 0;
-        for (int a = 0; a < code.size(); a++) {
-            AVM2Instruction ins = code.get(a);
-            pos += ins.getBytesLength();
-            if (ins.definition instanceof JumpIns) {
-                if (ins.definition instanceof ContinueJumpIns) {
-                    if (continueOffset != Integer.MAX_VALUE) {
-                        ins.operands[0] = (-pos + continueOffset);
-                        ins.definition = AVM2Code.instructionSet[AVM2Instructions.Jump];
-                    }
-                }
-                if (ins.definition instanceof BreakJumpIns) {
-                    ins.operands[0] = (-pos + breakOffset);
-                    ins.definition = AVM2Code.instructionSet[AVM2Instructions.Jump];
-                }
-            }
-        }
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, TernarOpItem item) throws CompilationException {
-        List<GraphTargetItem> onTrue = new ArrayList<>();
-        onTrue.add(item.onTrue);
-        List<GraphTargetItem> onFalse = new ArrayList<>();
-        onFalse.add(item.onFalse);
-        return generateIf(localData, item.expression, onTrue, onFalse, true);
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, WhileItem item) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        List<AVM2Instruction> whileExpr = new ArrayList<>();
-
-        List<GraphTargetItem> ex = new ArrayList<>(item.expression);
-        GraphTargetItem lastItem = null;
-        if (!ex.isEmpty()) {
-            lastItem = ex.remove(ex.size() - 1);
-            while (lastItem instanceof CommaExpressionItem) {
-                CommaExpressionItem cei = (CommaExpressionItem) lastItem;
-                ex.addAll(cei.commands);
-                lastItem = ex.remove(ex.size() - 1);
-            }
-            whileExpr.addAll(generateToInsList(localData, ex));
-        }
-        List<AVM2Instruction> whileBody = generateToInsList(localData, item.commands);
-        AVM2Instruction forwardJump = ins(AVM2Instructions.Jump, 0);
-        ret.add(forwardJump);
-        whileBody.add(0, ins(AVM2Instructions.Label));
-        ret.addAll(whileBody);
-        int whileBodyLen = insToBytes(whileBody).length;
-        forwardJump.operands[0] = whileBodyLen;
-        whileExpr.addAll(toInsList(condition(localData, lastItem, 0)));
-        int whileExprLen = insToBytes(whileExpr).length;
-        whileExpr.get(whileExpr.size() - 1).operands[0] = -(whileExprLen + whileBodyLen); //Assuming last is if instruction
-        ret.addAll(whileExpr);
-        fixLoop(whileBody, whileBodyLen + whileExprLen, whileBodyLen, item.loop.id);
-        return ret;
-    }
-
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, ForEachInAVM2Item item) throws CompilationException {
-        return generateForIn(localData, item.loop, item.expression.collection, (AssignableAVM2Item) item.expression.object, item.commands, true);
-    }
-
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, ForInAVM2Item item) throws CompilationException {
-        return generateForIn(localData, item.loop, item.expression.collection, (AssignableAVM2Item) item.expression.object, item.commands, false);
-    }
-
-    public List<GraphSourceItem> generateForIn(SourceGeneratorLocalData localData, Loop loop, GraphTargetItem collection, AssignableAVM2Item assignable, List<GraphTargetItem> commands, final boolean each) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        final Reference<Integer> counterReg = new Reference<>(0);
-        final Reference<Integer> collectionReg = new Reference<>(0);
-
-        if (assignable instanceof UnresolvedAVM2Item) {
-            assignable = (AssignableAVM2Item) ((UnresolvedAVM2Item) assignable).resolved;
-        }
-
-        ret.addAll(GraphTargetItem.toSourceMerge(localData, this,
-                ins(AVM2Instructions.PushByte, 0),
-                AssignableAVM2Item.setTemp(localData, this, counterReg),
-                collection,
-                NameAVM2Item.generateCoerce(localData, this, TypeItem.UNBOUNDED),
-                AssignableAVM2Item.setTemp(localData, this, collectionReg)
-        ));
-
-        GraphTargetItem assigned = new GraphTargetItem() {
-
-            @Override
-            public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
-                return null;
-            }
-
-            @Override
-            public boolean hasReturnValue() {
-                return true;
-            }
-
-            @Override
-            public GraphTargetItem returnType() {
-                return TypeItem.UNBOUNDED;
-            }
-
-            @Override
-            public List<GraphSourceItem> toSource(SourceGeneratorLocalData localData, SourceGenerator generator) throws CompilationException {
-                return toSourceMerge(localData, generator,
-                        AssignableAVM2Item.getTemp(localData, generator, collectionReg),
-                        AssignableAVM2Item.getTemp(localData, generator, counterReg),
-                        ins(each ? AVM2Instructions.NextValue : AVM2Instructions.NextName)
-                );
-            }
-        };
-        assignable.setAssignedValue(assigned);
-
-        List<AVM2Instruction> forBody = toInsList(GraphTargetItem.toSourceMerge(localData, this,
-                ins(AVM2Instructions.Label),
-                assignable.toSourceIgnoreReturnValue(localData, this)
-        ));
-
-        forBody.addAll(generateToInsList(localData, commands));
-        int forBodyLen = insToBytes(forBody).length;
-
-        AVM2Instruction forwardJump = ins(AVM2Instructions.Jump, forBodyLen);
-        ret.add(forwardJump);
-
-        List<AVM2Instruction> expr = new ArrayList<>();
-        expr.add(ins(AVM2Instructions.HasNext2, collectionReg.getVal(), counterReg.getVal()));
-        AVM2Instruction backIf = ins(AVM2Instructions.IfTrue, 0);
-        expr.add(backIf);
-
-        int exprLen = insToBytes(expr).length;
-        backIf.operands[0] = -(exprLen + forBodyLen);
-
-        fixLoop(forBody, forBodyLen + exprLen, forBodyLen, loop.id);
-        ret.addAll(forBody);
-        ret.addAll(expr);
-        ret.addAll(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(collectionReg, counterReg)));
-        return ret;
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, DoWhileItem item) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        List<AVM2Instruction> whileExpr = new ArrayList<>();
-
-        List<GraphTargetItem> ex = new ArrayList<>(item.expression);
-        GraphTargetItem lastItem = null;
-        if (!ex.isEmpty()) {
-            lastItem = ex.remove(ex.size() - 1);
-            while (lastItem instanceof CommaExpressionItem) {
-                CommaExpressionItem cei = (CommaExpressionItem) lastItem;
-                ex.addAll(cei.commands);
-                lastItem = ex.remove(ex.size() - 1);
-            }
-            whileExpr.addAll(generateToInsList(localData, ex));
-        }
-        List<AVM2Instruction> dowhileBody = generateToInsList(localData, item.commands);
-        List<AVM2Instruction> labelBody = new ArrayList<>();
-        labelBody.add(ins(AVM2Instructions.Label));
-        int labelBodyLen = insToBytes(labelBody).length;
-
-        AVM2Instruction forwardJump = ins(AVM2Instructions.Jump, labelBodyLen);
-        ret.add(forwardJump);
-        ret.addAll(labelBody);
-        ret.addAll(dowhileBody);
-        int dowhileBodyLen = insToBytes(dowhileBody).length;
-        whileExpr.addAll(toInsList(condition(localData, lastItem, 0)));
-        int dowhileExprLen = insToBytes(whileExpr).length;
-        whileExpr.get(whileExpr.size() - 1).operands[0] = -(dowhileExprLen + dowhileBodyLen + labelBodyLen); //Assuming last is if instruction
-        ret.addAll(whileExpr);
-        fixLoop(dowhileBody, dowhileBodyLen + dowhileExprLen, dowhileBodyLen, item.loop.id);
-        return ret;
-    }
-
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, WithAVM2Item item) throws CompilationException {
-
-        List<GraphSourceItem> ret = new ArrayList<>();
-        ret.addAll(item.scope.toSource(localData, this));
-        Reference<Integer> tempReg = new Reference<>(0);
-        ret.addAll(AssignableAVM2Item.dupSetTemp(localData, this, tempReg));
-        localData.scopeStack.add(new WithObjectAVM2Item(null, null, new LocalRegAVM2Item(null, null, tempReg.getVal(), null)));
-        ret.add(ins(AVM2Instructions.PushWith));
-        ret.addAll(generate(localData, item.items));
-        ret.add(ins(AVM2Instructions.PopScope));
-        ret.addAll(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(tempReg)));
-        localData.scopeStack.remove(localData.scopeStack.size() - 1);
-        return ret;
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, ForItem item) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        List<AVM2Instruction> forExpr = new ArrayList<>();
-
-        List<GraphTargetItem> ex = new ArrayList<>();
-        if (item.expression != null) {
-            ex.add(item.expression);
-        } else {
-            ex.add(new BooleanAVM2Item(null, null, true));
-        }
-        GraphTargetItem lastItem = null;
-        if (!ex.isEmpty()) {
-            lastItem = ex.remove(ex.size() - 1);
-            while (lastItem instanceof CommaExpressionItem) {
-                CommaExpressionItem cei = (CommaExpressionItem) lastItem;
-                ex.addAll(cei.commands);
-                lastItem = ex.remove(ex.size() - 1);
-            }
-            forExpr.addAll(generateToInsList(localData, ex));
-        }
-        List<AVM2Instruction> forBody = generateToInsList(localData, item.commands);
-        List<AVM2Instruction> forFinalCommands = generateToInsList(localData, item.finalCommands);
-
-        ret.addAll(generateToInsList(localData, item.firstCommands));
-
-        AVM2Instruction forwardJump = ins(AVM2Instructions.Jump, 0);
-        ret.add(forwardJump);
-        forBody.add(0, ins(AVM2Instructions.Label));
-        ret.addAll(forBody);
-        ret.addAll(forFinalCommands);
-        int forBodyLen = insToBytes(forBody).length;
-        int forFinalCLen = insToBytes(forFinalCommands).length;
-        forwardJump.operands[0] = forBodyLen + forFinalCLen;
-        forExpr.addAll(toInsList(condition(localData, lastItem, 0)));
-        int forExprLen = insToBytes(forExpr).length;
-        forExpr.get(forExpr.size() - 1).operands[0] = -(forExprLen + forBodyLen + forFinalCLen); //Assuming last is if instruction
-        ret.addAll(forExpr);
-        fixLoop(forBody, forBodyLen + forFinalCLen + forExprLen, forBodyLen, item.loop.id);
-        return ret;
-    }
-
-    private long uniqLast = 0;
-
-    public String uniqId() {
-        uniqLast++;
-        return "" + uniqLast;
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, SwitchItem item) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        Reference<Integer> switchedReg = new Reference<>(0);
-        AVM2Instruction forwardJump = ins(AVM2Instructions.Jump, 0);
-        ret.add(forwardJump);
-
-        int defIndex = -1;
-
-        for (int i = item.caseValues.size() - 1; i >= 0; i--) {
-            if (item.caseValues.get(i) instanceof DefaultItem) {
-                defIndex = i;
-                break;
-            }
-        }
-
-        List<AVM2Instruction> cases = new ArrayList<>();
-        cases.addAll(toInsList(new IntegerValueAVM2Item(null, null, (long) defIndex).toSource(localData, this)));
-        int cLen = insToBytes(cases).length;
-        List<AVM2Instruction> caseLast = new ArrayList<>();
-        caseLast.add(0, ins(AVM2Instructions.Jump, cLen));
-        caseLast.addAll(0, toInsList(new IntegerValueAVM2Item(null, null, (long) defIndex).toSource(localData, this)));
-        int cLastLen = insToBytes(caseLast).length;
-        caseLast.add(0, ins(AVM2Instructions.Jump, cLastLen));
-        cases.addAll(0, caseLast);
-
-        List<AVM2Instruction> preCases = new ArrayList<>();
-        preCases.addAll(toInsList(item.switchedObject.toSource(localData, this)));
-        preCases.addAll(toInsList(AssignableAVM2Item.setTemp(localData, this, switchedReg)));
-
-        for (int i = item.caseValues.size() - 1; i >= 0; i--) {
-            if (item.caseValues.get(i) instanceof DefaultItem) {
-                continue;
-            }
-            List<AVM2Instruction> sub = new ArrayList<>();
-            sub.addAll(toInsList(new IntegerValueAVM2Item(null, null, (long) i).toSource(localData, this)));
-            sub.add(ins(AVM2Instructions.Jump, insToBytes(cases).length));
-            int subLen = insToBytes(sub).length;
-
-            cases.addAll(0, sub);
-            cases.add(0, ins(AVM2Instructions.IfStrictNe, subLen));
-            cases.addAll(0, toInsList(AssignableAVM2Item.getTemp(localData, this, switchedReg)));
-            cases.addAll(0, toInsList(item.caseValues.get(i).toSource(localData, this)));
-        }
-        cases.addAll(0, preCases);
-
-        AVM2Instruction lookupOp = new AVM2Instruction(0, AVM2Instructions.LookupSwitch, new int[item.caseValues.size() + 1 + 1]);
-        cases.addAll(toInsList(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(switchedReg))));
-        List<AVM2Instruction> bodies = new ArrayList<>();
-        List<Integer> bodiesOffsets = new ArrayList<>();
-        int defOffset;
-        int casesLen = insToBytes(cases).length;
-        bodies.add(0, ins(AVM2Instructions.Label));
-        bodies.add(ins(new BreakJumpIns(item.loop.id), 0));  //There could be two breaks when default clause ends with break, but official compiler does this too, so who cares...
-        defOffset = -(insToBytes(bodies).length + casesLen);
-        for (int i = item.caseCommands.size() - 1; i >= 0; i--) {
-            bodies.addAll(0, generateToInsList(localData, item.caseCommands.get(i)));
-            bodies.add(0, ins(AVM2Instructions.Label));
-            bodiesOffsets.add(0, -(insToBytes(bodies).length + casesLen));
-        }
-        lookupOp.operands[0] = defOffset;
-        lookupOp.operands[1] = item.valuesMapping.size();
-        for (int i = 0; i < item.valuesMapping.size(); i++) {
-            lookupOp.operands[2 + i] = bodiesOffsets.get(item.valuesMapping.get(i));
-        }
-
-        forwardJump.operands[0] = insToBytes(bodies).length;
-        ret.addAll(bodies);
-        ret.addAll(cases);
-        ret.add(lookupOp);
-        fixSwitch(toInsList(ret), insToBytes(toInsList(ret)).length, uniqLast);
-        return ret;
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, NotItem item) throws CompilationException {
-        /*if (item.getOriginal() instanceof Inverted) {
-         GraphTargetItem norig = ((Inverted) item).invert();
-         return norig.toSource(localData, this);
-         }*/
-        List<GraphSourceItem> ret = new ArrayList<>();
-        ret.addAll(item.getOriginal().toSource(localData, this));
-        ret.add(ins(AVM2Instructions.Not));
-        return ret;
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, DuplicateItem item) {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        ret.add(ins(AVM2Instructions.Dup));
-        return ret;
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, BreakItem item) {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        AVM2Instruction abreak = ins(new BreakJumpIns(item.loopId), 0);
-        ret.add(abreak);
-        return ret;
-    }
-
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, FunctionAVM2Item item) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        int scope = 0;
-        if (!item.functionName.isEmpty()) {
-            ret.add(ins(AVM2Instructions.NewObject, 0));
-            ret.add(ins(AVM2Instructions.PushWith));
-            scope = localData.scopeStack.size();
-            localData.scopeStack.add(new PropertyAVM2Item(null, item.functionName, abcIndex, new ArrayList<>(), localData.callStack));
-        }
-        AVM2ConstantPool constants = abcIndex.getSelectedAbc().constants;
-        ret.add(ins(AVM2Instructions.NewFunction, method(false, constants.getStringId(item.functionName, true), true, false, localData.callStack, localData.pkg, item.needsActivation, item.subvariables, 0 /*Set later*/, item.hasRest, item.line, localData.currentClass, null, false, localData, item.paramTypes, item.paramNames, item.paramValues, item.body, item.retType)));
-        if (!item.functionName.isEmpty()) {
-            ret.add(ins(AVM2Instructions.Dup));
-            ret.add(ins(AVM2Instructions.GetScopeObject, scope));
-            ret.add(ins(AVM2Instructions.Swap));
-            ret.add(ins(AVM2Instructions.SetProperty, constants.getMultinameId(Multiname.createQName(false, constants.getStringId(item.functionName, true), constants.getNamespaceId(Namespace.KIND_PACKAGE, localData.pkg, 0, true)), true)));
-            ret.add(ins(AVM2Instructions.PopScope));
-            localData.scopeStack.remove(localData.scopeStack.size() - 1);
-        }
-        return ret;
-    }
-
-    private static int currentFinId = 1;
-
-    private static int finId() {
-        return currentFinId++;
-    }
-
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, TryAVM2Item item) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-
-        boolean newFinallyReg = false;
-        List<ABCException> newex = new ArrayList<>();
-        int aloneFinallyEx = -1;
-        int finallyEx = -1;
-        for (NameAVM2Item e : item.catchExceptions2) {
-            ABCException aex = new ABCException();
-            aex.name_index = abcIndex.getSelectedAbc().constants.getMultinameId(Multiname.createQName(false, abcIndex.getSelectedAbc().constants.getStringId(e.getVariableName(), true), abcIndex.getSelectedAbc().constants.getNamespaceId(Namespace.KIND_PACKAGE, "", 0, true)), true);
-            aex.type_index = typeName(localData, e.type);
-            newex.add(aex);
-        }
-        int finId = 0;
-        if (item.finallyCommands != null) {
-            if (item.catchExceptions2.isEmpty()) {
-                ABCException aex = new ABCException();
-                aex.name_index = 0;
-                aex.type_index = 0;
-                newex.add(aex);
-                aloneFinallyEx = newex.size() - 1;
-            }
-            ABCException aex = new ABCException();
-            aex.name_index = 0;
-            aex.type_index = 0;
-            newex.add(aex);
-            finallyEx = newex.size() - 1;
-            if (localData.finallyRegister == -1) {
-                localData.finallyRegister = getFreeRegister(localData);
-                killRegister(localData, localData.finallyRegister); //reuse for catches
-                newFinallyReg = true;
-            }
-            finId = finId();
-        }
-
-        if (finallyEx > -1) {
-            localData.finallyCatches.add(finId);
-        }
-        List<AVM2Instruction> tryCmds = generateToInsList(localData, item.tryCommands);
-
-        //int i = firstId + item.catchCommands.size() - 1;
-        List<AVM2Instruction> catches = new ArrayList<>();
-        Reference<Integer> tempReg = new Reference<>(0);
-
-        List<Integer> currentExceptionIds = new ArrayList<>();
-        List<List<AVM2Instruction>> catchCmds = new ArrayList<>();
-        for (int c = 0; c < item.catchCommands.size(); c++) {
-            int i = localData.exceptions.size();
-            localData.exceptions.add(newex.get(c));
-
-            currentExceptionIds.add(i);
-
-            //Reference<Integer> tempReg=new Reference<>(0);
-            List<AVM2Instruction> catchCmd = new ArrayList<>();
-            catchCmd.add(ins(AVM2Instructions.NewCatch, i));
-            catchCmd.addAll(toInsList(AssignableAVM2Item.dupSetTemp(localData, this, tempReg)));
-            catchCmd.add(ins(AVM2Instructions.Dup));
-            catchCmd.add(ins(AVM2Instructions.PushScope));
-            catchCmd.add(ins(AVM2Instructions.Swap));
-            catchCmd.add(ins(AVM2Instructions.SetSlot, 1));
-
-            for (AssignableAVM2Item a : item.catchVariables.get(c)) {
-                GraphTargetItem r = a;
-                if (r instanceof UnresolvedAVM2Item) {
-                    r = ((UnresolvedAVM2Item) r).resolvedRoot;
-                }
-                if (r instanceof NameAVM2Item) {
-                    NameAVM2Item n = (NameAVM2Item) r;
-                    if (item.catchExceptions2.get(c).getVariableName().equals(n.getVariableName())) {
-                        n.setSlotScope(localData.scopeStack.size());
-                    }
-                }
-            }
-            localData.scopeStack.add(new LocalRegAVM2Item(null, null, tempReg.getVal(), null));
-            catchCmd.addAll(generateToInsList(localData, item.catchCommands.get(c)));
-            localData.scopeStack.remove(localData.scopeStack.size() - 1);
-            catchCmd.add(ins(AVM2Instructions.PopScope));
-            catchCmd.addAll(toInsList(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(tempReg))));
-            catchCmds.add(catchCmd);
-        }
-        for (int c = item.catchCommands.size() - 1; c >= 0; c--) {
-            List<AVM2Instruction> preCatches = new ArrayList<>();
-            /*preCatches.add(ins(AVM2Instructions.GetLocal0));
-             preCatches.add(ins(AVM2Instructions.PushScope));
-             preCatches.add(AssignableAVM2Item.generateGetLoc(localData.activationReg));
-             preCatches.add(ins(AVM2Instructions.PushScope));*/
-            for (GraphTargetItem s : localData.scopeStack) {
-                preCatches.addAll(toInsList(s.toSource(localData, this)));
-                if (s instanceof WithObjectAVM2Item) {
-                    preCatches.add(ins(AVM2Instructions.PushWith));
-                } else {
-                    preCatches.add(ins(AVM2Instructions.PushScope));
-                }
-            }
-
-            //catchCmds.add(catchCmd);
-            preCatches.addAll(catchCmds.get(c));
-            catches.addAll(0, preCatches);
-            catches.add(0, new ExceptionMarkAVM2Instruction(currentExceptionIds.get(c), MARK_E_TARGET));
-            catches.add(0, ins(AVM2Instructions.Jump, insToBytes(catches).length));
-        }
-
-        if (aloneFinallyEx > -1) {
-            localData.exceptions.add(newex.get(aloneFinallyEx));
-            aloneFinallyEx = localData.exceptions.size() - 1;
-
-        }
-        if (finallyEx > -1) {
-            localData.exceptions.add(newex.get(finallyEx));
-            finallyEx = localData.exceptions.size() - 1;
-        }
-
-        for (int i : currentExceptionIds) {
-            ret.add(new ExceptionMarkAVM2Instruction(i, MARK_E_START));
-        }
-        if (aloneFinallyEx > -1) {
-            ret.add(new ExceptionMarkAVM2Instruction(aloneFinallyEx, MARK_E_START));
-        }
-        if (finallyEx > -1) {
-            ret.add(new ExceptionMarkAVM2Instruction(finallyEx, MARK_E_START));
-        }
-
-        ret.addAll(tryCmds);
-
-        for (int i : currentExceptionIds) {
-            ret.add(new ExceptionMarkAVM2Instruction(i, MARK_E_END));
-        }
-        if (aloneFinallyEx > -1) {
-            ret.add(new ExceptionMarkAVM2Instruction(aloneFinallyEx, MARK_E_END));
-        }
-
-        if (aloneFinallyEx > -1) {
-            List<AVM2Instruction> preCatches = new ArrayList<>();
-            for (GraphTargetItem s : localData.scopeStack) {
-                preCatches.addAll(toInsList(s.toSource(localData, this)));
-                if (s instanceof WithObjectAVM2Item) {
-                    preCatches.add(ins(AVM2Instructions.PushWith));
-                } else {
-                    preCatches.add(ins(AVM2Instructions.PushScope));
-                }
-            }
-            preCatches.add(ins(AVM2Instructions.NewCatch, aloneFinallyEx));
-            preCatches.addAll(toInsList(AssignableAVM2Item.dupSetTemp(localData, this, tempReg)));
-            preCatches.add(ins(AVM2Instructions.PushScope));
-            preCatches.add(ins(AVM2Instructions.Throw));
-            preCatches.add(ins(AVM2Instructions.PopScope));
-            preCatches.addAll(toInsList(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(tempReg))));
-            catches.add(ins(AVM2Instructions.Jump, insToBytes(preCatches).length));
-            catches.add(new ExceptionMarkAVM2Instruction(aloneFinallyEx, MARK_E_TARGET));
-            catches.addAll(preCatches);
-        }
-        AVM2Instruction finSwitch = null;
-        AVM2Instruction pushDefIns = ins(AVM2Instructions.PushByte, 0);
-
-        int defPos = 0;
-        if (finallyEx > -1) {
-            List<AVM2Instruction> preCatches = new ArrayList<>();
-            preCatches.add(0, new ExceptionMarkAVM2Instruction(finallyEx, MARK_E_TARGET));
-            for (GraphTargetItem s : localData.scopeStack) {
-                preCatches.addAll(toInsList(s.toSource(localData, this)));
-                if (s instanceof WithObjectAVM2Item) {
-                    preCatches.add(ins(AVM2Instructions.PushWith));
-                } else {
-                    preCatches.add(ins(AVM2Instructions.PushScope));
-                }
-            }
-            preCatches.add(ins(AVM2Instructions.NewCatch, finallyEx));
-            preCatches.addAll(toInsList(AssignableAVM2Item.dupSetTemp(localData, this, tempReg)));
-            preCatches.add(ins(AVM2Instructions.PushScope));
-            preCatches.add(ins(AVM2Instructions.PopScope));
-            Reference<Integer> tempReg2 = new Reference<>(0);
-            preCatches.add(ins(AVM2Instructions.Kill, tempReg.getVal()));
-            preCatches.add(ins(AVM2Instructions.CoerceA));
-            preCatches.addAll(toInsList(AssignableAVM2Item.setTemp(localData, this, tempReg2)));
-            preCatches.add(pushDefIns);
-
-            List<AVM2Instruction> finallySwitchCmds = new ArrayList<>();
-
-            finSwitch = new AVM2Instruction(0, AVM2Instructions.LookupSwitch, new int[1 + 1 + 1]);
-            finSwitch.operands[0] = finSwitch.getBytesLength();
-            finSwitch.operands[1] = 0; //switch cnt
-
-            List<AVM2Instruction> preFinallySwitch = new ArrayList<>();
-            preFinallySwitch.add(ins(AVM2Instructions.Label));
-            preFinallySwitch.add(ins(AVM2Instructions.Pop));
-            int preFinallySwitchLen = insToBytes(preFinallySwitch).length;
-
-            finallySwitchCmds.add(ins(AVM2Instructions.Label));
-            finallySwitchCmds.addAll(toInsList(AssignableAVM2Item.getTemp(localData, this, tempReg2)));
-            finallySwitchCmds.add(ins(AVM2Instructions.Kill, tempReg2.getVal()));
-            finallySwitchCmds.add(ins(AVM2Instructions.Throw));
-            finallySwitchCmds.add(ins(AVM2Instructions.PushByte, 255));
-            finallySwitchCmds.add(ins(AVM2Instructions.PopScope));
-            finallySwitchCmds.add(ins(AVM2Instructions.Kill, tempReg.getVal()));
-
-            int finSwitchLen = insToBytes(finallySwitchCmds).length;
-
-            preCatches.add(ins(AVM2Instructions.Jump, preFinallySwitchLen + finSwitchLen));
-            AVM2Instruction fjump = ins(AVM2Instructions.Jump, 0);
-            fjump.operands[0] = insToBytes(preCatches).length + preFinallySwitchLen + finSwitchLen;
-
-            preCatches.add(0, fjump);
-            preCatches.add(0, new ExceptionMarkAVM2Instruction(finallyEx, MARK_E_END));
-            preCatches.add(0, ins(AVM2Instructions.PushByte, 255));
-
-            finallySwitchCmds.add(new ExceptionMarkAVM2Instruction(finallyEx, MARK_E_FINALLYPART));
-
-            int oldReg = localData.finallyRegister;
-            localData.finallyRegister = getFreeRegister(localData);
-            Integer cnt = localData.finallyCounter.get(finId);
-            if (cnt == null) {
-                cnt = -1;
-            }
-            defPos = cnt;
-            cnt++; //Skip default clause (throw)
-            localData.finallyCounter.put(finId, cnt);
-            finallySwitchCmds.addAll(generateToInsList(localData, item.finallyCommands));
-            killRegister(localData, localData.finallyRegister);
-            localData.finallyRegister = oldReg;
-            finSwitchLen = insToBytes(finallySwitchCmds).length;
-
-            finSwitch.operands[2] = -finSwitchLen;
-            preCatches.addAll(preFinallySwitch);
-            preCatches.addAll(finallySwitchCmds);
-            preCatches.add(finSwitch);
-
-            catches.addAll(preCatches);
-            AssignableAVM2Item.killTemp(localData, this, Arrays.asList(tempReg, tempReg2));
-        }
-
-        ret.addAll(catches);
-        //localData.exceptions.addAll(newex);
-
-        if (finallyEx > -1) {
-            localData.finallyCatches.remove(localData.finallyCatches.size() - 1);
-        }
-        if (newFinallyReg) {
-            localData.finallyRegister = -1;
-            killRegister(localData, localData.finallyRegister);
-        }
-        int pos = 0;
-        int finallyPos = 0;
-        int switchPos = 0;
-        for (int s = 0; s < ret.size(); s++) {
-            GraphSourceItem src = ret.get(s);
-            if (src == finSwitch) {
-                switchPos = pos;
-            }
-            if (src instanceof AVM2Instruction) {
-                AVM2Instruction ins = (AVM2Instruction) src;
-                if (ins instanceof ExceptionMarkAVM2Instruction) {
-                    ExceptionMarkAVM2Instruction em = (ExceptionMarkAVM2Instruction) ins;
-                    if (em.exceptionId == finallyEx && em.markType == MARK_E_FINALLYPART) {
-                        finallyPos = pos;
-                        ret.remove(s);
-                        s--;
-                        continue;
-                    }
-                }
-                pos += ins.getBytesLength();
-            }
-
-        }
-
-        if (finSwitch != null) {
-            pos = 0;
-            int defLoc = finSwitch.operands[2];
-            List<Integer> switchLoc = new ArrayList<>();
-            boolean wasDef = false;
-            for (int s = 0; s < ret.size(); s++) {
-                GraphSourceItem src = ret.get(s);
-                if (src instanceof AVM2Instruction) {
-                    AVM2Instruction ins = (AVM2Instruction) src;
-                    if (ins.definition instanceof FinallyJumpIns) {
-                        FinallyJumpIns fji = (FinallyJumpIns) ins.definition;
-                        if (fji.getClauseId() == finId) {
-                            List<AVM2Instruction> bet = new ArrayList<>();
-                            bet.add(ins(AVM2Instructions.Label));
-                            bet.add(ins(AVM2Instructions.Pop));
-                            int betLen = insToBytes(bet).length;
-                            if (wasDef) {
-                                ins.operands[0] = 0;
-                            } else {
-                                ins.operands[0] = finallyPos - (pos + ins.getBytesLength());
-                            }
-                            ins.definition = AVM2Code.instructionSet[AVM2Instructions.Jump];
-                            switchLoc.add(pos + ins.getBytesLength() + betLen - switchPos);
-                        }
-                    }
-                    pos += ins.getBytesLength();
-                }
-                if (defPos == switchLoc.size() - 1) {
-                    switchLoc.add(defLoc);
-                    wasDef = true;
-                }
-            }
-            finSwitch.operands = new int[1 + 1 + switchLoc.size()];
-            pushDefIns.operands[0] = defPos + 1;
-            int afterLoc = finSwitch.getBytesLength();
-            finSwitch.operands[0] = afterLoc;
-            finSwitch.operands[1] = switchLoc.size() - 1;
-            for (int j = 0; j < switchLoc.size(); j++) {
-                finSwitch.operands[2 + j] = switchLoc.get(j);
-            }
-        }
-
-        return ret;
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, ContinueItem item) {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        AVM2Instruction acontinue = ins(new ContinueJumpIns(item.loopId), 0);
-        ret.add(acontinue);
-        return ret;
-    }
-
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, ReturnValueAVM2Item item) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        ret.addAll(item.value.toSource(localData, this));
-        if (!localData.finallyCatches.isEmpty()) {
-            ret.add(ins(AVM2Instructions.CoerceA));
-            ret.add(AssignableAVM2Item.generateSetLoc(localData.finallyRegister));
-            for (int i = localData.finallyCatches.size() - 1; i >= 0; i--) {
-                if (i < localData.finallyCatches.size() - 1) {
-                    ret.add(ins(AVM2Instructions.Label));
-                }
-                int clauseId = localData.finallyCatches.get(i);
-                Integer cnt = localData.finallyCounter.get(clauseId);
-                if (cnt == null) {
-                    cnt = -1;
-                }
-                cnt++;
-                localData.finallyCounter.put(clauseId, cnt);
-                ret.addAll(new IntegerValueAVM2Item(null, null, (long) cnt).toSource(localData, this));
-                ret.add(ins(new FinallyJumpIns(clauseId), 0));
-                ret.add(ins(AVM2Instructions.Label));
-                ret.add(ins(AVM2Instructions.Pop));
-            }
-            ret.add(ins(AVM2Instructions.Label));
-            ret.add(AssignableAVM2Item.generateGetLoc(localData.finallyRegister));
-            ret.add(ins(AVM2Instructions.Kill, localData.finallyRegister));
-        }
-        ret.add(ins(AVM2Instructions.ReturnValue));
-        return ret;
-    }
-
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, ReturnVoidAVM2Item item) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        if (!localData.finallyCatches.isEmpty()) {
-
-            for (int i = 0; i < localData.finallyCatches.size(); i++) {
-                if (i > 0) {
-                    ret.add(ins(AVM2Instructions.Label));
-                }
-                int clauseId = localData.finallyCatches.get(i);
-                Integer cnt = localData.finallyCounter.get(clauseId);
-                if (cnt == null) {
-                    cnt = -1;
-                }
-                cnt++;
-                localData.finallyCounter.put(clauseId, cnt);
-                ret.addAll(new IntegerValueAVM2Item(null, null, (long) cnt).toSource(localData, this));
-                ret.add(ins(new FinallyJumpIns(clauseId), 0));
-                ret.add(ins(AVM2Instructions.Label));
-                ret.add(ins(AVM2Instructions.Pop));
-            }
-            ret.add(ins(AVM2Instructions.Label));
-        }
-        ret.add(ins(AVM2Instructions.ReturnVoid));
-        return ret;
-    }
-
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, ThrowAVM2Item item) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        ret.addAll(item.value.toSource(localData, this));
-        ret.add(ins(AVM2Instructions.Throw));
-        return ret;
-    }
-
-    private List<AVM2Instruction> generateToInsList(SourceGeneratorLocalData localData, List<GraphTargetItem> commands) throws CompilationException {
-        return toInsList(generate(localData, commands));
-    }
-
-    private List<AVM2Instruction> generateToActionList(SourceGeneratorLocalData localData, GraphTargetItem command) throws CompilationException {
-        return toInsList(command.toSource(localData, this));
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, List<GraphTargetItem> commands) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        for (GraphTargetItem item : commands) {
-            ret.addAll(item.toSourceIgnoreReturnValue(localData, this));
-        }
-        return ret;
-    }
-
-    public HashMap<String, Integer> getRegisterVars(SourceGeneratorLocalData localData) {
-        return localData.registerVars;
-    }
-
-    public void setRegisterVars(SourceGeneratorLocalData localData, HashMap<String, Integer> value) {
-        localData.registerVars = value;
-    }
-
-    public void setInFunction(SourceGeneratorLocalData localData, int value) {
-        localData.inFunction = value;
-    }
-
-    public int isInFunction(SourceGeneratorLocalData localData) {
-        return localData.inFunction;
-    }
-
-    public boolean isInMethod(SourceGeneratorLocalData localData) {
-        return localData.inMethod;
-    }
-
-    public void setInMethod(SourceGeneratorLocalData localData, boolean value) {
-        localData.inMethod = value;
-    }
-
-    public int getForInLevel(SourceGeneratorLocalData localData) {
-        return localData.forInLevel;
-    }
-
-    public void setForInLevel(SourceGeneratorLocalData localData, int value) {
-        localData.forInLevel = value;
-    }
-
-    public int getTempRegister(SourceGeneratorLocalData localData) {
-        HashMap<String, Integer> registerVars = getRegisterVars(localData);
-        int tmpReg = 0;
-        for (int i = 0; i < 256; i++) {
-            if (!registerVars.containsValue(i)) {
-                tmpReg = i;
-                break;
-            }
-        }
-        return tmpReg;
-    }
-
-    public AVM2SourceGenerator(AbcIndexing abc) {
-        this.abcIndex = abc;
-    }
-
-    /*public ABC getABC() {
-     return abc;
-     }*/
-    public void generateClass(List<DottedChain> importedClasses, List<AssignableAVM2Item> cinitVariables, boolean cinitNeedsActivation, List<GraphTargetItem> cinit, List<NamespaceItem> openedNamespaces, int namespace, int initScope, DottedChain pkg, ClassInfo classInfo, InstanceInfo instanceInfo, SourceGeneratorLocalData localData, boolean isInterface, String name, String superName, GraphTargetItem extendsVal, List<GraphTargetItem> implementsStr, GraphTargetItem iinit, List<AssignableAVM2Item> iinitVariables, boolean iinitNeedsActivation, List<GraphTargetItem> traitItems, Reference<Integer> class_index) throws AVM2ParseException, CompilationException {
-        localData.currentClass = name;
-        localData.pkg = pkg;
-        localData.privateNs = abcIndex.getSelectedAbc().constants.getNamespaceId(Namespace.KIND_PRIVATE, pkg.toRawString() + ":" + name, 0, true);
-        localData.protectedNs = abcIndex.getSelectedAbc().constants.getNamespaceId(Namespace.KIND_PROTECTED, pkg.toRawString() + ":" + name, 0, true);
-        if (extendsVal == null && !isInterface) {
-            extendsVal = new TypeItem(DottedChain.OBJECT);
-        }
-        ParsedSymbol s = null;
-
-        if (Configuration.handleSkinPartsAutomatically.get()) {
-
-            Map<String, Boolean> skinParts = new HashMap<>();
-            for (GraphTargetItem t : traitItems) {
-                String tname = null;
-                List<Map.Entry<String, Map<String, String>>> tmetadata = null;
-                if (t instanceof MethodAVM2Item) {
-                    tname = ((MethodAVM2Item) t).functionName;
-                    tmetadata = ((MethodAVM2Item) t).metadata;
-                } else if (t instanceof SlotAVM2Item) {
-                    tname = ((SlotAVM2Item) t).var;
-                    tmetadata = ((SlotAVM2Item) t).metadata;
-                } else if (t instanceof ConstAVM2Item) {
-                    tname = ((ConstAVM2Item) t).var;
-                    tmetadata = ((ConstAVM2Item) t).metadata;
-                }
-                if (tname != null && tmetadata != null) {
-                    for (Map.Entry<String, Map<String, String>> en : tmetadata) {
-                        if ("SkinPart".equals(en.getKey())) {
-                            boolean req = false;
-                            if (en.getValue().containsKey("required")) {
-                                if ("true".equals(en.getValue().get("required"))) {
-                                    req = true;
-                                }
-                            }
-                            skinParts.put(tname, req);
-                        }
-                    }
-                }
-            }
-            if (!skinParts.isEmpty()) {
-
-                //Merge parts from _skinParts attribute of parent class
-                GraphTargetItem parent = extendsVal;
-                if (parent instanceof UnresolvedAVM2Item) {
-                    parent = ((UnresolvedAVM2Item) parent).resolved;
-                }
-                if (parent instanceof TypeItem) {
-                    ClassIndex ci = abcIndex.findClass(parent);
-                    if (ci != null) {
-                        int mi = ci.abc.class_info.get(ci.index).cinit_index;
-                        MethodBody pcinit = ci.abc.findBody(mi);
-                        ConvertData d = new ConvertData();
-
-                        List<Traits> initt = new ArrayList<>();
-                        initt.add(ci.abc.class_info.get(ci.index).static_traits);
-
-                        try {
-                            pcinit.convert(d, "-", ScriptExportMode.AS, true, mi, -1, ci.index, ci.abc, null, new ScopeStack(), GraphTextWriter.TRAIT_CLASS_INITIALIZER, new NulWriter(), new ArrayList<>(), initt, false);
-                            //FIXME! Add skinparts from _skinParts attribute of parent class!!!
-                        } catch (InterruptedException ex) {
-                            Logger.getLogger(AVM2SourceGenerator.class.getName()).log(Level.SEVERE, "Getting parent skinparts interrupted", ex);
-                        }
-                        for (Trait t : ci.abc.class_info.get(ci.index).static_traits.traits) {
-                            if (t instanceof TraitSlotConst) {
-                                TraitSlotConst tsc = (TraitSlotConst) t;
-                                if (tsc.kindType == Trait.TRAIT_SLOT) {
-                                    if ("_skinParts".equals(tsc.getName(ci.abc).getName(ci.abc.constants, new ArrayList<>(), true))) {
-                                        if (d.assignedValues.containsKey(tsc)) {
-                                            if (d.assignedValues.get(tsc).value instanceof NewObjectAVM2Item) {
-                                                NewObjectAVM2Item no = (NewObjectAVM2Item) d.assignedValues.get(tsc).value;
-                                                for (NameValuePair nvp : no.pairs) {
-                                                    skinParts.put(EcmaScript.toString(nvp.name.getResult()), EcmaScript.toBoolean(nvp.value.getResult()));
-                                                }
-                                            }
-
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                    }
-                }
-
-                /*
-            Add
-            override protected function get skinParts() : Object
-                {
-                   return _skinParts;
-                }
-                 */
-                List<GraphTargetItem> getterBody = new ArrayList<>();
-                UnresolvedAVM2Item sp = new UnresolvedAVM2Item(new ArrayList<>(), importedClasses, false, TypeItem.UNBOUNDED, 0, new DottedChain("_skinParts"),
-                        null, openedNamespaces);
-                getterBody.add(new ReturnValueAVM2Item(null, null, sp));
-                List<AssignableAVM2Item> subvars = new ArrayList<>();
-                subvars.add(sp);
-                List<List<NamespaceItem>> allopns = new ArrayList<>();
-                allopns.add(openedNamespaces);
-
-                GetterAVM2Item getter = new GetterAVM2Item(allopns, false, false, new ArrayList<>(), new NamespaceItem(pkg.toRawString() + ":" + name, Namespace.KIND_PROTECTED), isInterface, null, false, false, 0,
-                        true, false, false, "skinParts", new ArrayList<>(), new ArrayList<>(), new ArrayList<>(),
-                        getterBody, subvars, new TypeItem("Object"));
-
-                /*
-            Add
-            private static var _skinParts = {attr1:false, attr2:true};
-                 */
-                List<NameValuePair> pairs = new ArrayList<>();
-                for (String tname : skinParts.keySet()) {
-                    pairs.add(new NameValuePair(new StringAVM2Item(null, null, tname), skinParts.get(tname) ? new TrueItem(null, null) : new FalseItem(null, null)));
-                }
-
-                NewObjectAVM2Item sltVal = new NewObjectAVM2Item(null, null, pairs);
-
-                SlotAVM2Item slt = new SlotAVM2Item(
-                        new ArrayList<>(), new NamespaceItem(pkg.toRawString() + ":" + name, Namespace.KIND_PRIVATE),
-                        null, true, "_skinParts", new TypeItem("Object"), sltVal, 0);
-
-                traitItems.add(0, slt);
-                traitItems.add(getter);
-
-            }
-        }
-
-        Trait[] it = generateTraitsPhase1(importedClasses, openedNamespaces, name, superName, false, localData, traitItems, instanceInfo.instance_traits, class_index);
-        Trait[] st = generateTraitsPhase1(importedClasses, openedNamespaces, name, superName, true, localData, traitItems, classInfo.static_traits, class_index);
-        generateTraitsPhase2(importedClasses, pkg, traitItems, it, openedNamespaces, localData);
-        generateTraitsPhase2(importedClasses, pkg, traitItems, st, openedNamespaces, localData);
-        abcIndex.refreshSelected();
-        generateTraitsPhase3(importedClasses, initScope, isInterface, name, superName, false, localData, traitItems, instanceInfo.instance_traits, it, new HashMap<>(), class_index);
-        generateTraitsPhase3(importedClasses, initScope, isInterface, name, superName, true, localData, traitItems, classInfo.static_traits, st, new HashMap<>(), class_index);
-        int init;
-        if (iinit == null || isInterface) {
-            instanceInfo.iinit_index = init = method(false, 0, false, isInterface, new ArrayList<>(), pkg, false, new ArrayList<>(), initScope + 1, false, 0, isInterface ? null : name, extendsVal != null ? extendsVal.toString() : null, true, localData, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), TypeItem.UNBOUNDED/*?? FIXME*/);
-        } else {
-            MethodAVM2Item m = (MethodAVM2Item) iinit;
-            instanceInfo.iinit_index = init = method(false, str(pkg.toRawString() + ":" + name + "/" + name), false, false, new ArrayList<>(), pkg, m.needsActivation, m.subvariables, initScope + 1, m.hasRest, m.line, name, extendsVal != null ? extendsVal.toString() : null, true, localData, m.paramTypes, m.paramNames, m.paramValues, m.body, TypeItem.UNBOUNDED/*?? FIXME*/);
-        }
-
-        //Class initializer
-        int cinit_index = method(true, str(""), false, false, new ArrayList<>(), pkg, cinitNeedsActivation, cinitVariables, initScope + (implementsStr.isEmpty() ? 0 : 1), false, 0, isInterface ? null : name, superName, false, localData, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), cinit, TypeItem.UNBOUNDED);
-        MethodBody cinitBody = abcIndex.getSelectedAbc().findBody(cinit_index);
-
-        List<AVM2Instruction> sinitcode = new ArrayList<>();
-        List<AVM2Instruction> initcode = new ArrayList<>();
-        for (GraphTargetItem ti : traitItems) {
-            if ((ti instanceof SlotAVM2Item) || (ti instanceof ConstAVM2Item)) {
-                GraphTargetItem val = null;
-                boolean isStatic = false;
-                int ns = -1;
-                String tname = null;
-                boolean isConst = false;
-                if (ti instanceof SlotAVM2Item) {
-                    val = ((SlotAVM2Item) ti).value;
-                    isStatic = ((SlotAVM2Item) ti).isStatic();
-                    ns = genNs(importedClasses, pkg, ((SlotAVM2Item) ti).pkg, openedNamespaces, localData, ((SlotAVM2Item) ti).line);
-                    tname = ((SlotAVM2Item) ti).var;
-                }
-                if (ti instanceof ConstAVM2Item) {
-                    val = ((ConstAVM2Item) ti).value;
-                    isStatic = ((ConstAVM2Item) ti).isStatic();
-                    ns = genNs(importedClasses, pkg, ((ConstAVM2Item) ti).pkg, openedNamespaces, localData, ((ConstAVM2Item) ti).line);
-                    tname = ((ConstAVM2Item) ti).var;
-                    isConst = true;
-                }
-                if (isStatic && val != null) {
-                    sinitcode.add(ins(AVM2Instructions.FindProperty, traitName(ns, tname)));
-                    localData.isStatic = true;
-                    sinitcode.addAll(toInsList(val.toSource(localData, this)));
-                    sinitcode.add(ins(isConst ? AVM2Instructions.InitProperty : AVM2Instructions.SetProperty, traitName(ns, tname)));
-                }
-                if (!isStatic && val != null) {
-                    //do not init basic values, that can be stored in trait
-                    if (!(val instanceof IntegerValueAVM2Item) && !(val instanceof StringAVM2Item) && !(val instanceof BooleanAVM2Item) && !(val instanceof NullAVM2Item) && !(val instanceof UndefinedAVM2Item)) {
-                        initcode.add(ins(AVM2Instructions.GetLocal0));
-                        localData.isStatic = false;
-                        initcode.addAll(toInsList(val.toSource(localData, this)));
-                        initcode.add(ins(isConst ? AVM2Instructions.InitProperty : AVM2Instructions.SetProperty, traitName(ns, tname)));
-                    }
-                }
-            }
-        }
-        MethodBody initBody = null;
-        if (!isInterface) {
-            initBody = abcIndex.getSelectedAbc().findBody(init);
-            initBody.insertAll(iinit == null ? 0 : 2, initcode);//after getlocal0,pushscope
-
-            if (cinitBody.getCode().code.get(cinitBody.getCode().code.size() - 1).definition instanceof ReturnVoidIns) {
-                cinitBody.insertAll(2, sinitcode); //after getlocal0,pushscope
-            }
-        }
-        cinitBody.markOffsets();
-        cinitBody.autoFillStats(abcIndex.getSelectedAbc(), initScope + (implementsStr.isEmpty() ? 0 : 1), true);
-
-        classInfo.cinit_index = cinit_index;
-        if (initBody != null) {
-            initBody.autoFillStats(abcIndex.getSelectedAbc(), initScope + 1, true);
-        }
-        instanceInfo.interfaces = new int[implementsStr.size()];
-        for (int i = 0; i < implementsStr.size(); i++) {
-            instanceInfo.interfaces[i] = superIntName(localData, implementsStr.get(i));
-        }
-
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, CommaExpressionItem item) throws CompilationException {
-        if (item.commands.isEmpty()) {
-            return new ArrayList<>();
-        }
-
-        //We need to handle commands and last expression separately, otherwise last expression result will be popped
-        List<GraphTargetItem> cmds = new ArrayList<>(item.commands);
-        GraphTargetItem lastExpr = cmds.remove(cmds.size() - 1);
-        List<GraphSourceItem> ret = new ArrayList<>();
-        ret.addAll(generate(localData, cmds));
-        ret.addAll(lastExpr.toSource(localData, this));
-        return ret;
-    }
-
-    public int generateClass(int namespace, ClassInfo ci, InstanceInfo ii, int initScope, DottedChain pkg, SourceGeneratorLocalData localData, AVM2Item cls, Reference<Integer> class_index) throws AVM2ParseException, CompilationException {
-        /*ClassInfo ci = new ClassInfo();
-         InstanceInfo ii = new InstanceInfo();
-         abc.class_info.add(ci);
-         abc.instance_info.add(ii);
-         */
-        if (cls instanceof ClassAVM2Item) {
-            ClassAVM2Item cai = (ClassAVM2Item) cls;
-            //TODO: iinit variables, iinit activation
-            generateClass(cai.importedClasses, cai.cinitVariables, cai.cinitActivation, cai.staticInit,
-                    cai.openedNamespaces,
-                    namespace,
-                    initScope, pkg, ci, ii,
-                    localData, false,
-                    cai.className, cai.extendsOp == null ? "Object" : cai.extendsOp.toString(),
-                    cai.extendsOp, cai.implementsOp, cai.iinit,
-                    cai.iinitVariables, cai.iinitActivation, cai.traits, class_index
-            );
-            if (!cai.isDynamic) {
-                ii.flags |= InstanceInfo.CLASS_SEALED;
-            }
-            if (cai.isFinal) {
-                ii.flags |= InstanceInfo.CLASS_FINAL;
-            }
-            ii.flags |= InstanceInfo.CLASS_PROTECTEDNS;
-            ii.protectedNS = abcIndex.getSelectedAbc().constants.getNamespaceId(Namespace.KIND_PROTECTED, pkg.toRawString() + ":" + cai.className, 0, true);
-        }
-        if (cls instanceof InterfaceAVM2Item) {
-            InterfaceAVM2Item iai = (InterfaceAVM2Item) cls;
-            ii.flags |= InstanceInfo.CLASS_INTERFACE;
-            ii.flags |= InstanceInfo.CLASS_SEALED;
-            generateClass(iai.importedClasses, new ArrayList<>(), false, new ArrayList<>(),
-                    iai.openedNamespaces, namespace, initScope, pkg, ci, ii, localData, true, iai.name, null, null, iai.superInterfaces, null, null, false, iai.methods,
-                    class_index
-            );
-        }
-
-        return abcIndex.getSelectedAbc().instance_info.size() - 1;
-    }
-
-    public int traitName(int namespace, String var) {
-        return abcIndex.getSelectedAbc().constants.getMultinameId(Multiname.createQName(false, str(var), namespace), true);
-    }
-
-    public int typeName(SourceGeneratorLocalData localData, GraphTargetItem type) throws CompilationException {
-        if (type instanceof UnboundedTypeItem) {
-            return 0;
-        }
-        if (("" + type).equals("*")) {
-            return 0;
-        }
-
-        return resolveType(localData, type, abcIndex);
-        /*
-         TypeItem nameItem = (TypeItem) type;
-         name = nameItem.fullTypeName;
-         if (name.contains(".")) {
-         pkg = name.substring(0, name.lastIndexOf('.'));
-         name = name.substring(name.lastIndexOf('.') + 1);
-         }
-         if (!nameItem.subtypes.isEmpty()) { //It's vector => TypeName
-         List<Integer> params = new ArrayList<>();
-         for (GraphTargetItem p : nameItem.subtypes) {
-         params.add(typeName(localData, p));//abc.getLastAbc().constants.getMultinameId(new Multiname(Multiname.QNAME, str(p), namespace(Namespace.KIND_PACKAGE, ppkg), 0, 0, new ArrayList<Integer>()), true));
-         }
-         int qname = abc.getLastAbc().constants.getMultinameId(new Multiname(Multiname.QNAME, str(name), namespace(Namespace.KIND_PACKAGE, pkg), 0, 0, new ArrayList<Integer>()), true);
-         return abc.getLastAbc().constants.getMultinameId(new Multiname(Multiname.TYPENAME, 0, 0, 0, qname, params), true);
-         } else {
-         return abc.getLastAbc().constants.getMultinameId(new Multiname(Multiname.QNAME, str(name), namespace(Namespace.KIND_PACKAGE, pkg), 0, 0, new ArrayList<Integer>()), true);
-         }*/
-    }
-
-    public int ident(GraphTargetItem name) {
-        if (name instanceof NameAVM2Item) {
-            return str(((NameAVM2Item) name).getVariableName());
-        }
-        throw new RuntimeException("no ident"); //FIXME
-    }
-
-    public int namespace(int nsKind, String name) {
-        return abcIndex.getSelectedAbc().constants.getNamespaceId(nsKind, str(name), 0, true);
-    }
-
-    public int str(String name) {
-        return abcIndex.getSelectedAbc().constants.getStringId(name, true);
-    }
-
-    public int propertyName(GraphTargetItem name) {
-        if (name instanceof NameAVM2Item) {
-            NameAVM2Item va = (NameAVM2Item) name;
-            return abcIndex.getSelectedAbc().constants.getMultinameId(Multiname.createQName(false, str(va.getVariableName()), namespace(Namespace.KIND_PACKAGE, "")), true);
-        }
-        throw new RuntimeException("no prop"); //FIXME
-    }
-
-    public int getFreeRegister(SourceGeneratorLocalData localData) {
-        for (int i = 0;; i++) {
-            if (!localData.registerVars.containsValue(i)) {
-                localData.registerVars.put("__TEMP__" + i, i);
-                return i;
-            }
-        }
-    }
-
-    public boolean killRegister(SourceGeneratorLocalData localData, int i) {
-        String key = null;
-        for (String k : localData.registerVars.keySet()) {
-            if (localData.registerVars.get(k) == i) {
-                key = k;
-                break;
-            }
-        }
-        if (key != null) {
-            localData.registerVars.remove(key);
-            return true;
-        }
-        return false;
-    }
-
-    public int method(boolean isStatic, int name_index, boolean subMethod, boolean isInterface, List<MethodBody> callStack, DottedChain pkg, boolean needsActivation, List<AssignableAVM2Item> subvariables, int initScope, boolean hasRest, int line, String className, String superType, boolean constructor, SourceGeneratorLocalData localData, List<GraphTargetItem> paramTypes, List<String> paramNames, List<GraphTargetItem> paramValues, List<GraphTargetItem> body, GraphTargetItem retType) throws CompilationException {
-        //Reference<Boolean> hasArgs = new Reference<>(Boolean.FALSE);
-        //calcRegisters(localData,needsActivation,paramNames,subvariables,body, hasArgs);
-        SourceGeneratorLocalData newlocalData = new SourceGeneratorLocalData(new HashMap<>(), 1, true, 0);
-        newlocalData.currentClass = className;
-        newlocalData.pkg = localData.pkg;
-        newlocalData.callStack.addAll(localData.callStack);
-        newlocalData.traitUsages = localData.traitUsages;
-        newlocalData.currentScript = localData.currentScript;
-        newlocalData.documentClass = localData.documentClass;
-        newlocalData.privateNs = localData.privateNs;
-        newlocalData.protectedNs = localData.protectedNs;
-        newlocalData.isStatic = isStatic;
-        newlocalData.subMethod = subMethod;
-        localData = newlocalData;
-
-        localData.activationReg = 0;
-
-        for (int i = 0; i < subvariables.size(); i++) {
-            AssignableAVM2Item an = subvariables.get(i);
-            if (an instanceof UnresolvedAVM2Item) {
-                UnresolvedAVM2Item n = (UnresolvedAVM2Item) an;
-                if (n.resolved == null) {
-                    String fullClass = localData.getFullClass();
-                    GraphTargetItem res = n.resolve(new TypeItem(fullClass), paramTypes, paramNames, abcIndex, callStack, subvariables);
-                    if (res instanceof AssignableAVM2Item) {
-                        subvariables.set(i, (AssignableAVM2Item) res);
-                    } else {
-                        subvariables.remove(i);
-                        i--;
-                    }
-                }
-            }
-        }
-
-        for (int t = 0; t < paramTypes.size(); t++) {
-            GraphTargetItem an = paramTypes.get(t);
-            if (an instanceof UnresolvedAVM2Item) {
-                UnresolvedAVM2Item n = (UnresolvedAVM2Item) an;
-                if (n.resolved == null) {
-                    String fullClass = localData.getFullClass();
-                    GraphTargetItem res = n.resolve(new TypeItem(fullClass), paramTypes, paramNames, abcIndex, callStack, subvariables);
-                    paramTypes.set(t, res);
-                }
-            }
-        }
-
-        boolean hasArguments = false;
-        List<String> slotNames = new ArrayList<>();
-        List<String> slotTypes = new ArrayList<>();
-        slotNames.add("--first");
-        slotTypes.add("-");
-
-        int paramLine = 0; //?
-
-        List<String> registerNames = new ArrayList<>();
-        List<Integer> registerLines = new ArrayList<>();
-        List<String> registerTypes = new ArrayList<>();
-        if (className != null) {
-            String fullClassName = pkg.add(className).toRawString();
-            registerTypes.add(fullClassName);
-            localData.scopeStack.add(new LocalRegAVM2Item(null, null, registerNames.size(), null));
-            registerNames.add("this");
-            registerLines.add(0); //?
-
-        } else {
-            registerTypes.add("global");
-            registerNames.add("this");
-            registerLines.add(0); //?
-        }
-        for (GraphTargetItem t : paramTypes) {
-            registerTypes.add(t.toString());
-            slotTypes.add(t.toString());
-        }
-        for (int i = 0; i < paramNames.size(); i++) {
-            registerLines.add(paramLine);
-        }
-        registerNames.addAll(paramNames);
-        slotNames.addAll(paramNames);
-        /*for (GraphTargetItem p : paramTypes) {
-         slotTypes.add("" + p);
-         }*/
-        if (hasRest) {
-            registerTypes.add("Array");
-            slotTypes.add("Array");
-        }
-        localData.registerVars.clear();
-        for (AssignableAVM2Item an : subvariables) {
-            if (an instanceof NameAVM2Item) {
-                NameAVM2Item n = (NameAVM2Item) an;
-                if (n.getVariableName().equals("arguments") & !n.isDefinition()) {
-                    registerNames.add("arguments");
-                    registerTypes.add("Object");
-                    registerLines.add(0); //?
-                    hasArguments = true;
-                    break;
-                }
-            }
-        }
-        int paramRegCount = registerNames.size();
-
-        if (needsActivation) {
-            registerNames.add("+$activation");
-            registerLines.add(0); //?
-            localData.activationReg = registerNames.size() - 1;
-            registerTypes.add("Object");
-            localData.scopeStack.add(new LocalRegAVM2Item(null, null, localData.activationReg, null));
-        }
-
-        String mask = Configuration.registerNameFormat.get();
-        mask = mask.replace("%d", "([0-9]+)");
-        Pattern pat = Pattern.compile(mask);
-
-        //Two rounds
-        for (int round = 1; round <= 2; round++) {
-            for (AssignableAVM2Item an : subvariables) {
-                if (an instanceof NameAVM2Item) {
-                    NameAVM2Item n = (NameAVM2Item) an;
-                    if (n.isDefinition() && !registerNames.contains(n.getVariableName())) {
-                        if (!needsActivation || (n.getSlotScope() <= 0)) {
-                            String varName = n.getVariableName();
-                            Matcher m = pat.matcher(varName);
-                            //In first round, make all register that match standard loc_xx register
-                            if ((round == 1) && (m.matches())) {
-                                String regIndexStr = m.group(1);
-                                int regIndex = Integer.parseInt(regIndexStr);
-                                while (registerNames.size() <= regIndex + 1) {
-                                    String standardName = String.format(mask, registerNames.size() - 1);
-                                    registerNames.add(standardName);
-                                    registerTypes.add("*");
-                                    slotNames.add(standardName);
-                                    slotTypes.add("*");
-                                    registerLines.add(paramLine);
-                                }
-                                registerNames.set(regIndex, varName);
-                                registerTypes.set(regIndex, varName);
-                                slotNames.set(regIndex, varName);
-                                slotTypes.set(regIndex, varName);
-                                registerLines.set(regIndex, n.line);
-                            } //in second round the rest
-                            else if (round == 2 && !m.matches()) {
-                                registerNames.add(n.getVariableName());
-                                registerTypes.add(n.type.toString());
-                                slotNames.add(n.getVariableName());
-                                slotTypes.add(n.type.toString());
-                                registerLines.add(n.line);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        int slotScope = subMethod ? 0 : 1;
-
-        for (AssignableAVM2Item an : subvariables) {
-            if (an instanceof NameAVM2Item) {
-                NameAVM2Item n = (NameAVM2Item) an;
-                String variableName = n.getVariableName();
-                if (variableName != null) {
-                    boolean isThisOrSuper = variableName.equals("this") || variableName.equals("super");
-                    if (!isThisOrSuper && needsActivation) {
-                        if (n.getSlotNumber() <= 0) {
-                            n.setSlotNumber(slotNames.indexOf(variableName));
-                            n.setSlotScope(slotScope);
-                        }
-                    } else if (isThisOrSuper) {
-                        n.setRegNumber(0);
-                    } else {
-                        n.setRegNumber(registerNames.indexOf(variableName));
-                    }
-                }
-            }
-        }
-
-        for (int i = 0; i < registerNames.size(); i++) {
-            if (needsActivation && i > localData.activationReg) {
-                break;
-            }
-            localData.registerVars.put(registerNames.get(i), i);
-        }
-        List<NameAVM2Item> declarations = new ArrayList<>();
-        loopn:
-        for (AssignableAVM2Item an : subvariables) {
-            if (an instanceof NameAVM2Item) {
-                NameAVM2Item n = (NameAVM2Item) an;
-
-                if (needsActivation) {
-                    if (n.getSlotScope() != slotScope) {
-                        continue;
-                    } else if (n.getSlotNumber() < paramRegCount) {
-                        continue;
-                    }
-                }
-                for (NameAVM2Item d : declarations) {
-                    if (n.getVariableName() != null && n.getVariableName().equals(d.getVariableName())) {
-                        continue loopn;
-                    }
-                }
-
-                for (GraphTargetItem it : body) { //search first level of commands
-                    if (it instanceof NameAVM2Item) {
-                        NameAVM2Item n2 = (NameAVM2Item) it;
-                        if (n2.isDefinition() && n2.getAssignedValue() != null && n2.getVariableName().equals(n.getVariableName())) {
-                            continue loopn;
-                        }
-                        if (!n2.isDefinition() && n2.getVariableName() != null && n2.getVariableName().equals(n.getVariableName())) { //used earlier than defined
-                            break;
-                        }
-                    }
-                }
-                if (n.unresolved) {
-                    continue;
-                }
-                if (n.redirect != null) {
-                    continue;
-                }
-                if (n.getNs() != null) {
-                    continue;
-                }
-
-                String variableName = n.getVariableName();
-                if ("this".equals(variableName) || "super".equals(variableName) || paramNames.contains(variableName) || "arguments".equals(variableName)) {
-                    continue;
-                }
-
-                NameAVM2Item d = new NameAVM2Item(n.type, n.line, n.getVariableName(), NameAVM2Item.getDefaultValue("" + n.type), true, n.openedNamespaces);
-                //no index
-                if (needsActivation) {
-                    if (d.getSlotNumber() <= 0) {
-                        d.setSlotNumber(n.getSlotNumber());
-                        d.setSlotScope(n.getSlotScope());
-                    }
-                } else {
-                    d.setRegNumber(n.getRegNumber());
-                }
-                declarations.add(d);
-            }
-        }
-
-        int[] param_types = new int[paramTypes.size()];
-        ValueKind[] optional = new ValueKind[paramValues.size()];
-        //int[] param_names = new int[paramNames.size()];
-        for (int i = 0; i < paramTypes.size(); i++) {
-            param_types[i] = typeName(localData, paramTypes.get(i));
-            //param_names[i] = str(paramNames.get(i));
-        }
-
-        for (int i = 0; i < paramValues.size(); i++) {
-            optional[i] = getValueKind(Namespace.KIND_NAMESPACE/*FIXME*/, paramTypes.get(paramTypes.size() - paramValues.size() + i), paramValues.get(i));
-            if (optional[i] == null) {
-                throw new CompilationException("Default value must be compiletime constant", line);
-            }
-        }
-
-        MethodInfo mi = new MethodInfo(param_types, constructor ? 0 : typeName(localData, retType), name_index, 0, optional, new int[0]/*no param_names*/);
-        if (hasArguments) {
-            mi.setFlagNeed_Arguments();
-        }
-        //No param names like in official
-        /*
-         if (!paramNames.isEmpty()) {
-         mi.setFlagHas_paramnames();
-         }*/
-        if (!paramValues.isEmpty()) {
-            mi.setFlagHas_optional();
-        }
-        if (hasRest) {
-            mi.setFlagNeed_rest();
-        }
-
-        int mindex;
-        if (!isInterface) {
-            MethodBody mbody = new MethodBody(abcIndex.getSelectedAbc(), new Traits(), new byte[0], new ABCException[0]);
-
-            if (needsActivation) {
-                int slotId = 1;
-                for (int i = 1; i < slotNames.size(); i++) {
-                    TraitSlotConst tsc = new TraitSlotConst();
-                    tsc.slot_id = slotId++;
-                    tsc.name_index = abcIndex.getSelectedAbc().constants.getMultinameId(Multiname.createQName(false, abcIndex.getSelectedAbc().constants.getStringId(slotNames.get(i), true), abcIndex.getSelectedAbc().constants.getNamespaceId(Namespace.KIND_PACKAGE_INTERNAL, pkg, 0, true)), true);
-                    tsc.type_index = typeName(localData, new TypeItem(slotTypes.get(i)));
-                    mbody.traits.traits.add(tsc);
-                }
-                for (int i = 1; i < paramRegCount; i++) {
-                    NameAVM2Item param = new NameAVM2Item(new TypeItem(registerTypes.get(i)), 0, registerNames.get(i), null, false, new ArrayList<>());
-                    param.setRegNumber(i);
-                    NameAVM2Item d = new NameAVM2Item(new TypeItem(registerTypes.get(i)), 0, registerNames.get(i), param, true, new ArrayList<>());
-                    d.setSlotScope(slotScope);
-                    d.setSlotNumber(slotNames.indexOf(registerNames.get(i)));
-                    declarations.add(d);
-                }
-            }
-            if (body != null) {
-                body.addAll(0, declarations);
-            }
-
-            localData.exceptions = new ArrayList<>();
-            localData.callStack.add(mbody);
-            List<GraphSourceItem> src = body == null ? new ArrayList<>() : generate(localData, body);
-
-            mbody.method_info = abcIndex.getSelectedAbc().addMethodInfo(mi);
-            ArrayList<AVM2Instruction> mbodyCode = toInsList(src);
-            mbody.setCode(new AVM2Code(mbodyCode));
-
-            if (needsActivation) {
-                if (localData.traitUsages.containsKey(mbody)) {
-                    List<Integer> usages = localData.traitUsages.get(mbody);
-                    for (int i = 0; i < mbody.traits.traits.size(); i++) {
-                        if (usages.contains(i)) {
-                            TraitSlotConst tsc = (TraitSlotConst) mbody.traits.traits.get(i);
-                            GraphTargetItem type = TypeItem.UNBOUNDED;
-                            if (tsc.type_index > 0) {
-                                type = new TypeItem(abcIndex.getSelectedAbc().constants.getMultiname(tsc.type_index).getNameWithNamespace(abcIndex.getSelectedAbc().constants));
-                            }
-                            NameAVM2Item d = new NameAVM2Item(type, 0, tsc.getName(abcIndex.getSelectedAbc()).getName(abcIndex.getSelectedAbc().constants, null, true), NameAVM2Item.getDefaultValue("" + type), true, new ArrayList<>());
-                            d.setSlotNumber(tsc.slot_id);
-                            d.setSlotScope(slotScope);
-                            mbodyCode.addAll(0, toInsList(d.toSourceIgnoreReturnValue(localData, this)));
-                        }
-                    }
-                }
-
-                List<AVM2Instruction> acts = new ArrayList<>();
-                acts.add(ins(AVM2Instructions.NewActivation));
-                acts.add(ins(AVM2Instructions.Dup));
-                acts.add(AssignableAVM2Item.generateSetLoc(localData.activationReg));
-                acts.add(ins(AVM2Instructions.PushScope));
-
-                mbodyCode.addAll(0, acts);
-            }
-
-            if (constructor) {
-                /* List<ABC> abcs = new ArrayList<>();
-                 abcs.add(abc);
-                 abcs.addAll(allABCs);
-                 */
-                int parentConstMinAC = 0;
-
-                AbcIndexing.ClassIndex ci = abcIndex.findClass(new TypeItem(superType));
-
-                if (ci != null) {
-                    MethodInfo pmi = ci.abc.method_info.get(ci.abc.instance_info.get(ci.index).iinit_index);
-                    parentConstMinAC = pmi.param_types.length;
-                    if (pmi.flagHas_optional()) {
-                        parentConstMinAC -= pmi.optional.length;
-                    }
-                }
-                int ac = -1;
-                for (AVM2Instruction ins : mbodyCode) {
-                    if (ins.definition instanceof ConstructSuperIns) {
-                        ac = ins.operands[0];
-                        if (parentConstMinAC > ac) {
-                            throw new CompilationException("Parent constructor call requires different number of arguments", line);
-                        }
-
-                    }
-                }
-                if (ac == -1) {
-                    if (parentConstMinAC == 0) {
-                        mbodyCode.add(0, new AVM2Instruction(0, AVM2Instructions.GetLocal0, null));
-                        mbodyCode.add(1, new AVM2Instruction(0, AVM2Instructions.ConstructSuper, new int[]{0}));
-
-                    } else {
-                        throw new CompilationException("Parent constructor must be called", line);
-                    }
-                }
-            }
-            for (int i = 1; i < registerNames.size(); i++) {
-                mbodyCode.add(i - 1, ins(AVM2Instructions.Debug, 1, str(registerNames.get(i)), i - 1, (int) registerLines.get(i)));
-            }
-            if (!subMethod) {
-                mbodyCode.add(0, new AVM2Instruction(0, AVM2Instructions.GetLocal0, null));
-                mbodyCode.add(1, new AVM2Instruction(0, AVM2Instructions.PushScope, null));
-            }
-            boolean addRet = false;
-            if (!mbodyCode.isEmpty()) {
-                InstructionDefinition lastDef = mbodyCode.get(mbodyCode.size() - 1).definition;
-                if (!((lastDef instanceof ReturnVoidIns) || (lastDef instanceof ReturnValueIns))) {
-                    addRet = true;
-                }
-            } else {
-                addRet = true;
-            }
-            if (addRet) {
-                if (retType.toString().equals("*") || retType.toString().equals("void") || constructor) {
-                    mbodyCode.add(new AVM2Instruction(0, AVM2Instructions.ReturnVoid, null));
-                } else {
-                    mbodyCode.add(new AVM2Instruction(0, AVM2Instructions.PushUndefined, null));
-                    mbodyCode.add(new AVM2Instruction(0, AVM2Instructions.ReturnValue, null));
-                }
-            }
-            mbody.exceptions = localData.exceptions.toArray(new ABCException[localData.exceptions.size()]);
-            int offset = 0;
-            for (int i = 0; i < mbodyCode.size(); i++) {
-                AVM2Instruction ins = mbodyCode.get(i);
-                if (ins instanceof ExceptionMarkAVM2Instruction) {
-                    ExceptionMarkAVM2Instruction m = (ExceptionMarkAVM2Instruction) ins;
-                    switch (m.markType) {
-                        case MARK_E_START:
-                            mbody.exceptions[m.exceptionId].start = offset;
-                            break;
-                        case MARK_E_END:
-                            mbody.exceptions[m.exceptionId].end = offset;
-                            break;
-                        case MARK_E_TARGET:
-                            mbody.exceptions[m.exceptionId].target = offset;
-                            break;
-                    }
-                    mbodyCode.remove(i);
-                    i--;
-                    continue;
-                }
-                offset += ins.getBytesLength();
-            }
-
-            mbody.markOffsets();
-            mbody.autoFillStats(abcIndex.getSelectedAbc(), initScope, className != null);
-            abcIndex.getSelectedAbc().addMethodBody(mbody);
-            mindex = mbody.method_info;
-        } else {
-            mindex = abcIndex.getSelectedAbc().addMethodInfo(mi);
-        }
-
-        return mindex;
-    }
-
-    public ValueKind getValueKind(int ns, GraphTargetItem type, GraphTargetItem val) {
-
-        if (val instanceof BooleanAVM2Item) {
-            BooleanAVM2Item bi = (BooleanAVM2Item) val;
-            if (bi.value) {
-                return new ValueKind(0, ValueKind.CONSTANT_True);
-            } else {
-                return new ValueKind(0, ValueKind.CONSTANT_False);
-            }
-        }
-
-        boolean isNs = false;
-        if (type instanceof NameAVM2Item) {
-            if (((NameAVM2Item) type).getVariableName().equals("namespace")) {
-                isNs = true;
-            }
-        }
-
-        if ((type instanceof TypeItem) && (((TypeItem) type).fullTypeName.equals(DottedChain.NAMESPACE))) {
-            isNs = true;
-        }
-
-        if (val instanceof StringAVM2Item) {
-            StringAVM2Item sval = (StringAVM2Item) val;
-            if (isNs) {
-                return new ValueKind(namespace(Namespace.KIND_NAMESPACE, sval.getValue()), ValueKind.CONSTANT_Namespace);
-            } else {
-                return new ValueKind(str(sval.getValue()), ValueKind.CONSTANT_Utf8);
-            }
-        }
-        if (val instanceof IntegerValueAVM2Item) {
-            return new ValueKind(abcIndex.getSelectedAbc().constants.getIntId(((IntegerValueAVM2Item) val).value, true), ValueKind.CONSTANT_Int);
-        }
-        if (val instanceof FloatValueAVM2Item) {
-            return new ValueKind(abcIndex.getSelectedAbc().constants.getDoubleId(((FloatValueAVM2Item) val).value, true), ValueKind.CONSTANT_Double);
-        }
-        if (val instanceof NanAVM2Item) {
-            return new ValueKind(abcIndex.getSelectedAbc().constants.getDoubleId(Double.NaN, true), ValueKind.CONSTANT_Double);
-        }
-        if (val instanceof NullAVM2Item) {
-            return new ValueKind(0, ValueKind.CONSTANT_Null);
-        }
-        if (val instanceof UndefinedAVM2Item) {
-            return new ValueKind(0, ValueKind.CONSTANT_Undefined);
-        }
-        return null;
-    }
-
-    private int genNs(List<DottedChain> importedClasses, DottedChain pkg, NamespaceItem ns, List<NamespaceItem> openedNamespaces, SourceGeneratorLocalData localData, int line) throws CompilationException {
-        ns.resolveCustomNs(abcIndex, importedClasses, pkg, openedNamespaces, localData);
-        return ns.getCpoolIndex(abcIndex);
-    }
-
-    public void generateTraitsPhase2(List<DottedChain> importedClasses, DottedChain pkg, List<GraphTargetItem> items, Trait[] traits, List<NamespaceItem> openedNamespaces, SourceGeneratorLocalData localData) throws CompilationException {
-        for (int k = 0; k < items.size(); k++) {
-            GraphTargetItem item = items.get(k);
-            if (traits[k] == null) {
-
-            } else if (item instanceof InterfaceAVM2Item) {
-                traits[k].name_index = traitName(((InterfaceAVM2Item) item).pkg == null ? 0 : ((InterfaceAVM2Item) item).pkg.getCpoolIndex(abcIndex), ((InterfaceAVM2Item) item).name);
-            } else if (item instanceof ClassAVM2Item) {
-                traits[k].name_index = traitName(((ClassAVM2Item) item).pkg == null ? 0 : ((ClassAVM2Item) item).pkg.getCpoolIndex(abcIndex), ((ClassAVM2Item) item).className);
-            } else if ((item instanceof MethodAVM2Item) || (item instanceof GetterAVM2Item) || (item instanceof SetterAVM2Item)) {
-                traits[k].name_index = traitName(genNs(importedClasses, pkg, ((MethodAVM2Item) item).pkg, openedNamespaces, localData, ((MethodAVM2Item) item).line), ((MethodAVM2Item) item).functionName);
-            } else if (item instanceof FunctionAVM2Item) {
-                traits[k].name_index = traitName(((FunctionAVM2Item) item).pkg == null ? 0 : ((FunctionAVM2Item) item).pkg.getCpoolIndex(abcIndex), ((FunctionAVM2Item) item).functionName);
-            } else if (item instanceof ConstAVM2Item) {
-                traits[k].name_index = traitName(genNs(importedClasses, pkg, ((ConstAVM2Item) item).pkg, openedNamespaces, localData, ((ConstAVM2Item) item).line), ((ConstAVM2Item) item).var);
-            } else if (item instanceof SlotAVM2Item) {
-                traits[k].name_index = traitName(genNs(importedClasses, pkg, ((SlotAVM2Item) item).pkg, openedNamespaces, localData, ((SlotAVM2Item) item).line), ((SlotAVM2Item) item).var);
-            }
-        }
-
-        for (int k = 0; k < items.size(); k++) {
-            GraphTargetItem item = items.get(k);
-            if (traits[k] == null) {
-                continue;
-            }
-            if (item instanceof ClassAVM2Item) {
-
-                InstanceInfo instanceInfo = abcIndex.getSelectedAbc().instance_info.get(((TraitClass) traits[k]).class_info);
-                instanceInfo.name_index = abcIndex.getSelectedAbc().constants.getMultinameId(
-                        Multiname.createQName(
-                                false,
-                                abcIndex.getSelectedAbc().constants.getStringId(((ClassAVM2Item) item).className, true),
-                                ((ClassAVM2Item) item).pkg.getCpoolIndex(abcIndex)), true);
-
-                if (((ClassAVM2Item) item).extendsOp != null) {
-                    instanceInfo.super_index = typeName(localData, ((ClassAVM2Item) item).extendsOp);
-                } else {
-                    instanceInfo.super_index = abcIndex.getSelectedAbc().constants.getMultinameId(Multiname.createQName(false, str("Object"), namespace(Namespace.KIND_PACKAGE, "")), true);
-                }
-                instanceInfo.interfaces = new int[((ClassAVM2Item) item).implementsOp.size()];
-                for (int i = 0; i < ((ClassAVM2Item) item).implementsOp.size(); i++) {
-                    instanceInfo.interfaces[i] = superIntName(localData, ((ClassAVM2Item) item).implementsOp.get(i));
-                }
-            }
-            if (item instanceof InterfaceAVM2Item) {
-                ABC abc = abcIndex.getSelectedAbc();
-                AVM2ConstantPool constants = abc.constants;
-                InstanceInfo instanceInfo = abc.instance_info.get(((TraitClass) traits[k]).class_info);
-                instanceInfo.name_index = constants.getMultinameId(Multiname.createQName(false, constants.getStringId(((InterfaceAVM2Item) item).name, true),
-                        ((InterfaceAVM2Item) item).pkg.getCpoolIndex(abcIndex)), true);
-
-                instanceInfo.interfaces = new int[((InterfaceAVM2Item) item).superInterfaces.size()];
-                for (int i = 0; i < ((InterfaceAVM2Item) item).superInterfaces.size(); i++) {
-                    GraphTargetItem un = ((InterfaceAVM2Item) item).superInterfaces.get(i);
-                    instanceInfo.interfaces[i] = superIntName(localData, un);
-                }
-            }
-        }
-    }
-
-    public int superIntName(SourceGeneratorLocalData localData, GraphTargetItem un) throws CompilationException {
-        if (un instanceof UnresolvedAVM2Item) {
-            ((UnresolvedAVM2Item) un).resolve(null, new ArrayList<>(), new ArrayList<>(), abcIndex, new ArrayList<>(), new ArrayList<>());
-            un = ((UnresolvedAVM2Item) un).resolved;
-        }
-        if (!(un instanceof TypeItem)) { //not applyType
-            throw new CompilationException("Invalid type", 0);
-        }
-        TypeItem sup = (TypeItem) un;
-        int propId = resolveType(localData, sup, abcIndex);
-        int[] nss = new int[]{abcIndex.getSelectedAbc().constants.getMultiname(propId).namespace_index};
-        return abcIndex.getSelectedAbc().constants.getMultinameId(Multiname.createMultiname(false, abcIndex.getSelectedAbc().constants.getMultiname(propId).name_index, abcIndex.getSelectedAbc().constants.getNamespaceSetId(nss, true)), true);
-
-    }
-
-    public int[] generateMetadata(List<Map.Entry<String, Map<String, String>>> metadata) {
-        int[] ret = new int[metadata.size()];
-        for (int i = 0; i < metadata.size(); i++) {
-            Map.Entry<String, Map<String, String>> en = metadata.get(i);
-            int[] keys = new int[en.getValue().size()];
-            int[] values = new int[en.getValue().size()];
-            int j = 0;
-            for (String key : en.getValue().keySet()) {
-                keys[j] = abcIndex.getSelectedAbc().constants.getStringId(key, true);
-                values[j] = abcIndex.getSelectedAbc().constants.getStringId(en.getValue().get(key), true);
-                j++;
-            }
-            MetadataInfo mi = new MetadataInfo(abcIndex.getSelectedAbc().constants.getStringId(en.getKey(), true), keys, values);
-            ret[i] = abcIndex.getSelectedAbc().metadata_info.size();
-            abcIndex.getSelectedAbc().metadata_info.add(mi);
-        }
-        return ret;
-    }
-
-    public void generateTraitsPhase3(List<DottedChain> importedClasses, int methodInitScope, boolean isInterface, String className, String superName, boolean generateStatic, SourceGeneratorLocalData localData, List<GraphTargetItem> items, Traits ts, Trait[] traits, Map<Trait, Integer> initScopes, Reference<Integer> class_index) throws AVM2ParseException, CompilationException {
-
-        //Note: Names must be generated first before accesed in inner subs
-        for (int k = 0; k < items.size(); k++) {
-            GraphTargetItem item = items.get(k);
-            if (traits[k] == null) {
-                continue;
-            }
-            if (item instanceof InterfaceAVM2Item) {
-                generateClass(((InterfaceAVM2Item) item).pkg.getCpoolIndex(abcIndex), abcIndex.getSelectedAbc().class_info.get(((TraitClass) traits[k]).class_info), abcIndex.getSelectedAbc().instance_info.get(((TraitClass) traits[k]).class_info), initScopes.get(traits[k]), ((InterfaceAVM2Item) item).pkg.name, localData, (InterfaceAVM2Item) item, class_index);
-            }
-
-            if (item instanceof ClassAVM2Item) {
-                generateClass(((ClassAVM2Item) item).pkg.getCpoolIndex(abcIndex), abcIndex.getSelectedAbc().class_info.get(((TraitClass) traits[k]).class_info), abcIndex.getSelectedAbc().instance_info.get(((TraitClass) traits[k]).class_info), initScopes.get(traits[k]), ((ClassAVM2Item) item).pkg.name, localData, (ClassAVM2Item) item, class_index);
-            }
-            if ((item instanceof MethodAVM2Item) || (item instanceof GetterAVM2Item) || (item instanceof SetterAVM2Item)) {
-                MethodAVM2Item mai = (MethodAVM2Item) item;
-                if (mai.isStatic() != generateStatic) {
-                    continue;
-                }
-                for (List<NamespaceItem> ln : mai.allOpenedNamespaces) {
-                    for (NamespaceItem n : ln) {
-                        n.resolveCustomNs(abcIndex, importedClasses, localData.pkg, ln, localData);
-                    }
-                }
-                String suffix = null;
-                if (item instanceof GetterAVM2Item) {
-                    suffix = "get";
-                }
-                if (item instanceof SetterAVM2Item) {
-                    suffix = "set";
-                }
-
-                ((TraitMethodGetterSetter) traits[k]).method_info = method(mai.isStatic(), methodName(mai.outsidePackage, localData.pkg, mai.functionName, mai.pkg, className, mai.customNamespace, suffix), false, isInterface, new ArrayList<>(), localData.pkg, mai.needsActivation, mai.subvariables, methodInitScope + (mai.isStatic() ? 0 : 1), mai.hasRest, mai.line, className, superName, false, localData, mai.paramTypes, mai.paramNames, mai.paramValues, mai.body, mai.retType);
-            } else if (item instanceof FunctionAVM2Item) {
-                FunctionAVM2Item fai = (FunctionAVM2Item) item;
-                ((TraitFunction) traits[k]).method_info = method(false, methodName(false/*?*/, localData.pkg, fai.functionName, fai.pkg, null, null, ""), false, isInterface, new ArrayList<>(), localData.pkg, fai.needsActivation, fai.subvariables, methodInitScope, fai.hasRest, fai.line, className, superName, false, localData, fai.paramTypes, fai.paramNames, fai.paramValues, fai.body, fai.retType);
-            }
-        }
-    }
-
-    private int methodName(boolean outsidePkg, DottedChain pkg, String methodName, NamespaceItem ns, String className, String customNs, String typeSuffix) {
-        StringBuilder sb = new StringBuilder();
-        /*if (ns != null) {
-         sb.append(ns.name.toRawString());
-         }*/
-        if (className != null) {
-            if (pkg != null && !pkg.isEmpty() && !pkg.isTopLevel()) {
-                sb.append(pkg.toRawString());
-                sb.append(":");
-            }
-            sb.append(className);
-        }
-        if (customNs != null) {
-            sb.append(customNs);
-        } else if (ns != null) {
-            switch (ns.kind) {
-                case Namespace.KIND_PACKAGE_INTERNAL:
-                    sb.append(pkg == null ? "" /*?*/ : pkg.toRawString());
-                    break;
-                case Namespace.KIND_PRIVATE:
-
-                    if (!outsidePkg) {
-                        sb.append("/private");
-                    }
-                    break;
-                case Namespace.KIND_PROTECTED:
-                case Namespace.KIND_STATIC_PROTECTED:
-                    sb.append("/protected");
-                    break;
-            }
-        }
-        sb.append(":");
-        sb.append(methodName);
-        if (typeSuffix != null && !typeSuffix.isEmpty()) {
-            sb.append("/");
-            sb.append(typeSuffix);
-        }
-        return abcIndex.getSelectedAbc().constants.getStringId(sb.toString(), true);
-    }
-
-    public Trait[] generateTraitsPhase1(List<DottedChain> importedClasses, List<NamespaceItem> openedNamespaces, String className, String superName, boolean generateStatic, SourceGeneratorLocalData localData, List<GraphTargetItem> items, Traits ts, Reference<Integer> classIndex) throws AVM2ParseException, CompilationException {
-        Trait[] traits = new Trait[items.size()];
-        int slot_id = 1;
-        int disp_id = 3; //1 and 2 are for constructor
-        for (int k = 0; k < items.size(); k++) {
-            GraphTargetItem item = items.get(k);
-            if (item instanceof InterfaceAVM2Item) {
-                TraitClass tc = new TraitClass();
-                ClassInfo ci = new ClassInfo();
-                InstanceInfo ii = new InstanceInfo();
-                /*abc.class_info.add(ci);
-                 abc.instance_info.add(ii);*/
-                tc.class_info = classIndex.getVal();
-                abcIndex.getSelectedAbc().addClass(ci, ii, classIndex.getVal());
-                classIndex.setVal(classIndex.getVal() + 1);
-                ii.flags |= InstanceInfo.CLASS_INTERFACE;
-                //ii.name_index = traitName(((InterfaceAVM2Item) item).namespace, ((InterfaceAVM2Item) item).name);
-                //tc.class_info = abc.instance_info.size() - 1;
-                tc.kindType = Trait.TRAIT_CLASS;
-                //tc.name_index = traitName(((InterfaceAVM2Item) item).namespace, ((InterfaceAVM2Item) item).name);
-                tc.slot_id = 0; //?
-                ts.traits.add(tc);
-                traits[k] = tc;
-                traits[k].metadata = generateMetadata(((InterfaceAVM2Item) item).metadata);
-            }
-
-            if (item instanceof ClassAVM2Item) {
-                TraitClass tc = new TraitClass();
-                ClassInfo ci = new ClassInfo();
-                InstanceInfo ii = new InstanceInfo();
-                //ii.name_index = traitName(((ClassAVM2Item) item).namespace, ((ClassAVM2Item) item).className);
-                /*abc.class_info.add(ci);
-                 abc.instance_info.add(instanceInfo);*/
-                tc.class_info = classIndex.getVal();
-                abcIndex.getSelectedAbc().addClass(ci, ii, classIndex.getVal());
-                classIndex.setVal(classIndex.getVal() + 1);
-                tc.kindType = Trait.TRAIT_CLASS;
-                // tc.name_index = traitName(((ClassAVM2Item) item).namespace, ((ClassAVM2Item) item).className);
-                tc.slot_id = slot_id++;
-                ts.traits.add(tc);
-                traits[k] = tc;
-                traits[k].metadata = generateMetadata(((ClassAVM2Item) item).metadata);
-
-            }
-            if ((item instanceof SlotAVM2Item) || (item instanceof ConstAVM2Item)) {
-                TraitSlotConst tsc = new TraitSlotConst();
-                tsc.kindType = (item instanceof SlotAVM2Item) ? Trait.TRAIT_SLOT : Trait.TRAIT_CONST;
-                String var = null;
-                GraphTargetItem val = null;
-                GraphTargetItem type = null;
-                boolean isNamespace = false;
-                int namespace = 0;
-                boolean isStatic = false;
-                int[] metadata = new int[0];
-                if (item instanceof SlotAVM2Item) {
-                    SlotAVM2Item sai = (SlotAVM2Item) item;
-                    if (sai.isStatic() != generateStatic) {
-                        continue;
-                    }
-                    var = sai.var;
-                    val = sai.value;
-                    type = sai.type;
-                    isStatic = sai.isStatic();
-                    if (sai.pkg != null) {
-                        sai.pkg.resolveCustomNs(abcIndex, importedClasses, localData.pkg, openedNamespaces, localData);
-                    }
-                    namespace = sai.pkg == null ? 0 : sai.pkg.getCpoolIndex(abcIndex);
-                    metadata = generateMetadata(((SlotAVM2Item) item).metadata);
-                }
-                if (item instanceof ConstAVM2Item) {
-                    ConstAVM2Item cai = (ConstAVM2Item) item;
-                    if (cai.isStatic() != generateStatic) {
-                        continue;
-                    }
-                    var = cai.var;
-                    val = cai.value;
-                    type = cai.type;
-                    if (cai.pkg != null) {
-                        cai.pkg.resolveCustomNs(abcIndex, importedClasses, localData.pkg, openedNamespaces, localData);
-                    }
-                    namespace = cai.pkg == null ? 0 : cai.pkg.getCpoolIndex(abcIndex);
-                    isNamespace = type.toString().equals("Namespace");
-                    isStatic = cai.isStatic();
-                    metadata = generateMetadata(((ConstAVM2Item) item).metadata);
-                }
-                if (isNamespace) {
-                    tsc.name_index = traitName(namespace, var);
-                }
-                tsc.type_index = isNamespace ? 0 : (type == null ? 0 : typeName(localData, type));
-
-                ValueKind vk = getValueKind(namespace, type, val);
-                if (vk == null) {
-                    tsc.value_kind = ValueKind.CONSTANT_Undefined;
-                } else {
-                    tsc.value_kind = vk.value_kind;
-                    tsc.value_index = vk.value_index;
-                }
-                tsc.slot_id = isStatic ? slot_id++ : 0;
-                ts.traits.add(tsc);
-                traits[k] = tsc;
-                traits[k].metadata = metadata;
-            }
-            if ((item instanceof MethodAVM2Item) || (item instanceof GetterAVM2Item) || (item instanceof SetterAVM2Item)) {
-                MethodAVM2Item mai = (MethodAVM2Item) item;
-                if (mai.isStatic() != generateStatic) {
-                    continue;
-                }
-                TraitMethodGetterSetter tmgs = new TraitMethodGetterSetter();
-                tmgs.kindType = (item instanceof GetterAVM2Item) ? Trait.TRAIT_GETTER : ((item instanceof SetterAVM2Item) ? Trait.TRAIT_SETTER : Trait.TRAIT_METHOD);
-                tmgs.disp_id = mai.isStatic() ? disp_id++ : 0; //For a reason, there is disp_id only for static methods (or not?)
-                if (mai.isFinal() || (className != null && mai.isStatic())) {
-                    tmgs.kindFlags |= Trait.ATTR_Final;
-                }
-                if (mai.isOverride()) {
-                    tmgs.kindFlags |= Trait.ATTR_Override;
-                }
-                ts.traits.add(tmgs);
-
-                traits[k] = tmgs;
-                traits[k].metadata = generateMetadata(((MethodAVM2Item) item).metadata);
-            }
-            /*else if (item instanceof FunctionAVM2Item) {
-             TraitFunction tf = new TraitFunction();
-             tf.slot_id = slot_id++;
-             tf.kindType = Trait.TRAIT_FUNCTION;
-             //tf.name_index = traitName(((FunctionAVM2Item) item).namespace, ((FunctionAVM2Item) item).functionName);
-             ts.traits.add(tf);
-             traits[k] = tf;
-             traits[k].metadata = generateMetadata(((FunctionAVM2Item) item).metadata);
-             }*/
-
-        }
-
-        return traits;
-    }
-
-    public ScriptInfo generateScriptInfo(List<List<NamespaceItem>> allOpenedNamespaces, SourceGeneratorLocalData localData, List<GraphTargetItem> commands, int classPos) throws AVM2ParseException, CompilationException {
-        Reference<Integer> class_index = new Reference<>(classPos);
-        ScriptInfo si = new ScriptInfo();
-        localData.currentScript = si;
-        Trait[] traitArr = generateTraitsPhase1(new ArrayList<>(), new ArrayList<>(), null, null, true, localData, commands, si.traits, class_index);
-        generateTraitsPhase2(new ArrayList<>(), null/*FIXME*/, commands, traitArr, new ArrayList<>(), localData);
-
-        abcIndex.refreshSelected();
-
-        ABC abc = abcIndex.getSelectedAbc();
-        AVM2ConstantPool constants = abc.constants;
-        MethodInfo mi = new MethodInfo(new int[0], 0, constants.getStringId("", true), 0, new ValueKind[0], new int[0]);
-        MethodBody mb = new MethodBody(abc, new Traits(), new byte[0], new ABCException[0]);
-        mb.method_info = abc.addMethodInfo(mi);
-        mb.setCode(new AVM2Code());
-        List<AVM2Instruction> mbCode = mb.getCode().code;
-        mbCode.add(ins(AVM2Instructions.GetLocal0));
-        mbCode.add(ins(AVM2Instructions.PushScope));
-
-        int traitScope = 2;
-
-        Map<Trait, Integer> initScopes = new HashMap<>();
-
-        for (Trait t : si.traits.traits) {
-            if (t instanceof TraitClass) {
-                TraitClass tc = (TraitClass) t;
-                List<Integer> parents = new ArrayList<>();
-                if (localData.documentClass) {
-                    mbCode.add(ins(AVM2Instructions.GetScopeObject, 0));
-                    traitScope++;
-                } else {
-                    int[] nsset = new int[]{constants.getMultiname(tc.name_index).namespace_index};
-                    mbCode.add(ins(AVM2Instructions.FindPropertyStrict, constants.getMultinameId(Multiname.createMultiname(false, constants.getMultiname(tc.name_index).name_index, constants.getNamespaceSetId(nsset, true)), true)));
-                }
-                if (abc.instance_info.get(tc.class_info).isInterface()) {
-                    mbCode.add(ins(AVM2Instructions.PushNull));
-                } else {
-
-                    AbcIndexing.ClassIndex ci = abcIndex.findClass(AbcIndexing.multinameToType(abc.instance_info.get(tc.class_info).name_index, constants));
-                    while (ci != null && ci.parent != null) {
-                        ci = ci.parent;
-                        Multiname origM = ci.abc.constants.getMultiname(ci.abc.instance_info.get(ci.index).name_index);
-                        Namespace origNs = ci.abc.constants.getNamespace(origM.namespace_index);
-                        if (origM.kind == Multiname.QNAME || origM.kind == Multiname.QNAMEA) {
-                            parents.add(constants.getMultinameId(
-                                    Multiname.createQName(origM.kind == Multiname.QNAMEA,
-                                            constants.getStringId(ci.abc.constants.getString(origM.name_index), true),
-                                            constants.getNamespaceId(origNs.kind,
-                                                    ci.abc.constants.getString(origNs.name_index), 0, true)), true));
-                        }
-                    }
-
-                    //add all parent objects to scopestack
-                    for (int i = parents.size() - 1; i >= 0; i--) {
-                        mbCode.add(ins(AVM2Instructions.GetLex, parents.get(i)));
-                        mbCode.add(ins(AVM2Instructions.PushScope));
-                        traitScope++;
-                    }
-                    //direct parent class to new_class instruction
-                    if (!parents.isEmpty()) { //NON EXISTING PARENT CLASS - TODO: handle as error!
-                        mbCode.add(ins(AVM2Instructions.GetLex, parents.get(0)));
-                    }
-                }
-                mbCode.add(ins(AVM2Instructions.NewClass, tc.class_info));
-                for (int i = 0; i < parents.size(); i++) {
-                    mbCode.add(ins(AVM2Instructions.PopScope));
-                }
-
-                mbCode.add(ins(AVM2Instructions.InitProperty, tc.name_index));
-                initScopes.put(t, traitScope);
-                traitScope = 1;
-            }
-        }
-
-        abc.addMethodBody(mb);
-        si.init_index = mb.method_info;
-        localData.pkg = DottedChain.EMPTY;
-        generateTraitsPhase3(new ArrayList<>(), 1/*??*/, false, null, null, true, localData, commands, si.traits, traitArr, initScopes, class_index);
-
-        int maxSlotId = 0;
-        for (int k = 0; k < si.traits.traits.size(); k++) {
-            if (si.traits.traits.get(k) instanceof TraitSlotConst) {
-                TraitSlotConst ti = (TraitSlotConst) si.traits.traits.get(k);
-                if (ti.slot_id > maxSlotId) {
-                    maxSlotId = ti.slot_id;
-                }
-            }
-        }
-        for (int k = 0; k < si.traits.traits.size(); k++) {
-            if ((si.traits.traits.get(k) instanceof TraitMethodGetterSetter) && (commands.get(k) instanceof MethodAVM2Item)) {
-                MethodAVM2Item mai = (MethodAVM2Item) commands.get(k);
-                if (mai.outsidePackage) {
-                    TraitMethodGetterSetter tmgs = (TraitMethodGetterSetter) si.traits.traits.get(k);
-                    TraitSlotConst nts = new TraitSlotConst();
-                    nts.name_index = si.traits.traits.get(k).name_index;
-                    nts.metadata = si.traits.traits.get(k).metadata;
-
-                    nts.slot_id = maxSlotId + 1;
-                    maxSlotId++;
-                    nts.type_index = abcIndex.getSelectedAbc().constants.getQnameId("Function", Namespace.KIND_PACKAGE, "", true);
-                    nts.value_index = 0;
-                    nts.value_kind = 0;
-                    int methodinfo = tmgs.method_info;
-                    si.traits.traits.set(k, nts);
-                    mbCode.add(ins(AVM2Instructions.NewFunction, methodinfo));
-                    mbCode.add(ins(AVM2Instructions.InitProperty, nts.name_index));
-                }
-            }
-        }
-
-        mbCode.add(ins(AVM2Instructions.ReturnVoid));
-        mb.autoFillStats(abc, 1, false);
-
-        return si;
-    }
-
-    public static void parentNamesAddNames(AbcIndexing abc, int name_index, List<Integer> indices, List<String> names, List<String> namespaces) {
-        List<Integer> cindices = new ArrayList<>();
-
-        List<ABC> outABCs = new ArrayList<>();
-        parentNames(abc, name_index, cindices, names, namespaces, outABCs);
-        for (int i = 0; i < cindices.size(); i++) {
-            ABC a = outABCs.get(i);
-            int m = cindices.get(i);
-            if (a == abc.getSelectedAbc()) {
-                indices.add(m);
-                continue;
-            }
-            Multiname superName = a.constants.getMultiname(m);
-            indices.add(
-                    abc.getSelectedAbc().constants.getMultinameId(
-                            Multiname.createQName(false,
-                                    abc.getSelectedAbc().constants.getStringId(superName.getName(a.constants, null, true), true),
-                                    abc.getSelectedAbc().constants.getNamespaceId(superName.getNamespace(a.constants).kind, superName.getNamespace(a.constants).getName(a.constants), 0, true)), true)
-            );
-        }
-    }
-
-    public static GraphTargetItem getTraitReturnType(AbcIndexing abc, Trait t) {
-        if (t instanceof TraitSlotConst) {
-            TraitSlotConst tsc = (TraitSlotConst) t;
-            if (tsc.type_index == 0) {
-                return TypeItem.UNBOUNDED;
-            }
-            return PropertyAVM2Item.multinameToType(tsc.type_index, abc.getSelectedAbc().constants);
-        }
-        if (t instanceof TraitMethodGetterSetter) {
-            TraitMethodGetterSetter tmgs = (TraitMethodGetterSetter) t;
-            if (tmgs.kindType == Trait.TRAIT_GETTER) {
-                return PropertyAVM2Item.multinameToType(abc.getSelectedAbc().method_info.get(tmgs.method_info).ret_type, abc.getSelectedAbc().constants);
-            }
-            if (tmgs.kindType == Trait.TRAIT_SETTER) {
-                if (abc.getSelectedAbc().method_info.get(tmgs.method_info).param_types.length > 0) {
-                    return PropertyAVM2Item.multinameToType(abc.getSelectedAbc().method_info.get(tmgs.method_info).param_types[0], abc.getSelectedAbc().constants);
-                } else {
-                    return TypeItem.UNBOUNDED;
-                }
-            }
-        }
-        if (t instanceof TraitFunction) {
-            return new TypeItem(DottedChain.FUNCTION);
-        }
-        return TypeItem.UNBOUNDED;
-    }
-
-    public static boolean searchPrototypeChain(List<Integer> otherNs, int privateNs, int protectedNs, boolean instanceOnly, AbcIndexing abc, DottedChain pkg, String obj, String propertyName, Reference<String> outName, Reference<DottedChain> outNs, Reference<DottedChain> outPropNs, Reference<Integer> outPropNsKind, Reference<Integer> outPropNsIndex, Reference<GraphTargetItem> outPropType, Reference<ValueKind> outPropValue, Reference<ABC> outPropValueAbc) {
-        for (int ns : otherNs) {
-            if (searchPrototypeChain(ns, instanceOnly, abc, pkg, obj, propertyName, outName, outNs, outPropNs, outPropNsKind, outPropNsIndex, outPropType, outPropValue, outPropValueAbc)) {
-                return true;
-            }
-        }
-
-        if (searchPrototypeChain(privateNs, instanceOnly, abc, pkg, obj, propertyName, outName, outNs, outPropNs, outPropNsKind, outPropNsIndex, outPropType, outPropValue, outPropValueAbc)) {
-            return true;
-        }
-        if (searchPrototypeChain(protectedNs, instanceOnly, abc, pkg, obj, propertyName, outName, outNs, outPropNs, outPropNsKind, outPropNsIndex, outPropType, outPropValue, outPropValueAbc)) {
-            return true;
-        }
-        return searchPrototypeChain(0, instanceOnly, abc, pkg, obj, propertyName, outName, outNs, outPropNs, outPropNsKind, outPropNsIndex, outPropType, outPropValue, outPropValueAbc);
-    }
-
-    private static boolean searchPrototypeChain(int selectedNs, boolean instanceOnly, AbcIndexing abc, DottedChain pkg, String obj, String propertyName, Reference<String> outName, Reference<DottedChain> outNs, Reference<DottedChain> outPropNs, Reference<Integer> outPropNsKind, Reference<Integer> outPropNsIndex, Reference<GraphTargetItem> outPropType, Reference<ValueKind> outPropValue, Reference<ABC> outPropValueAbc) {
-
-        AbcIndexing.TraitIndex sp = abc.findScriptProperty(pkg.add(propertyName));
-        if (sp == null) {
-            sp = abc.findProperty(new AbcIndexing.PropertyDef(propertyName, new TypeItem(pkg.add(obj)), abc.getSelectedAbc(), selectedNs), !instanceOnly, true);
-        }
-        if (sp != null) {
-            if (sp.objType instanceof TypeItem) {
-                outName.setVal(((TypeItem) sp.objType).fullTypeName.getLast());
-                outNs.setVal(((TypeItem) sp.objType).fullTypeName.getWithoutLast());
-            } else {
-                //FIXME? Vector?
-            }
-            outPropNs.setVal(sp.trait.getName(sp.abc).getNamespace(sp.abc.constants).getName(sp.abc.constants));
-            outPropNsKind.setVal(sp.trait.getName(sp.abc).getNamespace(sp.abc.constants).kind);
-            int nsi = sp.trait.getName(sp.abc).namespace_index;
-            outPropNsIndex.setVal(sp.abc == abc.getSelectedAbc() ? sp.abc.constants.getNamespaceSubIndex(nsi) : 0);
-            outPropType.setVal(sp.returnType);
-            outPropValue.setVal(sp.value);
-            outPropValueAbc.setVal(sp.abc);
-            return true;
-        }
-        return false;
-    }
-
-    public static void parentNames(AbcIndexing abc, int name_index, List<Integer> indices, List<String> names, List<String> namespaces, List<ABC> outABCs) {
-        AbcIndexing.ClassIndex ci = abc.findClass(new TypeItem(abc.getSelectedAbc().constants.getMultiname(name_index).getNameWithNamespace(abc.getSelectedAbc().constants)));
-        while (ci != null) {
-            int ni = ci.abc.instance_info.get(ci.index).name_index;
-            indices.add(ni);
-            outABCs.add(ci.abc);
-            names.add(ci.abc.constants.getMultiname(ni).getName(ci.abc.constants, null, true));
-            namespaces.add(ci.abc.constants.getMultiname(ni).getNamespace(ci.abc.constants).getName(ci.abc.constants).toRawString());
-            ci = ci.parent;
-        }
-    }
-
-    /* public void calcRegisters(Reference<Integer> activationReg, SourceGeneratorLocalData localData, boolean needsActivation, List<String> funParamNames,List<NameAVM2Item> funSubVariables,List<GraphTargetItem> funBody, Reference<Boolean> hasArguments) throws ParseException {
-
-     }*/
- /*public int resolveType(String objType) {
-     if (objType.equals("*")) {
-     return 0;
-     }
-     List<ABC> abcs = new ArrayList<>();
-     abcs.add(abc);
-     abcs.addAll(allABCs);
-     for (ABC a : abcs) {
-     int ci = a.findClassByName(objType);
-     if (ci != -1) {
-     Multiname tname = a.instance_info.get(ci).getName(a.constants);
-     return abc.getLastAbc().constants.getMultinameId(new Multiname(tname.kind,
-     abc.getLastAbc().constants.getStringId(tname.getName(a.constants, new ArrayList<>()), true),
-     abc.getLastAbc().constants.getNamespaceId(new Namespace(tname.getNamespace(a.constants).kind, abc.getLastAbc().constants.getStringId(tname.getNamespace(a.constants).getName(a.constants), true)), 0, true), 0, 0, new ArrayList<Integer>()), true);
-     }
-     }
-     return 0;
-     }*/
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, TypeItem item) throws CompilationException {
-        String currentFullClassName = localData.getFullClass();
-
-        if (localData.documentClass && item.toString().equals(currentFullClassName)) {
-            int slotId = 0;
-            int c = abcIndex.getSelectedAbc().findClassByName(currentFullClassName);
-            for (Trait t : localData.currentScript.traits.traits) {
-                if (t instanceof TraitClass) {
-                    TraitClass tc = (TraitClass) t;
-                    if (tc.class_info == c) {
-                        slotId = tc.slot_id;
-                        break;
-                    }
-                }
-            }
-            return GraphTargetItem.toSourceMerge(localData, this, ins(AVM2Instructions.GetGlobalScope), ins(AVM2Instructions.GetSlot, slotId));
-        } else {
-            return GraphTargetItem.toSourceMerge(localData, this, ins(AVM2Instructions.GetLex, resolveType(localData, item, abcIndex)));
-        }
-    }
-
-    public static int resolveType(SourceGeneratorLocalData localData, GraphTargetItem item, AbcIndexing abcIndex) throws CompilationException {
-        int name_index = 0;
-        GraphTargetItem typeItem = null;
-
-        if (item instanceof UnresolvedAVM2Item) {
-            String fullClass = localData.getFullClass();
-            item = ((UnresolvedAVM2Item) item).resolve(new TypeItem(fullClass), new ArrayList<>(), new ArrayList<>(), abcIndex, new ArrayList<>(), new ArrayList<>());
-        }
-        if (item instanceof TypeItem) {
-            typeItem = item;
-        } else if (item instanceof ApplyTypeAVM2Item) {
-            typeItem = ((ApplyTypeAVM2Item) item).object;
-        } else {
-            throw new CompilationException("Invalid type:" + item + " (" + item.getClass().getName() + ")", 0/*??*/);
-        }
-        if (typeItem instanceof UnresolvedAVM2Item) {
-            String fullClass = localData.getFullClass();
-            typeItem = ((UnresolvedAVM2Item) typeItem).resolve(new TypeItem(fullClass), new ArrayList<>(), new ArrayList<>(), abcIndex, new ArrayList<>(), new ArrayList<>());
-        }
-
-        if (!(typeItem instanceof TypeItem)) {
-            throw new CompilationException("Invalid type", 0/*??*/);
-        }
-
-        TypeItem type = (TypeItem) typeItem;
-
-        DottedChain dname = type.fullTypeName;
-        DottedChain pkg = dname.getWithoutLast();
-        String name = dname.getLast();
-        /*for (InstanceInfo ii : abc.getSelectedAbc().instance_info) {
-         Multiname mname = abc.getSelectedAbc().constants.constant_multiname.get(ii.name_index);
-         if (mname != null && name.equals(mname.getName(abc.getSelectedAbc().constants, null, true))) {
-         Namespace ns = mname.getNamespace(abc.getSelectedAbc().constants);
-         if (ns != null && ns.hasName(pkg, abc.getSelectedAbc().constants)) {
-         name_index = ii.name_index;
-         break;
-         }
-         }
-         }*/
-        ABC abc = abcIndex.getSelectedAbc();
-        AVM2ConstantPool constants = abc.constants;
-        AbcIndexing.ClassIndex ci = abcIndex.findClass(new TypeItem(dname));
-        if (ci != null) {
-            Multiname m = ci.abc.instance_info.get(ci.index).getName(ci.abc.constants);
-            if (m != null) {
-                Namespace ns = ci.abc.instance_info.get(ci.index).getName(ci.abc.constants).getNamespace(ci.abc.constants);
-                String n = m.getName(ci.abc.constants, new ArrayList<>(), true);
-                String nsn = ns == null ? null : ns.getName(ci.abc.constants).toRawString();
-                name_index = constants.getQnameId(
-                        n,
-                        ns == null ? Namespace.KIND_PACKAGE : ns.kind,
-                        nsn, true);
-            }
-        }
-
-        for (int i = 1; i < constants.getMultinameCount(); i++) {
-            Multiname mname = constants.getMultiname(i);
-            if (mname != null && name.equals(mname.getName(constants, null, true))) {
-                if (mname.getNamespace(constants) != null && pkg.equals(mname.getNamespace(constants).getName(constants))) {
-                    name_index = i;
-                    break;
-                }
-            }
-        }
-        if (name_index == 0) {
-            if (pkg.isEmpty() && localData.currentScript != null /*FIXME!*/) {
-                for (Trait t : localData.currentScript.traits.traits) {
-                    if (t.getName(abc).getName(constants, null, true).equals(name)) {
-                        name_index = t.name_index;
-                        break;
-                    }
-                }
-            }
-            if (name_index == 0) {
-                name_index = constants.getMultinameId(Multiname.createQName(false, constants.getStringId(name, true), constants.getNamespaceId(Namespace.KIND_PACKAGE, pkg, 0, true)), true);
-            }
-        }
-
-        if (item instanceof ApplyTypeAVM2Item) {
-            ApplyTypeAVM2Item atype = (ApplyTypeAVM2Item) item;
-            int[] params = new int[atype.params.size()];
-            int i = 0;
-            for (GraphTargetItem s : atype.params) {
-                params[i++] = resolveType(localData, s, abcIndex);
-            }
-            return constants.getMultinameId(Multiname.createTypeName(name_index, params), true);
-        }
-
-        return name_index;
-    }
-
-    @Override
-    public List<GraphSourceItem> generateDiscardValue(SourceGeneratorLocalData localData, GraphTargetItem item) throws CompilationException {
-        List<GraphSourceItem> ret = item.toSource(localData, this);
-        ret.add(ins(AVM2Instructions.Pop));
-        return ret;
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, PushItem item) throws CompilationException {
-        return item.value.toSource(localData, this);
-    }
-
-    @Override
-    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, PopItem item) throws CompilationException {
-        List<GraphSourceItem> ret = new ArrayList<>();
-        return ret;
-    }
-
-}
+/*
+ *  Copyright (C) 2010-2016 JPEXS, All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.
+ */
+package com.jpexs.decompiler.flash.abc.avm2.parser.script;
+
+import com.jpexs.decompiler.flash.SWFInputStream;
+import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
+import com.jpexs.decompiler.flash.abc.ABC;
+import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
+import com.jpexs.decompiler.flash.abc.avm2.AVM2ConstantPool;
+import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
+import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instructions;
+import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition;
+import com.jpexs.decompiler.flash.abc.avm2.instructions.construction.ConstructSuperIns;
+import com.jpexs.decompiler.flash.abc.avm2.instructions.jumps.JumpIns;
+import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ReturnValueIns;
+import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ReturnVoidIns;
+import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.ApplyTypeAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.BooleanAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.FloatValueAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.GetDescendantsAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.IntegerValueAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.NameValuePair;
+import com.jpexs.decompiler.flash.abc.avm2.model.NanAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.NewObjectAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.NullAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.ReturnValueAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.ReturnVoidAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.StringAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.ThrowAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.UndefinedAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.WithAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.WithObjectAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.clauses.ForEachInAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.clauses.ForInAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.clauses.TryAVM2Item;
+import com.jpexs.decompiler.flash.abc.avm2.model.operations.IfCondition;
+import com.jpexs.decompiler.flash.abc.avm2.parser.AVM2ParseException;
+import com.jpexs.decompiler.flash.abc.avm2.parser.script.AbcIndexing.ClassIndex;
+import com.jpexs.decompiler.flash.abc.types.ABCException;
+import com.jpexs.decompiler.flash.abc.types.ClassInfo;
+import com.jpexs.decompiler.flash.abc.types.ConvertData;
+import com.jpexs.decompiler.flash.abc.types.InstanceInfo;
+import com.jpexs.decompiler.flash.abc.types.MetadataInfo;
+import com.jpexs.decompiler.flash.abc.types.MethodBody;
+import com.jpexs.decompiler.flash.abc.types.MethodInfo;
+import com.jpexs.decompiler.flash.abc.types.Multiname;
+import com.jpexs.decompiler.flash.abc.types.Namespace;
+import com.jpexs.decompiler.flash.abc.types.ScriptInfo;
+import com.jpexs.decompiler.flash.abc.types.ValueKind;
+import com.jpexs.decompiler.flash.abc.types.traits.Trait;
+import com.jpexs.decompiler.flash.abc.types.traits.TraitClass;
+import com.jpexs.decompiler.flash.abc.types.traits.TraitFunction;
+import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter;
+import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst;
+import com.jpexs.decompiler.flash.abc.types.traits.Traits;
+import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.ecma.EcmaScript;
+import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
+import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
+import com.jpexs.decompiler.flash.helpers.NulWriter;
+import com.jpexs.decompiler.graph.CompilationException;
+import com.jpexs.decompiler.graph.DottedChain;
+import com.jpexs.decompiler.graph.GraphSourceItem;
+import com.jpexs.decompiler.graph.GraphTargetItem;
+import com.jpexs.decompiler.graph.Loop;
+import com.jpexs.decompiler.graph.ScopeStack;
+import com.jpexs.decompiler.graph.SourceGenerator;
+import com.jpexs.decompiler.graph.TypeItem;
+import com.jpexs.decompiler.graph.model.AndItem;
+import com.jpexs.decompiler.graph.model.BreakItem;
+import com.jpexs.decompiler.graph.model.CommaExpressionItem;
+import com.jpexs.decompiler.graph.model.ContinueItem;
+import com.jpexs.decompiler.graph.model.DefaultItem;
+import com.jpexs.decompiler.graph.model.DoWhileItem;
+import com.jpexs.decompiler.graph.model.DuplicateItem;
+import com.jpexs.decompiler.graph.model.FalseItem;
+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.PopItem;
+import com.jpexs.decompiler.graph.model.PushItem;
+import com.jpexs.decompiler.graph.model.SwitchItem;
+import com.jpexs.decompiler.graph.model.TernarOpItem;
+import com.jpexs.decompiler.graph.model.TrueItem;
+import com.jpexs.decompiler.graph.model.UnboundedTypeItem;
+import com.jpexs.decompiler.graph.model.WhileItem;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ *
+ * @author JPEXS
+ */
+public class AVM2SourceGenerator implements SourceGenerator {
+
+    public final AbcIndexing abcIndex;
+
+    public static final int MARK_E_START = 0;
+
+    public static final int MARK_E_END = 1;
+
+    public static final int MARK_E_TARGET = 2;
+
+    public static final int MARK_E_FINALLYPART = 3;
+
+    private AVM2Instruction ins(int instructionCode, int... operands) {
+        return new AVM2Instruction(0, instructionCode, operands);
+    }
+
+    private AVM2Instruction ins(InstructionDefinition def, int... operands) {
+        return new AVM2Instruction(0, def, operands);
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, FalseItem item) throws CompilationException {
+        return GraphTargetItem.toSourceMerge(localData, this, ins(AVM2Instructions.PushFalse));
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, TrueItem item) throws CompilationException {
+        return GraphTargetItem.toSourceMerge(localData, this, ins(AVM2Instructions.PushTrue));
+    }
+
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, GetDescendantsAVM2Item item) throws CompilationException {
+
+        AVM2ConstantPool constants = abcIndex.getSelectedAbc().constants;
+        int[] nssa = new int[item.openedNamespaces.size()];
+        for (int i = 0; i < item.openedNamespaces.size(); i++) {
+            nssa[i] = item.openedNamespaces.get(i).getCpoolIndex(abcIndex);
+        }
+
+        int nsset = constants.getNamespaceSetId(nssa, true);
+
+        return GraphTargetItem.toSourceMerge(localData, this,
+                item.object,
+                ins(AVM2Instructions.GetDescendants, constants.getMultinameId(Multiname.createMultiname(false, constants.getStringId(item.nameStr, true), nsset), true))
+        );
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, AndItem item) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        ret.addAll(generateToActionList(localData, item.leftSide));
+        ret.add(ins(AVM2Instructions.Dup));
+        if (!("" + item.leftSide.returnType()).equals("Boolean")) {
+            ret.add(ins(AVM2Instructions.ConvertB));
+        }
+        List<AVM2Instruction> andExpr = generateToActionList(localData, item.rightSide);
+        andExpr.add(0, ins(AVM2Instructions.Pop));
+        int andExprLen = insToBytes(andExpr).length;
+        ret.add(ins(AVM2Instructions.IfFalse, andExprLen));
+        ret.addAll(andExpr);
+        return ret;
+
+    }
+
+    private byte[] insToBytes(List<AVM2Instruction> code) {
+        try {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            for (AVM2Instruction instruction : code) {
+
+                baos.write(instruction.getBytes());
+
+            }
+            return baos.toByteArray();
+        } catch (IOException ex) {
+            Logger.getLogger(AVM2SourceGenerator.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        return SWFInputStream.BYTE_ARRAY_EMPTY;
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, OrItem item) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        ret.addAll(generateToActionList(localData, item.leftSide));
+        ret.add(ins(AVM2Instructions.Dup));
+        if (!("" + item.leftSide.returnType()).equals("Boolean")) {
+            ret.add(ins(AVM2Instructions.ConvertB));
+        }
+        List<AVM2Instruction> orExpr = generateToActionList(localData, item.rightSide);
+        orExpr.add(0, ins(AVM2Instructions.Pop));
+        int orExprLen = insToBytes(orExpr).length;
+        ret.add(ins(AVM2Instructions.IfTrue, orExprLen));
+        ret.addAll(orExpr);
+        return ret;
+    }
+
+    public ArrayList<AVM2Instruction> toInsList(List<GraphSourceItem> items) {
+        ArrayList<AVM2Instruction> ret = new ArrayList<>();
+        for (GraphSourceItem s : items) {
+            if (s instanceof AVM2Instruction) {
+                ret.add((AVM2Instruction) s);
+            }
+        }
+        return ret;
+    }
+
+    private List<AVM2Instruction> nonempty(List<AVM2Instruction> list) {
+        if (list == null) {
+            return new ArrayList<>();
+        }
+        return list;
+    }
+
+    private List<GraphSourceItem> condition(SourceGeneratorLocalData localData, GraphTargetItem t, int offset) throws CompilationException {
+        if (t instanceof IfCondition) {
+            IfCondition ic = (IfCondition) t;
+            return GraphTargetItem.toSourceMerge(localData, this, ic.getLeftSide(), ic.getRightSide(), ins(ic.getIfDefinition(), offset));
+        }
+        return GraphTargetItem.toSourceMerge(localData, this, t, ins(AVM2Instructions.IfTrue, offset));
+    }
+
+    private List<GraphSourceItem> notCondition(SourceGeneratorLocalData localData, GraphTargetItem t, int offset) throws CompilationException {
+        if (t instanceof IfCondition) {
+            IfCondition ic = (IfCondition) t;
+            return GraphTargetItem.toSourceMerge(localData, this, ic.getLeftSide(), ic.getRightSide(), ins(ic.getIfNotDefinition(), offset));
+        }
+        return GraphTargetItem.toSourceMerge(localData, this, t, ins(AVM2Instructions.IfFalse, offset));
+    }
+
+    private List<GraphSourceItem> generateIf(SourceGeneratorLocalData localData, GraphTargetItem expression, List<GraphTargetItem> onTrueCmds, List<GraphTargetItem> onFalseCmds, boolean ternar) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        //ret.addAll(notCondition(localData, expression));
+        List<AVM2Instruction> onTrue;
+        List<AVM2Instruction> onFalse = null;
+        if (ternar) {
+            onTrue = toInsList(onTrueCmds.get(0).toSource(localData, this));
+        } else {
+            onTrue = generateToInsList(localData, onTrueCmds);
+        }
+
+        if (onFalseCmds != null && !onFalseCmds.isEmpty()) {
+            if (ternar) {
+                onFalse = toInsList(onFalseCmds.get(0).toSource(localData, this));
+            } else {
+                onFalse = generateToInsList(localData, onFalseCmds);
+            }
+        }
+        AVM2Instruction ajmp = null;
+        if (onFalse != null) {
+            if (!((!nonempty(onTrue).isEmpty())
+                    && ((onTrue.get(onTrue.size() - 1).definition instanceof ContinueJumpIns)
+                    || ((onTrue.get(onTrue.size() - 1).definition instanceof BreakJumpIns))))) {
+                ajmp = ins(AVM2Instructions.Jump, 0);
+                onTrue.add(ajmp);
+            }
+        }
+
+        byte[] onTrueBytes = insToBytes(onTrue);
+        int onTrueLen = onTrueBytes.length;
+
+        ret.addAll(notCondition(localData, expression, onTrueLen));
+        ret.addAll(onTrue);
+
+        if (onFalse != null) {
+            byte[] onFalseBytes = insToBytes(onFalse);
+            int onFalseLen = onFalseBytes.length;
+            if (ajmp != null) {
+                ajmp.operands[0] = onFalseLen;
+            }
+            ret.addAll(onFalse);
+        }
+        return ret;
+    }
+
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, XMLFilterAVM2Item item) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        final Reference<Integer> counterReg = new Reference<>(0);
+        final Reference<Integer> collectionReg = new Reference<>(0);
+        final Reference<Integer> xmlListReg = new Reference<>(0);
+        List<GraphSourceItem> xmlListSetTemp = AssignableAVM2Item.setTemp(localData, this, xmlListReg);
+        AVM2ConstantPool constants = abcIndex.getSelectedAbc().constants;
+        ret.addAll(GraphTargetItem.toSourceMerge(localData, this,
+                ins(AVM2Instructions.PushByte, 0),
+                AssignableAVM2Item.setTemp(localData, this, counterReg),
+                item.object,
+                ins(AVM2Instructions.CheckFilter),
+                NameAVM2Item.generateCoerce(localData, this, TypeItem.UNBOUNDED),
+                AssignableAVM2Item.setTemp(localData, this, collectionReg),
+                ins(AVM2Instructions.GetLex, constants.getMultinameId(Multiname.createQName(false, constants.getStringId("XMLList", true), constants.getNamespaceId(Namespace.KIND_PACKAGE, "", 0, true)), true)),
+                ins(AVM2Instructions.PushString, constants.getStringId("", true)),
+                ins(AVM2Instructions.Construct, 1),
+                xmlListSetTemp
+        ));
+        final Reference<Integer> tempVal1 = new Reference<>(0);
+        final Reference<Integer> tempVal2 = new Reference<>(0);
+
+        List<AVM2Instruction> forBody = toInsList(GraphTargetItem.toSourceMerge(localData, this,
+                ins(AVM2Instructions.Label),
+                AssignableAVM2Item.getTemp(localData, this, collectionReg),
+                AssignableAVM2Item.getTemp(localData, this, counterReg),
+                ins(AVM2Instructions.NextValue),
+                AssignableAVM2Item.dupSetTemp(localData, this, tempVal1),
+                AssignableAVM2Item.dupSetTemp(localData, this, tempVal2),
+                ins(AVM2Instructions.PushWith)
+        ));
+        localData.scopeStack.add(new LocalRegAVM2Item(null, null, tempVal2.getVal(), null));
+        forBody.addAll(toInsList(item.value.toSource(localData, this)));
+        List<AVM2Instruction> trueBody = new ArrayList<>();
+        trueBody.addAll(toInsList(AssignableAVM2Item.getTemp(localData, this, xmlListReg)));
+        trueBody.addAll(toInsList(AssignableAVM2Item.getTemp(localData, this, counterReg)));
+        trueBody.addAll(toInsList(AssignableAVM2Item.getTemp(localData, this, tempVal1)));
+        trueBody.add(ins(AVM2Instructions.SetProperty, constants.getMultinameId(Multiname.createMultinameL(false, NamespaceItem.getCpoolSetIndex(abcIndex, item.openedNamespaces)), true)));
+        forBody.add(ins(AVM2Instructions.IfFalse, insToBytes(trueBody).length));
+        forBody.addAll(trueBody);
+        forBody.add(ins(AVM2Instructions.PopScope));
+        localData.scopeStack.remove(localData.scopeStack.size() - 1);
+        forBody.addAll(toInsList(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(tempVal2, tempVal1))));
+
+        int forBodyLen = insToBytes(forBody).length;
+        AVM2Instruction forwardJump = ins(AVM2Instructions.Jump, forBodyLen);
+        ret.add(forwardJump);
+
+        List<AVM2Instruction> expr = new ArrayList<>();
+        expr.add(ins(AVM2Instructions.HasNext2, collectionReg.getVal(), counterReg.getVal()));
+        AVM2Instruction backIf = ins(AVM2Instructions.IfTrue, 0);
+        expr.add(backIf);
+
+        int exprLen = insToBytes(expr).length;
+        backIf.operands[0] = -(exprLen + forBodyLen);
+
+        ret.addAll(forBody);
+        ret.addAll(expr);
+        ret.addAll(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(collectionReg, counterReg)));
+        ret.addAll(AssignableAVM2Item.getTemp(localData, this, xmlListReg));
+        ret.addAll(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(xmlListReg)));
+        return ret;
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, IfItem item) throws CompilationException {
+        return generateIf(localData, item.expression, item.onTrue, item.onFalse, false);
+    }
+
+    private void fixSwitch(List<AVM2Instruction> code, int breakOffset, long loopId) {
+        fixLoop(code, breakOffset, Integer.MAX_VALUE, loopId);
+    }
+
+    private void fixLoop(List<AVM2Instruction> code, int breakOffset, int continueOffset, long loopId) {
+        int pos = 0;
+        for (int a = 0; a < code.size(); a++) {
+            AVM2Instruction ins = code.get(a);
+            pos += ins.getBytesLength();
+            if (ins.definition instanceof JumpIns) {
+                if (ins.definition instanceof ContinueJumpIns) {
+                    if (continueOffset != Integer.MAX_VALUE) {
+                        ins.operands[0] = (-pos + continueOffset);
+                        ins.definition = AVM2Code.instructionSet[AVM2Instructions.Jump];
+                    }
+                }
+                if (ins.definition instanceof BreakJumpIns) {
+                    ins.operands[0] = (-pos + breakOffset);
+                    ins.definition = AVM2Code.instructionSet[AVM2Instructions.Jump];
+                }
+            }
+        }
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, TernarOpItem item) throws CompilationException {
+        List<GraphTargetItem> onTrue = new ArrayList<>();
+        onTrue.add(item.onTrue);
+        List<GraphTargetItem> onFalse = new ArrayList<>();
+        onFalse.add(item.onFalse);
+        return generateIf(localData, item.expression, onTrue, onFalse, true);
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, WhileItem item) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        List<AVM2Instruction> whileExpr = new ArrayList<>();
+
+        List<GraphTargetItem> ex = new ArrayList<>(item.expression);
+        GraphTargetItem lastItem = null;
+        if (!ex.isEmpty()) {
+            lastItem = ex.remove(ex.size() - 1);
+            while (lastItem instanceof CommaExpressionItem) {
+                CommaExpressionItem cei = (CommaExpressionItem) lastItem;
+                ex.addAll(cei.commands);
+                lastItem = ex.remove(ex.size() - 1);
+            }
+            whileExpr.addAll(generateToInsList(localData, ex));
+        }
+        List<AVM2Instruction> whileBody = generateToInsList(localData, item.commands);
+        AVM2Instruction forwardJump = ins(AVM2Instructions.Jump, 0);
+        ret.add(forwardJump);
+        whileBody.add(0, ins(AVM2Instructions.Label));
+        ret.addAll(whileBody);
+        int whileBodyLen = insToBytes(whileBody).length;
+        forwardJump.operands[0] = whileBodyLen;
+        whileExpr.addAll(toInsList(condition(localData, lastItem, 0)));
+        int whileExprLen = insToBytes(whileExpr).length;
+        whileExpr.get(whileExpr.size() - 1).operands[0] = -(whileExprLen + whileBodyLen); //Assuming last is if instruction
+        ret.addAll(whileExpr);
+        fixLoop(whileBody, whileBodyLen + whileExprLen, whileBodyLen, item.loop.id);
+        return ret;
+    }
+
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, ForEachInAVM2Item item) throws CompilationException {
+        return generateForIn(localData, item.loop, item.expression.collection, (AssignableAVM2Item) item.expression.object, item.commands, true);
+    }
+
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, ForInAVM2Item item) throws CompilationException {
+        return generateForIn(localData, item.loop, item.expression.collection, (AssignableAVM2Item) item.expression.object, item.commands, false);
+    }
+
+    public List<GraphSourceItem> generateForIn(SourceGeneratorLocalData localData, Loop loop, GraphTargetItem collection, AssignableAVM2Item assignable, List<GraphTargetItem> commands, final boolean each) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        final Reference<Integer> counterReg = new Reference<>(0);
+        final Reference<Integer> collectionReg = new Reference<>(0);
+
+        if (assignable instanceof UnresolvedAVM2Item) {
+            assignable = (AssignableAVM2Item) ((UnresolvedAVM2Item) assignable).resolved;
+        }
+
+        ret.addAll(GraphTargetItem.toSourceMerge(localData, this,
+                ins(AVM2Instructions.PushByte, 0),
+                AssignableAVM2Item.setTemp(localData, this, counterReg),
+                collection,
+                NameAVM2Item.generateCoerce(localData, this, TypeItem.UNBOUNDED),
+                AssignableAVM2Item.setTemp(localData, this, collectionReg)
+        ));
+
+        GraphTargetItem assigned = new GraphTargetItem() {
+
+            @Override
+            public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+                return null;
+            }
+
+            @Override
+            public boolean hasReturnValue() {
+                return true;
+            }
+
+            @Override
+            public GraphTargetItem returnType() {
+                return TypeItem.UNBOUNDED;
+            }
+
+            @Override
+            public List<GraphSourceItem> toSource(SourceGeneratorLocalData localData, SourceGenerator generator) throws CompilationException {
+                return toSourceMerge(localData, generator,
+                        AssignableAVM2Item.getTemp(localData, generator, collectionReg),
+                        AssignableAVM2Item.getTemp(localData, generator, counterReg),
+                        ins(each ? AVM2Instructions.NextValue : AVM2Instructions.NextName)
+                );
+            }
+        };
+        assignable.setAssignedValue(assigned);
+
+        List<AVM2Instruction> forBody = toInsList(GraphTargetItem.toSourceMerge(localData, this,
+                ins(AVM2Instructions.Label),
+                assignable.toSourceIgnoreReturnValue(localData, this)
+        ));
+
+        forBody.addAll(generateToInsList(localData, commands));
+        int forBodyLen = insToBytes(forBody).length;
+
+        AVM2Instruction forwardJump = ins(AVM2Instructions.Jump, forBodyLen);
+        ret.add(forwardJump);
+
+        List<AVM2Instruction> expr = new ArrayList<>();
+        expr.add(ins(AVM2Instructions.HasNext2, collectionReg.getVal(), counterReg.getVal()));
+        AVM2Instruction backIf = ins(AVM2Instructions.IfTrue, 0);
+        expr.add(backIf);
+
+        int exprLen = insToBytes(expr).length;
+        backIf.operands[0] = -(exprLen + forBodyLen);
+
+        fixLoop(forBody, forBodyLen + exprLen, forBodyLen, loop.id);
+        ret.addAll(forBody);
+        ret.addAll(expr);
+        ret.addAll(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(collectionReg, counterReg)));
+        return ret;
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, DoWhileItem item) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        List<AVM2Instruction> whileExpr = new ArrayList<>();
+
+        List<GraphTargetItem> ex = new ArrayList<>(item.expression);
+        GraphTargetItem lastItem = null;
+        if (!ex.isEmpty()) {
+            lastItem = ex.remove(ex.size() - 1);
+            while (lastItem instanceof CommaExpressionItem) {
+                CommaExpressionItem cei = (CommaExpressionItem) lastItem;
+                ex.addAll(cei.commands);
+                lastItem = ex.remove(ex.size() - 1);
+            }
+            whileExpr.addAll(generateToInsList(localData, ex));
+        }
+        List<AVM2Instruction> dowhileBody = generateToInsList(localData, item.commands);
+        List<AVM2Instruction> labelBody = new ArrayList<>();
+        labelBody.add(ins(AVM2Instructions.Label));
+        int labelBodyLen = insToBytes(labelBody).length;
+
+        AVM2Instruction forwardJump = ins(AVM2Instructions.Jump, labelBodyLen);
+        ret.add(forwardJump);
+        ret.addAll(labelBody);
+        ret.addAll(dowhileBody);
+        int dowhileBodyLen = insToBytes(dowhileBody).length;
+        whileExpr.addAll(toInsList(condition(localData, lastItem, 0)));
+        int dowhileExprLen = insToBytes(whileExpr).length;
+        whileExpr.get(whileExpr.size() - 1).operands[0] = -(dowhileExprLen + dowhileBodyLen + labelBodyLen); //Assuming last is if instruction
+        ret.addAll(whileExpr);
+        fixLoop(dowhileBody, dowhileBodyLen + dowhileExprLen, dowhileBodyLen, item.loop.id);
+        return ret;
+    }
+
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, WithAVM2Item item) throws CompilationException {
+
+        List<GraphSourceItem> ret = new ArrayList<>();
+        ret.addAll(item.scope.toSource(localData, this));
+        Reference<Integer> tempReg = new Reference<>(0);
+        ret.addAll(AssignableAVM2Item.dupSetTemp(localData, this, tempReg));
+        localData.scopeStack.add(new WithObjectAVM2Item(null, null, new LocalRegAVM2Item(null, null, tempReg.getVal(), null)));
+        ret.add(ins(AVM2Instructions.PushWith));
+        ret.addAll(generate(localData, item.items));
+        ret.add(ins(AVM2Instructions.PopScope));
+        ret.addAll(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(tempReg)));
+        localData.scopeStack.remove(localData.scopeStack.size() - 1);
+        return ret;
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, ForItem item) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        List<AVM2Instruction> forExpr = new ArrayList<>();
+
+        List<GraphTargetItem> ex = new ArrayList<>();
+        if (item.expression != null) {
+            ex.add(item.expression);
+        } else {
+            ex.add(new BooleanAVM2Item(null, null, true));
+        }
+        GraphTargetItem lastItem = null;
+        if (!ex.isEmpty()) {
+            lastItem = ex.remove(ex.size() - 1);
+            while (lastItem instanceof CommaExpressionItem) {
+                CommaExpressionItem cei = (CommaExpressionItem) lastItem;
+                ex.addAll(cei.commands);
+                lastItem = ex.remove(ex.size() - 1);
+            }
+            forExpr.addAll(generateToInsList(localData, ex));
+        }
+        List<AVM2Instruction> forBody = generateToInsList(localData, item.commands);
+        List<AVM2Instruction> forFinalCommands = generateToInsList(localData, item.finalCommands);
+
+        ret.addAll(generateToInsList(localData, item.firstCommands));
+
+        AVM2Instruction forwardJump = ins(AVM2Instructions.Jump, 0);
+        ret.add(forwardJump);
+        forBody.add(0, ins(AVM2Instructions.Label));
+        ret.addAll(forBody);
+        ret.addAll(forFinalCommands);
+        int forBodyLen = insToBytes(forBody).length;
+        int forFinalCLen = insToBytes(forFinalCommands).length;
+        forwardJump.operands[0] = forBodyLen + forFinalCLen;
+        forExpr.addAll(toInsList(condition(localData, lastItem, 0)));
+        int forExprLen = insToBytes(forExpr).length;
+        forExpr.get(forExpr.size() - 1).operands[0] = -(forExprLen + forBodyLen + forFinalCLen); //Assuming last is if instruction
+        ret.addAll(forExpr);
+        fixLoop(forBody, forBodyLen + forFinalCLen + forExprLen, forBodyLen, item.loop.id);
+        return ret;
+    }
+
+    private long uniqLast = 0;
+
+    public String uniqId() {
+        uniqLast++;
+        return "" + uniqLast;
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, SwitchItem item) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        Reference<Integer> switchedReg = new Reference<>(0);
+        AVM2Instruction forwardJump = ins(AVM2Instructions.Jump, 0);
+        ret.add(forwardJump);
+
+        int defIndex = -1;
+
+        for (int i = item.caseValues.size() - 1; i >= 0; i--) {
+            if (item.caseValues.get(i) instanceof DefaultItem) {
+                defIndex = i;
+                break;
+            }
+        }
+
+        List<AVM2Instruction> cases = new ArrayList<>();
+        cases.addAll(toInsList(new IntegerValueAVM2Item(null, null, (long) defIndex).toSource(localData, this)));
+        int cLen = insToBytes(cases).length;
+        List<AVM2Instruction> caseLast = new ArrayList<>();
+        caseLast.add(0, ins(AVM2Instructions.Jump, cLen));
+        caseLast.addAll(0, toInsList(new IntegerValueAVM2Item(null, null, (long) defIndex).toSource(localData, this)));
+        int cLastLen = insToBytes(caseLast).length;
+        caseLast.add(0, ins(AVM2Instructions.Jump, cLastLen));
+        cases.addAll(0, caseLast);
+
+        List<AVM2Instruction> preCases = new ArrayList<>();
+        preCases.addAll(toInsList(item.switchedObject.toSource(localData, this)));
+        preCases.addAll(toInsList(AssignableAVM2Item.setTemp(localData, this, switchedReg)));
+
+        for (int i = item.caseValues.size() - 1; i >= 0; i--) {
+            if (item.caseValues.get(i) instanceof DefaultItem) {
+                continue;
+            }
+            List<AVM2Instruction> sub = new ArrayList<>();
+            sub.addAll(toInsList(new IntegerValueAVM2Item(null, null, (long) i).toSource(localData, this)));
+            sub.add(ins(AVM2Instructions.Jump, insToBytes(cases).length));
+            int subLen = insToBytes(sub).length;
+
+            cases.addAll(0, sub);
+            cases.add(0, ins(AVM2Instructions.IfStrictNe, subLen));
+            cases.addAll(0, toInsList(AssignableAVM2Item.getTemp(localData, this, switchedReg)));
+            cases.addAll(0, toInsList(item.caseValues.get(i).toSource(localData, this)));
+        }
+        cases.addAll(0, preCases);
+
+        AVM2Instruction lookupOp = new AVM2Instruction(0, AVM2Instructions.LookupSwitch, new int[item.caseValues.size() + 1 + 1]);
+        cases.addAll(toInsList(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(switchedReg))));
+        List<AVM2Instruction> bodies = new ArrayList<>();
+        List<Integer> bodiesOffsets = new ArrayList<>();
+        int defOffset;
+        int casesLen = insToBytes(cases).length;
+        bodies.add(0, ins(AVM2Instructions.Label));
+        bodies.add(ins(new BreakJumpIns(item.loop.id), 0));  //There could be two breaks when default clause ends with break, but official compiler does this too, so who cares...
+        defOffset = -(insToBytes(bodies).length + casesLen);
+        for (int i = item.caseCommands.size() - 1; i >= 0; i--) {
+            bodies.addAll(0, generateToInsList(localData, item.caseCommands.get(i)));
+            bodies.add(0, ins(AVM2Instructions.Label));
+            bodiesOffsets.add(0, -(insToBytes(bodies).length + casesLen));
+        }
+        lookupOp.operands[0] = defOffset;
+        lookupOp.operands[1] = item.valuesMapping.size();
+        for (int i = 0; i < item.valuesMapping.size(); i++) {
+            lookupOp.operands[2 + i] = bodiesOffsets.get(item.valuesMapping.get(i));
+        }
+
+        forwardJump.operands[0] = insToBytes(bodies).length;
+        ret.addAll(bodies);
+        ret.addAll(cases);
+        ret.add(lookupOp);
+        fixSwitch(toInsList(ret), insToBytes(toInsList(ret)).length, uniqLast);
+        return ret;
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, NotItem item) throws CompilationException {
+        /*if (item.getOriginal() instanceof Inverted) {
+         GraphTargetItem norig = ((Inverted) item).invert();
+         return norig.toSource(localData, this);
+         }*/
+        List<GraphSourceItem> ret = new ArrayList<>();
+        ret.addAll(item.getOriginal().toSource(localData, this));
+        ret.add(ins(AVM2Instructions.Not));
+        return ret;
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, DuplicateItem item) {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        ret.add(ins(AVM2Instructions.Dup));
+        return ret;
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, BreakItem item) {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        AVM2Instruction abreak = ins(new BreakJumpIns(item.loopId), 0);
+        ret.add(abreak);
+        return ret;
+    }
+
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, FunctionAVM2Item item) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        int scope = 0;
+        if (!item.functionName.isEmpty()) {
+            ret.add(ins(AVM2Instructions.NewObject, 0));
+            ret.add(ins(AVM2Instructions.PushWith));
+            scope = localData.scopeStack.size();
+            localData.scopeStack.add(new PropertyAVM2Item(null, item.functionName, abcIndex, new ArrayList<>(), localData.callStack));
+        }
+        AVM2ConstantPool constants = abcIndex.getSelectedAbc().constants;
+        ret.add(ins(AVM2Instructions.NewFunction, method(false, constants.getStringId(item.functionName, true), true, false, localData.callStack, localData.pkg, item.needsActivation, item.subvariables, 0 /*Set later*/, item.hasRest, item.line, localData.currentClass, null, false, localData, item.paramTypes, item.paramNames, item.paramValues, item.body, item.retType)));
+        if (!item.functionName.isEmpty()) {
+            ret.add(ins(AVM2Instructions.Dup));
+            ret.add(ins(AVM2Instructions.GetScopeObject, scope));
+            ret.add(ins(AVM2Instructions.Swap));
+            ret.add(ins(AVM2Instructions.SetProperty, constants.getMultinameId(Multiname.createQName(false, constants.getStringId(item.functionName, true), constants.getNamespaceId(Namespace.KIND_PACKAGE, localData.pkg, 0, true)), true)));
+            ret.add(ins(AVM2Instructions.PopScope));
+            localData.scopeStack.remove(localData.scopeStack.size() - 1);
+        }
+        return ret;
+    }
+
+    private static int currentFinId = 1;
+
+    private static int finId() {
+        return currentFinId++;
+    }
+
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, TryAVM2Item item) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+
+        boolean newFinallyReg = false;
+        List<ABCException> newex = new ArrayList<>();
+        int aloneFinallyEx = -1;
+        int finallyEx = -1;
+        for (NameAVM2Item e : item.catchExceptions2) {
+            ABCException aex = new ABCException();
+            aex.name_index = abcIndex.getSelectedAbc().constants.getMultinameId(Multiname.createQName(false, abcIndex.getSelectedAbc().constants.getStringId(e.getVariableName(), true), abcIndex.getSelectedAbc().constants.getNamespaceId(Namespace.KIND_PACKAGE, "", 0, true)), true);
+            aex.type_index = typeName(localData, e.type);
+            newex.add(aex);
+        }
+        int finId = 0;
+        if (item.finallyCommands != null) {
+            if (item.catchExceptions2.isEmpty()) {
+                ABCException aex = new ABCException();
+                aex.name_index = 0;
+                aex.type_index = 0;
+                newex.add(aex);
+                aloneFinallyEx = newex.size() - 1;
+            }
+            ABCException aex = new ABCException();
+            aex.name_index = 0;
+            aex.type_index = 0;
+            newex.add(aex);
+            finallyEx = newex.size() - 1;
+            if (localData.finallyRegister == -1) {
+                localData.finallyRegister = getFreeRegister(localData);
+                killRegister(localData, localData.finallyRegister); //reuse for catches
+                newFinallyReg = true;
+            }
+            finId = finId();
+        }
+
+        if (finallyEx > -1) {
+            localData.finallyCatches.add(finId);
+        }
+        List<AVM2Instruction> tryCmds = generateToInsList(localData, item.tryCommands);
+
+        //int i = firstId + item.catchCommands.size() - 1;
+        List<AVM2Instruction> catches = new ArrayList<>();
+        Reference<Integer> tempReg = new Reference<>(0);
+
+        List<Integer> currentExceptionIds = new ArrayList<>();
+        List<List<AVM2Instruction>> catchCmds = new ArrayList<>();
+        for (int c = 0; c < item.catchCommands.size(); c++) {
+            int i = localData.exceptions.size();
+            localData.exceptions.add(newex.get(c));
+
+            currentExceptionIds.add(i);
+
+            //Reference<Integer> tempReg=new Reference<>(0);
+            List<AVM2Instruction> catchCmd = new ArrayList<>();
+            catchCmd.add(ins(AVM2Instructions.NewCatch, i));
+            catchCmd.addAll(toInsList(AssignableAVM2Item.dupSetTemp(localData, this, tempReg)));
+            catchCmd.add(ins(AVM2Instructions.Dup));
+            catchCmd.add(ins(AVM2Instructions.PushScope));
+            catchCmd.add(ins(AVM2Instructions.Swap));
+            catchCmd.add(ins(AVM2Instructions.SetSlot, 1));
+
+            for (AssignableAVM2Item a : item.catchVariables.get(c)) {
+                GraphTargetItem r = a;
+                if (r instanceof UnresolvedAVM2Item) {
+                    r = ((UnresolvedAVM2Item) r).resolvedRoot;
+                }
+                if (r instanceof NameAVM2Item) {
+                    NameAVM2Item n = (NameAVM2Item) r;
+                    if (item.catchExceptions2.get(c).getVariableName().equals(n.getVariableName())) {
+                        n.setSlotScope(localData.scopeStack.size());
+                    }
+                }
+            }
+            localData.scopeStack.add(new LocalRegAVM2Item(null, null, tempReg.getVal(), null));
+            catchCmd.addAll(generateToInsList(localData, item.catchCommands.get(c)));
+            localData.scopeStack.remove(localData.scopeStack.size() - 1);
+            catchCmd.add(ins(AVM2Instructions.PopScope));
+            catchCmd.addAll(toInsList(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(tempReg))));
+            catchCmds.add(catchCmd);
+        }
+        for (int c = item.catchCommands.size() - 1; c >= 0; c--) {
+            List<AVM2Instruction> preCatches = new ArrayList<>();
+            /*preCatches.add(ins(AVM2Instructions.GetLocal0));
+             preCatches.add(ins(AVM2Instructions.PushScope));
+             preCatches.add(AssignableAVM2Item.generateGetLoc(localData.activationReg));
+             preCatches.add(ins(AVM2Instructions.PushScope));*/
+            for (GraphTargetItem s : localData.scopeStack) {
+                preCatches.addAll(toInsList(s.toSource(localData, this)));
+                if (s instanceof WithObjectAVM2Item) {
+                    preCatches.add(ins(AVM2Instructions.PushWith));
+                } else {
+                    preCatches.add(ins(AVM2Instructions.PushScope));
+                }
+            }
+
+            //catchCmds.add(catchCmd);
+            preCatches.addAll(catchCmds.get(c));
+            catches.addAll(0, preCatches);
+            catches.add(0, new ExceptionMarkAVM2Instruction(currentExceptionIds.get(c), MARK_E_TARGET));
+            catches.add(0, ins(AVM2Instructions.Jump, insToBytes(catches).length));
+        }
+
+        if (aloneFinallyEx > -1) {
+            localData.exceptions.add(newex.get(aloneFinallyEx));
+            aloneFinallyEx = localData.exceptions.size() - 1;
+
+        }
+        if (finallyEx > -1) {
+            localData.exceptions.add(newex.get(finallyEx));
+            finallyEx = localData.exceptions.size() - 1;
+        }
+
+        for (int i : currentExceptionIds) {
+            ret.add(new ExceptionMarkAVM2Instruction(i, MARK_E_START));
+        }
+        if (aloneFinallyEx > -1) {
+            ret.add(new ExceptionMarkAVM2Instruction(aloneFinallyEx, MARK_E_START));
+        }
+        if (finallyEx > -1) {
+            ret.add(new ExceptionMarkAVM2Instruction(finallyEx, MARK_E_START));
+        }
+
+        ret.addAll(tryCmds);
+
+        for (int i : currentExceptionIds) {
+            ret.add(new ExceptionMarkAVM2Instruction(i, MARK_E_END));
+        }
+        if (aloneFinallyEx > -1) {
+            ret.add(new ExceptionMarkAVM2Instruction(aloneFinallyEx, MARK_E_END));
+        }
+
+        if (aloneFinallyEx > -1) {
+            List<AVM2Instruction> preCatches = new ArrayList<>();
+            for (GraphTargetItem s : localData.scopeStack) {
+                preCatches.addAll(toInsList(s.toSource(localData, this)));
+                if (s instanceof WithObjectAVM2Item) {
+                    preCatches.add(ins(AVM2Instructions.PushWith));
+                } else {
+                    preCatches.add(ins(AVM2Instructions.PushScope));
+                }
+            }
+            preCatches.add(ins(AVM2Instructions.NewCatch, aloneFinallyEx));
+            preCatches.addAll(toInsList(AssignableAVM2Item.dupSetTemp(localData, this, tempReg)));
+            preCatches.add(ins(AVM2Instructions.PushScope));
+            preCatches.add(ins(AVM2Instructions.Throw));
+            preCatches.add(ins(AVM2Instructions.PopScope));
+            preCatches.addAll(toInsList(AssignableAVM2Item.killTemp(localData, this, Arrays.asList(tempReg))));
+            catches.add(ins(AVM2Instructions.Jump, insToBytes(preCatches).length));
+            catches.add(new ExceptionMarkAVM2Instruction(aloneFinallyEx, MARK_E_TARGET));
+            catches.addAll(preCatches);
+        }
+        AVM2Instruction finSwitch = null;
+        AVM2Instruction pushDefIns = ins(AVM2Instructions.PushByte, 0);
+
+        int defPos = 0;
+        if (finallyEx > -1) {
+            List<AVM2Instruction> preCatches = new ArrayList<>();
+            preCatches.add(0, new ExceptionMarkAVM2Instruction(finallyEx, MARK_E_TARGET));
+            for (GraphTargetItem s : localData.scopeStack) {
+                preCatches.addAll(toInsList(s.toSource(localData, this)));
+                if (s instanceof WithObjectAVM2Item) {
+                    preCatches.add(ins(AVM2Instructions.PushWith));
+                } else {
+                    preCatches.add(ins(AVM2Instructions.PushScope));
+                }
+            }
+            preCatches.add(ins(AVM2Instructions.NewCatch, finallyEx));
+            preCatches.addAll(toInsList(AssignableAVM2Item.dupSetTemp(localData, this, tempReg)));
+            preCatches.add(ins(AVM2Instructions.PushScope));
+            preCatches.add(ins(AVM2Instructions.PopScope));
+            Reference<Integer> tempReg2 = new Reference<>(0);
+            preCatches.add(ins(AVM2Instructions.Kill, tempReg.getVal()));
+            preCatches.add(ins(AVM2Instructions.CoerceA));
+            preCatches.addAll(toInsList(AssignableAVM2Item.setTemp(localData, this, tempReg2)));
+            preCatches.add(pushDefIns);
+
+            List<AVM2Instruction> finallySwitchCmds = new ArrayList<>();
+
+            finSwitch = new AVM2Instruction(0, AVM2Instructions.LookupSwitch, new int[1 + 1 + 1]);
+            finSwitch.operands[0] = finSwitch.getBytesLength();
+            finSwitch.operands[1] = 0; //switch cnt
+
+            List<AVM2Instruction> preFinallySwitch = new ArrayList<>();
+            preFinallySwitch.add(ins(AVM2Instructions.Label));
+            preFinallySwitch.add(ins(AVM2Instructions.Pop));
+            int preFinallySwitchLen = insToBytes(preFinallySwitch).length;
+
+            finallySwitchCmds.add(ins(AVM2Instructions.Label));
+            finallySwitchCmds.addAll(toInsList(AssignableAVM2Item.getTemp(localData, this, tempReg2)));
+            finallySwitchCmds.add(ins(AVM2Instructions.Kill, tempReg2.getVal()));
+            finallySwitchCmds.add(ins(AVM2Instructions.Throw));
+            finallySwitchCmds.add(ins(AVM2Instructions.PushByte, 255));
+            finallySwitchCmds.add(ins(AVM2Instructions.PopScope));
+            finallySwitchCmds.add(ins(AVM2Instructions.Kill, tempReg.getVal()));
+
+            int finSwitchLen = insToBytes(finallySwitchCmds).length;
+
+            preCatches.add(ins(AVM2Instructions.Jump, preFinallySwitchLen + finSwitchLen));
+            AVM2Instruction fjump = ins(AVM2Instructions.Jump, 0);
+            fjump.operands[0] = insToBytes(preCatches).length + preFinallySwitchLen + finSwitchLen;
+
+            preCatches.add(0, fjump);
+            preCatches.add(0, new ExceptionMarkAVM2Instruction(finallyEx, MARK_E_END));
+            preCatches.add(0, ins(AVM2Instructions.PushByte, 255));
+
+            finallySwitchCmds.add(new ExceptionMarkAVM2Instruction(finallyEx, MARK_E_FINALLYPART));
+
+            int oldReg = localData.finallyRegister;
+            localData.finallyRegister = getFreeRegister(localData);
+            Integer cnt = localData.finallyCounter.get(finId);
+            if (cnt == null) {
+                cnt = -1;
+            }
+            defPos = cnt;
+            cnt++; //Skip default clause (throw)
+            localData.finallyCounter.put(finId, cnt);
+            finallySwitchCmds.addAll(generateToInsList(localData, item.finallyCommands));
+            killRegister(localData, localData.finallyRegister);
+            localData.finallyRegister = oldReg;
+            finSwitchLen = insToBytes(finallySwitchCmds).length;
+
+            finSwitch.operands[2] = -finSwitchLen;
+            preCatches.addAll(preFinallySwitch);
+            preCatches.addAll(finallySwitchCmds);
+            preCatches.add(finSwitch);
+
+            catches.addAll(preCatches);
+            AssignableAVM2Item.killTemp(localData, this, Arrays.asList(tempReg, tempReg2));
+        }
+
+        ret.addAll(catches);
+        //localData.exceptions.addAll(newex);
+
+        if (finallyEx > -1) {
+            localData.finallyCatches.remove(localData.finallyCatches.size() - 1);
+        }
+        if (newFinallyReg) {
+            localData.finallyRegister = -1;
+            killRegister(localData, localData.finallyRegister);
+        }
+        int pos = 0;
+        int finallyPos = 0;
+        int switchPos = 0;
+        for (int s = 0; s < ret.size(); s++) {
+            GraphSourceItem src = ret.get(s);
+            if (src == finSwitch) {
+                switchPos = pos;
+            }
+            if (src instanceof AVM2Instruction) {
+                AVM2Instruction ins = (AVM2Instruction) src;
+                if (ins instanceof ExceptionMarkAVM2Instruction) {
+                    ExceptionMarkAVM2Instruction em = (ExceptionMarkAVM2Instruction) ins;
+                    if (em.exceptionId == finallyEx && em.markType == MARK_E_FINALLYPART) {
+                        finallyPos = pos;
+                        ret.remove(s);
+                        s--;
+                        continue;
+                    }
+                }
+                pos += ins.getBytesLength();
+            }
+
+        }
+
+        if (finSwitch != null) {
+            pos = 0;
+            int defLoc = finSwitch.operands[2];
+            List<Integer> switchLoc = new ArrayList<>();
+            boolean wasDef = false;
+            for (int s = 0; s < ret.size(); s++) {
+                GraphSourceItem src = ret.get(s);
+                if (src instanceof AVM2Instruction) {
+                    AVM2Instruction ins = (AVM2Instruction) src;
+                    if (ins.definition instanceof FinallyJumpIns) {
+                        FinallyJumpIns fji = (FinallyJumpIns) ins.definition;
+                        if (fji.getClauseId() == finId) {
+                            List<AVM2Instruction> bet = new ArrayList<>();
+                            bet.add(ins(AVM2Instructions.Label));
+                            bet.add(ins(AVM2Instructions.Pop));
+                            int betLen = insToBytes(bet).length;
+                            if (wasDef) {
+                                ins.operands[0] = 0;
+                            } else {
+                                ins.operands[0] = finallyPos - (pos + ins.getBytesLength());
+                            }
+                            ins.definition = AVM2Code.instructionSet[AVM2Instructions.Jump];
+                            switchLoc.add(pos + ins.getBytesLength() + betLen - switchPos);
+                        }
+                    }
+                    pos += ins.getBytesLength();
+                }
+                if (defPos == switchLoc.size() - 1) {
+                    switchLoc.add(defLoc);
+                    wasDef = true;
+                }
+            }
+            finSwitch.operands = new int[1 + 1 + switchLoc.size()];
+            pushDefIns.operands[0] = defPos + 1;
+            int afterLoc = finSwitch.getBytesLength();
+            finSwitch.operands[0] = afterLoc;
+            finSwitch.operands[1] = switchLoc.size() - 1;
+            for (int j = 0; j < switchLoc.size(); j++) {
+                finSwitch.operands[2 + j] = switchLoc.get(j);
+            }
+        }
+
+        return ret;
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, ContinueItem item) {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        AVM2Instruction acontinue = ins(new ContinueJumpIns(item.loopId), 0);
+        ret.add(acontinue);
+        return ret;
+    }
+
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, ReturnValueAVM2Item item) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        ret.addAll(item.value.toSource(localData, this));
+        if (!localData.finallyCatches.isEmpty()) {
+            ret.add(ins(AVM2Instructions.CoerceA));
+            ret.add(AssignableAVM2Item.generateSetLoc(localData.finallyRegister));
+            for (int i = localData.finallyCatches.size() - 1; i >= 0; i--) {
+                if (i < localData.finallyCatches.size() - 1) {
+                    ret.add(ins(AVM2Instructions.Label));
+                }
+                int clauseId = localData.finallyCatches.get(i);
+                Integer cnt = localData.finallyCounter.get(clauseId);
+                if (cnt == null) {
+                    cnt = -1;
+                }
+                cnt++;
+                localData.finallyCounter.put(clauseId, cnt);
+                ret.addAll(new IntegerValueAVM2Item(null, null, (long) cnt).toSource(localData, this));
+                ret.add(ins(new FinallyJumpIns(clauseId), 0));
+                ret.add(ins(AVM2Instructions.Label));
+                ret.add(ins(AVM2Instructions.Pop));
+            }
+            ret.add(ins(AVM2Instructions.Label));
+            ret.add(AssignableAVM2Item.generateGetLoc(localData.finallyRegister));
+            ret.add(ins(AVM2Instructions.Kill, localData.finallyRegister));
+        }
+        ret.add(ins(AVM2Instructions.ReturnValue));
+        return ret;
+    }
+
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, ReturnVoidAVM2Item item) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        if (!localData.finallyCatches.isEmpty()) {
+
+            for (int i = 0; i < localData.finallyCatches.size(); i++) {
+                if (i > 0) {
+                    ret.add(ins(AVM2Instructions.Label));
+                }
+                int clauseId = localData.finallyCatches.get(i);
+                Integer cnt = localData.finallyCounter.get(clauseId);
+                if (cnt == null) {
+                    cnt = -1;
+                }
+                cnt++;
+                localData.finallyCounter.put(clauseId, cnt);
+                ret.addAll(new IntegerValueAVM2Item(null, null, (long) cnt).toSource(localData, this));
+                ret.add(ins(new FinallyJumpIns(clauseId), 0));
+                ret.add(ins(AVM2Instructions.Label));
+                ret.add(ins(AVM2Instructions.Pop));
+            }
+            ret.add(ins(AVM2Instructions.Label));
+        }
+        ret.add(ins(AVM2Instructions.ReturnVoid));
+        return ret;
+    }
+
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, ThrowAVM2Item item) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        ret.addAll(item.value.toSource(localData, this));
+        ret.add(ins(AVM2Instructions.Throw));
+        return ret;
+    }
+
+    private List<AVM2Instruction> generateToInsList(SourceGeneratorLocalData localData, List<GraphTargetItem> commands) throws CompilationException {
+        return toInsList(generate(localData, commands));
+    }
+
+    private List<AVM2Instruction> generateToActionList(SourceGeneratorLocalData localData, GraphTargetItem command) throws CompilationException {
+        return toInsList(command.toSource(localData, this));
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, List<GraphTargetItem> commands) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        for (GraphTargetItem item : commands) {
+            ret.addAll(item.toSourceIgnoreReturnValue(localData, this));
+        }
+        return ret;
+    }
+
+    public HashMap<String, Integer> getRegisterVars(SourceGeneratorLocalData localData) {
+        return localData.registerVars;
+    }
+
+    public void setRegisterVars(SourceGeneratorLocalData localData, HashMap<String, Integer> value) {
+        localData.registerVars = value;
+    }
+
+    public void setInFunction(SourceGeneratorLocalData localData, int value) {
+        localData.inFunction = value;
+    }
+
+    public int isInFunction(SourceGeneratorLocalData localData) {
+        return localData.inFunction;
+    }
+
+    public boolean isInMethod(SourceGeneratorLocalData localData) {
+        return localData.inMethod;
+    }
+
+    public void setInMethod(SourceGeneratorLocalData localData, boolean value) {
+        localData.inMethod = value;
+    }
+
+    public int getForInLevel(SourceGeneratorLocalData localData) {
+        return localData.forInLevel;
+    }
+
+    public void setForInLevel(SourceGeneratorLocalData localData, int value) {
+        localData.forInLevel = value;
+    }
+
+    public int getTempRegister(SourceGeneratorLocalData localData) {
+        HashMap<String, Integer> registerVars = getRegisterVars(localData);
+        int tmpReg = 0;
+        for (int i = 0; i < 256; i++) {
+            if (!registerVars.containsValue(i)) {
+                tmpReg = i;
+                break;
+            }
+        }
+        return tmpReg;
+    }
+
+    public AVM2SourceGenerator(AbcIndexing abc) {
+        this.abcIndex = abc;
+    }
+
+    /*public ABC getABC() {
+     return abc;
+     }*/
+    public void generateClass(List<DottedChain> importedClasses, List<AssignableAVM2Item> cinitVariables, boolean cinitNeedsActivation, List<GraphTargetItem> cinit, List<NamespaceItem> openedNamespaces, int namespace, int initScope, DottedChain pkg, ClassInfo classInfo, InstanceInfo instanceInfo, SourceGeneratorLocalData localData, boolean isInterface, String name, String superName, GraphTargetItem extendsVal, List<GraphTargetItem> implementsStr, GraphTargetItem iinit, List<AssignableAVM2Item> iinitVariables, boolean iinitNeedsActivation, List<GraphTargetItem> traitItems, Reference<Integer> class_index) throws AVM2ParseException, CompilationException {
+        localData.currentClass = name;
+        localData.pkg = pkg;
+        localData.privateNs = abcIndex.getSelectedAbc().constants.getNamespaceId(Namespace.KIND_PRIVATE, pkg.toRawString() + ":" + name, 0, true);
+        localData.protectedNs = abcIndex.getSelectedAbc().constants.getNamespaceId(Namespace.KIND_PROTECTED, pkg.toRawString() + ":" + name, 0, true);
+        if (extendsVal == null && !isInterface) {
+            extendsVal = new TypeItem(DottedChain.OBJECT);
+        }
+        ParsedSymbol s = null;
+
+        if (Configuration.handleSkinPartsAutomatically.get()) {
+
+            Map<String, Boolean> skinParts = new HashMap<>();
+            for (GraphTargetItem t : traitItems) {
+                String tname = null;
+                List<Map.Entry<String, Map<String, String>>> tmetadata = null;
+                if (t instanceof MethodAVM2Item) {
+                    tname = ((MethodAVM2Item) t).functionName;
+                    tmetadata = ((MethodAVM2Item) t).metadata;
+                } else if (t instanceof SlotAVM2Item) {
+                    tname = ((SlotAVM2Item) t).var;
+                    tmetadata = ((SlotAVM2Item) t).metadata;
+                } else if (t instanceof ConstAVM2Item) {
+                    tname = ((ConstAVM2Item) t).var;
+                    tmetadata = ((ConstAVM2Item) t).metadata;
+                }
+                if (tname != null && tmetadata != null) {
+                    for (Map.Entry<String, Map<String, String>> en : tmetadata) {
+                        if ("SkinPart".equals(en.getKey())) {
+                            boolean req = false;
+                            if (en.getValue().containsKey("required")) {
+                                if ("true".equals(en.getValue().get("required"))) {
+                                    req = true;
+                                }
+                            }
+                            skinParts.put(tname, req);
+                        }
+                    }
+                }
+            }
+            if (!skinParts.isEmpty()) {
+
+                //Merge parts from _skinParts attribute of parent class
+                GraphTargetItem parent = extendsVal;
+                if (parent instanceof UnresolvedAVM2Item) {
+                    parent = ((UnresolvedAVM2Item) parent).resolved;
+                }
+                if (parent instanceof TypeItem) {
+                    ClassIndex ci = abcIndex.findClass(parent);
+                    if (ci != null) {
+                        int mi = ci.abc.class_info.get(ci.index).cinit_index;
+                        MethodBody pcinit = ci.abc.findBody(mi);
+                        ConvertData d = new ConvertData();
+
+                        List<Traits> initt = new ArrayList<>();
+                        initt.add(ci.abc.class_info.get(ci.index).static_traits);
+
+                        try {
+                            pcinit.convert(d, "-", ScriptExportMode.AS, true, mi, -1, ci.index, ci.abc, null, new ScopeStack(), GraphTextWriter.TRAIT_CLASS_INITIALIZER, new NulWriter(), new ArrayList<>(), initt, false);
+                            //FIXME! Add skinparts from _skinParts attribute of parent class!!!
+                        } catch (InterruptedException ex) {
+                            Logger.getLogger(AVM2SourceGenerator.class.getName()).log(Level.SEVERE, "Getting parent skinparts interrupted", ex);
+                        }
+                        for (Trait t : ci.abc.class_info.get(ci.index).static_traits.traits) {
+                            if (t instanceof TraitSlotConst) {
+                                TraitSlotConst tsc = (TraitSlotConst) t;
+                                if (tsc.kindType == Trait.TRAIT_SLOT) {
+                                    if ("_skinParts".equals(tsc.getName(ci.abc).getName(ci.abc.constants, new ArrayList<>(), true))) {
+                                        if (d.assignedValues.containsKey(tsc)) {
+                                            if (d.assignedValues.get(tsc).value instanceof NewObjectAVM2Item) {
+                                                NewObjectAVM2Item no = (NewObjectAVM2Item) d.assignedValues.get(tsc).value;
+                                                for (NameValuePair nvp : no.pairs) {
+                                                    skinParts.put(EcmaScript.toString(nvp.name.getResult()), EcmaScript.toBoolean(nvp.value.getResult()));
+                                                }
+                                            }
+
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                    }
+                }
+
+                /*
+            Add
+            override protected function get skinParts() : Object
+                {
+                   return _skinParts;
+                }
+                 */
+                List<GraphTargetItem> getterBody = new ArrayList<>();
+                UnresolvedAVM2Item sp = new UnresolvedAVM2Item(new ArrayList<>(), importedClasses, false, TypeItem.UNBOUNDED, 0, new DottedChain("_skinParts"),
+                        null, openedNamespaces);
+                getterBody.add(new ReturnValueAVM2Item(null, null, sp));
+                List<AssignableAVM2Item> subvars = new ArrayList<>();
+                subvars.add(sp);
+                List<List<NamespaceItem>> allopns = new ArrayList<>();
+                allopns.add(openedNamespaces);
+
+                GetterAVM2Item getter = new GetterAVM2Item(allopns, false, false, new ArrayList<>(), new NamespaceItem(pkg.toRawString() + ":" + name, Namespace.KIND_PROTECTED), isInterface, null, false, false, 0,
+                        true, false, false, "skinParts", new ArrayList<>(), new ArrayList<>(), new ArrayList<>(),
+                        getterBody, subvars, new TypeItem("Object"));
+
+                /*
+            Add
+            private static var _skinParts = {attr1:false, attr2:true};
+                 */
+                List<NameValuePair> pairs = new ArrayList<>();
+                for (String tname : skinParts.keySet()) {
+                    pairs.add(new NameValuePair(new StringAVM2Item(null, null, tname), skinParts.get(tname) ? new TrueItem(null, null) : new FalseItem(null, null)));
+                }
+
+                NewObjectAVM2Item sltVal = new NewObjectAVM2Item(null, null, pairs);
+
+                SlotAVM2Item slt = new SlotAVM2Item(
+                        new ArrayList<>(), new NamespaceItem(pkg.toRawString() + ":" + name, Namespace.KIND_PRIVATE),
+                        null, true, "_skinParts", new TypeItem("Object"), sltVal, 0);
+
+                traitItems.add(0, slt);
+                traitItems.add(getter);
+
+            }
+        }
+
+        Trait[] it = generateTraitsPhase1(importedClasses, openedNamespaces, name, superName, false, localData, traitItems, instanceInfo.instance_traits, class_index);
+        Trait[] st = generateTraitsPhase1(importedClasses, openedNamespaces, name, superName, true, localData, traitItems, classInfo.static_traits, class_index);
+        generateTraitsPhase2(importedClasses, pkg, traitItems, it, openedNamespaces, localData);
+        generateTraitsPhase2(importedClasses, pkg, traitItems, st, openedNamespaces, localData);
+        abcIndex.refreshSelected();
+        generateTraitsPhase3(importedClasses, initScope, isInterface, name, superName, false, localData, traitItems, instanceInfo.instance_traits, it, new HashMap<>(), class_index);
+        generateTraitsPhase3(importedClasses, initScope, isInterface, name, superName, true, localData, traitItems, classInfo.static_traits, st, new HashMap<>(), class_index);
+        int init;
+        if (iinit == null || isInterface) {
+            instanceInfo.iinit_index = init = method(false, 0, false, isInterface, new ArrayList<>(), pkg, false, new ArrayList<>(), initScope + 1, false, 0, isInterface ? null : name, extendsVal != null ? extendsVal.toString() : null, true, localData, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), TypeItem.UNBOUNDED/*?? FIXME*/);
+        } else {
+            MethodAVM2Item m = (MethodAVM2Item) iinit;
+            instanceInfo.iinit_index = init = method(false, str(pkg.toRawString() + ":" + name + "/" + name), false, false, new ArrayList<>(), pkg, m.needsActivation, m.subvariables, initScope + 1, m.hasRest, m.line, name, extendsVal != null ? extendsVal.toString() : null, true, localData, m.paramTypes, m.paramNames, m.paramValues, m.body, TypeItem.UNBOUNDED/*?? FIXME*/);
+        }
+
+        //Class initializer
+        int cinit_index = method(true, str(""), false, false, new ArrayList<>(), pkg, cinitNeedsActivation, cinitVariables, initScope + (implementsStr.isEmpty() ? 0 : 1), false, 0, isInterface ? null : name, superName, false, localData, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), cinit, TypeItem.UNBOUNDED);
+        MethodBody cinitBody = abcIndex.getSelectedAbc().findBody(cinit_index);
+
+        List<AVM2Instruction> sinitcode = new ArrayList<>();
+        List<AVM2Instruction> initcode = new ArrayList<>();
+        for (GraphTargetItem ti : traitItems) {
+            if ((ti instanceof SlotAVM2Item) || (ti instanceof ConstAVM2Item)) {
+                GraphTargetItem val = null;
+                boolean isStatic = false;
+                int ns = -1;
+                String tname = null;
+                boolean isConst = false;
+                if (ti instanceof SlotAVM2Item) {
+                    val = ((SlotAVM2Item) ti).value;
+                    isStatic = ((SlotAVM2Item) ti).isStatic();
+                    ns = genNs(importedClasses, pkg, ((SlotAVM2Item) ti).pkg, openedNamespaces, localData, ((SlotAVM2Item) ti).line);
+                    tname = ((SlotAVM2Item) ti).var;
+                }
+                if (ti instanceof ConstAVM2Item) {
+                    val = ((ConstAVM2Item) ti).value;
+                    isStatic = ((ConstAVM2Item) ti).isStatic();
+                    ns = genNs(importedClasses, pkg, ((ConstAVM2Item) ti).pkg, openedNamespaces, localData, ((ConstAVM2Item) ti).line);
+                    tname = ((ConstAVM2Item) ti).var;
+                    isConst = true;
+                }
+                if (isStatic && val != null) {
+                    sinitcode.add(ins(AVM2Instructions.FindProperty, traitName(ns, tname)));
+                    localData.isStatic = true;
+                    sinitcode.addAll(toInsList(val.toSource(localData, this)));
+                    sinitcode.add(ins(isConst ? AVM2Instructions.InitProperty : AVM2Instructions.SetProperty, traitName(ns, tname)));
+                }
+                if (!isStatic && val != null) {
+                    //do not init basic values, that can be stored in trait
+                    if (!(val instanceof IntegerValueAVM2Item) && !(val instanceof StringAVM2Item) && !(val instanceof BooleanAVM2Item) && !(val instanceof NullAVM2Item) && !(val instanceof UndefinedAVM2Item)) {
+                        initcode.add(ins(AVM2Instructions.GetLocal0));
+                        localData.isStatic = false;
+                        initcode.addAll(toInsList(val.toSource(localData, this)));
+                        initcode.add(ins(isConst ? AVM2Instructions.InitProperty : AVM2Instructions.SetProperty, traitName(ns, tname)));
+                    }
+                }
+            }
+        }
+        MethodBody initBody = null;
+        if (!isInterface) {
+            initBody = abcIndex.getSelectedAbc().findBody(init);
+            initBody.insertAll(iinit == null ? 0 : 2, initcode);//after getlocal0,pushscope
+
+            if (cinitBody.getCode().code.get(cinitBody.getCode().code.size() - 1).definition instanceof ReturnVoidIns) {
+                cinitBody.insertAll(2, sinitcode); //after getlocal0,pushscope
+            }
+        }
+        cinitBody.markOffsets();
+        cinitBody.autoFillStats(abcIndex.getSelectedAbc(), initScope + (implementsStr.isEmpty() ? 0 : 1), true);
+
+        classInfo.cinit_index = cinit_index;
+        if (initBody != null) {
+            initBody.autoFillStats(abcIndex.getSelectedAbc(), initScope + 1, true);
+        }
+        instanceInfo.interfaces = new int[implementsStr.size()];
+        for (int i = 0; i < implementsStr.size(); i++) {
+            instanceInfo.interfaces[i] = superIntName(localData, implementsStr.get(i));
+        }
+
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, CommaExpressionItem item) throws CompilationException {
+        if (item.commands.isEmpty()) {
+            return new ArrayList<>();
+        }
+
+        //We need to handle commands and last expression separately, otherwise last expression result will be popped
+        List<GraphTargetItem> cmds = new ArrayList<>(item.commands);
+        GraphTargetItem lastExpr = cmds.remove(cmds.size() - 1);
+        List<GraphSourceItem> ret = new ArrayList<>();
+        ret.addAll(generate(localData, cmds));
+        ret.addAll(lastExpr.toSource(localData, this));
+        return ret;
+    }
+
+    public int generateClass(int namespace, ClassInfo ci, InstanceInfo ii, int initScope, DottedChain pkg, SourceGeneratorLocalData localData, AVM2Item cls, Reference<Integer> class_index) throws AVM2ParseException, CompilationException {
+        /*ClassInfo ci = new ClassInfo();
+         InstanceInfo ii = new InstanceInfo();
+         abc.class_info.add(ci);
+         abc.instance_info.add(ii);
+         */
+        if (cls instanceof ClassAVM2Item) {
+            ClassAVM2Item cai = (ClassAVM2Item) cls;
+            //TODO: iinit variables, iinit activation
+            generateClass(cai.importedClasses, cai.cinitVariables, cai.cinitActivation, cai.staticInit,
+                    cai.openedNamespaces,
+                    namespace,
+                    initScope, pkg, ci, ii,
+                    localData, false,
+                    cai.className, cai.extendsOp == null ? "Object" : cai.extendsOp.toString(),
+                    cai.extendsOp, cai.implementsOp, cai.iinit,
+                    cai.iinitVariables, cai.iinitActivation, cai.traits, class_index
+            );
+            if (!cai.isDynamic) {
+                ii.flags |= InstanceInfo.CLASS_SEALED;
+            }
+            if (cai.isFinal) {
+                ii.flags |= InstanceInfo.CLASS_FINAL;
+            }
+            ii.flags |= InstanceInfo.CLASS_PROTECTEDNS;
+            ii.protectedNS = abcIndex.getSelectedAbc().constants.getNamespaceId(Namespace.KIND_PROTECTED, pkg.toRawString() + ":" + cai.className, 0, true);
+        }
+        if (cls instanceof InterfaceAVM2Item) {
+            InterfaceAVM2Item iai = (InterfaceAVM2Item) cls;
+            ii.flags |= InstanceInfo.CLASS_INTERFACE;
+            ii.flags |= InstanceInfo.CLASS_SEALED;
+            generateClass(iai.importedClasses, new ArrayList<>(), false, new ArrayList<>(),
+                    iai.openedNamespaces, namespace, initScope, pkg, ci, ii, localData, true, iai.name, null, null, iai.superInterfaces, null, null, false, iai.methods,
+                    class_index
+            );
+        }
+
+        return abcIndex.getSelectedAbc().instance_info.size() - 1;
+    }
+
+    public int traitName(int namespace, String var) {
+        return abcIndex.getSelectedAbc().constants.getMultinameId(Multiname.createQName(false, str(var), namespace), true);
+    }
+
+    public int typeName(SourceGeneratorLocalData localData, GraphTargetItem type) throws CompilationException {
+        if (type instanceof UnboundedTypeItem) {
+            return 0;
+        }
+        if (("" + type).equals("*")) {
+            return 0;
+        }
+
+        return resolveType(localData, type, abcIndex);
+        /*
+         TypeItem nameItem = (TypeItem) type;
+         name = nameItem.fullTypeName;
+         if (name.contains(".")) {
+         pkg = name.substring(0, name.lastIndexOf('.'));
+         name = name.substring(name.lastIndexOf('.') + 1);
+         }
+         if (!nameItem.subtypes.isEmpty()) { //It's vector => TypeName
+         List<Integer> params = new ArrayList<>();
+         for (GraphTargetItem p : nameItem.subtypes) {
+         params.add(typeName(localData, p));//abc.getLastAbc().constants.getMultinameId(new Multiname(Multiname.QNAME, str(p), namespace(Namespace.KIND_PACKAGE, ppkg), 0, 0, new ArrayList<Integer>()), true));
+         }
+         int qname = abc.getLastAbc().constants.getMultinameId(new Multiname(Multiname.QNAME, str(name), namespace(Namespace.KIND_PACKAGE, pkg), 0, 0, new ArrayList<Integer>()), true);
+         return abc.getLastAbc().constants.getMultinameId(new Multiname(Multiname.TYPENAME, 0, 0, 0, qname, params), true);
+         } else {
+         return abc.getLastAbc().constants.getMultinameId(new Multiname(Multiname.QNAME, str(name), namespace(Namespace.KIND_PACKAGE, pkg), 0, 0, new ArrayList<Integer>()), true);
+         }*/
+    }
+
+    public int ident(GraphTargetItem name) {
+        if (name instanceof NameAVM2Item) {
+            return str(((NameAVM2Item) name).getVariableName());
+        }
+        throw new RuntimeException("no ident"); //FIXME
+    }
+
+    public int namespace(int nsKind, String name) {
+        return abcIndex.getSelectedAbc().constants.getNamespaceId(nsKind, str(name), 0, true);
+    }
+
+    public int str(String name) {
+        return abcIndex.getSelectedAbc().constants.getStringId(name, true);
+    }
+
+    public int propertyName(GraphTargetItem name) {
+        if (name instanceof NameAVM2Item) {
+            NameAVM2Item va = (NameAVM2Item) name;
+            return abcIndex.getSelectedAbc().constants.getMultinameId(Multiname.createQName(false, str(va.getVariableName()), namespace(Namespace.KIND_PACKAGE, "")), true);
+        }
+        throw new RuntimeException("no prop"); //FIXME
+    }
+
+    public int getFreeRegister(SourceGeneratorLocalData localData) {
+        for (int i = 0;; i++) {
+            if (!localData.registerVars.containsValue(i)) {
+                localData.registerVars.put("__TEMP__" + i, i);
+                return i;
+            }
+        }
+    }
+
+    public boolean killRegister(SourceGeneratorLocalData localData, int i) {
+        String key = null;
+        for (String k : localData.registerVars.keySet()) {
+            if (localData.registerVars.get(k) == i) {
+                key = k;
+                break;
+            }
+        }
+        if (key != null) {
+            localData.registerVars.remove(key);
+            return true;
+        }
+        return false;
+    }
+
+    public int method(boolean isStatic, int name_index, boolean subMethod, boolean isInterface, List<MethodBody> callStack, DottedChain pkg, boolean needsActivation, List<AssignableAVM2Item> subvariables, int initScope, boolean hasRest, int line, String className, String superType, boolean constructor, SourceGeneratorLocalData localData, List<GraphTargetItem> paramTypes, List<String> paramNames, List<GraphTargetItem> paramValues, List<GraphTargetItem> body, GraphTargetItem retType) throws CompilationException {
+        //Reference<Boolean> hasArgs = new Reference<>(Boolean.FALSE);
+        //calcRegisters(localData,needsActivation,paramNames,subvariables,body, hasArgs);
+        SourceGeneratorLocalData newlocalData = new SourceGeneratorLocalData(new HashMap<>(), 1, true, 0);
+        newlocalData.currentClass = className;
+        newlocalData.pkg = localData.pkg;
+        newlocalData.callStack.addAll(localData.callStack);
+        newlocalData.traitUsages = localData.traitUsages;
+        newlocalData.currentScript = localData.currentScript;
+        newlocalData.documentClass = localData.documentClass;
+        newlocalData.privateNs = localData.privateNs;
+        newlocalData.protectedNs = localData.protectedNs;
+        newlocalData.isStatic = isStatic;
+        newlocalData.subMethod = subMethod;
+        localData = newlocalData;
+
+        localData.activationReg = 0;
+
+        for (int i = 0; i < subvariables.size(); i++) {
+            AssignableAVM2Item an = subvariables.get(i);
+            if (an instanceof UnresolvedAVM2Item) {
+                UnresolvedAVM2Item n = (UnresolvedAVM2Item) an;
+                if (n.resolved == null) {
+                    String fullClass = localData.getFullClass();
+                    GraphTargetItem res = n.resolve(new TypeItem(fullClass), paramTypes, paramNames, abcIndex, callStack, subvariables);
+                    if (res instanceof AssignableAVM2Item) {
+                        subvariables.set(i, (AssignableAVM2Item) res);
+                    } else {
+                        subvariables.remove(i);
+                        i--;
+                    }
+                }
+            }
+        }
+
+        for (int t = 0; t < paramTypes.size(); t++) {
+            GraphTargetItem an = paramTypes.get(t);
+            if (an instanceof UnresolvedAVM2Item) {
+                UnresolvedAVM2Item n = (UnresolvedAVM2Item) an;
+                if (n.resolved == null) {
+                    String fullClass = localData.getFullClass();
+                    GraphTargetItem res = n.resolve(new TypeItem(fullClass), paramTypes, paramNames, abcIndex, callStack, subvariables);
+                    paramTypes.set(t, res);
+                }
+            }
+        }
+
+        boolean hasArguments = false;
+        List<String> slotNames = new ArrayList<>();
+        List<String> slotTypes = new ArrayList<>();
+        slotNames.add("--first");
+        slotTypes.add("-");
+
+        int paramLine = 0; //?
+
+        List<String> registerNames = new ArrayList<>();
+        List<Integer> registerLines = new ArrayList<>();
+        List<String> registerTypes = new ArrayList<>();
+        if (className != null) {
+            String fullClassName = pkg.add(className).toRawString();
+            registerTypes.add(fullClassName);
+            localData.scopeStack.add(new LocalRegAVM2Item(null, null, registerNames.size(), null));
+            registerNames.add("this");
+            registerLines.add(0); //?
+
+        } else {
+            registerTypes.add("global");
+            registerNames.add("this");
+            registerLines.add(0); //?
+        }
+        for (GraphTargetItem t : paramTypes) {
+            registerTypes.add(t.toString());
+            slotTypes.add(t.toString());
+        }
+        for (int i = 0; i < paramNames.size(); i++) {
+            registerLines.add(paramLine);
+        }
+        registerNames.addAll(paramNames);
+        slotNames.addAll(paramNames);
+        /*for (GraphTargetItem p : paramTypes) {
+         slotTypes.add("" + p);
+         }*/
+        if (hasRest) {
+            registerTypes.add("Array");
+            slotTypes.add("Array");
+        }
+        localData.registerVars.clear();
+        for (AssignableAVM2Item an : subvariables) {
+            if (an instanceof NameAVM2Item) {
+                NameAVM2Item n = (NameAVM2Item) an;
+                if (n.getVariableName().equals("arguments") & !n.isDefinition()) {
+                    registerNames.add("arguments");
+                    registerTypes.add("Object");
+                    registerLines.add(0); //?
+                    hasArguments = true;
+                    break;
+                }
+            }
+        }
+        int paramRegCount = registerNames.size();
+
+        if (needsActivation) {
+            registerNames.add("+$activation");
+            registerLines.add(0); //?
+            localData.activationReg = registerNames.size() - 1;
+            registerTypes.add("Object");
+            localData.scopeStack.add(new LocalRegAVM2Item(null, null, localData.activationReg, null));
+        }
+
+        String mask = Configuration.registerNameFormat.get();
+        mask = mask.replace("%d", "([0-9]+)");
+        Pattern pat = Pattern.compile(mask);
+
+        //Two rounds
+        for (int round = 1; round <= 2; round++) {
+            for (AssignableAVM2Item an : subvariables) {
+                if (an instanceof NameAVM2Item) {
+                    NameAVM2Item n = (NameAVM2Item) an;
+                    if (n.isDefinition() && !registerNames.contains(n.getVariableName())) {
+                        if (!needsActivation || (n.getSlotScope() <= 0)) {
+                            String varName = n.getVariableName();
+                            Matcher m = pat.matcher(varName);
+                            //In first round, make all register that match standard loc_xx register
+                            if ((round == 1) && (m.matches())) {
+                                String regIndexStr = m.group(1);
+                                int regIndex = Integer.parseInt(regIndexStr);
+                                while (registerNames.size() <= regIndex + 1) {
+                                    String standardName = String.format(mask, registerNames.size() - 1);
+                                    registerNames.add(standardName);
+                                    registerTypes.add("*");
+                                    slotNames.add(standardName);
+                                    slotTypes.add("*");
+                                    registerLines.add(paramLine);
+                                }
+                                registerNames.set(regIndex, varName);
+                                registerTypes.set(regIndex, varName);
+                                slotNames.set(regIndex, varName);
+                                slotTypes.set(regIndex, varName);
+                                registerLines.set(regIndex, n.line);
+                            } //in second round the rest
+                            else if (round == 2 && !m.matches()) {
+                                registerNames.add(n.getVariableName());
+                                registerTypes.add(n.type.toString());
+                                slotNames.add(n.getVariableName());
+                                slotTypes.add(n.type.toString());
+                                registerLines.add(n.line);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        int slotScope = subMethod ? 0 : 1;
+
+        for (AssignableAVM2Item an : subvariables) {
+            if (an instanceof NameAVM2Item) {
+                NameAVM2Item n = (NameAVM2Item) an;
+                String variableName = n.getVariableName();
+                if (variableName != null) {
+                    boolean isThisOrSuper = variableName.equals("this") || variableName.equals("super");
+                    if (!isThisOrSuper && needsActivation) {
+                        if (n.getSlotNumber() <= 0) {
+                            n.setSlotNumber(slotNames.indexOf(variableName));
+                            n.setSlotScope(slotScope);
+                        }
+                    } else if (isThisOrSuper) {
+                        n.setRegNumber(0);
+                    } else {
+                        n.setRegNumber(registerNames.indexOf(variableName));
+                    }
+                }
+            }
+        }
+
+        for (int i = 0; i < registerNames.size(); i++) {
+            if (needsActivation && i > localData.activationReg) {
+                break;
+            }
+            localData.registerVars.put(registerNames.get(i), i);
+        }
+        List<NameAVM2Item> declarations = new ArrayList<>();
+        loopn:
+        for (AssignableAVM2Item an : subvariables) {
+            if (an instanceof NameAVM2Item) {
+                NameAVM2Item n = (NameAVM2Item) an;
+
+                if (needsActivation) {
+                    if (n.getSlotScope() != slotScope) {
+                        continue;
+                    } else if (n.getSlotNumber() < paramRegCount) {
+                        continue;
+                    }
+                }
+                for (NameAVM2Item d : declarations) {
+                    if (n.getVariableName() != null && n.getVariableName().equals(d.getVariableName())) {
+                        continue loopn;
+                    }
+                }
+
+                for (GraphTargetItem it : body) { //search first level of commands
+                    if (it instanceof NameAVM2Item) {
+                        NameAVM2Item n2 = (NameAVM2Item) it;
+                        if (n2.isDefinition() && n2.getAssignedValue() != null && n2.getVariableName().equals(n.getVariableName())) {
+                            continue loopn;
+                        }
+                        if (!n2.isDefinition() && n2.getVariableName() != null && n2.getVariableName().equals(n.getVariableName())) { //used earlier than defined
+                            break;
+                        }
+                    }
+                }
+                if (n.unresolved) {
+                    continue;
+                }
+                if (n.redirect != null) {
+                    continue;
+                }
+                if (n.getNs() != null) {
+                    continue;
+                }
+
+                String variableName = n.getVariableName();
+                if ("this".equals(variableName) || "super".equals(variableName) || paramNames.contains(variableName) || "arguments".equals(variableName)) {
+                    continue;
+                }
+
+                NameAVM2Item d = new NameAVM2Item(n.type, n.line, n.getVariableName(), NameAVM2Item.getDefaultValue("" + n.type), true, n.openedNamespaces);
+                //no index
+                if (needsActivation) {
+                    if (d.getSlotNumber() <= 0) {
+                        d.setSlotNumber(n.getSlotNumber());
+                        d.setSlotScope(n.getSlotScope());
+                    }
+                } else {
+                    d.setRegNumber(n.getRegNumber());
+                }
+                declarations.add(d);
+            }
+        }
+
+        int[] param_types = new int[paramTypes.size()];
+        ValueKind[] optional = new ValueKind[paramValues.size()];
+        //int[] param_names = new int[paramNames.size()];
+        for (int i = 0; i < paramTypes.size(); i++) {
+            param_types[i] = typeName(localData, paramTypes.get(i));
+            //param_names[i] = str(paramNames.get(i));
+        }
+
+        for (int i = 0; i < paramValues.size(); i++) {
+            optional[i] = getValueKind(Namespace.KIND_NAMESPACE/*FIXME*/, paramTypes.get(paramTypes.size() - paramValues.size() + i), paramValues.get(i));
+            if (optional[i] == null) {
+                throw new CompilationException("Default value must be compiletime constant", line);
+            }
+        }
+
+        MethodInfo mi = new MethodInfo(param_types, constructor ? 0 : typeName(localData, retType), name_index, 0, optional, new int[0]/*no param_names*/);
+        if (hasArguments) {
+            mi.setFlagNeed_Arguments();
+        }
+        //No param names like in official
+        /*
+         if (!paramNames.isEmpty()) {
+         mi.setFlagHas_paramnames();
+         }*/
+        if (!paramValues.isEmpty()) {
+            mi.setFlagHas_optional();
+        }
+        if (hasRest) {
+            mi.setFlagNeed_rest();
+        }
+
+        int mindex;
+        if (!isInterface) {
+            MethodBody mbody = new MethodBody(abcIndex.getSelectedAbc(), new Traits(), new byte[0], new ABCException[0]);
+
+            if (needsActivation) {
+                int slotId = 1;
+                for (int i = 1; i < slotNames.size(); i++) {
+                    TraitSlotConst tsc = new TraitSlotConst();
+                    tsc.slot_id = slotId++;
+                    tsc.name_index = abcIndex.getSelectedAbc().constants.getMultinameId(Multiname.createQName(false, abcIndex.getSelectedAbc().constants.getStringId(slotNames.get(i), true), abcIndex.getSelectedAbc().constants.getNamespaceId(Namespace.KIND_PACKAGE_INTERNAL, pkg, 0, true)), true);
+                    tsc.type_index = typeName(localData, new TypeItem(slotTypes.get(i)));
+                    mbody.traits.traits.add(tsc);
+                }
+                for (int i = 1; i < paramRegCount; i++) {
+                    NameAVM2Item param = new NameAVM2Item(new TypeItem(registerTypes.get(i)), 0, registerNames.get(i), null, false, new ArrayList<>());
+                    param.setRegNumber(i);
+                    NameAVM2Item d = new NameAVM2Item(new TypeItem(registerTypes.get(i)), 0, registerNames.get(i), param, true, new ArrayList<>());
+                    d.setSlotScope(slotScope);
+                    d.setSlotNumber(slotNames.indexOf(registerNames.get(i)));
+                    declarations.add(d);
+                }
+            }
+            if (body != null) {
+                body.addAll(0, declarations);
+            }
+
+            localData.exceptions = new ArrayList<>();
+            localData.callStack.add(mbody);
+            List<GraphSourceItem> src = body == null ? new ArrayList<>() : generate(localData, body);
+
+            mbody.method_info = abcIndex.getSelectedAbc().addMethodInfo(mi);
+            ArrayList<AVM2Instruction> mbodyCode = toInsList(src);
+            mbody.setCode(new AVM2Code(mbodyCode));
+
+            if (needsActivation) {
+                if (localData.traitUsages.containsKey(mbody)) {
+                    List<Integer> usages = localData.traitUsages.get(mbody);
+                    for (int i = 0; i < mbody.traits.traits.size(); i++) {
+                        if (usages.contains(i)) {
+                            TraitSlotConst tsc = (TraitSlotConst) mbody.traits.traits.get(i);
+                            GraphTargetItem type = TypeItem.UNBOUNDED;
+                            if (tsc.type_index > 0) {
+                                type = new TypeItem(abcIndex.getSelectedAbc().constants.getMultiname(tsc.type_index).getNameWithNamespace(abcIndex.getSelectedAbc().constants));
+                            }
+                            NameAVM2Item d = new NameAVM2Item(type, 0, tsc.getName(abcIndex.getSelectedAbc()).getName(abcIndex.getSelectedAbc().constants, null, true), NameAVM2Item.getDefaultValue("" + type), true, new ArrayList<>());
+                            d.setSlotNumber(tsc.slot_id);
+                            d.setSlotScope(slotScope);
+                            mbodyCode.addAll(0, toInsList(d.toSourceIgnoreReturnValue(localData, this)));
+                        }
+                    }
+                }
+
+                List<AVM2Instruction> acts = new ArrayList<>();
+                acts.add(ins(AVM2Instructions.NewActivation));
+                acts.add(ins(AVM2Instructions.Dup));
+                acts.add(AssignableAVM2Item.generateSetLoc(localData.activationReg));
+                acts.add(ins(AVM2Instructions.PushScope));
+
+                mbodyCode.addAll(0, acts);
+            }
+
+            if (constructor) {
+                /* List<ABC> abcs = new ArrayList<>();
+                 abcs.add(abc);
+                 abcs.addAll(allABCs);
+                 */
+                int parentConstMinAC = 0;
+
+                AbcIndexing.ClassIndex ci = abcIndex.findClass(new TypeItem(superType));
+
+                if (ci != null) {
+                    MethodInfo pmi = ci.abc.method_info.get(ci.abc.instance_info.get(ci.index).iinit_index);
+                    parentConstMinAC = pmi.param_types.length;
+                    if (pmi.flagHas_optional()) {
+                        parentConstMinAC -= pmi.optional.length;
+                    }
+                }
+                int ac = -1;
+                for (AVM2Instruction ins : mbodyCode) {
+                    if (ins.definition instanceof ConstructSuperIns) {
+                        ac = ins.operands[0];
+                        if (parentConstMinAC > ac) {
+                            throw new CompilationException("Parent constructor call requires different number of arguments", line);
+                        }
+
+                    }
+                }
+                if (ac == -1) {
+                    if (parentConstMinAC == 0) {
+                        mbodyCode.add(0, new AVM2Instruction(0, AVM2Instructions.GetLocal0, null));
+                        mbodyCode.add(1, new AVM2Instruction(0, AVM2Instructions.ConstructSuper, new int[]{0}));
+
+                    } else {
+                        throw new CompilationException("Parent constructor must be called", line);
+                    }
+                }
+            }
+            for (int i = 1; i < registerNames.size(); i++) {
+                mbodyCode.add(i - 1, ins(AVM2Instructions.Debug, 1, str(registerNames.get(i)), i - 1, (int) registerLines.get(i)));
+            }
+            if (!subMethod) {
+                mbodyCode.add(0, new AVM2Instruction(0, AVM2Instructions.GetLocal0, null));
+                mbodyCode.add(1, new AVM2Instruction(0, AVM2Instructions.PushScope, null));
+            }
+            boolean addRet = false;
+            if (!mbodyCode.isEmpty()) {
+                InstructionDefinition lastDef = mbodyCode.get(mbodyCode.size() - 1).definition;
+                if (!((lastDef instanceof ReturnVoidIns) || (lastDef instanceof ReturnValueIns))) {
+                    addRet = true;
+                }
+            } else {
+                addRet = true;
+            }
+            if (addRet) {
+                if (retType.toString().equals("*") || retType.toString().equals("void") || constructor) {
+                    mbodyCode.add(new AVM2Instruction(0, AVM2Instructions.ReturnVoid, null));
+                } else {
+                    mbodyCode.add(new AVM2Instruction(0, AVM2Instructions.PushUndefined, null));
+                    mbodyCode.add(new AVM2Instruction(0, AVM2Instructions.ReturnValue, null));
+                }
+            }
+            mbody.exceptions = localData.exceptions.toArray(new ABCException[localData.exceptions.size()]);
+            int offset = 0;
+            for (int i = 0; i < mbodyCode.size(); i++) {
+                AVM2Instruction ins = mbodyCode.get(i);
+                if (ins instanceof ExceptionMarkAVM2Instruction) {
+                    ExceptionMarkAVM2Instruction m = (ExceptionMarkAVM2Instruction) ins;
+                    switch (m.markType) {
+                        case MARK_E_START:
+                            mbody.exceptions[m.exceptionId].start = offset;
+                            break;
+                        case MARK_E_END:
+                            mbody.exceptions[m.exceptionId].end = offset;
+                            break;
+                        case MARK_E_TARGET:
+                            mbody.exceptions[m.exceptionId].target = offset;
+                            break;
+                    }
+                    mbodyCode.remove(i);
+                    i--;
+                    continue;
+                }
+                offset += ins.getBytesLength();
+            }
+
+            mbody.markOffsets();
+            mbody.autoFillStats(abcIndex.getSelectedAbc(), initScope, className != null);
+            abcIndex.getSelectedAbc().addMethodBody(mbody);
+            mindex = mbody.method_info;
+        } else {
+            mindex = abcIndex.getSelectedAbc().addMethodInfo(mi);
+        }
+
+        return mindex;
+    }
+
+    public ValueKind getValueKind(int ns, GraphTargetItem type, GraphTargetItem val) {
+
+        if (val instanceof BooleanAVM2Item) {
+            BooleanAVM2Item bi = (BooleanAVM2Item) val;
+            if (bi.value) {
+                return new ValueKind(0, ValueKind.CONSTANT_True);
+            } else {
+                return new ValueKind(0, ValueKind.CONSTANT_False);
+            }
+        }
+
+        boolean isNs = false;
+        if (type instanceof NameAVM2Item) {
+            if (((NameAVM2Item) type).getVariableName().equals("namespace")) {
+                isNs = true;
+            }
+        }
+
+        if ((type instanceof TypeItem) && (((TypeItem) type).fullTypeName.equals(DottedChain.NAMESPACE))) {
+            isNs = true;
+        }
+
+        if (val instanceof StringAVM2Item) {
+            StringAVM2Item sval = (StringAVM2Item) val;
+            if (isNs) {
+                return new ValueKind(namespace(Namespace.KIND_NAMESPACE, sval.getValue()), ValueKind.CONSTANT_Namespace);
+            } else {
+                return new ValueKind(str(sval.getValue()), ValueKind.CONSTANT_Utf8);
+            }
+        }
+        if (val instanceof IntegerValueAVM2Item) {
+            return new ValueKind(abcIndex.getSelectedAbc().constants.getIntId(((IntegerValueAVM2Item) val).value, true), ValueKind.CONSTANT_Int);
+        }
+        if (val instanceof FloatValueAVM2Item) {
+            return new ValueKind(abcIndex.getSelectedAbc().constants.getDoubleId(((FloatValueAVM2Item) val).value, true), ValueKind.CONSTANT_Double);
+        }
+        if (val instanceof NanAVM2Item) {
+            return new ValueKind(abcIndex.getSelectedAbc().constants.getDoubleId(Double.NaN, true), ValueKind.CONSTANT_Double);
+        }
+        if (val instanceof NullAVM2Item) {
+            return new ValueKind(0, ValueKind.CONSTANT_Null);
+        }
+        if (val instanceof UndefinedAVM2Item) {
+            return new ValueKind(0, ValueKind.CONSTANT_Undefined);
+        }
+        return null;
+    }
+
+    private int genNs(List<DottedChain> importedClasses, DottedChain pkg, NamespaceItem ns, List<NamespaceItem> openedNamespaces, SourceGeneratorLocalData localData, int line) throws CompilationException {
+        ns.resolveCustomNs(abcIndex, importedClasses, pkg, openedNamespaces, localData);
+        return ns.getCpoolIndex(abcIndex);
+    }
+
+    public void generateTraitsPhase2(List<DottedChain> importedClasses, DottedChain pkg, List<GraphTargetItem> items, Trait[] traits, List<NamespaceItem> openedNamespaces, SourceGeneratorLocalData localData) throws CompilationException {
+        for (int k = 0; k < items.size(); k++) {
+            GraphTargetItem item = items.get(k);
+            if (traits[k] == null) {
+
+            } else if (item instanceof InterfaceAVM2Item) {
+                traits[k].name_index = traitName(((InterfaceAVM2Item) item).pkg == null ? 0 : ((InterfaceAVM2Item) item).pkg.getCpoolIndex(abcIndex), ((InterfaceAVM2Item) item).name);
+            } else if (item instanceof ClassAVM2Item) {
+                traits[k].name_index = traitName(((ClassAVM2Item) item).pkg == null ? 0 : ((ClassAVM2Item) item).pkg.getCpoolIndex(abcIndex), ((ClassAVM2Item) item).className);
+            } else if ((item instanceof MethodAVM2Item) || (item instanceof GetterAVM2Item) || (item instanceof SetterAVM2Item)) {
+                traits[k].name_index = traitName(genNs(importedClasses, pkg, ((MethodAVM2Item) item).pkg, openedNamespaces, localData, ((MethodAVM2Item) item).line), ((MethodAVM2Item) item).functionName);
+            } else if (item instanceof FunctionAVM2Item) {
+                traits[k].name_index = traitName(((FunctionAVM2Item) item).pkg == null ? 0 : ((FunctionAVM2Item) item).pkg.getCpoolIndex(abcIndex), ((FunctionAVM2Item) item).functionName);
+            } else if (item instanceof ConstAVM2Item) {
+                traits[k].name_index = traitName(genNs(importedClasses, pkg, ((ConstAVM2Item) item).pkg, openedNamespaces, localData, ((ConstAVM2Item) item).line), ((ConstAVM2Item) item).var);
+            } else if (item instanceof SlotAVM2Item) {
+                traits[k].name_index = traitName(genNs(importedClasses, pkg, ((SlotAVM2Item) item).pkg, openedNamespaces, localData, ((SlotAVM2Item) item).line), ((SlotAVM2Item) item).var);
+            }
+        }
+
+        for (int k = 0; k < items.size(); k++) {
+            GraphTargetItem item = items.get(k);
+            if (traits[k] == null) {
+                continue;
+            }
+            if (item instanceof ClassAVM2Item) {
+
+                InstanceInfo instanceInfo = abcIndex.getSelectedAbc().instance_info.get(((TraitClass) traits[k]).class_info);
+                instanceInfo.name_index = abcIndex.getSelectedAbc().constants.getMultinameId(
+                        Multiname.createQName(
+                                false,
+                                abcIndex.getSelectedAbc().constants.getStringId(((ClassAVM2Item) item).className, true),
+                                ((ClassAVM2Item) item).pkg.getCpoolIndex(abcIndex)), true);
+
+                if (((ClassAVM2Item) item).extendsOp != null) {
+                    instanceInfo.super_index = typeName(localData, ((ClassAVM2Item) item).extendsOp);
+                } else {
+                    instanceInfo.super_index = abcIndex.getSelectedAbc().constants.getMultinameId(Multiname.createQName(false, str("Object"), namespace(Namespace.KIND_PACKAGE, "")), true);
+                }
+                instanceInfo.interfaces = new int[((ClassAVM2Item) item).implementsOp.size()];
+                for (int i = 0; i < ((ClassAVM2Item) item).implementsOp.size(); i++) {
+                    instanceInfo.interfaces[i] = superIntName(localData, ((ClassAVM2Item) item).implementsOp.get(i));
+                }
+            }
+            if (item instanceof InterfaceAVM2Item) {
+                ABC abc = abcIndex.getSelectedAbc();
+                AVM2ConstantPool constants = abc.constants;
+                InstanceInfo instanceInfo = abc.instance_info.get(((TraitClass) traits[k]).class_info);
+                instanceInfo.name_index = constants.getMultinameId(Multiname.createQName(false, constants.getStringId(((InterfaceAVM2Item) item).name, true),
+                        ((InterfaceAVM2Item) item).pkg.getCpoolIndex(abcIndex)), true);
+
+                instanceInfo.interfaces = new int[((InterfaceAVM2Item) item).superInterfaces.size()];
+                for (int i = 0; i < ((InterfaceAVM2Item) item).superInterfaces.size(); i++) {
+                    GraphTargetItem un = ((InterfaceAVM2Item) item).superInterfaces.get(i);
+                    instanceInfo.interfaces[i] = superIntName(localData, un);
+                }
+            }
+        }
+    }
+
+    public int superIntName(SourceGeneratorLocalData localData, GraphTargetItem un) throws CompilationException {
+        if (un instanceof UnresolvedAVM2Item) {
+            ((UnresolvedAVM2Item) un).resolve(null, new ArrayList<>(), new ArrayList<>(), abcIndex, new ArrayList<>(), new ArrayList<>());
+            un = ((UnresolvedAVM2Item) un).resolved;
+        }
+        if (!(un instanceof TypeItem)) { //not applyType
+            throw new CompilationException("Invalid type", 0);
+        }
+        TypeItem sup = (TypeItem) un;
+        int propId = resolveType(localData, sup, abcIndex);
+        int[] nss = new int[]{abcIndex.getSelectedAbc().constants.getMultiname(propId).namespace_index};
+        return abcIndex.getSelectedAbc().constants.getMultinameId(Multiname.createMultiname(false, abcIndex.getSelectedAbc().constants.getMultiname(propId).name_index, abcIndex.getSelectedAbc().constants.getNamespaceSetId(nss, true)), true);
+
+    }
+
+    public int[] generateMetadata(List<Map.Entry<String, Map<String, String>>> metadata) {
+        int[] ret = new int[metadata.size()];
+        for (int i = 0; i < metadata.size(); i++) {
+            Map.Entry<String, Map<String, String>> en = metadata.get(i);
+            int[] keys = new int[en.getValue().size()];
+            int[] values = new int[en.getValue().size()];
+            int j = 0;
+            for (String key : en.getValue().keySet()) {
+                keys[j] = abcIndex.getSelectedAbc().constants.getStringId(key, true);
+                values[j] = abcIndex.getSelectedAbc().constants.getStringId(en.getValue().get(key), true);
+                j++;
+            }
+            MetadataInfo mi = new MetadataInfo(abcIndex.getSelectedAbc().constants.getStringId(en.getKey(), true), keys, values);
+            ret[i] = abcIndex.getSelectedAbc().metadata_info.size();
+            abcIndex.getSelectedAbc().metadata_info.add(mi);
+        }
+        return ret;
+    }
+
+    public void generateTraitsPhase3(List<DottedChain> importedClasses, int methodInitScope, boolean isInterface, String className, String superName, boolean generateStatic, SourceGeneratorLocalData localData, List<GraphTargetItem> items, Traits ts, Trait[] traits, Map<Trait, Integer> initScopes, Reference<Integer> class_index) throws AVM2ParseException, CompilationException {
+
+        //Note: Names must be generated first before accesed in inner subs
+        for (int k = 0; k < items.size(); k++) {
+            GraphTargetItem item = items.get(k);
+            if (traits[k] == null) {
+                continue;
+            }
+            if (item instanceof InterfaceAVM2Item) {
+                generateClass(((InterfaceAVM2Item) item).pkg.getCpoolIndex(abcIndex), abcIndex.getSelectedAbc().class_info.get(((TraitClass) traits[k]).class_info), abcIndex.getSelectedAbc().instance_info.get(((TraitClass) traits[k]).class_info), initScopes.get(traits[k]), ((InterfaceAVM2Item) item).pkg.name, localData, (InterfaceAVM2Item) item, class_index);
+            }
+
+            if (item instanceof ClassAVM2Item) {
+                generateClass(((ClassAVM2Item) item).pkg.getCpoolIndex(abcIndex), abcIndex.getSelectedAbc().class_info.get(((TraitClass) traits[k]).class_info), abcIndex.getSelectedAbc().instance_info.get(((TraitClass) traits[k]).class_info), initScopes.get(traits[k]), ((ClassAVM2Item) item).pkg.name, localData, (ClassAVM2Item) item, class_index);
+            }
+            if ((item instanceof MethodAVM2Item) || (item instanceof GetterAVM2Item) || (item instanceof SetterAVM2Item)) {
+                MethodAVM2Item mai = (MethodAVM2Item) item;
+                if (mai.isStatic() != generateStatic) {
+                    continue;
+                }
+                for (List<NamespaceItem> ln : mai.allOpenedNamespaces) {
+                    for (NamespaceItem n : ln) {
+                        n.resolveCustomNs(abcIndex, importedClasses, localData.pkg, ln, localData);
+                    }
+                }
+                String suffix = null;
+                if (item instanceof GetterAVM2Item) {
+                    suffix = "get";
+                }
+                if (item instanceof SetterAVM2Item) {
+                    suffix = "set";
+                }
+
+                ((TraitMethodGetterSetter) traits[k]).method_info = method(mai.isStatic(), methodName(mai.outsidePackage, localData.pkg, mai.functionName, mai.pkg, className, mai.customNamespace, suffix), false, isInterface, new ArrayList<>(), localData.pkg, mai.needsActivation, mai.subvariables, methodInitScope + (mai.isStatic() ? 0 : 1), mai.hasRest, mai.line, className, superName, false, localData, mai.paramTypes, mai.paramNames, mai.paramValues, mai.body, mai.retType);
+            } else if (item instanceof FunctionAVM2Item) {
+                FunctionAVM2Item fai = (FunctionAVM2Item) item;
+                ((TraitFunction) traits[k]).method_info = method(false, methodName(false/*?*/, localData.pkg, fai.functionName, fai.pkg, null, null, ""), false, isInterface, new ArrayList<>(), localData.pkg, fai.needsActivation, fai.subvariables, methodInitScope, fai.hasRest, fai.line, className, superName, false, localData, fai.paramTypes, fai.paramNames, fai.paramValues, fai.body, fai.retType);
+            }
+        }
+    }
+
+    private int methodName(boolean outsidePkg, DottedChain pkg, String methodName, NamespaceItem ns, String className, String customNs, String typeSuffix) {
+        StringBuilder sb = new StringBuilder();
+        /*if (ns != null) {
+         sb.append(ns.name.toRawString());
+         }*/
+        if (className != null) {
+            if (pkg != null && !pkg.isEmpty() && !pkg.isTopLevel()) {
+                sb.append(pkg.toRawString());
+                sb.append(":");
+            }
+            sb.append(className);
+        }
+        if (customNs != null) {
+            sb.append(customNs);
+        } else if (ns != null) {
+            switch (ns.kind) {
+                case Namespace.KIND_PACKAGE_INTERNAL:
+                    sb.append(pkg == null ? "" /*?*/ : pkg.toRawString());
+                    break;
+                case Namespace.KIND_PRIVATE:
+
+                    if (!outsidePkg) {
+                        sb.append("/private");
+                    }
+                    break;
+                case Namespace.KIND_PROTECTED:
+                case Namespace.KIND_STATIC_PROTECTED:
+                    sb.append("/protected");
+                    break;
+            }
+        }
+        sb.append(":");
+        sb.append(methodName);
+        if (typeSuffix != null && !typeSuffix.isEmpty()) {
+            sb.append("/");
+            sb.append(typeSuffix);
+        }
+        return abcIndex.getSelectedAbc().constants.getStringId(sb.toString(), true);
+    }
+
+    public Trait[] generateTraitsPhase1(List<DottedChain> importedClasses, List<NamespaceItem> openedNamespaces, String className, String superName, boolean generateStatic, SourceGeneratorLocalData localData, List<GraphTargetItem> items, Traits ts, Reference<Integer> classIndex) throws AVM2ParseException, CompilationException {
+        Trait[] traits = new Trait[items.size()];
+        int slot_id = 1;
+        int disp_id = 3; //1 and 2 are for constructor
+        for (int k = 0; k < items.size(); k++) {
+            GraphTargetItem item = items.get(k);
+            if (item instanceof InterfaceAVM2Item) {
+                TraitClass tc = new TraitClass();
+                ClassInfo ci = new ClassInfo();
+                InstanceInfo ii = new InstanceInfo();
+                /*abc.class_info.add(ci);
+                 abc.instance_info.add(ii);*/
+                tc.class_info = classIndex.getVal();
+                abcIndex.getSelectedAbc().addClass(ci, ii, classIndex.getVal());
+                classIndex.setVal(classIndex.getVal() + 1);
+                ii.flags |= InstanceInfo.CLASS_INTERFACE;
+                //ii.name_index = traitName(((InterfaceAVM2Item) item).namespace, ((InterfaceAVM2Item) item).name);
+                //tc.class_info = abc.instance_info.size() - 1;
+                tc.kindType = Trait.TRAIT_CLASS;
+                //tc.name_index = traitName(((InterfaceAVM2Item) item).namespace, ((InterfaceAVM2Item) item).name);
+                tc.slot_id = 0; //?
+                ts.traits.add(tc);
+                traits[k] = tc;
+                traits[k].metadata = generateMetadata(((InterfaceAVM2Item) item).metadata);
+                if (traits[k].metadata.length > 0) {
+                    traits[k].kindFlags |= Trait.ATTR_Metadata;
+                }
+            }
+
+            if (item instanceof ClassAVM2Item) {
+                TraitClass tc = new TraitClass();
+                ClassInfo ci = new ClassInfo();
+                InstanceInfo ii = new InstanceInfo();
+                //ii.name_index = traitName(((ClassAVM2Item) item).namespace, ((ClassAVM2Item) item).className);
+                /*abc.class_info.add(ci);
+                 abc.instance_info.add(instanceInfo);*/
+                tc.class_info = classIndex.getVal();
+                abcIndex.getSelectedAbc().addClass(ci, ii, classIndex.getVal());
+                classIndex.setVal(classIndex.getVal() + 1);
+                tc.kindType = Trait.TRAIT_CLASS;
+                // tc.name_index = traitName(((ClassAVM2Item) item).namespace, ((ClassAVM2Item) item).className);
+                tc.slot_id = slot_id++;
+                ts.traits.add(tc);
+                traits[k] = tc;
+                traits[k].metadata = generateMetadata(((ClassAVM2Item) item).metadata);
+                if (traits[k].metadata.length > 0) {
+                    traits[k].kindFlags |= Trait.ATTR_Metadata;
+                }
+            }
+            if ((item instanceof SlotAVM2Item) || (item instanceof ConstAVM2Item)) {
+                TraitSlotConst tsc = new TraitSlotConst();
+                tsc.kindType = (item instanceof SlotAVM2Item) ? Trait.TRAIT_SLOT : Trait.TRAIT_CONST;
+                String var = null;
+                GraphTargetItem val = null;
+                GraphTargetItem type = null;
+                boolean isNamespace = false;
+                int namespace = 0;
+                boolean isStatic = false;
+                int[] metadata = new int[0];
+                if (item instanceof SlotAVM2Item) {
+                    SlotAVM2Item sai = (SlotAVM2Item) item;
+                    if (sai.isStatic() != generateStatic) {
+                        continue;
+                    }
+                    var = sai.var;
+                    val = sai.value;
+                    type = sai.type;
+                    isStatic = sai.isStatic();
+                    if (sai.pkg != null) {
+                        sai.pkg.resolveCustomNs(abcIndex, importedClasses, localData.pkg, openedNamespaces, localData);
+                    }
+                    namespace = sai.pkg == null ? 0 : sai.pkg.getCpoolIndex(abcIndex);
+                    metadata = generateMetadata(((SlotAVM2Item) item).metadata);
+                }
+                if (item instanceof ConstAVM2Item) {
+                    ConstAVM2Item cai = (ConstAVM2Item) item;
+                    if (cai.isStatic() != generateStatic) {
+                        continue;
+                    }
+                    var = cai.var;
+                    val = cai.value;
+                    type = cai.type;
+                    if (cai.pkg != null) {
+                        cai.pkg.resolveCustomNs(abcIndex, importedClasses, localData.pkg, openedNamespaces, localData);
+                    }
+                    namespace = cai.pkg == null ? 0 : cai.pkg.getCpoolIndex(abcIndex);
+                    isNamespace = type.toString().equals("Namespace");
+                    isStatic = cai.isStatic();
+                    metadata = generateMetadata(((ConstAVM2Item) item).metadata);
+                }
+                if (isNamespace) {
+                    tsc.name_index = traitName(namespace, var);
+                }
+                tsc.type_index = isNamespace ? 0 : (type == null ? 0 : typeName(localData, type));
+
+                ValueKind vk = getValueKind(namespace, type, val);
+                if (vk == null) {
+                    tsc.value_kind = ValueKind.CONSTANT_Undefined;
+                } else {
+                    tsc.value_kind = vk.value_kind;
+                    tsc.value_index = vk.value_index;
+                }
+                tsc.slot_id = isStatic ? slot_id++ : 0;
+                ts.traits.add(tsc);
+                traits[k] = tsc;
+                traits[k].metadata = metadata;
+                if (traits[k].metadata.length > 0) {
+                    traits[k].kindFlags |= Trait.ATTR_Metadata;
+                }
+            }
+            if ((item instanceof MethodAVM2Item) || (item instanceof GetterAVM2Item) || (item instanceof SetterAVM2Item)) {
+                MethodAVM2Item mai = (MethodAVM2Item) item;
+                if (mai.isStatic() != generateStatic) {
+                    continue;
+                }
+                TraitMethodGetterSetter tmgs = new TraitMethodGetterSetter();
+                tmgs.kindType = (item instanceof GetterAVM2Item) ? Trait.TRAIT_GETTER : ((item instanceof SetterAVM2Item) ? Trait.TRAIT_SETTER : Trait.TRAIT_METHOD);
+                tmgs.disp_id = mai.isStatic() ? disp_id++ : 0; //For a reason, there is disp_id only for static methods (or not?)
+                if (mai.isFinal() || (className != null && mai.isStatic())) {
+                    tmgs.kindFlags |= Trait.ATTR_Final;
+                }
+                if (mai.isOverride()) {
+                    tmgs.kindFlags |= Trait.ATTR_Override;
+                }
+                ts.traits.add(tmgs);
+
+                traits[k] = tmgs;
+                traits[k].metadata = generateMetadata(((MethodAVM2Item) item).metadata);
+                if (traits[k].metadata.length > 0) {
+                    traits[k].kindFlags |= Trait.ATTR_Metadata;
+                }
+            }
+            /*else if (item instanceof FunctionAVM2Item) {
+             TraitFunction tf = new TraitFunction();
+             tf.slot_id = slot_id++;
+             tf.kindType = Trait.TRAIT_FUNCTION;
+             //tf.name_index = traitName(((FunctionAVM2Item) item).namespace, ((FunctionAVM2Item) item).functionName);
+             ts.traits.add(tf);
+             traits[k] = tf;
+             traits[k].metadata = generateMetadata(((FunctionAVM2Item) item).metadata);
+             }*/
+
+        }
+
+        return traits;
+    }
+
+    public ScriptInfo generateScriptInfo(List<List<NamespaceItem>> allOpenedNamespaces, SourceGeneratorLocalData localData, List<GraphTargetItem> commands, int classPos) throws AVM2ParseException, CompilationException {
+        Reference<Integer> class_index = new Reference<>(classPos);
+        ScriptInfo si = new ScriptInfo();
+        localData.currentScript = si;
+        Trait[] traitArr = generateTraitsPhase1(new ArrayList<>(), new ArrayList<>(), null, null, true, localData, commands, si.traits, class_index);
+        generateTraitsPhase2(new ArrayList<>(), null/*FIXME*/, commands, traitArr, new ArrayList<>(), localData);
+
+        abcIndex.refreshSelected();
+
+        ABC abc = abcIndex.getSelectedAbc();
+        AVM2ConstantPool constants = abc.constants;
+        MethodInfo mi = new MethodInfo(new int[0], 0, constants.getStringId("", true), 0, new ValueKind[0], new int[0]);
+        MethodBody mb = new MethodBody(abc, new Traits(), new byte[0], new ABCException[0]);
+        mb.method_info = abc.addMethodInfo(mi);
+        mb.setCode(new AVM2Code());
+        List<AVM2Instruction> mbCode = mb.getCode().code;
+        mbCode.add(ins(AVM2Instructions.GetLocal0));
+        mbCode.add(ins(AVM2Instructions.PushScope));
+
+        int traitScope = 2;
+
+        Map<Trait, Integer> initScopes = new HashMap<>();
+
+        for (Trait t : si.traits.traits) {
+            if (t instanceof TraitClass) {
+                TraitClass tc = (TraitClass) t;
+                List<Integer> parents = new ArrayList<>();
+                if (localData.documentClass) {
+                    mbCode.add(ins(AVM2Instructions.GetScopeObject, 0));
+                    traitScope++;
+                } else {
+                    int[] nsset = new int[]{constants.getMultiname(tc.name_index).namespace_index};
+                    mbCode.add(ins(AVM2Instructions.FindPropertyStrict, constants.getMultinameId(Multiname.createMultiname(false, constants.getMultiname(tc.name_index).name_index, constants.getNamespaceSetId(nsset, true)), true)));
+                }
+                if (abc.instance_info.get(tc.class_info).isInterface()) {
+                    mbCode.add(ins(AVM2Instructions.PushNull));
+                } else {
+
+                    AbcIndexing.ClassIndex ci = abcIndex.findClass(AbcIndexing.multinameToType(abc.instance_info.get(tc.class_info).name_index, constants));
+                    while (ci != null && ci.parent != null) {
+                        ci = ci.parent;
+                        Multiname origM = ci.abc.constants.getMultiname(ci.abc.instance_info.get(ci.index).name_index);
+                        Namespace origNs = ci.abc.constants.getNamespace(origM.namespace_index);
+                        if (origM.kind == Multiname.QNAME || origM.kind == Multiname.QNAMEA) {
+                            parents.add(constants.getMultinameId(
+                                    Multiname.createQName(origM.kind == Multiname.QNAMEA,
+                                            constants.getStringId(ci.abc.constants.getString(origM.name_index), true),
+                                            constants.getNamespaceId(origNs.kind,
+                                                    ci.abc.constants.getString(origNs.name_index), 0, true)), true));
+                        }
+                    }
+
+                    //add all parent objects to scopestack
+                    for (int i = parents.size() - 1; i >= 0; i--) {
+                        mbCode.add(ins(AVM2Instructions.GetLex, parents.get(i)));
+                        mbCode.add(ins(AVM2Instructions.PushScope));
+                        traitScope++;
+                    }
+                    //direct parent class to new_class instruction
+                    if (!parents.isEmpty()) { //NON EXISTING PARENT CLASS - TODO: handle as error!
+                        mbCode.add(ins(AVM2Instructions.GetLex, parents.get(0)));
+                    }
+                }
+                mbCode.add(ins(AVM2Instructions.NewClass, tc.class_info));
+                for (int i = 0; i < parents.size(); i++) {
+                    mbCode.add(ins(AVM2Instructions.PopScope));
+                }
+
+                mbCode.add(ins(AVM2Instructions.InitProperty, tc.name_index));
+                initScopes.put(t, traitScope);
+                traitScope = 1;
+            }
+        }
+
+        abc.addMethodBody(mb);
+        si.init_index = mb.method_info;
+        localData.pkg = DottedChain.EMPTY;
+        generateTraitsPhase3(new ArrayList<>(), 1/*??*/, false, null, null, true, localData, commands, si.traits, traitArr, initScopes, class_index);
+
+        int maxSlotId = 0;
+        for (int k = 0; k < si.traits.traits.size(); k++) {
+            if (si.traits.traits.get(k) instanceof TraitSlotConst) {
+                TraitSlotConst ti = (TraitSlotConst) si.traits.traits.get(k);
+                if (ti.slot_id > maxSlotId) {
+                    maxSlotId = ti.slot_id;
+                }
+            }
+        }
+        for (int k = 0; k < si.traits.traits.size(); k++) {
+            if ((si.traits.traits.get(k) instanceof TraitMethodGetterSetter) && (commands.get(k) instanceof MethodAVM2Item)) {
+                MethodAVM2Item mai = (MethodAVM2Item) commands.get(k);
+                if (mai.outsidePackage) {
+                    TraitMethodGetterSetter tmgs = (TraitMethodGetterSetter) si.traits.traits.get(k);
+                    TraitSlotConst nts = new TraitSlotConst();
+                    nts.name_index = si.traits.traits.get(k).name_index;
+                    nts.metadata = si.traits.traits.get(k).metadata;
+
+                    nts.slot_id = maxSlotId + 1;
+                    maxSlotId++;
+                    nts.type_index = abcIndex.getSelectedAbc().constants.getQnameId("Function", Namespace.KIND_PACKAGE, "", true);
+                    nts.value_index = 0;
+                    nts.value_kind = 0;
+                    int methodinfo = tmgs.method_info;
+                    si.traits.traits.set(k, nts);
+                    mbCode.add(ins(AVM2Instructions.NewFunction, methodinfo));
+                    mbCode.add(ins(AVM2Instructions.InitProperty, nts.name_index));
+                }
+            }
+        }
+
+        mbCode.add(ins(AVM2Instructions.ReturnVoid));
+        mb.autoFillStats(abc, 1, false);
+
+        return si;
+    }
+
+    public static void parentNamesAddNames(AbcIndexing abc, int name_index, List<Integer> indices, List<String> names, List<String> namespaces) {
+        List<Integer> cindices = new ArrayList<>();
+
+        List<ABC> outABCs = new ArrayList<>();
+        parentNames(abc, name_index, cindices, names, namespaces, outABCs);
+        for (int i = 0; i < cindices.size(); i++) {
+            ABC a = outABCs.get(i);
+            int m = cindices.get(i);
+            if (a == abc.getSelectedAbc()) {
+                indices.add(m);
+                continue;
+            }
+            Multiname superName = a.constants.getMultiname(m);
+            indices.add(
+                    abc.getSelectedAbc().constants.getMultinameId(
+                            Multiname.createQName(false,
+                                    abc.getSelectedAbc().constants.getStringId(superName.getName(a.constants, null, true), true),
+                                    abc.getSelectedAbc().constants.getNamespaceId(superName.getNamespace(a.constants).kind, superName.getNamespace(a.constants).getName(a.constants), 0, true)), true)
+            );
+        }
+    }
+
+    public static GraphTargetItem getTraitReturnType(AbcIndexing abc, Trait t) {
+        if (t instanceof TraitSlotConst) {
+            TraitSlotConst tsc = (TraitSlotConst) t;
+            if (tsc.type_index == 0) {
+                return TypeItem.UNBOUNDED;
+            }
+            return PropertyAVM2Item.multinameToType(tsc.type_index, abc.getSelectedAbc().constants);
+        }
+        if (t instanceof TraitMethodGetterSetter) {
+            TraitMethodGetterSetter tmgs = (TraitMethodGetterSetter) t;
+            if (tmgs.kindType == Trait.TRAIT_GETTER) {
+                return PropertyAVM2Item.multinameToType(abc.getSelectedAbc().method_info.get(tmgs.method_info).ret_type, abc.getSelectedAbc().constants);
+            }
+            if (tmgs.kindType == Trait.TRAIT_SETTER) {
+                if (abc.getSelectedAbc().method_info.get(tmgs.method_info).param_types.length > 0) {
+                    return PropertyAVM2Item.multinameToType(abc.getSelectedAbc().method_info.get(tmgs.method_info).param_types[0], abc.getSelectedAbc().constants);
+                } else {
+                    return TypeItem.UNBOUNDED;
+                }
+            }
+        }
+        if (t instanceof TraitFunction) {
+            return new TypeItem(DottedChain.FUNCTION);
+        }
+        return TypeItem.UNBOUNDED;
+    }
+
+    public static boolean searchPrototypeChain(List<Integer> otherNs, int privateNs, int protectedNs, boolean instanceOnly, AbcIndexing abc, DottedChain pkg, String obj, String propertyName, Reference<String> outName, Reference<DottedChain> outNs, Reference<DottedChain> outPropNs, Reference<Integer> outPropNsKind, Reference<Integer> outPropNsIndex, Reference<GraphTargetItem> outPropType, Reference<ValueKind> outPropValue, Reference<ABC> outPropValueAbc) {
+        for (int ns : otherNs) {
+            if (searchPrototypeChain(ns, instanceOnly, abc, pkg, obj, propertyName, outName, outNs, outPropNs, outPropNsKind, outPropNsIndex, outPropType, outPropValue, outPropValueAbc)) {
+                return true;
+            }
+        }
+
+        if (searchPrototypeChain(privateNs, instanceOnly, abc, pkg, obj, propertyName, outName, outNs, outPropNs, outPropNsKind, outPropNsIndex, outPropType, outPropValue, outPropValueAbc)) {
+            return true;
+        }
+        if (searchPrototypeChain(protectedNs, instanceOnly, abc, pkg, obj, propertyName, outName, outNs, outPropNs, outPropNsKind, outPropNsIndex, outPropType, outPropValue, outPropValueAbc)) {
+            return true;
+        }
+        return searchPrototypeChain(0, instanceOnly, abc, pkg, obj, propertyName, outName, outNs, outPropNs, outPropNsKind, outPropNsIndex, outPropType, outPropValue, outPropValueAbc);
+    }
+
+    private static boolean searchPrototypeChain(int selectedNs, boolean instanceOnly, AbcIndexing abc, DottedChain pkg, String obj, String propertyName, Reference<String> outName, Reference<DottedChain> outNs, Reference<DottedChain> outPropNs, Reference<Integer> outPropNsKind, Reference<Integer> outPropNsIndex, Reference<GraphTargetItem> outPropType, Reference<ValueKind> outPropValue, Reference<ABC> outPropValueAbc) {
+
+        AbcIndexing.TraitIndex sp = abc.findScriptProperty(pkg.add(propertyName));
+        if (sp == null) {
+            sp = abc.findProperty(new AbcIndexing.PropertyDef(propertyName, new TypeItem(pkg.add(obj)), abc.getSelectedAbc(), selectedNs), !instanceOnly, true);
+        }
+        if (sp != null) {
+            if (sp.objType instanceof TypeItem) {
+                outName.setVal(((TypeItem) sp.objType).fullTypeName.getLast());
+                outNs.setVal(((TypeItem) sp.objType).fullTypeName.getWithoutLast());
+            } else {
+                //FIXME? Vector?
+            }
+            outPropNs.setVal(sp.trait.getName(sp.abc).getNamespace(sp.abc.constants).getName(sp.abc.constants));
+            outPropNsKind.setVal(sp.trait.getName(sp.abc).getNamespace(sp.abc.constants).kind);
+            int nsi = sp.trait.getName(sp.abc).namespace_index;
+            outPropNsIndex.setVal(sp.abc == abc.getSelectedAbc() ? sp.abc.constants.getNamespaceSubIndex(nsi) : 0);
+            outPropType.setVal(sp.returnType);
+            outPropValue.setVal(sp.value);
+            outPropValueAbc.setVal(sp.abc);
+            return true;
+        }
+        return false;
+    }
+
+    public static void parentNames(AbcIndexing abc, int name_index, List<Integer> indices, List<String> names, List<String> namespaces, List<ABC> outABCs) {
+        AbcIndexing.ClassIndex ci = abc.findClass(new TypeItem(abc.getSelectedAbc().constants.getMultiname(name_index).getNameWithNamespace(abc.getSelectedAbc().constants)));
+        while (ci != null) {
+            int ni = ci.abc.instance_info.get(ci.index).name_index;
+            indices.add(ni);
+            outABCs.add(ci.abc);
+            names.add(ci.abc.constants.getMultiname(ni).getName(ci.abc.constants, null, true));
+            namespaces.add(ci.abc.constants.getMultiname(ni).getNamespace(ci.abc.constants).getName(ci.abc.constants).toRawString());
+            ci = ci.parent;
+        }
+    }
+
+    /* public void calcRegisters(Reference<Integer> activationReg, SourceGeneratorLocalData localData, boolean needsActivation, List<String> funParamNames,List<NameAVM2Item> funSubVariables,List<GraphTargetItem> funBody, Reference<Boolean> hasArguments) throws ParseException {
+
+     }*/
+ /*public int resolveType(String objType) {
+     if (objType.equals("*")) {
+     return 0;
+     }
+     List<ABC> abcs = new ArrayList<>();
+     abcs.add(abc);
+     abcs.addAll(allABCs);
+     for (ABC a : abcs) {
+     int ci = a.findClassByName(objType);
+     if (ci != -1) {
+     Multiname tname = a.instance_info.get(ci).getName(a.constants);
+     return abc.getLastAbc().constants.getMultinameId(new Multiname(tname.kind,
+     abc.getLastAbc().constants.getStringId(tname.getName(a.constants, new ArrayList<>()), true),
+     abc.getLastAbc().constants.getNamespaceId(new Namespace(tname.getNamespace(a.constants).kind, abc.getLastAbc().constants.getStringId(tname.getNamespace(a.constants).getName(a.constants), true)), 0, true), 0, 0, new ArrayList<Integer>()), true);
+     }
+     }
+     return 0;
+     }*/
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, TypeItem item) throws CompilationException {
+        String currentFullClassName = localData.getFullClass();
+
+        if (localData.documentClass && item.toString().equals(currentFullClassName)) {
+            int slotId = 0;
+            int c = abcIndex.getSelectedAbc().findClassByName(currentFullClassName);
+            for (Trait t : localData.currentScript.traits.traits) {
+                if (t instanceof TraitClass) {
+                    TraitClass tc = (TraitClass) t;
+                    if (tc.class_info == c) {
+                        slotId = tc.slot_id;
+                        break;
+                    }
+                }
+            }
+            return GraphTargetItem.toSourceMerge(localData, this, ins(AVM2Instructions.GetGlobalScope), ins(AVM2Instructions.GetSlot, slotId));
+        } else {
+            return GraphTargetItem.toSourceMerge(localData, this, ins(AVM2Instructions.GetLex, resolveType(localData, item, abcIndex)));
+        }
+    }
+
+    public static int resolveType(SourceGeneratorLocalData localData, GraphTargetItem item, AbcIndexing abcIndex) throws CompilationException {
+        int name_index = 0;
+        GraphTargetItem typeItem = null;
+
+        if (item instanceof UnresolvedAVM2Item) {
+            String fullClass = localData.getFullClass();
+            item = ((UnresolvedAVM2Item) item).resolve(new TypeItem(fullClass), new ArrayList<>(), new ArrayList<>(), abcIndex, new ArrayList<>(), new ArrayList<>());
+        }
+        if (item instanceof TypeItem) {
+            typeItem = item;
+        } else if (item instanceof ApplyTypeAVM2Item) {
+            typeItem = ((ApplyTypeAVM2Item) item).object;
+        } else {
+            throw new CompilationException("Invalid type:" + item + " (" + item.getClass().getName() + ")", 0/*??*/);
+        }
+        if (typeItem instanceof UnresolvedAVM2Item) {
+            String fullClass = localData.getFullClass();
+            typeItem = ((UnresolvedAVM2Item) typeItem).resolve(new TypeItem(fullClass), new ArrayList<>(), new ArrayList<>(), abcIndex, new ArrayList<>(), new ArrayList<>());
+        }
+
+        if (!(typeItem instanceof TypeItem)) {
+            throw new CompilationException("Invalid type", 0/*??*/);
+        }
+
+        TypeItem type = (TypeItem) typeItem;
+
+        DottedChain dname = type.fullTypeName;
+        DottedChain pkg = dname.getWithoutLast();
+        String name = dname.getLast();
+        /*for (InstanceInfo ii : abc.getSelectedAbc().instance_info) {
+         Multiname mname = abc.getSelectedAbc().constants.constant_multiname.get(ii.name_index);
+         if (mname != null && name.equals(mname.getName(abc.getSelectedAbc().constants, null, true))) {
+         Namespace ns = mname.getNamespace(abc.getSelectedAbc().constants);
+         if (ns != null && ns.hasName(pkg, abc.getSelectedAbc().constants)) {
+         name_index = ii.name_index;
+         break;
+         }
+         }
+         }*/
+        ABC abc = abcIndex.getSelectedAbc();
+        AVM2ConstantPool constants = abc.constants;
+        AbcIndexing.ClassIndex ci = abcIndex.findClass(new TypeItem(dname));
+        if (ci != null) {
+            Multiname m = ci.abc.instance_info.get(ci.index).getName(ci.abc.constants);
+            if (m != null) {
+                Namespace ns = ci.abc.instance_info.get(ci.index).getName(ci.abc.constants).getNamespace(ci.abc.constants);
+                String n = m.getName(ci.abc.constants, new ArrayList<>(), true);
+                String nsn = ns == null ? null : ns.getName(ci.abc.constants).toRawString();
+                name_index = constants.getQnameId(
+                        n,
+                        ns == null ? Namespace.KIND_PACKAGE : ns.kind,
+                        nsn, true);
+            }
+        }
+
+        for (int i = 1; i < constants.getMultinameCount(); i++) {
+            Multiname mname = constants.getMultiname(i);
+            if (mname != null && name.equals(mname.getName(constants, null, true))) {
+                if (mname.getNamespace(constants) != null && pkg.equals(mname.getNamespace(constants).getName(constants))) {
+                    name_index = i;
+                    break;
+                }
+            }
+        }
+        if (name_index == 0) {
+            if (pkg.isEmpty() && localData.currentScript != null /*FIXME!*/) {
+                for (Trait t : localData.currentScript.traits.traits) {
+                    if (t.getName(abc).getName(constants, null, true).equals(name)) {
+                        name_index = t.name_index;
+                        break;
+                    }
+                }
+            }
+            if (name_index == 0) {
+                name_index = constants.getMultinameId(Multiname.createQName(false, constants.getStringId(name, true), constants.getNamespaceId(Namespace.KIND_PACKAGE, pkg, 0, true)), true);
+            }
+        }
+
+        if (item instanceof ApplyTypeAVM2Item) {
+            ApplyTypeAVM2Item atype = (ApplyTypeAVM2Item) item;
+            int[] params = new int[atype.params.size()];
+            int i = 0;
+            for (GraphTargetItem s : atype.params) {
+                params[i++] = resolveType(localData, s, abcIndex);
+            }
+            return constants.getMultinameId(Multiname.createTypeName(name_index, params), true);
+        }
+
+        return name_index;
+    }
+
+    @Override
+    public List<GraphSourceItem> generateDiscardValue(SourceGeneratorLocalData localData, GraphTargetItem item) throws CompilationException {
+        List<GraphSourceItem> ret = item.toSource(localData, this);
+        ret.add(ins(AVM2Instructions.Pop));
+        return ret;
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, PushItem item) throws CompilationException {
+        return item.value.toSource(localData, this);
+    }
+
+    @Override
+    public List<GraphSourceItem> generate(SourceGeneratorLocalData localData, PopItem item) throws CompilationException {
+        List<GraphSourceItem> ret = new ArrayList<>();
+        return ret;
+    }
+
+}

From e8712900a4a007451211662e3f66a32c161c146a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Sat, 20 Aug 2016 19:10:49 +0200
Subject: [PATCH 23/23] FFDec AS3 compiler deleting fixes

---
 .../importers/FFDecAs3ScriptReplacer.java     | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/FFDecAs3ScriptReplacer.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/FFDecAs3ScriptReplacer.java
index 723dcdf12..666c5355b 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/FFDecAs3ScriptReplacer.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/importers/FFDecAs3ScriptReplacer.java
@@ -8,6 +8,7 @@ import com.jpexs.decompiler.flash.abc.avm2.parser.script.ActionScript3Parser;
 import com.jpexs.decompiler.flash.abc.types.ScriptInfo;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitClass;
 import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.tags.Tag;
 import com.jpexs.decompiler.graph.CompilationException;
 import java.io.File;
 import java.io.IOException;
@@ -19,12 +20,12 @@ public class FFDecAs3ScriptReplacer implements As3ScriptReplacerInterface {
 
     @Override
     public void replaceScript(ScriptPack pack, String text) throws As3ScriptReplaceException, IOException, InterruptedException {
+        ABC abc = pack.abc;
+        SWF swf = pack.abc.getSwf();
+        String scriptName = pack.getPathScriptName() + ".as";
+        int oldIndex = pack.scriptIndex;
+        int newIndex = abc.script_info.size();
         try {
-            ABC abc = pack.abc;
-            SWF swf = pack.abc.getSwf();
-            String scriptName = pack.getPathScriptName() + ".as";
-            int oldIndex = pack.scriptIndex;
-            int newIndex = abc.script_info.size();
             String documentClass = swf.getDocumentClass();
             boolean isDocumentClass = documentClass != null && documentClass.equals(pack.getClassPath().toString());
 
@@ -48,6 +49,7 @@ public class FFDecAs3ScriptReplacer implements As3ScriptReplacerInterface {
             List<ABC> otherAbcs = new ArrayList<>(pack.allABCs);
 
             otherAbcs.remove(abc);
+            abc.script_info.get(oldIndex).delete(abc, true);
 
             ActionScript3Parser.compile(text, abc, otherAbcs, isDocumentClass, scriptName, newClassIndex, oldIndex);
             if (pack.isSimple) {
@@ -55,20 +57,16 @@ public class FFDecAs3ScriptReplacer implements As3ScriptReplacerInterface {
                 abc.script_info.set(oldIndex, abc.script_info.get(newIndex));
                 abc.script_info.remove(newIndex);
             } else {
-                abc.script_info.get(newIndex).setModified(true);
-                //Note: Is deleting traits safe?
-                List<Integer> todel = new ArrayList<>(new TreeSet<>(pack.traitIndices));
-                for (int i = todel.size() - 1; i >= 0; i--) {
-                    si.traits.traits.remove((int) todel.get(i));
-                }
+                //???
             }
-
-            abc.script_info.get(oldIndex)
-                    .setModified(true);
+            abc.script_info.get(oldIndex).setModified(true);
+            abc.pack();//remove old deleted items            
+            ((Tag) abc.parentTag).setModified(true);
         } catch (AVM2ParseException ex) {
+            abc.script_info.get(oldIndex).delete(abc, false);
             throw new As3ScriptReplaceException(new As3ScriptReplaceExceptionItem(null, ex.text, (int) ex.line));
         } catch (CompilationException ex) {
-            throw new As3ScriptReplaceException(new As3ScriptReplaceExceptionItem(null, ex.text, ex.line));
+            abc.script_info.get(oldIndex).delete(abc, false);
         }
     }