fixed format warnings
[swftools.git] / lib / as3 / abc.c
index a0502ac..7e11e1c 100644 (file)
 #include "../rfxswf.h"
 #include "../q.h"
 #include "abc.h"
+#include "assets.h"
 
 char stringbuffer[2048];
 
-typedef struct _opcode
-{
-    unsigned char opcode;
-    char*name;
-    char*params;
-} opcode_t;
-
-/* 2 = multiname
-   m = method
-   n = number of params
-   i = method info
-   b = byte
-   s = short
-   c = class
-   s = string
-   S = switch
-*/
-
 int abc_RegisterNameSpace(abc_file_t*file, const char*name);
 int abc_RegisterPackageNameSpace(abc_file_t*file, const char*name);
 int abc_RegisterPackageInternalNameSpace(abc_file_t*file, const char*name);
@@ -55,402 +38,33 @@ int abc_RegisterExplicitNameSpace(abc_file_t*file, const char*name);
 int abc_RegisterStaticProtectedNameSpace(abc_file_t*file, const char*name);
 int abc_RegisterPrivateNameSpace(abc_file_t*file, const char*name);
 
+/* TODO: switch to a datastructure with just values */
+#define NO_KEY ""
 
-opcode_t opcodes[]={
-{0xa0, "add", ""},
-{0xc5, "add_i", ""},
-{0x86, "atype", "2"},
-{0x87, "astypelate", ""},
-{0xA8, "bitand", ""},
-{0x97, "bitnot", ""},
-{0xa9, "bitor", ""},
-{0xaa, "bitxor", ""},
-{0x41, "call", "n"},
-{0x43, "callmethod", "mn"},
-{0x4c, "callproplex", "2n"},
-{0x46, "callproperty", "2n"},
-{0x4f, "callpropvoid", "2n"},
-{0x44, "callstatic", "in"},
-{0x45, "callsuper", "2n"},
-{0x4e, "callsupervoid", "2n"},
-{0x78, "checkfilter", ""},
-{0x80, "coerce", "2"},
-{0x82, "coerce_a", ""},
-{0x85, "coerce_s", ""},
-{0x42, "construct", "n"},
-{0x4a, "constructprop", "2n"},
-{0x49, "constructsuper", "n"},
-{0x76, "convert_b", ""},
-{0x73, "convert_i", ""},
-{0x75, "convert_d", ""},
-{0x77, "convert_o", ""},
-{0x74, "convert_u", ""},
-{0x70, "convert_s", ""},
-{0xef, "debug", "bsbu"},
-{0xf1, "debugfile", "s"},
-{0xf0, "debugline", "u"},
-{0x94, "declocal", "u"},
-{0xc3, "declocal_i", "u"},
-{0x93, "decrement", ""},
-{0xc1, "decrement_i", ""},
-{0x6a, "deleteproperty", "2"},
-{0xa3, "divide", ""},
-{0x2a, "dup", ""},
-{0x06, "dxns", "s"},
-{0x07, "dxnslate", ""},
-{0xab, "equals", ""},
-{0x72, "esc_xattr", ""},
-{0x71, "esc_xelem", ""},
-{0x5e, "findproperty", "2"},
-{0x5d, "findpropstrict", "2"},
-{0x59, "getdescendants", "2"},
-{0x64, "getglobalscope", ""},
-{0x6e, "getglobalslot", "u"},
-{0x60, "getlex", "2"},
-{0x62, "getlocal", "u"},
-{0xd0, "getlocal_0", ""},
-{0xd1, "getlocal_1", ""},
-{0xd2, "getlocal_2", ""},
-{0xd3, "getlocal_3", ""},
-{0x66, "getproperty", "2"},
-{0x65, "getscopeobject", "u"},
-{0x6c, "getslot", "u"},
-{0x04, "getsuper", "2"},
-{0xaf, "greaterequals", ""},
-{0x1f, "hasnext", ""},
-{0x32, "hasnext2", "uu"},
-{0x13, "ifeq", "j"},
-{0x12, "iffalse", "j"},
-{0x18, "ifge", "j"},
-{0x17, "ifgt", "j"},
-{0x16, "ifle", "j"},
-{0x15, "iflt", "j"},
-{0x0f, "ifnge", "j"},
-{0x0e, "ifngt", "j"},
-{0x0d, "ifnle", "j"},
-{0x0c, "ifnlt", "j"},
-{0x14, "ifne", "j"},
-{0x19, "ifstricteq", "j"},
-{0x1a, "ifstrictne", "j"},
-{0x11, "iftrue", "j"},
-{0xb4, "in", ""},
-{0x92, "inclocal", "u"},
-{0xc2, "inclocal_i", "u"},
-{0x91, "increment", ""},
-{0xc0, "increment_i", ""},
-{0x68, "initproperty", "2"},
-{0xb1, "instanceof", ""},
-{0xb2, "istype", "2"},
-{0xb3, "istypelate", ""},
-{0x10, "jump", "j"},
-{0x08, "kill", "u"},
-{0x09, "label", ""},
-{0xae, "lessequals", ""},
-{0xad, "lessthan", ""},
-{0x1b, "lookupswitch", "S"},
-{0xa5, "lshift", ""},
-{0xa4, "modulo", ""},
-{0xa2, "multiply", ""},
-{0xc7, "multiply_i", ""},
-{0x90, "negate", ""},
-{0xc4, "negate_i", ""},
-{0x57, "newactivation", ""},
-{0x56, "newarray", "u"},
-{0x5a, "newcatch", "u"}, //index into exception_info
-{0x58, "newclass", "c"}, //index into class_info
-{0x40, "newfunction", "u"}, //index into method_info
-{0x55, "newobject", "u"},
-{0x1e, "nextname", ""},
-{0x23, "nextvalue", ""},
-{0x02, "nop", ""},
-{0x96, "not", ""},
-{0x29, "pop", ""},
-{0x1d, "popscope", ""},
-{0x24, "pushbyte", "b"},
-{0x2f, "pushdouble", "u"}, //index into floats
-{0x27, "pushfalse", ""},
-{0x2d, "pushint", "u"}, //index into ints
-{0x31, "pushnamespace", "u"}, //index into namespace
-{0x28, "pushnan", ""},
-{0x20, "pushnull", ""},
-{0x30, "pushscope", ""},
-{0x25, "pushshort", "u"},
-{0x2c, "pushstring", "s"},
-{0x26, "pushtrue", ""},
-{0x2e, "pushuint", "u"}, //index into uints
-{0x21, "pushundefined", ""},
-{0x1c, "pushwith", ""},
-{0x48, "returnvalue", ""},
-{0x47, "returnvoid", ""},
-{0xa6, "rshift", ""},
-{0x63, "setlocal", "u"},
-{0xd4, "setlocal_0", ""},
-{0xd5, "setlocal_1", ""},
-{0xd6, "setlocal_2", ""},
-{0xd7, "setlocal_3", ""},
-{0x6f, "setglobalshot", "u"},
-{0x61, "setproperty", "2"},
-{0x6d, "setslot", "u"},
-{0x05, "setsuper", "2"},
-{0xac, "strictequals", ""},
-{0xa1, "subtract", ""},
-{0xc6, "subtract_i", ""},
-{0x2b, "swap", ""},
-{0x03, "throw", ""},
-{0x95, "typeof", ""},
-{0xa7, "urshift", ""},
-{0xb0, "xxx", ""},
-};
-
-static U8 op2index[256] = {255};
-
-opcode_t* opcode_get(U8 op)
-{
-    int t;
-    if(op2index[0]==255) 
-        memset(op2index, 0, sizeof(op2index));
-
-    if(op2index[op])
-        return &opcodes[op2index[op]];
-
-    for(t=0;t<sizeof(opcodes)/sizeof(opcodes[0]);t++) {
-        op2index[opcodes[t].opcode] = t;
-        if(opcodes[t].opcode==op)
-            return &opcodes[t];
-    }
-    return 0;
-}
-
-static void code_free(abc_code_t*code)
-{
-    while(code) {
-        abc_code_t*next = code->next;
-        memset(code, 0, sizeof(code));
-        free(code);
-        code = next;
-    }
-}
-
-static abc_code_t*parse_code(TAG*tag, int len, abc_file_t*file, pool_t*pool)
-{
-    abc_code_t*head=0;
-    abc_code_t*code=0;
-    int end=tag->pos+len;
-    while(tag->pos<end) {
-        U8 opcode = swf_GetU8(tag);
-        opcode_t*op = opcode_get(opcode);
-       if(!op) {
-           fprintf(stderr, "Can't parse opcode %02x\n", opcode);
-           return head;
-        }
-        NEW(abc_code_t,c);
-        if(!head) {
-            head = code = c;
-        } else {
-            code->next = c;
-            code = c;
-        }
-
-        c->opcode = opcode;
-
-        char*p = op->params;
-        int pos = 0;
-        while(*p) {
-            void*data = 0;
-            if(*p == 'n') { // number
-                data = (void*)(ptroff_t)swf_GetU30(tag);
-            } else if(*p == '2') { //multiname
-                data = array_getvalue(pool->multinames, swf_GetU30(tag));
-            } else if(*p == 'm') { //method
-                data = array_getvalue(file->methods, swf_GetU30(tag));
-            } else if(*p == 'c') { //classinfo
-                data = array_getvalue(file->classes, swf_GetU30(tag));
-            } else if(*p == 'i') { //methodbody TODO
-                data = array_getvalue(file->method_bodies, swf_GetU30(tag));
-            } else if(*p == 'u') { // lookoup TODO
-                data = (void*)(ptroff_t)swf_GetU30(tag);
-            } else if(*p == 'b') { // byte
-                data = (void*)(ptroff_t)swf_GetU8(tag);
-            } else if(*p == 'j') { // jump TODO
-                data = (void*)(ptroff_t)swf_GetS24(tag);
-            } else if(*p == 's') { // string
-                data = (void*)array_getkey(pool->strings, swf_GetU30(tag));
-            } else if(*p == 'S') { // switch statement TODO
-                /* I hate these things */
-                swf_GetU24(tag); //default
-                int num = swf_GetU30(tag)+1;
-                int t;
-                for(t=0;t<num;t++) 
-                    swf_GetU24(tag);
-                data = 0;
-            } else {
-                printf("Can't parse opcode param type \"%c\"\n", *p);
-                return 0;
-            }
-            code->params[pos++] = data;
-            p++;
-        }
-    }
-    return head;
-}
-
-static int dump_code(abc_code_t*c, abc_file_t*file, char*prefix, FILE*fo)
-{
-    pool_t*pool = pool_new();
-
-    while(c) {
-       U8 opcode = c->opcode;
-       int t;
-       char found = 0;
-        opcode_t*op = opcode_get(opcode);
-       if(!op) {
-           fprintf(stderr, "Can't parse opcode %02x\n", opcode);
-           return 0;
-       } else {
-            fprintf(fo, "%s%s ", prefix, op->name);
-            char*p = op->params;
-            char first = 1;
-            int pos=0;
-            while(*p) {
-                void*data = c->params[pos];
-                if(pos>0)
-                    printf(", ");
-
-                if(*p == 'n') {
-                    int n = (ptroff_t)data;
-                    printf("%d params", n);
-                } else if(*p == '2') {
-                    multiname_t*n = (multiname_t*)data;
-                    char* m = multiname_to_string(n);
-                    printf("%s", m);
-                    free(m);
-                } else if(*p == 'm') {
-                    int n = (ptroff_t)data;
-                    abc_method_t*cls = (abc_method_t*)array_getvalue(file->methods, n);
-                    printf("[method%d]", n);
-                } else if(*p == 'c') {
-                    int n = (ptroff_t)data;
-                    abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, n);
-                    printf("[classinfo%d %s]", n, cls->classname);
-                } else if(*p == 'i') {
-                    int n = (ptroff_t)data;
-                    abc_method_body_t*cls = (abc_method_body_t*)array_getvalue(file->method_bodies, n);
-                    printf("[methodbody%d]", n);
-                } else if(*p == 'u') {
-                    int n = (ptroff_t)data;
-                    printf("%d", n);
-                } else if(*p == 'b') {
-                    int b = (ptroff_t)data;
-                    printf("%02x", b);
-                } else if(*p == 'j') {
-                    int n = (ptroff_t)data;
-                    printf("%d", n);
-                } else if(*p == 's') {
-                    printf("\"%s\"", data);
-                } else if(*p == 'S') {
-                    printf("[switch data]");
-                } else {
-                    fprintf(stderr, "Can't parse opcode param type \"%c\"\n", *p);
-                    return 0;
-                }
-                p++;
-                pos++;
-                first = 0;
-            }
-            found = 1;
-            break;
-       }
-        c = c->next;
-    }
-    return 1;
-}
-
-static int opcode_write(TAG*tag, abc_code_t*code, pool_t*pool, abc_file_t*file)
+static void params_dump(FILE*fo, multiname_list_t*l, constant_list_t*o)
 {
-    opcode_t*c = opcode_get(code->opcode);
-    char*p = c->params;
-    int pos = 0;
-    int len = 0;
-    while(*p) {
-        void*data = code->params[pos++];
-        if(*p == 'n') { // number
-            len += swf_SetU30(tag, (ptroff_t)data);
-        } else if(*p == '2') { //multiname
-            multiname_t*m = (multiname_t*)data;
-            len += swf_SetU30(tag, pool_register_multiname(pool, m));
-        } else if(*p == 'm') { //method
-            abc_method_t*m = (abc_method_t*)data;
-            len += swf_SetU30(tag, m->index);
-        } else if(*p == 'c') { //classinfo 
-            abc_class_t*cls = (abc_class_t*)data;
-            len += swf_SetU30(tag, cls->index);
-        } else if(*p == 'i') { //methodbody
-            abc_method_body_t*m = (abc_method_body_t*)data;
-            len += swf_SetU30(tag, m->index);
-        } else if(*p == 'u') { // integer
-            len += swf_SetU30(tag, (ptroff_t)data);
-        } else if(*p == 'b') { // byte
-            if(tag)
-                swf_SetU8(tag, (ptroff_t)data);
-            len++;
-        } else if(*p == 'j') { // jump
-            len += swf_SetS24(tag, (ptroff_t)data);
-        } else if(*p == 's') { // string
-            int index = pool_register_string(pool, data);
-            len += swf_SetU30(tag, index);
-        } else if(*p == 'S') { // switch statement
-            len+=swf_SetU24(tag, 0); //default
-            len+=swf_SetU30(tag, 0); //nr-1
-            len+=swf_SetU24(tag, 0); //first
-        } else {
-            printf("Can't parse opcode param type \"%c\"\n", *p);
+    int n = list_length(l);
+    int no = list_length(o);
+    int i = 0;
+
+    fprintf(fo, "(");
+    while(l) {
+        char*s = multiname_tostring(l->multiname);
+        fprintf(fo, "%s", s);
+        free(s);
+        if(i>=n-no) {
+            s = constant_tostring(o->constant);
+            fprintf(fo, " = ");
+            fprintf(fo, "%s", s);
+            free(s);
+            o = o->next;
         }
-        p++;
-    }
-    return len;
-}
-
-
-static char* params_to_string(multiname_list_t*list)
-{
-    multiname_list_t*l;
-    int n;
 
-    l = list;
-    n = 0;
-    while(list) {
-        n++;list=list->next;
+        if(l->next)
+            fprintf(fo, ", ");
+        l = l->next;i++;
     }
-
-    char**names = (char**)malloc(sizeof(char*)*n);
-    
-    l = list;
-    n = 0;
-    int size = 0;
-    while(list) {
-        names[n] = multiname_to_string(list->multiname);
-        size += strlen(names[n]) + 2;
-        n++;list=list->next;
-    }
-
-    char* params = malloc(size+5);
-    params[0]='(';
-    params[1]=0;
-    l = list;
-    int s=0;
-    n = 0;
-    while(list) {
-        if(s)
-            strcat(params, ", ");
-        strcat(params, names[n]);
-        free(names[n]);
-        n++;
-        s=1;
-    }
-    free(names);
-    strcat(params, ")");
-    int t;
-    return params;
+    fprintf(fo, ")");
 }
 
 //#define DEBUG
@@ -461,121 +75,25 @@ static void parse_metadata(TAG*tag, abc_file_t*file, pool_t*pool)
     int t;
     int num_metadata = swf_GetU30(tag);
 
-    DEBUG printf("%d metadata\n");
+    DEBUG printf("%d metadata\n", num_metadata);
     for(t=0;t<num_metadata;t++) {
-        const char*entry_name = array_getkey(pool->strings, swf_GetU30(tag));
+        const char*entry_name = pool_lookup_string(pool, swf_GetU30(tag));
         int num = swf_GetU30(tag);
         int s;
         DEBUG printf("  %s\n", entry_name);
         array_t*items = array_new();
         for(s=0;s<num;s++) {
-            const char*key = array_getkey(pool->strings, swf_GetU30(tag));
-            const char*value = array_getkey(pool->strings, swf_GetU30(tag));
+            int i1 = swf_GetU30(tag);
+            int i2 = swf_GetU30(tag);
+            const char*key = i1?pool_lookup_string(pool, i1):"";
+            const char*value = i2?pool_lookup_string(pool, i2):"";
             DEBUG printf("    %s=%s\n", key, value);
-            array_append(items, key, value);
+            array_append(items, key, strdup(value));
         }
         array_append(file->metadata, entry_name, items);
     }
 }
 
-#define TRAIT_SLOT 0
-#define TRAIT_METHOD 1
-#define TRAIT_GETTER 2
-#define TRAIT_SETTER 3
-#define TRAIT_CLASS 4
-#define TRAIT_FUNCTION 5
-#define TRAIT_CONST 6
-
-static void traits_free(trait_list_t*traits) 
-{
-    trait_list_t*t = traits;
-    while(t) {
-        free(t->trait);t->trait = 0;
-        t = t->next;
-    }
-    list_free(traits);
-}
-
-static trait_list_t* traits_parse(TAG*tag, pool_t*pool, abc_file_t*file)
-{
-    int num_traits = swf_GetU30(tag);
-    trait_list_t*traits = list_new();
-    int t;
-    if(num_traits) {
-        DEBUG printf("%d traits\n", num_traits);
-    }
-    
-    for(t=0;t<num_traits;t++) {
-       trait_t*trait = malloc(sizeof(trait_t));
-       memset(trait, 0, sizeof(trait_t));
-       list_append(traits, trait);
-       trait->name = pool_lookup_multiname(pool, swf_GetU30(tag));
-       const char*name = 0;
-       DEBUG name = multiname_to_string(trait->name);
-       U8 kind = trait->type = swf_GetU8(tag);
-        U8 attributes = kind&0xf0;
-        kind&=0x0f;
-       DEBUG printf("  trait %d) %s type=%02x\n", t, name, kind);
-       if(kind == TRAIT_METHOD || kind == TRAIT_GETTER || kind == TRAIT_SETTER) { // method / getter / setter
-           trait->disp_id = swf_GetU30(tag);
-           trait->method = (abc_method_t*)array_getvalue(file->methods, swf_GetU30(tag));
-           DEBUG printf("  method/getter/setter\n");
-       } else if(kind == TRAIT_FUNCTION) { // function
-           trait->slot_id =  swf_GetU30(tag);
-           trait->method = (abc_method_t*)array_getvalue(file->methods, swf_GetU30(tag));
-       } else if(kind == TRAIT_CLASS) { // class
-           trait->slot_id = swf_GetU30(tag);
-           trait->cls = (abc_class_t*)array_getvalue(file->classes, swf_GetU30(tag));
-           DEBUG printf("  class %s %d %d\n", name, trait->slot_id, trait->cls);
-       } else if(kind == TRAIT_SLOT || kind == TRAIT_CONST) { // slot, const
-            /* a slot is a variable in a class that is shared amonst all instances
-               of the same type, but which has a unique location in each object 
-               (in other words, slots are non-static, traits are static)
-             */
-           trait->slot_id = swf_GetU30(tag);
-            trait->type_name = (multiname_t*)array_getvalue(pool->multinames, swf_GetU30(tag));
-           trait->vindex = swf_GetU30(tag);
-           if(trait->vindex) {
-               trait->vkind = swf_GetU8(tag);
-           }
-           DEBUG printf("  slot %s %d %s (vindex=%d)\n", name, trait->slot_id, trait->type_name->name, trait->vindex);
-       } else {
-           fprintf(stderr, "Can't parse trait type %d\n", kind);
-       }
-        if(attributes&0x40) {
-            int num = swf_GetU30(tag);
-            int s;
-            for(s=0;s<num;s++) {
-                swf_GetU30(tag); //index into metadata array
-            }
-        }
-    }
-    return traits;
-}
-
-void traits_skip(TAG*tag)
-{
-    int num_traits = swf_GetU30(tag);
-    int t;
-    for(t=0;t<num_traits;t++) {
-        swf_GetU30(tag);
-       U8 kind = swf_GetU8(tag);
-        U8 attributes = kind&0xf0;
-        kind&=0x0f;
-        swf_GetU30(tag);
-        swf_GetU30(tag);
-       if(kind == TRAIT_SLOT || kind == TRAIT_CONST) {
-           if(swf_GetU30(tag)) swf_GetU8(tag);
-        } else if(kind>TRAIT_CONST) {
-           fprintf(stderr, "Can't parse trait type %d\n", kind);
-       }
-        if(attributes&0x40) {
-            int s, num = swf_GetU30(tag);
-            for(s=0;s<num;s++) swf_GetU30(tag);
-        }
-    }
-}
-
 void swf_CopyData(TAG*to, TAG*from, int len)
 {
     unsigned char*data = malloc(len);
@@ -589,88 +107,35 @@ abc_file_t*abc_file_new()
     abc_file_t*f = malloc(sizeof(abc_file_t));
     memset(f, 0, sizeof(abc_file_t));
     f->metadata = array_new();
+
     f->methods = array_new();
     f->classes = array_new();
     f->scripts = array_new();
     f->method_bodies = array_new();
+    f->flags = ABCFILE_LAZY;
 
     return f;
 }
 
-static namespace_t* namespace_new(U8 access, const char*name)
-{
-    namespace_t*ns = malloc(sizeof(namespace_t));
-    memset(ns, 0, sizeof(namespace_t));
-
-    if(access==0) { // autodetect access
-       char*n = strdup(name);
-       if(n[0] == '[') {
-           char*bracket = strchr(n, ']');
-           if(bracket) {
-               *bracket = 0;
-               char*a = n+1;
-               name += (bracket-n)+1;
-               if(!strcmp(a, "")) access=0x16;
-               else if(!strcmp(a, "package")) access=0x16;
-               else if(!strcmp(a, "packageinternal")) access=0x17;
-               else if(!strcmp(a, "protected")) access=0x18;
-               else if(!strcmp(a, "explicit")) access=0x19;
-               else if(!strcmp(a, "staticprotected")) access=0x1a;
-               else if(!strcmp(a, "private")) access=0x05;
-               else {
-                   fprintf(stderr, "Undefined access level: [%s]\n", a);
-                    return 0;
-               }
-           }
-       } else {
-           access = 0x16;
-       }
-       free(n);
-    }
-    ns->access = access;
-    ns->name = strdup(name);
-    return ns;
-}
-namespace_t* namespace(abc_file_t*file, const char*name) {
-    return namespace_new(0x08, name);
-}
-namespace_t* abc_packagenamespace(abc_file_t*file, const char*name) {
-    return namespace_new(0x16 , name);
-}
-namespace_t* abc_packageinternalnamespace(abc_file_t*file, const char*name) {
-    return namespace_new(0x17, name);
-}
-namespace_t* abc_protectednamespace(abc_file_t*file, const char*name) {
-    return namespace_new(0x18, name);
-}
-namespace_t* abc_explicitnamespace(abc_file_t*file, const char*name) {
-    return namespace_new(0x19, name);
-}
-namespace_t* abc_staticprotectednamespace(abc_file_t*file, const char*name) {
-    return namespace_new(0x1a, name);
-}
-namespace_t* abc_privatenamespace(abc_file_t*file, const char*name) {
-    return namespace_new(0x05, name);
-}
+abc_class_t* abc_class_new(abc_file_t*file, multiname_t*classname, multiname_t*superclass) {
+    
+    NEW(abc_class_t,c);
+    if(file)
+        array_append(file->classes, NO_KEY, c);
 
-#define CLASS_SEALED 1
-#define CLASS_FINAL 2
-#define CLASS_INTERFACE 4
-#define CLASS_PROTECTED_NS 8
-
-abc_class_t* abc_class_new(abc_file_t*pool, char*classname, char*superclass) {
-    abc_class_t* c = malloc(sizeof(abc_class_t));
-    memset(c, 0, sizeof(abc_class_t));
-    c->index = array_append(pool->classes, classname, c);
-    c->pool = pool;
-    c->classname = multiname_fromstring(classname);
-    c->superclass = superclass?multiname_fromstring(superclass):0;
+    c->file = file;
+    c->classname = multiname_clone(classname);
+    c->superclass = multiname_clone(superclass);
     c->flags = 0;
     c->constructor = 0;
     c->static_constructor = 0;
     c->traits = list_new();
     return c;
 }
+abc_class_t* abc_class_new2(abc_file_t*pool, char*classname, char*superclass) 
+{
+    return abc_class_new(pool, multiname_fromstring(classname), multiname_fromstring(superclass));
+}
 
 void abc_class_sealed(abc_class_t*c)
 {
@@ -686,128 +151,370 @@ void abc_class_interface(abc_class_t*c)
 }
 void abc_class_protectedNS(abc_class_t*c, char*namespace)
 {
-    c->protectedNS = namespace;
+    c->protectedNS = namespace_new_protected(namespace);
     c->flags |= CLASS_PROTECTED_NS;
 }
-
-abc_method_body_t* add_method(abc_file_t*pool, abc_class_t*cls, char*returntype, int num_params, va_list va)
+void abc_class_add_interface(abc_class_t*c, multiname_t*interface)
 {
-    /* construct code (method body) object */
-    abc_method_body_t* c = malloc(sizeof(abc_method_body_t));
-    memset(c, 0, sizeof(abc_method_body_t));
-    c->index = array_append(pool->method_bodies, 0, c);
-    c->pool = pool;
-    c->traits = list_new();
-    c->code = 0;
+    list_append(c->interfaces, multiname_clone(interface));
+}
+char*abc_class_fullname(abc_class_t*cls)
+{
+    const char*package = cls->classname->ns->name;
+    const char*name = cls->classname->name;
+    int l1 = strlen(package);
+    int l2 = strlen(name);
+    char*fullname = malloc(l1+l2+2);
+    if(l1) {
+       memcpy(fullname, package, l1);
+       fullname[l1++]='.';
+    }
+    memcpy(fullname+l1, name, l2+1);
+    return fullname;
+}
 
+void abc_method_init(abc_method_t*m, abc_file_t*file, multiname_t*returntype, char body)
+{
     /* construct method object */
-    abc_method_t* m = malloc(sizeof(abc_method_t));
-    memset(m, 0, sizeof(abc_method_t));
-    m->index = array_append(pool->methods, 0, m);
-    if(returntype && strcmp(returntype, "void")) {
-       m->return_type = multiname_fromstring(returntype);
-    } else {
-       m->return_type = 0;
+    m->index = array_length(file->methods);
+    array_append(file->methods, NO_KEY, m);
+    m->return_type = returntype;
+
+    if(body) {
+        /* construct code (method body) object */
+        NEW(abc_method_body_t,c);
+        array_append(file->method_bodies, NO_KEY, c);
+        c->index = array_length(file->method_bodies);
+        c->file = file;
+        c->traits = list_new();
+        c->code = 0;
+
+        /* crosslink the two objects */
+        m->body = c;
+        c->method = m;
     }
-    int t;
-    for(t=0;t<num_params;t++) {
-       const char*param = va_arg(va, const char*);
-       list_append(m->parameters, multiname_fromstring(param));
-    }
-
-    /* crosslink the two objects */
-    m->body = c;
-    c->method = m;
-
-    return c;
+}
+abc_method_t* abc_method_new(abc_file_t*file, multiname_t*returntype, char body)
+{
+    NEW(abc_method_t,m);
+    abc_method_init(m, file, returntype, body);
+    return m;
 }
 
-abc_method_body_t* abc_class_constructor(abc_class_t*cls, char*returntype, int num_params, ...) 
+abc_method_t* abc_class_getconstructor(abc_class_t*cls, multiname_t*returntype)
 {
-    va_list va;
-    va_start(va, num_params);
-    abc_method_body_t* c = add_method(cls->pool, cls, returntype, num_params, va);
-    va_end(va);
-    cls->constructor = c->method;
-    return c;
+    if(cls->constructor) {
+        return cls->constructor;
+    }
+    abc_method_t* m = abc_method_new(cls->file, returntype, 1);
+    cls->constructor = m;
+    return m;
 }
 
-abc_method_body_t* abc_class_staticconstructor(abc_class_t*cls, char*returntype, int num_params, ...) 
+abc_method_t* abc_class_getstaticconstructor(abc_class_t*cls, multiname_t*returntype)
 {
-    va_list va;
-    va_start(va, num_params);
-    abc_method_body_t* c = add_method(cls->pool, cls, returntype, num_params, va);
-    va_end(va);
-    cls->static_constructor = c->method;
-    return c;
+    if(cls->static_constructor) {
+        return cls->static_constructor;
+    }
+    abc_method_t* m = abc_method_new(cls->file, returntype, 1);
+    cls->static_constructor = m;
+    return m;
 }
 
-trait_t*trait_new(int type, multiname_t*name, int data1, int data2, int vindex, int vkind)
+trait_t*trait_new(int type, multiname_t*name, int data1, int data2, constant_t*v)
 {
     trait_t*trait = malloc(sizeof(trait_t));
     memset(trait, 0, sizeof(trait_t));
-    trait->type = type;
+    trait->kind = type&0x0f;
+    trait->attributes = type&0xf0;
     trait->name = name;
     trait->data1 = data1;
     trait->data2 = data2;
-    trait->vindex = vindex;
-    trait->vkind = vkind;
+    trait->value = v;
     return trait;
 }
 
-abc_method_body_t* abc_class_method(abc_class_t*cls, char*returntype, char*name, int num_params, ...)
+trait_t*trait_new_member(trait_list_t**traits, multiname_t*type, multiname_t*name,constant_t*v)
 {
-    abc_file_t*pool = cls->pool;
-    va_list va;
-    va_start(va, num_params);
-    abc_method_body_t* c = add_method(cls->pool, cls, returntype, num_params, va);
-    va_end(va);
-    list_append(cls->traits, trait_new(TRAIT_METHOD, multiname_fromstring(name), 0, c->method->index, 0, 0));
-    return c;
+    int kind = TRAIT_SLOT;
+    trait_t*trait = malloc(sizeof(trait_t));
+    memset(trait, 0, sizeof(trait_t));
+    trait->kind = kind&0x0f;
+    trait->attributes = kind&0xf0;
+    trait->name = name;
+    trait->type_name = type;
+   
+    trait->slot_id = list_length(*traits)+1;
+    trait_list_t*l = *traits;
+    list_append_(traits, trait);
+    return trait;
+}
+trait_t*trait_new_method(trait_list_t**traits, multiname_t*name, abc_method_t*m)
+{
+    int type = TRAIT_METHOD;
+    trait_t*trait = malloc(sizeof(trait_t));
+    memset(trait, 0, sizeof(trait_t));
+    trait->kind = type&0x0f;
+    trait->attributes = type&0xf0;
+    trait->name = name;
+    trait->method = m;
+    
+    /* start assigning traits at position #1.
+       Weird things happen when assigning slot 0- slot 0 and 1 seem
+       to be identical */
+    trait->slot_id = list_length(*traits)+1;
+    list_append_(traits, trait);
+    return trait;
 }
 
-void abc_AddSlot(abc_class_t*cls, char*name, int slot, char*multiname)
+abc_method_t* abc_class_method(abc_class_t*cls, multiname_t*returntype, multiname_t*name)
 {
-    abc_file_t*pool = cls->pool;
-    multiname_t*m = multiname_fromstring(multiname);
-    list_append(cls->traits, trait_new(TRAIT_SLOT, m, slot, 0, 0, 0));
+    abc_file_t*file = cls->file;
+    abc_method_t* m = abc_method_new(cls->file, returntype, !(cls->flags&CLASS_INTERFACE));
+    m->trait = trait_new_method(&cls->traits, multiname_clone(name), m);
+    return m;
+}
+abc_method_t* abc_class_staticmethod(abc_class_t*cls, multiname_t*returntype, multiname_t*name)
+{
+    abc_file_t*file = cls->file;
+    abc_method_t* m = abc_method_new(cls->file, returntype, !(cls->flags&CLASS_INTERFACE));
+    m->trait = trait_new_method(&cls->static_traits, multiname_clone(name), m);
+    return m;
+}
+
+trait_t* abc_class_slot(abc_class_t*cls, multiname_t*name, multiname_t*type)
+{
+    abc_file_t*file = cls->file;
+    multiname_t*m_name = multiname_clone(name);
+    multiname_t*m_type = multiname_clone(type);
+    trait_t*t = trait_new_member(&cls->traits, m_type, m_name, 0);
+    return t;
+}
+trait_t* abc_class_staticslot(abc_class_t*cls, multiname_t*name, multiname_t*type)
+{
+    abc_file_t*file = cls->file;
+    multiname_t*m_name = multiname_clone(name);
+    multiname_t*m_type = multiname_clone(type);
+    trait_t*t = trait_new_member(&cls->static_traits, m_type, m_name, 0);
+    return t;
+}
+
+
+trait_t* traits_find_slotid(trait_list_t*traits, int slotid)
+{
+    trait_list_t*l;
+    trait_t*t=0;
+    for(l=traits;l;l=l->next) {
+        if(l->trait->slot_id==slotid) {
+            t=l->trait; 
+            break;
+        }
+    }
+    return t;
 }
 
 void abc_method_body_addClassTrait(abc_method_body_t*code, char*multiname, int slotid, abc_class_t*cls)
 {
-    abc_file_t*pool = code->pool;
+    abc_file_t*file = code->file;
     multiname_t*m = multiname_fromstring(multiname);
-    trait_t*trait = trait_new(TRAIT_CLASS, m, slotid, 0, 0, 0);
+    trait_t*trait = trait_new(TRAIT_CLASS, m, slotid, 0, 0);
     trait->cls = cls;
     list_append(code->traits, trait);
 }
 
-/* notice: traits of a method (body) belonging to an init script
-   and traits of the init script are *not* the same thing */
-void abc_initscript_addClassTrait(abc_script_t*script, char*multiname, int slotid, abc_class_t*cls)
+/* notice: traits of a method (body) belonging to an init script
+   and traits of the init script are *not* the same thing */
+trait_t* abc_initscript_addClassTrait(abc_script_t*script, multiname_t*multiname, abc_class_t*cls)
+{
+    abc_file_t*file = script->file;
+    multiname_t*m = multiname_clone(multiname);
+    int slotid = list_length(script->traits)+1;
+    trait_t*trait = trait_new(TRAIT_CLASS, m, slotid, 0, 0);
+    trait->cls = cls;
+    list_append(script->traits, trait);
+    return trait;
+}
+
+abc_script_t* abc_initscript(abc_file_t*file)
+{
+    abc_method_t*m = abc_method_new(file, 0, 1);
+    abc_script_t* s = malloc(sizeof(abc_script_t));
+    s->method = m;
+    s->traits = list_new();
+    s->file = file;
+    array_append(file->scripts, NO_KEY, s);
+    return s;
+}
+
+static void traits_dump(FILE*fo, const char*prefix, trait_list_t*traits, abc_file_t*file, dict_t*methods_seen);
+
+static void dump_method(FILE*fo, const char*prefix, 
+                                 const char*attr, 
+                                 const char*type, 
+                                 const char*name, 
+                                 abc_method_t*m, abc_file_t*file, dict_t*methods_seen)
+{
+    if(methods_seen)
+        dict_put(methods_seen, m, 0);
+
+    char*return_type = 0;
+    if(m->return_type)
+        return_type = multiname_tostring(m->return_type);
+    else
+        return_type = strdup("*");
+
+    fprintf(fo, "%s", prefix);
+    fprintf(fo, "%s %s ", attr, type);
+    fprintf(fo, "%s %s=%s", return_type, name, m->name);
+    params_dump(fo, m->parameters, m->optional_parameters);
+    fprintf(fo, "(%d params, %d optional)\n", list_length(m->parameters), list_length(m->optional_parameters));
+
+    free(return_type);return_type=0;
+
+    abc_method_body_t*c = m->body;
+    if(!c) {
+        return;
+    }
+    
+    fprintf(fo, "%s[stack:%d locals:%d scope:%d-%d flags:", 
+            prefix, c->old.max_stack, c->old.local_count, c->old.init_scope_depth, 
+            c->old.max_scope_depth);
+
+
+    int flags = c->method->flags;
+    if(flags&METHOD_NEED_ARGUMENTS) {fprintf(fo, " need_arguments");flags&=~METHOD_NEED_ARGUMENTS;}
+    if(flags&METHOD_NEED_ACTIVATION) {fprintf(fo, " need_activation");flags&=~METHOD_NEED_ACTIVATION;}
+    if(flags&METHOD_NEED_REST) {fprintf(fo, " need_rest");flags&=~METHOD_NEED_REST;}
+    if(flags&METHOD_HAS_OPTIONAL) {fprintf(fo, " has_optional");flags&=~METHOD_HAS_OPTIONAL;}
+    if(flags&METHOD_SET_DXNS) {fprintf(fo, " set_dxns");flags&=~METHOD_SET_DXNS;}
+    if(flags&METHOD_HAS_PARAM_NAMES) {fprintf(fo, " has_param_names");flags&=~METHOD_HAS_PARAM_NAMES;}
+    if(flags) fprintf(fo, " %02x", flags);
+    fprintf(fo, "]");
+
+    if(m->trait) {
+        fprintf(fo, " slot:%d", m->trait->slot_id);
+    }
+    fprintf(fo, "\n");
+
+
+    char prefix2[80];
+    sprintf(prefix2, "%s    ", prefix);
+    if(c->traits)
+        traits_dump(fo, prefix, c->traits, file, methods_seen);
+    fprintf(fo, "%s{\n", prefix);
+    code_dump2(c->code, c->exceptions, file, prefix2, fo);
+    fprintf(fo, "%s}\n\n", prefix);
+}
+
+static void traits_free(trait_list_t*traits) 
+{
+    trait_list_t*t = traits;
+    while(t) {
+        if(t->trait->name) {
+            multiname_destroy(t->trait->name);t->trait->name = 0;
+        }
+       if(t->trait->kind == TRAIT_SLOT || t->trait->kind == TRAIT_CONST) {
+            multiname_destroy(t->trait->type_name);
+        }
+        if(t->trait->value) {
+            constant_free(t->trait->value);t->trait->value = 0;
+        }
+        free(t->trait);t->trait = 0;
+        t = t->next;
+    }
+    list_free(traits);
+}
+            
+static char trait_is_method(trait_t*trait)
+{
+    return (trait->kind == TRAIT_METHOD || trait->kind == TRAIT_GETTER || 
+            trait->kind == TRAIT_SETTER || trait->kind == TRAIT_FUNCTION);
+}
+
+static trait_list_t* traits_parse(TAG*tag, pool_t*pool, abc_file_t*file)
+{
+    int num_traits = swf_GetU30(tag);
+    trait_list_t*traits = list_new();
+    int t;
+    if(num_traits) {
+        DEBUG printf("%d traits\n", num_traits);
+    }
+    
+    for(t=0;t<num_traits;t++) {
+        NEW(trait_t,trait);
+       list_append(traits, trait);
+
+       trait->name = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag))); // always a QName (ns,name)
+
+       const char*name = 0;
+       DEBUG name = multiname_tostring(trait->name);
+       U8 kind = swf_GetU8(tag);
+        U8 attributes = kind&0xf0;
+        kind&=0x0f;
+        trait->kind = kind;
+        trait->attributes = attributes;
+       DEBUG printf("  trait %d) %s type=%02x\n", t, name, kind);
+       if(kind == TRAIT_METHOD || kind == TRAIT_GETTER || kind == TRAIT_SETTER) { // method / getter / setter
+           trait->disp_id = swf_GetU30(tag);
+           trait->method = (abc_method_t*)array_getvalue(file->methods, swf_GetU30(tag));
+            trait->method->trait = trait;
+           DEBUG printf("  method/getter/setter\n");
+       } else if(kind == TRAIT_FUNCTION) { // function
+           trait->slot_id =  swf_GetU30(tag);
+           trait->method = (abc_method_t*)array_getvalue(file->methods, swf_GetU30(tag));
+            trait->method->trait = trait;
+       } else if(kind == TRAIT_CLASS) { // class
+           trait->slot_id = swf_GetU30(tag);
+           trait->cls = (abc_class_t*)array_getvalue(file->classes, swf_GetU30(tag));
+           DEBUG printf("  class %s %d %08x\n", name, trait->slot_id, (int)trait->cls);
+       } else if(kind == TRAIT_SLOT || kind == TRAIT_CONST) { // slot, const
+           trait->slot_id = swf_GetU30(tag);
+            trait->type_name = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag)));
+           int vindex = swf_GetU30(tag);
+           if(vindex) {
+               int vkind = swf_GetU8(tag);
+                trait->value = constant_fromindex(pool, vindex, vkind);
+           }
+           DEBUG printf("  slot %s %d %s (%s)\n", name, trait->slot_id, trait->type_name->name, constant_tostring(trait->value));
+       } else {
+           fprintf(stderr, "Can't parse trait type %d\n", kind);
+       }
+        if(attributes&0x40) {
+            int num = swf_GetU30(tag);
+            int s;
+            for(s=0;s<num;s++) {
+                swf_GetU30(tag); //index into metadata array
+            }
+        }
+    }
+    return traits;
+}
+
+void traits_skip(TAG*tag)
 {
-    abc_file_t*pool = script->pool;
-    multiname_t*m = multiname_fromstring(multiname);
-    trait_t*trait = trait_new(TRAIT_CLASS, m, slotid, 0, 0, 0);
-    trait->cls = cls;
-    list_append(script->traits, trait);
+    int num_traits = swf_GetU30(tag);
+    int t;
+    for(t=0;t<num_traits;t++) {
+        swf_GetU30(tag);
+       U8 kind = swf_GetU8(tag);
+        U8 attributes = kind&0xf0;
+        kind&=0x0f;
+        swf_GetU30(tag);
+        swf_GetU30(tag);
+       if(kind == TRAIT_SLOT || kind == TRAIT_CONST) {
+           if(swf_GetU30(tag)) swf_GetU8(tag);
+        } else if(kind>TRAIT_CONST) {
+           fprintf(stderr, "Can't parse trait type %d\n", kind);
+       }
+        if(attributes&0x40) {
+            int s, num = swf_GetU30(tag);
+            for(s=0;s<num;s++) swf_GetU30(tag);
+        }
+    }
 }
 
