Merge pull request #910 from Neverbirth/abc_fix

Fixed trait instance flag parsing. Fixes issue #886

Author: elsassph

External/Plugins/AS3Context/AbcConverter.cs

@@ -129,8 +129,17 @@ public static void Convert(ContentParser parser, PathModel path, IASContext cont
                     type.Flags = FlagType.Class;
                     conflicts.Add(type.Name, type.QualifiedName);
 
-                    if (instance.flags == TraitMember.Function)
+                    if ((instance.flags & TraitFlag.Interface) > 0)
                         type.Flags |= FlagType.Interface;
+                    else
+                    {
+                        if ((instance.flags & TraitFlag.Final) > 0)
+                            type.Flags |= FlagType.Final;
+
+                        if ((instance.flags & TraitFlag.Sealed) == 0)
+                            type.Flags |= FlagType.Dynamic;
+
+                    }
 
                     thisDocs = GetDocs(model.Package);
                     if (thisDocs != null)

External/Tools/SwfOp/Data/Abc.cs

@@ -62,6 +62,7 @@ public enum TraitMember: byte
         HasProtectedNS = 0x08
     }
 
+    [Flags]
     public enum Attribute: byte
     {
         Final = 0x01, // 1=final, 0=virtual
@@ -70,11 +71,13 @@ public enum Attribute: byte
         Public = 0x08 // 1=add public namespace
     }
 
-    public enum ClassFlag: byte
+    [Flags]
+    public enum TraitFlag : byte
     {
         Sealed = 0x01,
         Final = 0x02,
-        Interface = 0x04
+        Interface = 0x04,
+        HasProtectedNS = 0x08
     }
 
     public enum Op : byte
@@ -454,7 +457,7 @@ public class Traits
         public MethodInfo init;
         public Traits itraits;
         public QName baseName;
-        public TraitMember flags;
+        public TraitFlag flags;
         public Namespace protectedNs;
         public QName[] interfaces;
         public Dictionary<QName, MemberInfo> names;
@@ -838,8 +841,8 @@ private void parseInstanceInfos(BinaryReader br)
                 instances[i] = t;
                 t.name = (QName)names[readU32(br)];
                 t.baseName = (QName)names[readU32(br)];
-                t.flags = (TraitMember)br.ReadByte();
-                if ((t.flags & TraitMember.HasProtectedNS) > 0)
+                t.flags = (TraitFlag)br.ReadByte();
+                if ((t.flags & TraitFlag.HasProtectedNS) > 0)
                     t.protectedNs = (Namespace)namespaces[readU32(br)];
 
                 int interface_count = readU32(br);