-abc_script_t* abc_initscript(abc_file_t*pool, char*returntype, int num_params, ...) 
-{
-    va_list va;
-    va_start(va, num_params);
-    abc_method_body_t* c = add_method(pool, 0, returntype, num_params, va);
-    abc_script_t* s = malloc(sizeof(abc_script_t));
-    s->method = c->method;
-    s->traits = list_new();
-    s->pool = pool;
-    array_append(pool->scripts, 0, s);
-    va_end(va);
-    return s;
-}
 
-static void write_traits(pool_t*pool, TAG*tag, trait_list_t*traits)
+static void traits_write(pool_t*pool, TAG*tag, trait_list_t*traits)
 {
     if(!traits) {
         swf_SetU30(tag, 0);
@@ -820,91 +527,88 @@ static void write_traits(pool_t*pool, TAG*tag, trait_list_t*traits)
        trait_t*trait = traits->trait;
 
        swf_SetU30(tag, pool_register_multiname(pool, trait->name));
-       swf_SetU8(tag, trait->type);
+       swf_SetU8(tag, trait->kind|trait->attributes);
 
        swf_SetU30(tag, trait->data1);
 
-        if(trait->type == TRAIT_CLASS) {
+        if(trait->kind == TRAIT_CLASS) {
             swf_SetU30(tag, trait->cls->index);
-        } else if(trait->type == TRAIT_GETTER ||
-                  trait->type == TRAIT_SETTER ||
-                  trait->type == TRAIT_METHOD) {
+        } else if(trait->kind == TRAIT_GETTER ||
+                  trait->kind == TRAIT_SETTER ||
+                  trait->kind == TRAIT_METHOD) {
             swf_SetU30(tag, trait->method->index);
-        } else if(trait->type == TRAIT_SLOT ||
-                  trait->type == TRAIT_CONST) {
+        } else if(trait->kind == TRAIT_SLOT ||
+                  trait->kind == TRAIT_CONST) {
             int index = pool_register_multiname(pool, trait->type_name);
             swf_SetU30(tag, index);
         } else  {
            swf_SetU30(tag, trait->data2);
         }
 
-       if(trait->type == TRAIT_SLOT || trait->type == TRAIT_CONST) {
-           swf_SetU30(tag, trait->vindex);
-           if(trait->vindex) {
-               swf_SetU8(tag, trait->vkind);
+       if(trait->kind == TRAIT_SLOT || trait->kind == TRAIT_CONST) {
+            int vindex = constant_get_index(pool, trait->value);
+           swf_SetU30(tag, vindex);
+           if(vindex) {
+               swf_SetU8(tag, trait->value->type);
            }
        }
+        if(trait->attributes&0x40) {
+            // metadata
+            swf_SetU30(tag, 0);
+        }
         traits = traits->next;
     }
 }
 
-static void dump_traits(FILE*fo, const char*prefix, trait_list_t*traits, abc_file_t*file);
-
-static void dump_method(FILE*fo, const char*prefix, const char*type, const char*name, abc_method_t*m, abc_file_t*file)
-{
-    const char*return_type = "";
-    if(m->return_type)
-        return_type = multiname_to_string(m->return_type);
-
-    char*paramstr = params_to_string(m->parameters);
-
-    fprintf(fo, "%s%s %s %s=%s %s\n", prefix, type, return_type, name, m->name, paramstr);
-
-    abc_method_body_t*c = m->body;
-    
-    fprintf(fo, "%s[%d %d %d %d %d]\n", prefix, c->max_stack, c->local_count, c->init_scope_depth, c->max_scope_depth, c->exception_count);
-
-    char prefix2[80];
-    sprintf(prefix2, "%s    ", prefix);
-    if(c->traits)
-        dump_traits(fo, prefix, c->traits, file);
-    fprintf(fo, "%s{\n", prefix);
-    dump_code(c->code, file, prefix2, fo);
-    fprintf(fo, "%s}\n\n", prefix);
-}
 
-static void dump_traits(FILE*fo, const char*prefix, trait_list_t*traits, abc_file_t*file)
+static void traits_dump(FILE*fo, const char*prefix, trait_list_t*traits, abc_file_t*file, dict_t*methods_seen)
 {
     int t;
     while(traits) {
        trait_t*trait = traits->trait;
-       char*name = multiname_to_string(trait->name);
-       U8 kind = trait->type;
-        U8 attributes = kind&0xf0;
-        kind&=0x0f;
+       char*name = multiname_tostring(trait->name);
+       U8 kind = trait->kind;
+        U8 attributes = trait->attributes;
+
+        char a = attributes & (TRAIT_ATTR_OVERRIDE|TRAIT_ATTR_FINAL);
+        char* type = "";
+        if(a==TRAIT_ATTR_FINAL)
+            type = "final ";
+        else if(a==TRAIT_ATTR_OVERRIDE)
+            type = "override ";
+        else if(a==(TRAIT_ATTR_OVERRIDE|TRAIT_ATTR_FINAL))
+            type = "final override ";
+        
+        if(attributes&TRAIT_ATTR_METADATA)
+            fprintf(fo, "<metadata>");
+
        if(kind == TRAIT_METHOD) {
             abc_method_t*m = trait->method;
-           dump_method(fo, prefix, "method", name, m, file);
+           dump_method(fo, prefix, type, "method", name, m, file, methods_seen);
        } else if(kind == TRAIT_GETTER) {
             abc_method_t*m = trait->method;
-           dump_method(fo, prefix, "getter", name, m, file);
+           dump_method(fo, prefix, type, "getter", name, m, file, methods_seen);
         } else if(kind == TRAIT_SETTER) {
             abc_method_t*m = trait->method;
-           dump_method(fo, prefix, "setter", name, m, file);
+           dump_method(fo, prefix, type, "setter", name, m, file, methods_seen);
        } else if(kind == TRAIT_FUNCTION) { // function
             abc_method_t*m = trait->method;
-           dump_method(fo, prefix, "function", name, m, file);
+           dump_method(fo, prefix, type, "function", name, m, file, methods_seen);
        } else if(kind == TRAIT_CLASS) { // class
             abc_class_t*cls = trait->cls;
             if(!cls) {
-               fprintf(fo, "%sslot %d: class %s=class%d\n", prefix, trait->slot_id, name);
+               fprintf(fo, "%sslot %d: class %s=00000000\n", prefix, trait->slot_id, name);
             } else {
-               fprintf(fo, "%sslot %d: class %s=%s\n", prefix, trait->slot_id, name, cls->classname);
+               fprintf(fo, "%sslot %d: class %s=%s\n", prefix, trait->slot_id, name, cls->classname->name);
             }
        } else if(kind == TRAIT_SLOT || kind == TRAIT_CONST) { // slot, const
            int slot_id = trait->slot_id;
-           char*type_name = multiname_to_string(trait->type_name);
-           fprintf(fo, "%sslot %s %d %s (vindex=%d)\n", prefix, name, trait->slot_id, type_name, trait->vindex);
+           char*type_name = multiname_tostring(trait->type_name);
+            char*value = constant_tostring(trait->value);
+           fprintf(fo, "%sslot %d: %s %s:%s %s %s\n", prefix, trait->slot_id, 
+                    kind==TRAIT_CONST?"const":"var", name, type_name, 
+                    trait->value?"=":"", trait->value?value:"");
+            if(value) free(value);
             free(type_name);
        } else {
            fprintf(fo, "%s    can't dump trait type %d\n", prefix, kind);
@@ -917,11 +621,12 @@ static void dump_traits(FILE*fo, const char*prefix, trait_list_t*traits, abc_fil
 void* swf_DumpABC(FILE*fo, void*code, char*prefix)
 {
     abc_file_t* file = (abc_file_t*)code;
-        
-    if(file->name)
+
+    if(file->name) {
         fprintf(fo, "%s#\n", prefix);
         fprintf(fo, "%s#name: %s\n", prefix, file->name);
         fprintf(fo, "%s#\n", prefix);
+    }
 
     int t;
     for(t=0;t<file->metadata->num;t++) {
@@ -930,10 +635,12 @@ void* swf_DumpABC(FILE*fo, void*code, char*prefix)
         int s;
         array_t*items = (array_t*)array_getvalue(file->metadata, t);
         for(s=0;s<items->num;s++) {
-            fprintf(fo, "%s#  %s=%s\n", prefix, array_getkey(items, s), array_getvalue(items,s));
+            fprintf(fo, "%s#  %s=%s\n", prefix, (char*)array_getkey(items, s), (char*)array_getvalue(items,s));
         }
+        fprintf(fo, "%s#\n", prefix);
     }
 
+    dict_t*methods_seen = dict_new2(&ptr_type);
     for(t=0;t<file->classes->num;t++) {
         abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t);
         char prefix2[80];
@@ -944,44 +651,79 @@ void* swf_DumpABC(FILE*fo, void*code, char*prefix)
         if(cls->flags&2) fprintf(fo, "final ");
         if(cls->flags&4) fprintf(fo, "interface ");
         if(cls->flags&8) {
-            fprintf(fo, "protectedNS<%s> ", cls->protectedNS);
+            char*s = namespace_tostring(cls->protectedNS);
+            fprintf(fo, "protectedNS(%s) ", s);
+            free(s);
         }
 
-       fprintf(fo, "class %s", cls->classname);
+        char*classname = multiname_tostring(cls->classname);
+       fprintf(fo, "class %s", classname);
+        free(classname);
         if(cls->superclass) {
-            fprintf(fo, " extends %s", cls->superclass);
+            char*supername = multiname_tostring(cls->superclass);
+            fprintf(fo, " extends %s", supername);
+            free(supername);
+        }
+        if(cls->interfaces) {
             multiname_list_t*ilist = cls->interfaces;
             if(ilist)
                 fprintf(fo, " implements");
             while(ilist) {
-                char*s = multiname_to_string(ilist->multiname);
-                fprintf(fo, " %d", s);
+                char*s = multiname_tostring(ilist->multiname);
+                fprintf(fo, " %s", s);
                 free(s);
                 ilist = ilist->next;
             }
             ilist->next;
-            
         }
         if(cls->flags&0xf0) 
             fprintf(fo, "extra flags=%02x\n", cls->flags&0xf0);
        fprintf(fo, "%s{\n", prefix);
+
+        dict_put(methods_seen, cls->static_constructor, 0);
+        dict_put(methods_seen, cls->constructor, 0);
+
+        if(cls->static_constructor) {
+            dump_method(fo, prefix2, "", "staticconstructor", "", cls->static_constructor, file, methods_seen);
+        }
+        traits_dump(fo, prefix2, cls->static_traits, file, methods_seen);
        
-        dump_method(fo, prefix2,"staticconstructor", "", cls->static_constructor, file);
-        dump_traits(fo, prefix2, cls->static_constructor_traits, file);
-       
-        char*n = multiname_to_string(cls->classname);
-       dump_method(fo, prefix2, "constructor", n, cls->constructor, file);
+        char*n = multiname_tostring(cls->classname);
+        if(cls->constructor)
+           dump_method(fo, prefix2, "", "constructor", n, cls->constructor, file, methods_seen);
         free(n);
-       dump_traits(fo, prefix2,cls->traits, file);
+       traits_dump(fo, prefix2,cls->traits, file, methods_seen);
+
+       if(cls->asset) {
+           swf_DumpAsset(fo, cls->asset, prefix2);
+       }
+
         fprintf(fo, "%s}\n", prefix);
     }
     fprintf(fo, "%s\n", prefix);
 
     for(t=0;t<file->scripts->num;t++) {
         abc_script_t*s = (abc_script_t*)array_getvalue(file->scripts, t);
-        dump_method(fo, prefix,"initmethod", "init", s->method, file);
-        dump_traits(fo, prefix, s->traits, file);
+        dump_method(fo, prefix, "", "initmethod", "init", s->method, file, methods_seen);
+        traits_dump(fo, prefix, s->traits, file, methods_seen);
+    }
+    
+    char extra=0;
+    for(t=0;t<file->methods->num;t++) {
+        abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, t);
+        if(!dict_contains(methods_seen, m)) {
+            if(!extra) {
+                extra=1;
+                fprintf(fo, "\n");
+                fprintf(fo, "%s//internal (non-class non-script) methods:\n", prefix);
+            }
+            char name[18];
+            sprintf(name, "%08x ", m->index);
+            dump_method(fo, prefix, "", "internalmethod", name, m, file, methods_seen);
+        }
     }
+    dict_destroy(methods_seen);
+
     return file;
 }
 
@@ -996,7 +738,7 @@ void* swf_ReadABC(TAG*tag)
         U32 abcflags = swf_GetU32(tag);
         DEBUG printf("flags=%08x\n", abcflags);
         char*name= swf_GetString(tag);
-        file->name = name?strdup(name):0;
+        file->name = (name&&name[0])?strdup(name):0;
     }
     U32 version = swf_GetU32(tag);
     if(version!=0x002e0010) {
@@ -1008,47 +750,57 @@ void* swf_ReadABC(TAG*tag)
     int num_methods = swf_GetU30(tag);
     DEBUG printf("%d methods\n", num_methods);
     for(t=0;t<num_methods;t++) {
-       abc_method_t*m = malloc(sizeof(abc_method_t));
-       memset(m, 0, sizeof(*m));
+       NEW(abc_method_t,m);
        int param_count = swf_GetU30(tag);
        int return_type_index = swf_GetU30(tag);
-        m->return_type = pool_lookup_multiname(pool, return_type_index);
+        if(return_type_index)
+            m->return_type = multiname_clone(pool_lookup_multiname(pool, return_type_index));
+        else
+            m->return_type = 0;
 
        int s;
        for(s=0;s<param_count;s++) {
            int type_index = swf_GetU30(tag);
-            multiname_t*param = (multiname_t*)pool_lookup_multiname(pool, type_index);
-            /* type_index might be 0, which probably means ... (varargs) */
+            
+            /* type_index might be 0 ("*") */
+            multiname_t*param = type_index?multiname_clone(pool_lookup_multiname(pool, type_index)):0;
             list_append(m->parameters, param);
         }
 
        int namenr = swf_GetU30(tag);
-       m->name = "";
        if(namenr)
-           m->name = array_getkey(pool->strings, namenr);
+           m->name = strdup(pool_lookup_string(pool, namenr));
+        else
+           m->name = strdup("");
 
        m->flags = swf_GetU8(tag);
        
-        DEBUG printf("method %d) %s flags=%02x\n", t, params_to_string(m->parameters), m->flags);
+        DEBUG printf("method %d) %s ", t, m->name);
+        DEBUG params_dump(stdout, m->parameters, m->optional_parameters);
+        DEBUG printf("flags=%02x\n", m->flags);
 
         if(m->flags&0x08) {
-            /* optional parameters */
+            m->optional_parameters = list_new();
             int num = swf_GetU30(tag);
             int s;
             for(s=0;s<num;s++) {
-                int val = swf_GetU30(tag);
-                U8 kind = swf_GetU8(tag); // specifies index type for "val"
+                int vindex = swf_GetU30(tag);
+                U8 vkind = swf_GetU8(tag); // specifies index type for "val"
+                constant_t*c = constant_fromindex(pool, vindex, vkind);
+                list_append(m->optional_parameters, c);
+
             }
         }
        if(m->flags&0x80) {
             /* debug information- not used by avm2 */
             multiname_list_t*l = m->parameters;
             while(l) {
-               m->name = array_getkey(pool->strings, swf_GetU30(tag));
+               const char*name = pool_lookup_string(pool, swf_GetU30(tag));
                 l = l->next;
             }
        }
-       array_append(file->methods, m->name, m);
+        m->index = array_length(file->methods);
+       array_append(file->methods, NO_KEY, m);
     }
             
     parse_metadata(tag, file, pool);
@@ -1060,12 +812,14 @@ void* swf_ReadABC(TAG*tag)
     for(t=0;t<num_classes;t++) {
        abc_class_t*cls = malloc(sizeof(abc_class_t));
        memset(cls, 0, sizeof(abc_class_t));
-       array_append(file->classes, 0, cls);
        
-        DEBUG printf("class %d\n", t);
        swf_GetU30(tag); //classname
        swf_GetU30(tag); //supername
+
+        array_append(file->classes, NO_KEY, cls);
+
        cls->flags = swf_GetU8(tag);
+        DEBUG printf("class %d %02x\n", t, cls->flags);
        if(cls->flags&8) 
            swf_GetU30(tag); //protectedNS
         int s;
@@ -1073,17 +827,19 @@ void* swf_ReadABC(TAG*tag)
         cls->interfaces = 0;
         for(s=0;s<inum;s++) {
             int interface_index = swf_GetU30(tag);
-            multiname_t* m = (multiname_t*)array_getvalue(pool->multinames, interface_index);
+            multiname_t* m = multiname_clone(pool_lookup_multiname(pool, interface_index));
             list_append(cls->interfaces, m);
             DEBUG printf("  class %d interface: %s\n", t, m->name);
         }
 
-       swf_GetU30(tag); //iinit
+       int iinit = swf_GetU30(tag); //iinit
+        DEBUG printf("--iinit-->%d\n", iinit);
        traits_skip(tag);
     }
     for(t=0;t<num_classes;t++) {
         abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t);
        int cinit = swf_GetU30(tag);
+        DEBUG printf("--cinit(%d)-->%d\n", t, cinit);
         cls->static_constructor = (abc_method_t*)array_getvalue(file->methods, cinit);
         traits_skip(tag);
     }
@@ -1105,35 +861,47 @@ void* swf_ReadABC(TAG*tag)
        abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, methodnr);
        abc_method_body_t*c = malloc(sizeof(abc_method_body_t));
        memset(c, 0, sizeof(abc_method_body_t));
-       c->max_stack = swf_GetU30(tag);
-       c->local_count = swf_GetU30(tag);
-       c->init_scope_depth = swf_GetU30(tag);
-       c->max_scope_depth = swf_GetU30(tag);
+       c->old.max_stack = swf_GetU30(tag);
+       c->old.local_count = swf_GetU30(tag);
+       c->old.init_scope_depth = swf_GetU30(tag);
+       c->old.max_scope_depth = swf_GetU30(tag);
+
+        c->init_scope_depth = c->old.init_scope_depth;
        int code_length = swf_GetU30(tag);
+
        c->method = m;
        m->body = c;
 
         int pos = tag->pos + code_length;
-        c->code = parse_code(tag, code_length, file, pool);
+        codelookup_t*codelookup = 0;
+        c->code = code_parse(tag, code_length, file, pool, &codelookup);
         tag->pos = pos;
 
        int exception_count = swf_GetU30(tag);
         int s;
+        c->exceptions = list_new();
         for(s=0;s<exception_count;s++) {
-            swf_GetU30(tag); //from
-            swf_GetU30(tag); //to
-            swf_GetU30(tag); //target
-            swf_GetU30(tag); //exc_type
-            swf_GetU30(tag); //var_name
+            abc_exception_t*e = malloc(sizeof(abc_exception_t));
+
+            e->from = code_atposition(codelookup, swf_GetU30(tag));
+            e->to = code_atposition(codelookup, swf_GetU30(tag));
+            e->target = code_atposition(codelookup, swf_GetU30(tag));
+
+            e->exc_type = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag)));
+            e->var_name = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag)));
+            //e->var_name = pool_lookup_string(pool, swf_GetU30(tag));
+            //if(e->var_name) e->var_name = strdup(e->var_name);
+            list_append(c->exceptions, e);
         }
+        codelookup_free(codelookup);
        c->traits = traits_parse(tag, pool, file);
 
-       DEBUG printf("method_body %d) (method %d), %d bytes of code", t, methodnr, code_length);
+       DEBUG printf("method_body %d) (method %d), %d bytes of code\n", t, methodnr, code_length);
 
-       array_append(file->method_bodies, 0, c);
+       array_append(file->method_bodies, NO_KEY, c);
     }
     if(tag->len - tag->pos) {
-       fprintf(stderr, "%d unparsed bytes remaining in ABC block\n", tag->len - tag->pos);
+       fprintf(stderr, "ERROR: %d unparsed bytes remaining in ABC block\n", tag->len - tag->pos);
        return 0;
     }
 
@@ -1143,19 +911,19 @@ void* swf_ReadABC(TAG*tag)
 
         int classname_index = swf_GetU30(tag);
         int superclass_index = swf_GetU30(tag);
-       cls->classname = (multiname_t*)array_getvalue(pool->multinames, classname_index);
-       cls->superclass = (multiname_t*)array_getvalue(pool->multinames, superclass_index);
+       cls->classname = multiname_clone(pool_lookup_multiname(pool, classname_index));
+       cls->superclass = multiname_clone(pool_lookup_multiname(pool, superclass_index));
        cls->flags = swf_GetU8(tag);
        const char*ns = "";
        if(cls->flags&8) {
             int ns_index = swf_GetU30(tag);
-           cls->protectedNS = array_getkey(pool->namespaces, ns_index);
+           cls->protectedNS = namespace_clone(pool_lookup_namespace(pool, ns_index));
        }
         
         int num_interfaces = swf_GetU30(tag); //interface count
         int s;
         for(s=0;s<num_interfaces;s++) {
-            swf_GetU30(tag); // multiname index TODO
+            swf_GetU30(tag);
         }
        int iinit = swf_GetU30(tag);
         cls->constructor = (abc_method_t*)array_getvalue(file->methods, iinit);
@@ -1165,7 +933,7 @@ void* swf_ReadABC(TAG*tag)
         abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t);
         /* SKIP */
        swf_GetU30(tag); // cindex
-       cls->static_constructor_traits = traits_parse(tag, pool, file);
+       cls->static_traits = traits_parse(tag, pool, file);
     }
     int num_scripts2 = swf_GetU30(tag);
     for(t=0;t<num_scripts2;t++) {
@@ -1176,46 +944,56 @@ void* swf_ReadABC(TAG*tag)
         memset(s, 0, sizeof(abc_script_t));
         s->method = m;
         s->traits = traits_parse(tag, pool, file);
-        array_append(file->scripts, 0, s);
-        if(!s->traits) {
-           fprintf(stderr, "Can't parse script traits\n");
-            return 0;
-        }
+        array_append(file->scripts, NO_KEY, s);
     }
 
-    //pool_destroy(pool);
+    pool_destroy(pool);
     return file;
 }
 
-static void code_write(TAG*tag, abc_code_t*code, pool_t*pool, abc_file_t*file)
-{
-    int len = 0;
-    abc_code_t*c = code;
-    while(c) {
-        len += opcode_write(0, c, pool, file);
-        c = c->next;
-    }
-    swf_SetU30(tag, len);
-    int pos = tag->len;
-    c = code;
-    while(c) {
-        opcode_write(tag, c, pool, file);
-        c = c->next;
-    }
-    assert(tag->len - pos == len);
-}
-
-void swf_WriteABC(TAG*abctag, void*code)
+static pool_t*writeABC(TAG*abctag, void*code, pool_t*pool)
 {
     abc_file_t*file = (abc_file_t*)code;
-    pool_t*pool = pool_new();
+    if(!pool) 
+        pool = pool_new();
+    if(!file)
+        file = abc_file_new();
 
     TAG*tmp = swf_InsertTag(0,0);
     TAG*tag = tmp;
     int t;
+  
+    /* add method bodies where needed */
+    for(t=0;t<file->classes->num;t++) {
+       abc_class_t*c = (abc_class_t*)array_getvalue(file->classes, t);
+        if(!c->constructor) {
+            if(!(c->flags&CLASS_INTERFACE)) {
+                NEW(abc_method_t,m);array_append(file->methods, NO_KEY, m);
+                NEW(abc_method_body_t,body);array_append(file->method_bodies, NO_KEY, body);
+                // don't bother to set m->index
+                body->method = m; m->body = body;
+               if(c->superclass && c->superclass->name && strcmp(c->superclass->name,"Object")) {
+                   body->code = abc_getlocal_0(body->code);
+                   body->code = abc_constructsuper(body->code, 0);
+               }
+                body->code = abc_returnvoid(body->code);
+                c->constructor = m;
+            } else {
+                NEW(abc_method_t,m);array_append(file->methods, NO_KEY, m);
+                c->constructor = m;
+            }
+        }
+        if(!c->static_constructor) {
+            NEW(abc_method_t,m);array_append(file->methods, NO_KEY, m);
+            NEW(abc_method_body_t,body);array_append(file->method_bodies, NO_KEY, body);
+            body->method = m; m->body = body;
+            body->code = abc_returnvoid(0);
+            c->static_constructor = m;
+        }
+    }
+
 
     swf_SetU30(tag, file->methods->num);
-   
     /* enumerate classes, methods and method bodies */
     for(t=0;t<file->methods->num;t++) {
        abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, t);
@@ -1229,12 +1007,56 @@ void swf_WriteABC(TAG*abctag, void*code)
         abc_method_body_t*m = (abc_method_body_t*)array_getvalue(file->method_bodies, t);
         m->index = t;
     }
-
+    
+    /* generate code statistics */
+    for(t=0;t<file->method_bodies->num;t++) {
+        abc_method_body_t*m = (abc_method_body_t*)array_getvalue(file->method_bodies, t);
+        m->stats = code_get_statistics(m->code, m->exceptions);
+    }
+    
+    /* level init scope depths: The init scope depth of a method is
+       always as least as high as the init scope depth of it's surrounding
+       class.
+       A method has it's own init_scope_depth if it's an init method 
+       (then its init scope depth is zero), or if it's used as a closure.
+
+       Not sure yet what to do with methods which are used at different
+       locations- e.g. the nullmethod is used all over the place.
+       EDIT: flashplayer doesn't allow this anyway- a method can only
+             be used once
+
+       Also, I have the strong suspicion that flash player uses only
+       the difference between max_scope_stack and init_scope_stack, anyway.
+     */
+    for(t=0;t<file->classes->num;t++) {
+       abc_class_t*c = (abc_class_t*)array_getvalue(file->classes, t);
+        trait_list_t*traits = c->traits;
+        if(c->constructor && c->constructor->body &&
+           c->constructor->body->init_scope_depth < c->init_scope_depth) {
+           c->constructor->body->init_scope_depth = c->init_scope_depth;
+        }
+        if(c->static_constructor && c->static_constructor->body &&
+           c->static_constructor->body->init_scope_depth < c->init_scope_depth) {
+           c->static_constructor->body->init_scope_depth = c->init_scope_depth;
+        }
+        while(traits) {
+            trait_t*trait = traits->trait;
+            if(trait_is_method(trait) && trait->method->body) {
+                abc_method_body_t*body = trait->method->body;
+               if(body->init_scope_depth < c->init_scope_depth) {
+                   body->init_scope_depth = c->init_scope_depth;
+                }
+            }
+            traits = traits->next;
+        }
+    }
+    
     for(t=0;t<file->methods->num;t++) {
        abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, t);
         int n = 0;
         multiname_list_t*l = m->parameters;
-       swf_SetU30(tag, list_length(m->parameters));
+        int num_params = list_length(m->parameters);
+       swf_SetU30(tag, num_params);
         if(m->return_type) 
            swf_SetU30(tag, pool_register_multiname(pool, m->return_type));
         else
@@ -1244,8 +1066,34 @@ void swf_WriteABC(TAG*abctag, void*code)
            swf_SetU30(tag, pool_register_multiname(pool, l->multiname));
             l = l->next;
        }
-       swf_SetU30(tag, 0); // name
-       swf_SetU8(tag, 0); //flags
+        if(m->name) {
+           swf_SetU30(tag, pool_register_string(pool, m->name));
+        } else {
+           swf_SetU30(tag, 0);
+        }
+
+        U8 flags = m->flags&(METHOD_NEED_REST|METHOD_NEED_ARGUMENTS);
+        if(m->optional_parameters)
+            flags |= METHOD_HAS_OPTIONAL;
+        if(m->body) {
+            flags |= m->body->stats->flags;
+        }
+
+       swf_SetU8(tag, flags);
+        if(flags&METHOD_HAS_OPTIONAL) {
+            swf_SetU30(tag, list_length(m->optional_parameters));
+            constant_list_t*l = m->optional_parameters;
+            while(l) {
+                int i = constant_get_index(pool, l->constant);
+                swf_SetU30(tag, i);
+                if(!i) {
+                    swf_SetU8(tag, CONSTANT_NULL);
+                } else {
+                    swf_SetU8(tag, l->constant->type);
+                }
+                l = l->next;
+            }
+        }
     }
    
     /* write metadata */
@@ -1254,6 +1102,7 @@ void swf_WriteABC(TAG*abctag, void*code)
         const char*entry_name = array_getkey(file->metadata, t);
         swf_SetU30(tag, pool_register_string(pool, entry_name));
         array_t*items = (array_t*)array_getvalue(file->metadata, t);
+        swf_SetU30(tag, items->num);
         int s;
         for(s=0;s<items->num;s++) {
             int i1 = pool_register_string(pool, array_getkey(items, s));
@@ -1275,34 +1124,38 @@ void swf_WriteABC(TAG*abctag, void*code)
 
        swf_SetU8(tag, c->flags); // flags
         if(c->flags&0x08) {
-            namespace_t*ns = abc_protectednamespace(file, c->protectedNS);
-            int ns_index = pool_register_namespace(pool, ns);
+            int ns_index = pool_register_namespace(pool, c->protectedNS);
            swf_SetU30(tag, ns_index);
         }
 
-       swf_SetU30(tag, 0); // no interfaces
-       if(!c->constructor) {
-           fprintf(stderr, "Error: Class %s has no constructor\n", c->classname);
-           return;
-       }
+        swf_SetU30(tag, list_length(c->interfaces));
+        multiname_list_t*interface= c->interfaces;
+        while(interface) {
+            swf_SetU30(tag, pool_register_multiname(pool, interface->multiname));
+            interface = interface->next;
+        }
+
+       assert(c->constructor);
        swf_SetU30(tag, c->constructor->index);
-       write_traits(pool, tag, c->traits);
+
+       traits_write(pool, tag, c->traits);
     }
     for(t=0;t<file->classes->num;t++) {
        abc_class_t*c = (abc_class_t*)array_getvalue(file->classes, t);
-       if(!c->static_constructor) {
-           fprintf(stderr, "Error: Class %s has no static constructor\n", c->classname);
-           return;
-       }
+       assert(c->static_constructor);
        swf_SetU30(tag, c->static_constructor->index);
-        write_traits(pool, tag, c->static_constructor_traits);
+        
+        traits_write(pool, tag, c->static_traits);
     }
 
     swf_SetU30(tag, file->scripts->num);
     for(t=0;t<file->scripts->num;t++) {
        abc_script_t*s = (abc_script_t*)array_getvalue(file->scripts, t);
+        if(!s->method->body || !s->method->body->code) {
+            fprintf(stderr, "Internal Error: initscript has no body\n");
+        }
        swf_SetU30(tag, s->method->index); //!=t!
-       write_traits(pool, tag, s->traits);
+       traits_write(pool, tag, s->traits);
     }
 
     swf_SetU30(tag, file->method_bodies->num);
@@ -1310,41 +1163,47 @@ void swf_WriteABC(TAG*abctag, void*code)
        abc_method_body_t*c = (abc_method_body_t*)array_getvalue(file->method_bodies, t);
        abc_method_t*m = c->method;
        swf_SetU30(tag, m->index);
-       swf_SetU30(tag, c->max_stack);
-       swf_SetU30(tag, c->local_count);
-       swf_SetU30(tag, c->init_scope_depth);
-       swf_SetU30(tag, c->max_scope_depth);
 
-        code_write(tag, c->code, pool, file);
+       //swf_SetU30(tag, c->old.max_stack);
+       //swf_SetU30(tag, c->old.local_count);
+       //swf_SetU30(tag, c->old.init_scope_depth);
+       //swf_SetU30(tag, c->old.max_scope_depth);
+
+       swf_SetU30(tag, c->stats->max_stack);
+        int param_num = list_length(c->method->parameters)+1;
+        if(c->method->flags&METHOD_NEED_REST)
+            param_num++;
+        if(param_num <= c->stats->local_count)
+           swf_SetU30(tag, c->stats->local_count);
+        else
+           swf_SetU30(tag, param_num);
 
-       swf_SetU30(tag, c->exception_count);
-        write_traits(pool, tag, c->traits);
-    }
+       swf_SetU30(tag, c->init_scope_depth);
+       swf_SetU30(tag, c->stats->max_scope_depth+
+                        c->init_scope_depth);
 
+        code_write(tag, c->code, pool, file);
 
-    for(t=1;t<pool->multinames->num;t++) {
-        multiname_t*m = (multiname_t*)array_getvalue(pool->multinames, t);
-        if(m->ns) {
-            pool_register_namespace(pool, m->ns);
-        }
-        if(m->namespace_set) {
-            pool_register_namespace_set(pool, m->namespace_set);
-        }
-        if(m->name) {
-            pool_register_string(pool, m->name);
-        }
-    }
-    for(t=1;t<pool->namespace_sets->num;t++) {
-        namespace_set_t*set = (namespace_set_t*)array_getvalue(pool->namespace_sets, t);
-        namespace_list_t*i = set->namespaces;
-        while(i) {
-            pool_register_namespace(pool, i->namespace);
-            i = i->next;
+       swf_SetU30(tag, list_length(c->exceptions));
+        abc_exception_list_t*l = c->exceptions;
+        while(l) {
+            // warning: assumes "pos" in each code_t is up-to-date
+            swf_SetU30(tag, l->abc_exception->from->pos);
+            swf_SetU30(tag, l->abc_exception->to->pos);
+            swf_SetU30(tag, l->abc_exception->target->pos);
+            swf_SetU30(tag, pool_register_multiname(pool, l->abc_exception->exc_type));
+            swf_SetU30(tag, pool_register_multiname(pool, l->abc_exception->var_name));
+            l = l->next;
         }
+
+        traits_write(pool, tag, c->traits);
     }
-    for(t=1;t<pool->namespaces->num;t++) {
-       namespace_t*ns= (namespace_t*)array_getvalue(pool->namespaces, t);
-        array_append_if_new(pool->strings, ns->name, 0);
+   
+    /* free temporary codestat data again. Notice: If we were to write this
+       file multiple times, this can also be shifted to abc_file_free() */
+    for(t=0;t<file->method_bodies->num;t++) {
+        abc_method_body_t*m = (abc_method_body_t*)array_getvalue(file->method_bodies, t);
+        codestats_free(m->stats);m->stats=0;
     }
 
     // --- start to write real tag --
@@ -1352,372 +1211,137 @@ void swf_WriteABC(TAG*abctag, void*code)
     tag = abctag;
 
     if(tag->id == ST_DOABC) {
-        swf_SetU32(tag, 1); // flags
+        swf_SetU32(tag, file->flags); // flags
         swf_SetString(tag, file->name);
     }
 
     swf_SetU16(tag, 0x10); //version
     swf_SetU16(tag, 0x2e);
-
-    swf_SetU30(tag, pool->ints->num>1?pool->ints->num:0);
-    for(t=1;t<pool->ints->num;t++) {
-        S32 val = (ptroff_t)array_getvalue(pool->ints, t);
-        swf_SetS30(tag, val);
-    }
-    swf_SetU30(tag, pool->uints->num>1?pool->uints->num:0);
-    for(t=1;t<pool->uints->num;t++) {
-        swf_SetU30(tag, (ptroff_t)array_getvalue(pool->uints, t));
-    }
-    swf_SetU30(tag, pool->floats->num>1?pool->floats->num:0);
-    for(t=1;t<pool->floats->num;t++) {
-        array_getvalue(pool->floats, t);
-        swf_SetD64(tag, 0.0); // fixme
-    }
-    swf_SetU30(tag, pool->strings->num>1?pool->strings->num:0);
-    for(t=1;t<pool->strings->num;t++) {
-       swf_SetU30String(tag, array_getkey(pool->strings, t));
-    }
-    swf_SetU30(tag, pool->namespaces->num>1?pool->namespaces->num:0);
-    for(t=1;t<pool->namespaces->num;t++) {
-       namespace_t*ns= (namespace_t*)array_getvalue(pool->namespaces, t);
-       const char*name = ns->name;
-       int i = pool_find_string(pool, name);
-       swf_SetU8(tag, ns->access);
-       swf_SetU30(tag, i);
-    }
-    swf_SetU30(tag, pool->namespace_sets->num>1?pool->namespace_sets->num:0);
-    for(t=1;t<pool->namespace_sets->num;t++) {
-        namespace_set_t*set = (namespace_set_t*)array_getvalue(pool->namespace_sets, t);
-        namespace_list_t*i = set->namespaces; 
-        int len = list_length(i);
-        swf_SetU30(tag, len);
-        while(i) {
-            int index = pool_find_namespace(pool, i->namespace);
-            swf_SetU30(tag, index);
-            i = i->next;
-        }
-    }
-
-    swf_SetU30(tag, pool->multinames->num>1?pool->multinames->num:0);
-    for(t=1;t<pool->multinames->num;t++) {
-       multiname_t*m = (multiname_t*)array_getvalue(pool->multinames, t);
-       swf_SetU8(tag, m->type);
-
-        if(m->ns) {
-            assert(m->type==0x07 || m->type==0x0d);
-           int i = pool_find_namespace(pool, m->ns);
-            if(i<0) fprintf(stderr, "internal error: unregistered namespace %02x %s %s\n", m->ns->access, access2str(m->ns->access), m->ns->name);
-           swf_SetU30(tag, i);
-        } else {
-            assert(m->type!=0x07 && m->type!=0x0d);
-        }
-        if(m->name) {
-            assert(m->type==0x09 || m->type==0x0e || m->type==0x07 || m->type==0x0d || m->type==0x0f || m->type==0x10);
-           int i = pool_find_string(pool, m->name);
-            if(i<0) fprintf(stderr, "internal error: unregistered name\n");
-           swf_SetU30(tag, i);
-        } else {
-            assert(m->type!=0x09 && m->type!=0x0e && m->type!=0x07 && m->type!=0x0d && m->type!=0x0f && m->type!=0x10);
-        }
-        if(m->namespace_set) {
-            assert(m->type==0x09 || m->type==0x0e || m->type==0x1c || m->type==0x1b);
-           int i = pool_find_namespace_set(pool, m->namespace_set);
-            if(i<0) fprintf(stderr, "internal error: unregistered namespace set\n");
-           swf_SetU30(tag, i);
-        } else {
-            assert(m->type!=0x09 && m->type!=0x0e && m->type!=0x1c && m->type!=0x1b);
-        }
-
-    }
-
+    
+    pool_write(pool, tag);
+    
     swf_SetBlock(tag, tmp->data, tmp->len);
 
     swf_DeleteTag(0, tmp);
-    pool_destroy(pool);
+    return pool;
 }
 
-void swf_FreeABC(void*code)
+void swf_WriteABC(TAG*abctag, void*code)
 {
-    abc_file_t*file= (abc_file_t*)code;
+    pool_t*pool = writeABC(abctag, code, 0);
+    pool_optimize(pool);
+    swf_ResetTag(abctag, abctag->id);
+    writeABC(abctag, code, pool);
+    pool_destroy(pool);
+}
 
+void abc_file_free(abc_file_t*file)
+{
+    if(!file)
+        return;
     int t;
-    for(t=0;t<file->metadata->num;t++) {
-        array_t*items = (array_t*)array_getvalue(file->metadata, t);
-        array_free(items);
+    if(file->metadata) {
+        for(t=0;t<file->metadata->num;t++) {
+            array_t*items = (array_t*)array_getvalue(file->metadata, t);
+            int s;
+            for(s=0;s<items->num;s++) {
+                free(array_getvalue(items, s));
+            }
+            array_free(items);
+        }
+        array_free(file->metadata);file->metadata=0;
     }
-    array_free(file->metadata);
 
     for(t=0;t<file->methods->num;t++) {
         abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, t);
-        list_free(m->parameters);
+
+        multiname_list_t*param = m->parameters;
+        while(param) {
+            multiname_destroy(param->multiname);param->multiname=0;
+            param = param->next;
+        }
+        list_free(m->parameters);m->parameters=0;
+       
+        constant_list_t*opt = m->optional_parameters;
+        while(opt) {
+            constant_free(opt->constant);opt->constant=0;
+            opt = opt->next;
+        }
+        list_free(m->optional_parameters);m->optional_parameters=0;
+
+        if(m->name) {
+            free((void*)m->name);m->name=0;
+        }
+        if(m->return_type) {
+            multiname_destroy(m->return_type);
+        }
         free(m);
     }
-    array_free(file->methods);
+    array_free(file->methods);file->methods=0;
 
     for(t=0;t<file->classes->num;t++) {
         abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t);
-        list_free(cls->interfaces);
-        traits_free(cls->traits);
-       traits_free(cls->static_constructor_traits);
+        traits_free(cls->traits);cls->traits=0;
+       traits_free(cls->static_traits);cls->static_traits=0;
+
+        if(cls->classname) {
+            multiname_destroy(cls->classname);
+        }
+        if(cls->superclass) {
+            multiname_destroy(cls->superclass);
+        }
+
+        multiname_list_t*i = cls->interfaces;
+        while(i) {
+            multiname_destroy(i->multiname);i->multiname=0;
+            i = i->next;
+        }
+        list_free(cls->interfaces);cls->interfaces=0;
+
+        if(cls->protectedNS) {
+           namespace_destroy(cls->protectedNS);
+        }
         free(cls);
     }
-    array_free(file->classes);
+    array_free(file->classes);file->classes=0;
 
     for(t=0;t<file->scripts->num;t++) {
         abc_script_t*s = (abc_script_t*)array_getvalue(file->scripts, t);
-        traits_free(s->traits);
+        traits_free(s->traits);s->traits=0;
         free(s);
     }
-    array_free(file->scripts);
+    array_free(file->scripts);file->scripts=0;
 
     for(t=0;t<file->method_bodies->num;t++) {
         abc_method_body_t*body = (abc_method_body_t*)array_getvalue(file->method_bodies, t);
-        code_free(body->code);
-       traits_free(body->traits);
+        code_free(body->code);body->code=0;
+       traits_free(body->traits);body->traits=0;
+
+        abc_exception_list_t*ee = body->exceptions;
+        while(ee) {
+            abc_exception_t*e=ee->abc_exception;ee->abc_exception=0;
+            e->from = e->to = e->target = 0;
+            multiname_destroy(e->exc_type);e->exc_type=0;
+            multiname_destroy(e->var_name);e->var_name=0;
+            free(e);
+            ee=ee->next;
+        }
+        list_free(body->exceptions);body->exceptions=0;
+        
         free(body);
     }
-    array_free(file->method_bodies);
-
-    free(file);
-}
+    array_free(file->method_bodies);file->method_bodies=0;
 
-abc_code_t* add_opcode(abc_code_t*atag, U8 op)
-{
-    abc_code_t*tmp = (abc_code_t*)malloc(sizeof(abc_code_t));
-    tmp->opcode = op;
-    tmp->next = 0;
-    if(atag) {
-       tmp->prev = atag;
-       atag->next = tmp;
-       tmp->parent = atag->parent;
-    } else {
-       tmp->prev = 0;
-       tmp->parent = tmp;
+    if(file->name) {
+        free((void*)file->name);file->name=0;
     }
-    return tmp;
-}
 
-#include "abc_ops.c"
+    free(file);
+}
 
-void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events)
+void swf_FreeABC(void*code)
 {
-    int num_frames = 0;
-    int has_buttons = 0;
-    TAG*tag=swf->firstTag;
-    while(tag) {
-        if(tag->id == ST_SHOWFRAME)
-            num_frames++;
-        if(tag->id == ST_DEFINEBUTTON || tag->id == ST_DEFINEBUTTON2)
-            has_buttons = 1;
-        tag = tag->next;
-    }
-
-    abc_file_t*file = abc_file_new();
-    abc_method_body_t*c = 0;
-   
-    abc_class_t*cls = abc_class_new(file, "rfx::MainTimeline", "flash.display::MovieClip");
-    abc_class_protectedNS(cls, "rfx:MainTimeline");
-  
-    TAG*abctag = swf_InsertTagBefore(swf, swf->firstTag, ST_DOABC);
-    
-    tag = swf_InsertTag(abctag, ST_SYMBOLCLASS);
-    swf_SetU16(tag, 1);
-    swf_SetU16(tag, 0);
-    swf_SetString(tag, "rfx.MainTimeline");
-
-    c = abc_class_staticconstructor(cls, 0, 0);
-    c->max_stack = 1;
-    c->local_count = 1;
-    c->init_scope_depth = 9;
-    c->max_scope_depth = 10;
-
-    __ getlocal_0(c);
-    __ pushscope(c);
-    __ returnvoid(c);
-
-    c = abc_class_constructor(cls, 0, 0);
-    c->max_stack = 3;
-    c->local_count = 1;
-    c->init_scope_depth = 10;
-    c->max_scope_depth = 11;
-    
-    debugfile(c, "constructor.as");
-
-    __ getlocal_0(c);
-    __ pushscope(c);
-
-    __ getlocal_0(c);
-    __ constructsuper(c,0);
-
-    __ getlex(c, "[package]flash.system::Security");
-    __ pushstring(c, "*");
-    __ callpropvoid(c, "[package]::allowDomain", 1);
-    
-    if(stop_each_frame || has_buttons) {
-        int frame = 0;
-        tag = swf->firstTag;
-        abc_method_body_t*f = 0; //frame script
-        while(tag && tag->id!=ST_END) {
-            char framename[80];
-            char needs_framescript=0;
-            char buttonname[80];
-            char functionname[80];
-            sprintf(framename, "[packageinternal]rfx::frame%d", frame);
-            
-            if(!f && (tag->id == ST_DEFINEBUTTON || tag->id == ST_DEFINEBUTTON2 || stop_each_frame)) {
-                /* make the contructor add a frame script */
-                __ findpropstrict(c,"[package]::addFrameScript");
-                __ pushbyte(c,frame);
-                __ getlex(c,framename);
-                __ callpropvoid(c,"[package]::addFrameScript",2);
-
-                f = abc_class_method(cls, 0, framename, 0);
-                f->max_stack = 3;
-                f->local_count = 1;
-                f->init_scope_depth = 10;
-                f->max_scope_depth = 11;
-                __ debugfile(f, "framescript.as");
-                __ debugline(f, 1);
-                __ getlocal_0(f);
-                __ pushscope(f);
-            }
-
-            if(tag->id == ST_DEFINEBUTTON || tag->id == ST_DEFINEBUTTON2) {
-                U16 id = swf_GetDefineID(tag);
-                sprintf(buttonname, "::button%d", swf_GetDefineID(tag));
-                __ getlex(f,buttonname);
-                __ getlex(f,"flash.events::MouseEvent");
-                __ getproperty(f, "::CLICK");
-                sprintf(functionname, "::clickbutton%d", swf_GetDefineID(tag));
-                __ getlex(f,functionname);
-                __ callpropvoid(f, "::addEventListener" ,2);
-
-                if(stop_each_frame) {
-                    __ findpropstrict(f, "[package]::stop");
-                    __ callpropvoid(f, "[package]::stop", 0);
-                }
-                needs_framescript = 1;
-
-                abc_method_body_t*h =
-                    abc_class_method(cls, "::void", functionname, 1, "flash.events::MouseEvent");
-                h->max_stack = 6;
-                h->local_count = 2;
-                h->init_scope_depth = 10;
-                h->max_scope_depth = 11;
-                __ getlocal_0(h);
-                __ pushscope(h);
-
-                ActionTAG*oldaction = swf_ButtonGetAction(tag);
-                if(oldaction && oldaction->op == ACTION__GOTOFRAME) {
-                    int framenr = GET16(oldaction->data);
-                    if(framenr>254) {
-                        fprintf(stderr, "Warning: Couldn't translate jump to frame %d to flash 9 actionscript\n", framenr);
-                    }
-                    if(!events) {
-                        __ findpropstrict(h,"[package]::gotoAndStop");
-                        __ pushbyte(h,framenr+1);
-                        __ callpropvoid(h,"[package]::gotoAndStop", 1);
-                    } else {
-                        char framename[80];
-                        sprintf(framename, "frame%d", framenr);
-                        __ getlocal_0(h); //this
-                        __ findpropstrict(h, "[package]flash.events::TextEvent");
-                        __ pushstring(h, "link");
-                        __ pushtrue(h);
-                        __ pushtrue(h);
-                        __ pushstring(h, framename);
-                        __ constructprop(h,"[package]flash.events::TextEvent", 4);
-                        __ callpropvoid(h,"[package]::dispatchEvent", 1);
-                    }
-                } else if(oldaction && oldaction->op == ACTION__GETURL) {
-                    if(!events) {
-                        __ findpropstrict(h,"flash.net::navigateToURL");
-                        __ findpropstrict(h,"flash.net::URLRequest");
-                        // TODO: target _blank
-                        __ pushstring(h,oldaction->data); //url
-                        __ constructprop(h,"flash.net::URLRequest", 1);
-                        __ callpropvoid(h,"flash.net::navigateToURL", 1);
-                    } else {
-                        __ getlocal_0(h); //this
-                        __ findpropstrict(h, "[package]flash.events::TextEvent");
-                        __ pushstring(h, "link");
-                        __ pushtrue(h);
-                        __ pushtrue(h);
-                        __ pushstring(h,oldaction->data); //url
-                        __ constructprop(h,"[package]flash.events::TextEvent", 4);
-                        __ callpropvoid(h,"[package]::dispatchEvent", 1);
-                    }
-                } else if(oldaction) {
-                    fprintf(stderr, "Warning: Couldn't translate button code of button %d to flash 9 abc action\n", id);
-                }
-                __ returnvoid(h);
-                swf_ActionFree(oldaction);
-            }
-            if(tag->id == ST_SHOWFRAME) {
-                if(f) {
-                    __ returnvoid(f);
-                    f = 0;
-                }
-                frame++;
-            }
-            tag = tag->next;
-        }
-        if(f) {
-            __ returnvoid(f);
-        }
-    }
-    __ returnvoid(c);
-
-    tag = swf->firstTag;
-    while(tag) {
-        if(tag->id == ST_DEFINEBUTTON || tag->id == ST_DEFINEBUTTON2) {
-            char buttonname[80];
-            sprintf(buttonname, "::button%d", swf_GetDefineID(tag));
-            abc_AddSlot(cls, buttonname, 0, "flash.display::SimpleButton");
-        }
-        tag = tag->next;
-    }
-
-
-    abc_script_t*s = abc_initscript(file, 0, 0);
-    c = s->method->body;
-    c->max_stack = 2;
-    c->local_count = 1;
-    c->init_scope_depth = 1;
-    c->max_scope_depth = 9;
-
-    __ getlocal_0(c);
-    __ pushscope(c);
-    __ getscopeobject(c, 0);
-    __ getlex(c,"::Object");
-    __ pushscope(c);
-    __ getlex(c,"flash.events::EventDispatcher");
-    __ pushscope(c);
-    __ getlex(c,"flash.display::DisplayObject");
-    __ pushscope(c);
-    __ getlex(c,"flash.display::InteractiveObject");
-    __ pushscope(c);
-    __ getlex(c,"flash.display::DisplayObjectContainer");
-    __ pushscope(c);
-    __ getlex(c,"flash.display::Sprite");
-    __ pushscope(c);
-    __ getlex(c,"flash.display::MovieClip");
-    __ pushscope(c);
-    __ getlex(c,"flash.display::MovieClip");
-    __ newclass(c,cls);
-    __ popscope(c);
-    __ popscope(c);
-    __ popscope(c);
-    __ popscope(c);
-    __ popscope(c);
-    __ popscope(c);
-    __ popscope(c);
-    __ initproperty(c,"rfx::MainTimeline");
-    __ returnvoid(c);
-
-    //abc_method_body_addClassTrait(c, "rfx:MainTimeline", 1, cls);
-    abc_initscript_addClassTrait(s, "rfx::MainTimeline", 1, cls);
-
-    swf_WriteABC(abctag, file);
+    abc_file_t*file= (abc_file_t*)code;
+    abc_file_free(file);
 }