X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fas3%2Fabc.c;h=7e11e1c94f07fbfb830916f89c572f47676767bc;hp=27c43319e1ab7ab62e58e0aabcd51b66fb3aa27b;hb=2391d7ae5d8a145a250a8b80ab8c93ba74eba030;hpb=4e990c50e8224621ac557f21ed3bd937ba0bbff3

diff --git a/lib/as3/abc.c b/lib/as3/abc.c
index 27c4331..7e11e1c 100644
--- a/lib/as3/abc.c
+++ b/lib/as3/abc.c
@@ -24,618 +24,460 @@
 #include <stdarg.h>
 #include <assert.h>
 #include "../rfxswf.h"
+#include "../q.h"
 #include "abc.h"
+#include "assets.h"
 
 char stringbuffer[2048];
 
-dict_t* dict_new() {
-    dict_t*d = malloc(sizeof(dict_t));
-    memset(d, 0, sizeof(dict_t));
-    return d;
-}
+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);
+int abc_RegisterProtectedNameSpace(abc_file_t*file, const char*name);
+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);
 
-void dict_free(dict_t*dict) {
-    if(dict->d)
-    free(dict->d);dict->d = 0;
-    free(dict);
-}
+/* TODO: switch to a datastructure with just values */
+#define NO_KEY ""
 
-const char*dict_getstr(dict_t*dict, int nr) {
-    if(nr > dict->num || nr<0) {
-	printf("error: reference to string %d in dict\n");
-	return 0;
-    }
-    return dict->d[nr].name;
-}
-char*dict_getdata(dict_t*dict, int nr) {
-    if(nr > dict->num || nr<0) {
-	printf("error: reference to string %d in dict\n");
-	return 0;
-    }
-    return dict->d[nr].data;
-}
-int dict_append(dict_t*dict, const char*name, void*data) {
-    while(dict->size <= dict->num) {
-	dict->size += 64;
-	if(!dict->d) {
-	    dict->d = malloc(sizeof(dict_entry_t)*dict->size);
-	} else {
-	    dict->d = realloc(dict->d, sizeof(dict_entry_t)*dict->size);
-	}
-    }
-    if(name) {
-	dict->d[dict->num].name = strdup(name);
-    } else {
-	dict->d[dict->num].name = 0;
+static void params_dump(FILE*fo, multiname_list_t*l, constant_list_t*o)
+{
+    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;
+        }
+
+        if(l->next)
+            fprintf(fo, ", ");
+        l = l->next;i++;
     }
-    dict->d[dict->num].data = data;
-    return dict->num++;
+    fprintf(fo, ")");
 }
-int dict_find(dict_t*dict, const char*name)
+
+//#define DEBUG
+#define DEBUG if(0)
+
+static void parse_metadata(TAG*tag, abc_file_t*file, pool_t*pool)
 {
-    if(!name)
-	name = "";
     int t;
-    for(t=0;t<dict->num;t++) {
-	if(dict->d[t].name && !strcmp(dict->d[t].name,name))
-	    return t;
+    int num_metadata = swf_GetU30(tag);
+
+    DEBUG printf("%d metadata\n", num_metadata);
+    for(t=0;t<num_metadata;t++) {
+        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++) {
+            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, strdup(value));
+        }
+        array_append(file->metadata, entry_name, items);
     }
-    return -1;
 }
-int dict_find2(dict_t*dict, const char*name, void*data)
+
+void swf_CopyData(TAG*to, TAG*from, int len)
 {
-    if(!name)
-	name = "";
-    int t;
-    for(t=0;t<dict->num;t++) {
-	if(dict->d[t].name && !strcmp(dict->d[t].name,name) && dict->d[t].data == data)
-	    return t;
-    }
-    return -1;
+    unsigned char*data = malloc(len);
+    swf_GetBlock(from, data, len);
+    swf_SetBlock(to, data, len);
+    free(data);
 }
-int dict_update(dict_t*dict, const char*name, void*data) {
-    int pos = dict_find(dict, name);
-    if(pos>=0) {
-	dict->d[pos].data = data;
-	return pos;
-    }
-    return dict_append(dict, name, data);
+
+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;
 }
-int dict_append_if_new(dict_t*dict, const char*name, void*data) {
-    int pos = dict_find(dict, name);
-    if(pos>=0)
-	return pos;
-    return dict_append(dict, name, data);
+
+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);
+
+    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;
 }
-int dict_append_if_new2(dict_t*dict, const char*name, void*data) {
-    int pos = dict_find2(dict, name, data);
-    if(pos>=0)
-	return pos;
-    return dict_append(dict, name, data);
+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));
 }
 
-typedef struct _commonlist {
-    void*entry;
-    struct _commonlist*next;
-    struct _commonlist*last[0];
-} commonlist_t;
-
-int list_length(void*_list)
+void abc_class_sealed(abc_class_t*c)
 {
-    commonlist_t*l = (commonlist_t*)_list;
-    int n=0;
-    while(l) {
-        l = l->next;
-        n++;
-    }
-    return n;
+    c->flags |= CLASS_SEALED;
+}
+void abc_class_final(abc_class_t*c)
+{
+    c->flags |= CLASS_FINAL;
+}
+void abc_class_interface(abc_class_t*c)
+{
+    c->flags |= CLASS_INTERFACE;
+}
+void abc_class_protectedNS(abc_class_t*c, char*namespace)
+{
+    c->protectedNS = namespace_new_protected(namespace);
+    c->flags |= CLASS_PROTECTED_NS;
+}
+void abc_class_add_interface(abc_class_t*c, multiname_t*interface)
+{
+    list_append(c->interfaces, multiname_clone(interface));
 }
-void list_append(void*_list, void*entry)
+char*abc_class_fullname(abc_class_t*cls)
 {
-    commonlist_t**list = (commonlist_t**)_list;
-    commonlist_t* n = 0;
-    if(!*list) {
-        n = malloc(sizeof(commonlist_t)+sizeof(commonlist_t*));
-        *list = n;
-    } else {
-        n = malloc(sizeof(commonlist_t));
-        (*list)->last[0]->next = n;
+    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++]='.';
     }
-    n->next = 0;
-    n->entry = entry;
-    (*list)->last[0] = n;
+    memcpy(fullname+l1, name, l2+1);
+    return fullname;
 }
 
-int swf_GetU30(TAG*tag)
+void abc_method_init(abc_method_t*m, abc_file_t*file, multiname_t*returntype, char body)
 {
-    U32 shift = 0;
-    U32 s = 0;
-    while(1) {
-	U8 b = swf_GetU8(tag);
-	s|=(b&127)<<shift;
-	shift+=7;
-	if(!(b&128))
-	    break;
+    /* construct method object */
+    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;
     }
-    return s;
+}
+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;
 }
 
-int swf_GetS30(TAG*tag)
+abc_method_t* abc_class_getconstructor(abc_class_t*cls, multiname_t*returntype)
 {
-    U32 shift = 0;
-    U32 s = 0;
-    while(1) {
-	U8 b = swf_GetU8(tag);
-	s|=(b&127)<<shift;
-	shift+=7;
-	if(!(b&128)) {
-            if(b&64) {
-                s|=0xffffffff<<shift;
-            }
-	    break;
-        }
+    if(cls->constructor) {
+        return cls->constructor;
     }
-    return s;
+    abc_method_t* m = abc_method_new(cls->file, returntype, 1);
+    cls->constructor = m;
+    return m;
 }
 
-double swf_GetD64(TAG*tag)
+abc_method_t* abc_class_getstaticconstructor(abc_class_t*cls, multiname_t*returntype)
 {
-    double value = *(double*)&tag->data[tag->pos];
-    swf_GetU32(tag);
-    swf_GetU32(tag);
-    return value;
+    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;
 }
 
-
-typedef struct _opcode
+trait_t*trait_new(int type, multiname_t*name, int data1, int data2, constant_t*v)
 {
-    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);
-int abc_RegisterProtectedNameSpace(abc_file_t*file, const char*name);
-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);
-
+    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->data1 = data1;
+    trait->data2 = data2;
+    trait->value = v;
+    return trait;
+}
 
-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", "m"},
-{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", ""},
-};
-
-int swf_GetU24(TAG*tag)
+trait_t*trait_new_member(trait_list_t**traits, multiname_t*type, multiname_t*name,constant_t*v)
 {
-    int b1 = swf_GetU8(tag);
-    int b2 = swf_GetU8(tag);
-    int b3 = swf_GetU8(tag);
-    return b3<<16|b2<<8|b1;
+    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;
 }
-int swf_GetS24(TAG*tag)
+trait_t*trait_new_method(trait_list_t**traits, multiname_t*name, abc_method_t*m)
 {
-    int b1 = swf_GetU8(tag);
-    int b2 = swf_GetU8(tag);
-    int b3 = swf_GetU8(tag);
-    if(b3&0x80) {
-        return -1-((b3<<16|b2<<8|b1)^0xffffff);
-    } else {
-        return b3<<16|b2<<8|b1;
-    }
+    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;
 }
-static int parse_code(TAG*tag, int len, abc_file_t*pool, char*prefix)
+
+abc_method_t* abc_class_method(abc_class_t*cls, multiname_t*returntype, multiname_t*name)
 {
-    int end=tag->pos+len;
-    while(tag->pos<end) {
-	U8 opcode = swf_GetU8(tag);
-	int t;
-	char found = 0;
-	for(t=0;t<sizeof(opcodes)/sizeof(opcodes[0]);t++) {
-	    if(opcodes[t].opcode == opcode) {
-		printf("%s%s ", prefix, opcodes[t].name);
-		char*p = opcodes[t].params;
-		char first = 1;
-		while(*p) {
-		    if(!first)
-			printf(", ");
-		    if(*p == 'n') {
-			int n = swf_GetU30(tag);
-			printf("%d params", n);
-		    } else if(*p == '2') {
-			const char* m = dict_getstr(pool->multinames, swf_GetU30(tag));
-			printf("%s", m);
-		    } else if(*p == 'm') {
-			int n = swf_GetU30(tag);
-			printf("[method%d]", n);
-		    } else if(*p == 'c') {
-			int n = swf_GetU30(tag);
-                        abc_class_t*cls = (abc_class_t*)dict_getdata(pool->classes, n);
-			printf("[classinfo%d %s]", n, cls->classname);
-		    } else if(*p == 'i') {
-			int n = swf_GetU30(tag);
-			printf("[methodbody%d]", n);
-		    } else if(*p == 'u') {
-			int n = swf_GetU30(tag);
-			printf("%d", n);
-		    } else if(*p == 'b') {
-			int b = swf_GetU8(tag);
-			printf("%02x", b);
-		    } else if(*p == 'j') {
-			printf("%d", swf_GetS24(tag));
-		    } else if(*p == 's') {
-			const char*s = dict_getstr(pool->strings, swf_GetU30(tag));
-			printf("\"%s\"", s);
-		    } else if(*p == 'S') {
-                        swf_GetU24(tag); //default
-			int num = swf_GetU30(tag)+1;
-                        int t;
-                        for(t=0;t<num;t++) 
-                            swf_GetU24(tag);
-		    } else {
-                        printf("Can't parse opcode param type \"%c\"\n", *p);
-                        return 0;
-                    }
-		    p++;
-		    first = 0;
-		}
-		found = 1;
-		break;
-	    }
-	}
-	if(!found) {
-	    printf("Can't parse opcode %02x\n", opcode);
-	    return 0;
-	}
-	printf("\n");
-    }
-    if(tag->pos!=end) {
-	printf("Read beyond end of ABC Bytecode\n");
-	return 0;
-    }
-    return 1;
+    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;
 }
 
-static char* access2str(int type)
+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)
 {
-    if(type==0x08) return "";
-    else if(type==0x16) return "package";
-    else if(type==0x17) return "packageinternal";
-    else if(type==0x18) return "protected";
-    else if(type==0x19) return "explicit";
-    else if(type==0x1A) return "staticprotected";
-    else if(type==0x05) return "private";
-    else return "undefined";
+    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;
 }
 
 
-char* multiname_to_string(abc_multiname_t*m)
+trait_t* traits_find_slotid(trait_list_t*traits, int slotid)
 {
-    char*mname = 0;
-    if(m->type==0x07 || m->type==0x0d) {
-        mname = malloc(strlen(m->ns->name)+strlen(m->name)+32);
-        sprintf(mname, "<%s>\0", access2str(m->ns->access));
-        strcat(mname, m->ns->name);
-        strcat(mname, "::");
-        strcat(mname, m->name);
-    } else if(m->type==0x0f || m->type==0x10) {
-        mname = strdup(m->name);
-    } else if(m->type==0x11 || m->type==0x12) {
-        mname = strdup("");
-    } else if(m->type==0x09 || m->type==0x0e) {
-        mname = malloc(strlen(m->namespace_set_name)+strlen(m->name)+16);
-        strcpy(mname, m->namespace_set_name);
-        strcat(mname, "::");
-        strcat(mname, m->name);
-    } else if(m->type==0x1b || m->type==0x1c) {
-        mname = strdup(m->namespace_set_name);
+    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 mname;
+    return t;
 }
 
-
-static void dump_traits(const char*prefix, dict_t*traits, abc_file_t*pool);
-
-static char* params_to_string(abc_multiname_list_t*list)
+void abc_method_body_addClassTrait(abc_method_body_t*code, char*multiname, int slotid, abc_class_t*cls)
 {
-    abc_multiname_list_t*l;
-    int n;
-
-    l = list;
-    n = 0;
-    while(list) {
-        n++;list=list->next;
-    }
+    abc_file_t*file = code->file;
+    multiname_t*m = multiname_fromstring(multiname);
+    trait_t*trait = trait_new(TRAIT_CLASS, m, slotid, 0, 0);
+    trait->cls = cls;
+    list_append(code->traits, trait);
+}
 
-    char**names = (char**)malloc(sizeof(char*)*n);
-    
-    l = list;
-    n = 0;
-    int size = 0;
-    while(list) {
-        names[n] = multiname_to_string(list->abc_multiname);
-        size += strlen(names[n]) + 2;
-        n++;list=list->next;
-    }
+/* 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;
+}
 
-    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;
+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 dump_method(const char*prefix, const char*type, const char*name, int nr, abc_file_t*pool)
+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(nr >= pool->methods->num) {
-	printf("Invalid method number: %d\n", nr);
-	return;
-    }
-    abc_method_t*m = (abc_method_t*)dict_getdata(pool->methods, nr);
+    if(methods_seen)
+        dict_put(methods_seen, m, 0);
 
-    const char*return_type = "";
+    char*return_type = 0;
     if(m->return_type)
-        return_type = multiname_to_string(m->return_type);
+        return_type = multiname_tostring(m->return_type);
+    else
+        return_type = strdup("*");
 
-    char*paramstr = params_to_string(m->parameters);
+    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));
 
-    printf("%s%s %s %s=%s %s\n", prefix, type, return_type, name, m->name, paramstr);
+    free(return_type);return_type=0;
 
-    abc_method_body_t*c = (abc_method_body_t*)dict_getdata(pool->method_bodies, m->method_body_index);
+    abc_method_body_t*c = m->body;
+    if(!c) {
+        return;
+    }
     
-    printf("%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);
+    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");
+
 
-    swf_SetTagPos(c->tag, 0);
     char prefix2[80];
     sprintf(prefix2, "%s    ", prefix);
     if(c->traits)
-        dump_traits(prefix, c->traits, pool);
-    printf("%s{\n", prefix);
-    parse_code(c->tag, c->tag->len, pool,prefix2);
-    printf("%s}\n\n", prefix);
+        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);
 }
 
-//#define DEBUG
-#define DEBUG if(0)
-
-static void parse_metadata(TAG*tag, abc_file_t*pool)
+static void traits_free(trait_list_t*traits) 
 {
-    int t;
-    int num_metadata = swf_GetU30(tag);
-    DEBUG printf("%d metadata\n");
-    for(t=0;t<num_metadata;t++) {
-        const char*name = dict_getstr(pool->strings, swf_GetU30(tag));
-        int num = swf_GetU30(tag);
-        int s;
-        DEBUG printf("  %s\n", name);
-        for(s=0;s<num;s++) {
-            const char*key = dict_getstr(pool->strings, swf_GetU30(tag));
-            const char*value = dict_getstr(pool->strings, swf_GetU30(tag));
-            DEBUG printf("    %s=%s\n", key, value);
+    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);
 }
 
-#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 dict_t* traits_parse(TAG*tag, abc_file_t*pool)
+static trait_list_t* traits_parse(TAG*tag, pool_t*pool, abc_file_t*file)
 {
     int num_traits = swf_GetU30(tag);
-    dict_t*traits = dict_new();
+    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++) {
-	abc_trait_t*trait = malloc(sizeof(abc_trait_t));
-	memset(trait, 0, sizeof(abc_trait_t));
-	dict_append(traits, 0, trait);
-	trait->name_index = swf_GetU30(tag);
-	const char*name = dict_getstr(pool->multinames, trait->name_index);
-	U8 kind = trait->type = swf_GetU8(tag);
+        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 == 1 || kind == 2 || kind == 3) { // method / getter / setter
+	if(kind == TRAIT_METHOD || kind == TRAIT_GETTER || kind == TRAIT_SETTER) { // method / getter / setter
 	    trait->disp_id = swf_GetU30(tag);
-	    trait->nr = 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 == 5) { // function
+	} else if(kind == TRAIT_FUNCTION) { // function
 	    trait->slot_id =  swf_GetU30(tag);
-	    trait->nr = swf_GetU30(tag);
-	} else if(kind == 4) { // class
+	    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 = swf_GetU30(tag);
-	    DEBUG printf("  class %s %d %d\n", name, trait->slot_id, trait->cls);
-	} else if(kind == 0 || kind == 6) { // 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->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);
-	    const char*type_name = dict_getstr(pool->multinames, swf_GetU30(tag));
-	    trait->vindex = swf_GetU30(tag);
-	    if(trait->vindex) {
-		trait->vkind = swf_GetU8(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 (vindex=%d)\n", name, trait->slot_id, type_name, trait->vindex);
+	    DEBUG printf("  slot %s %d %s (%s)\n", name, trait->slot_id, trait->type_name->name, constant_tostring(trait->value));
 	} else {
-	    printf("    can't parse trait type %d\n", kind);
-	    return 0;
+	    fprintf(stderr, "Can't parse trait type %d\n", kind);
 	}
         if(attributes&0x40) {
             int num = swf_GetU30(tag);
@@ -648,394 +490,247 @@ static dict_t* traits_parse(TAG*tag, abc_file_t*pool)
     return traits;
 }
 
-static void dump_traits(const char*prefix, dict_t*traits, abc_file_t*pool)
+void traits_skip(TAG*tag)
 {
-    int num_traits = traits->num;
+    int num_traits = swf_GetU30(tag);
     int t;
     for(t=0;t<num_traits;t++) {
-	abc_trait_t*trait = (abc_trait_t*)dict_getdata(traits, t);
-	const char*name = dict_getstr(pool->multinames, trait->name_index);
-	U8 kind = trait->type;
+        swf_GetU30(tag);
+	U8 kind = swf_GetU8(tag);
         U8 attributes = kind&0xf0;
         kind&=0x0f;
-	if(kind == TRAIT_METHOD) {
-	    dump_method(prefix, "method", name, trait->nr, pool);
-	} else if(kind == TRAIT_GETTER) {
-	    dump_method(prefix, "getter", name, trait->nr, pool);
-        } else if(kind == TRAIT_SETTER) {
-	    dump_method(prefix, "setter", name, trait->nr, pool);
-	} else if(kind == TRAIT_FUNCTION) { // function
-	    dump_method(prefix, "function", name, trait->nr, pool);
-	} else if(kind == TRAIT_CLASS) { // class
-            abc_class_t*cls = (abc_class_t*)dict_getdata(pool->classes, trait->cls);
-            if(!cls) {
-	        printf("%sslot %d: class %s=class%d %d\n", prefix, trait->slot_id, name, trait->cls);
-            } else {
-	        printf("%sslot %d: class %s=%s\n", prefix, trait->slot_id, name, cls->classname);
-            }
-	} else if(kind == TRAIT_SLOT || kind == TRAIT_CONST) { // slot, const
-	    int slot_id = trait->slot_id;
-	    const char*type_name = dict_getstr(pool->multinames, trait->type_index);
-	    printf("%sslot %s %d %s (vindex=%d)\n", prefix, name, trait->slot_id, type_name, trait->vindex);
-	} else {
-	    printf("    can't dump trait type %d\n", kind);
+        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);
-    swf_GetBlock(from, data, len);
-    swf_SetBlock(to, data, len);
-    free(data);
-}
 
-abc_file_t*abc_file_new()
+static void traits_write(pool_t*pool, TAG*tag, trait_list_t*traits)
 {
-    abc_file_t*f = malloc(sizeof(abc_file_t));
-    memset(f, 0, sizeof(abc_file_t));
+    if(!traits) {
+        swf_SetU30(tag, 0);
+        return;
+    }
+    swf_SetU30(tag, list_length(traits));
+    int s;
 
-    f->ints = dict_new();
-    dict_append(f->ints, 0, (void*)(ptroff_t)0);
-    f->uints = dict_new();
-    dict_append(f->uints, 0, (void*)(ptroff_t)0);
-    f->floats = dict_new();
-    dict_append(f->floats, 0, 0);
-    f->strings = dict_new();
-    dict_append(f->strings, "--<UNDEFINED_STRING>--", 0);
-    f->namespaces = dict_new();
-    dict_append(f->namespaces, "--<UNDEFINED_NAMESPACE>--", 0);
-    f->namespace_sets = dict_new();
-    dict_append(f->namespace_sets, "--<UNDEFINED_NSSET>--", 0);
-    f->sets = dict_new();
-    dict_append(f->sets, "--<UNDEFINED_SET>--", 0);
-    f->multinames = dict_new();
-    dict_append(f->multinames, "--<UNDEFINED_MULTINAME>--", 0);
-
-    // abc_file
-
-    f->methods = dict_new();
-    f->classes = dict_new();
-    f->scripts = dict_new();
-    f->method_bodies = dict_new();
+    while(traits) {
+	trait_t*trait = traits->trait;
 
-    return f;
-}
+	swf_SetU30(tag, pool_register_multiname(pool, trait->name));
+	swf_SetU8(tag, trait->kind|trait->attributes);
 
-static abc_namespace_t* namespace_new(U8 access, const char*name)
-{
-    abc_namespace_t*ns = malloc(sizeof(abc_namespace_t));
-    memset(ns, 0, sizeof(abc_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;
-}
-abc_namespace_t* abc_namespace(abc_file_t*file, const char*name) {
-    return namespace_new(0x08, name);
-}
-abc_namespace_t* abc_packagenamespace(abc_file_t*file, const char*name) {
-    return namespace_new(0x16 , name);
-}
-abc_namespace_t* abc_packageinternalnamespace(abc_file_t*file, const char*name) {
-    return namespace_new(0x17, name);
-}
-abc_namespace_t* abc_protectednamespace(abc_file_t*file, const char*name) {
-    return namespace_new(0x18, name);
-}
-abc_namespace_t* abc_explicitnamespace(abc_file_t*file, const char*name) {
-    return namespace_new(0x19, name);
-}
-abc_namespace_t* abc_staticprotectednamespace(abc_file_t*file, const char*name) {
-    return namespace_new(0x1a, name);
-}
-abc_namespace_t* abc_privatenamespace(abc_file_t*file, const char*name) {
-    return namespace_new(0x05, name);
-}
+	swf_SetU30(tag, trait->data1);
 
-static int multiname_index(abc_file_t*pool, const char*name2) 
-{
-    if(!name2)
-	name2 = "::";
-    int pos = dict_find(pool->multinames, name2);
-    if(pos>=0)
-	return pos;
-
-    char*n = strdup(name2);
-    char*p = strstr(n, "::");
-    char*namespace=0,*name=0;
-    if(!p) {
-        if(strchr(n, ':')) {
-            fprintf(stderr, "Error: single ':' in name\n");
-        }
-	namespace = "";
-	name = n;
-    } else {
-	*p = 0;
-	namespace = n;
-	name = p+2;
-        if(strchr(namespace, ':')) {
-            fprintf(stderr, "Error: single ':' in namespace\n");
+        if(trait->kind == TRAIT_CLASS) {
+            swf_SetU30(tag, trait->cls->index);
+        } else if(trait->kind == TRAIT_GETTER ||
+                  trait->kind == TRAIT_SETTER ||
+                  trait->kind == TRAIT_METHOD) {
+            swf_SetU30(tag, trait->method->index);
+        } 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(strchr(name, ':')) {
-            fprintf(stderr, "Error: single ':' in qualified name\n");
+
+	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;
     }
-
-    abc_multiname_t*m = malloc(sizeof(abc_multiname_t));
-    memset(m, 0, sizeof(abc_multiname_t));
-
-    m->type = QNAME;
-    m->namespace_set_name = 0;
-    m->ns = namespace_new(0, namespace);
-    m->name = name;
-    return dict_append(pool->multinames, name2, m);
 }
-static abc_multiname_t* multiname_fromstring(abc_file_t*pool, const char*name)
-{
-    int i = multiname_index(pool, name);
-    return (abc_multiname_t*)dict_getdata(pool->multinames, i);
-}
-
-
-#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 = dict_append(pool->classes, 0, c);
-    c->pool = pool;
-    c->classname = strdup(classname);
-    c->superclass = superclass?strdup(superclass):0;
-    c->flags = 0;
-    c->iinit = -1;
-    c->static_constructor_index = -1;
-    c->traits = dict_new();
-    return c;
-}
 
-void abc_class_sealed(abc_class_t*c)
-{
-    c->flags |= CLASS_SEALED;
-}
-void abc_class_final(abc_class_t*c)
-{
-    c->flags |= CLASS_FINAL;
-}
-void abc_class_interface(abc_class_t*c)
+static void traits_dump(FILE*fo, const char*prefix, trait_list_t*traits, abc_file_t*file, dict_t*methods_seen)
 {
-    c->flags |= CLASS_INTERFACE;
-}
-void abc_class_protectedNS(abc_class_t*c, char*namespace)
-{
-    c->protectedNS = 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)
-{
-    /* 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 = dict_append(pool->method_bodies, 0, c);
-    c->tag = swf_InsertTag(0,0);
-    c->pool = pool;
-    c->traits = dict_new();
-
-    /* construct method object */
-    abc_method_t* m = malloc(sizeof(abc_method_t));
-    memset(m, 0, sizeof(abc_method_t));
-    m->index = dict_append(pool->methods, 0, m);
-    if(returntype && strcmp(returntype, "void")) {
-	m->return_type = multiname_fromstring(pool, returntype);
-    } else {
-	m->return_type = 0;
-    }
     int t;
-    for(t=0;t<num_params;t++) {
-	const char*param = va_arg(va, const char*);
-	list_append(&m->parameters, multiname_fromstring(pool, param));
-    }
-
-    /* crosslink the two objects */
-    m->method_body_index = c->index;
-    c->method = m;
-
-    return c;
-}
+    while(traits) {
+	trait_t*trait = traits->trait;
+	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>");
 
-abc_method_body_t* abc_class_constructor(abc_class_t*cls, char*returntype, int num_params, ...) 
-{
-    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->iinit = c->index;
-    return c;
+	if(kind == TRAIT_METHOD) {
+            abc_method_t*m = trait->method;
+	    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, type, "getter", name, m, file, methods_seen);
+        } else if(kind == TRAIT_SETTER) {
+            abc_method_t*m = trait->method;
+	    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, 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=00000000\n", prefix, trait->slot_id, name);
+            } else {
+	        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_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);
+	}
+        free(name);
+        traits=traits->next;
+    }
 }
 
-abc_method_body_t* abc_class_staticconstructor(abc_class_t*cls, char*returntype, int num_params, ...) 
+void* swf_DumpABC(FILE*fo, void*code, char*prefix)
 {
-    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_index = c->index;
-    return c;
-}
+    abc_file_t* file = (abc_file_t*)code;
 
-abc_trait_t*trait_new(int type, int name_index, int data1, int data2, int vindex, int vkind)
-{
-    abc_trait_t*trait = malloc(sizeof(abc_trait_t));
-    memset(trait, 0, sizeof(abc_trait_t));
-    trait->type = type;
-    trait->name_index = name_index;
-    trait->data1 = data1;
-    trait->data2 = data2;
-    trait->vindex = vindex;
-    trait->vkind = vkind;
-    return trait;
-}
+    if(file->name) {
+        fprintf(fo, "%s#\n", prefix);
+        fprintf(fo, "%s#name: %s\n", prefix, file->name);
+        fprintf(fo, "%s#\n", prefix);
+    }
 
-abc_method_body_t* abc_class_method(abc_class_t*cls, char*returntype, char*name, int num_params, ...)
-{
-    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);
-    dict_append(cls->traits, 0, trait_new(TRAIT_METHOD, multiname_index(pool, name), 0, c->method->index, 0, 0));
-    return c;
-}
+    int t;
+    for(t=0;t<file->metadata->num;t++) {
+        const char*entry_name = array_getkey(file->metadata, t);
+        fprintf(fo, "%s#Metadata \"%s\":\n", prefix, entry_name);
+        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, (char*)array_getkey(items, s), (char*)array_getvalue(items,s));
+        }
+        fprintf(fo, "%s#\n", prefix);
+    }
 
-void abc_AddSlot(abc_class_t*cls, char*name, int slot, char*multiname)
-{
-    abc_file_t*pool = cls->pool;
-    int i = multiname_index(pool, name);
-    dict_append(cls->traits, 0, trait_new(TRAIT_SLOT, i, slot, multiname_index(pool, multiname), 0, 0));
-}
+    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];
+        sprintf(prefix2, "%s    ", prefix);
 
-void abc_method_body_addClassTrait(abc_method_body_t*code, char*multiname, int slotid, abc_class_t*cls)
-{
-    abc_file_t*pool = code->pool;
-    int i = multiname_index(pool, multiname);
-    abc_trait_t*trait = trait_new(TRAIT_CLASS, i, slotid, cls->index, 0, 0);
-    dict_append(code->traits, 0, trait);
-}
+        fprintf(fo, "%s", prefix);
+        if(cls->flags&1) fprintf(fo, "sealed ");
+        if(cls->flags&2) fprintf(fo, "final ");
+        if(cls->flags&4) fprintf(fo, "interface ");
+        if(cls->flags&8) {
+            char*s = namespace_tostring(cls->protectedNS);
+            fprintf(fo, "protectedNS(%s) ", s);
+            free(s);
+        }
 
-/* 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)
-{
-    abc_file_t*pool = script->pool;
-    int i = multiname_index(pool, multiname);
-    abc_trait_t*trait = trait_new(TRAIT_CLASS, i, slotid, cls->index, 0, 0);
-    dict_append(script->traits, 0, trait);
-}
+        char*classname = multiname_tostring(cls->classname);
+	fprintf(fo, "class %s", classname);
+        free(classname);
+        if(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_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);
 
-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 = dict_new();
-    s->pool = pool;
-    dict_append(pool->scripts, 0, s);
-    va_end(va);
-    return s;
-}
+        dict_put(methods_seen, cls->static_constructor, 0);
+        dict_put(methods_seen, cls->constructor, 0);
 
-void swf_SetU30(TAG*tag, U32 u)
-{
-    do {
-	swf_SetU8(tag, (u&~0x7f?0x80:0) | (u&0x7F));
-	u>>=7;
-    } while(u);
-}
-void swf_SetU30String(TAG*tag, const char*str)
-{
-    int l = strlen(str);
-    swf_SetU30(tag, l);
-    swf_SetBlock(tag, (void*)str, l);
-}
+        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);
+	
+        char*n = multiname_tostring(cls->classname);
+        if(cls->constructor)
+	    dump_method(fo, prefix2, "", "constructor", n, cls->constructor, file, methods_seen);
+        free(n);
+	traits_dump(fo, prefix2,cls->traits, file, methods_seen);
+
+	if(cls->asset) {
+	    swf_DumpAsset(fo, cls->asset, prefix2);
+	}
 
-static void write_traits(abc_file_t*pool, TAG*tag, dict_t*traits)
-{
-    if(!traits) {
-        swf_SetU30(tag, 0);
-        return;
+        fprintf(fo, "%s}\n", prefix);
     }
-    swf_SetU30(tag, traits->num);
-    int s;
+    fprintf(fo, "%s\n", prefix);
 
-    for(s=0;s<traits->num;s++) {
-	abc_trait_t*trait = (abc_trait_t*)dict_getdata(traits, s);
-	swf_SetU30(tag, trait->name_index);
-	swf_SetU8(tag, trait->type);
-	swf_SetU30(tag, trait->data1);
-	swf_SetU30(tag, trait->data2);
-	if(trait->type == 0) { //slot
-	    swf_SetU30(tag, trait->vindex);
-	    if(trait->vindex) {
-		swf_SetU8(tag, trait->vkind);
-	    }
-	}
+    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, methods_seen);
+        traits_dump(fo, prefix, s->traits, file, methods_seen);
     }
-}
-
-int register_multiname(abc_file_t*pool, abc_multiname_t*n)
-{
-    if(!n)
-        return 0;
-    /* FIXME: might create duplicates */
-    return dict_append_if_new2(pool->multinames, n->name, n);
-}
-
-int register_namespace(abc_file_t*pool, abc_namespace_t*ns)
-{
-    /* FIXME: might create duplicates */
-    return dict_append_if_new2(pool->namespaces, ns->name, ns);
-}
+    
+    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);
 
-static inline abc_multiname_t*multiname_lookup(abc_file_t*pool, int i)
-{
-    return (abc_multiname_t*)dict_getdata(pool->multinames, i);
+    return file;
 }
 
 void* swf_ReadABC(TAG*tag)
 {
-    abc_file_t* pool = abc_file_new();
+    abc_file_t* file = abc_file_new();
+    pool_t*pool = pool_new();
 
     swf_SetTagPos(tag, 0);
     int t;
@@ -1043,179 +738,72 @@ void* swf_ReadABC(TAG*tag)
         U32 abcflags = swf_GetU32(tag);
         DEBUG printf("flags=%08x\n", abcflags);
         char*name= swf_GetString(tag);
-        if(*name)
-            printf("#name: %s\n", name);
+        file->name = (name&&name[0])?strdup(name):0;
     }
     U32 version = swf_GetU32(tag);
     if(version!=0x002e0010) {
         fprintf(stderr, "Warning: unknown AVM2 version %08x\n", version);
     }
 
-    int num_ints = swf_GetU30(tag);
-    DEBUG printf("%d ints\n", num_ints);
-    for(t=1;t<num_ints;t++) {
-        S32 v = swf_GetU30(tag);
-        DEBUG printf("int %d) %d\n", t, v);
-        dict_append(pool->ints, 0, (void*)(ptroff_t)v);
-    }
-
-    int num_uints = swf_GetU30(tag);
-    DEBUG printf("%d uints\n", num_uints);
-    for(t=1;t<num_uints;t++) {
-        U32 v = swf_GetS30(tag);
-        DEBUG printf("uint %d) %d\n", t, v);
-        dict_append(pool->uints, 0, (void*)(ptroff_t)v);
-    }
-    
-    int num_floats = swf_GetU30(tag);
-    DEBUG printf("%d floats\n", num_floats);
-    for(t=1;t<num_floats;t++) {
-        double d = swf_GetD64(tag);
-        DEBUG printf("float %d) %f\n", t, d);
-        dict_append(pool->floats, 0, 0);
-    }
-    
-    int num_strings = swf_GetU30(tag);
-    DEBUG printf("%d strings\n", num_strings);
-    for(t=1;t<num_strings;t++) {
-	int len = swf_GetU30(tag);
-	char*s = malloc(len+1);
-	swf_GetBlock(tag, s, len);
-	s[len] = 0;
-	dict_append(pool->strings, s, 0);
-	DEBUG printf("%d) \"%s\"\n", t, pool->strings->d[t].name);
-    }
-    int num_namespaces = swf_GetU30(tag);
-    DEBUG printf("%d namespaces\n", num_namespaces);
-    for(t=1;t<num_namespaces;t++) {
-	U8 type = swf_GetU8(tag);
-	int namenr = swf_GetU30(tag);
-	const char*name = dict_getstr(pool->strings, namenr);
-        abc_namespace_t*ns = malloc(sizeof(abc_namespace_t));
-        memset(ns, 0, sizeof(abc_namespace_t));
-        ns->access = type;
-        ns->name = strdup(name);
-	dict_append(pool->namespaces, name, ns);
-	int w = 0;
-	DEBUG w=1;
-	if(w) {
-	    if(type==0x08) printf("Namespace %s\n", name);
-	    else if(type==0x16) printf("PackageNamespace %s\n", name);
-	    else if(type==0x17) printf("PackageInternalNs %s\n", name);
-	    else if(type==0x18) printf("ProtectedNamespace %s\n", name);
-	    else if(type==0x19) printf("ExplicitNamespace %s\n", name);
-	    else if(type==0x1A) printf("StaticProtectedNs %s\n", name);
-	    else if(type==0x05) printf("PrivateNs %s\n", name);
-	    else {
-		printf("Undefined namespace type\n");
-		return 0;
-	    }
-	}
-    }
-    int num_sets = swf_GetU30(tag);
-    DEBUG printf("%d namespace sets\n", num_sets);
-    for(t=1;t<num_sets;t++) {
-        int count = swf_GetU30(tag);
-        int s;
-        const char**name = malloc(sizeof(const char*)*count);
-        int l = 0;
-        for(s=0;s<count;s++) {
-            int nsnr = swf_GetU30(tag);
-            name[s] = dict_getstr(pool->namespaces, nsnr);
-            l += strlen(name[s])+1;
-        }
-        char*desc = malloc(l+16);
-        strcpy(desc, "{");
-        for(s=0;s<count;s++) {
-            strcat(desc, name[s]);
-            strcat(desc, ",");
-        }
-        strcat(desc, "}");
-        dict_append(pool->namespace_sets, desc, 0);
-        DEBUG printf("set %d) %s\n", t, desc);
-    }
+    pool_read(pool, tag);
 
-    int num_multinames = swf_GetU30(tag);
-    DEBUG printf("%d multinames\n", num_multinames);
-    for(t=1;t<num_multinames;t++) {
-        abc_multiname_t*m = malloc(sizeof(abc_multiname_t));
-        memset(m, 0, sizeof(abc_multiname_t));
-
-	m->type = swf_GetU8(tag);
-
-	if(m->type==0x07 || m->type==0x0d) {
-	    int nr1 = swf_GetU30(tag);
-            m->ns = (abc_namespace_t*)dict_getdata(pool->namespaces, nr1);
-            int name_index = swf_GetU30(tag);
-	    m->name = dict_getstr(pool->strings, name_index);
-	} else if(m->type==0x0f || m->type==0x10) {
-            int name_index = swf_GetU30(tag);
-	    m->name = dict_getstr(pool->strings, name_index);
-	} else if(m->type==0x11 || m->type==0x12) {
-	} else if(m->type==0x09 || m->type==0x0e) {
-            int name_index = swf_GetU30(tag);
-            int namespace_set_index = swf_GetU30(tag);
-	    m->name = dict_getstr(pool->strings, name_index);
-	    m->namespace_set_name = dict_getstr(pool->namespace_sets, namespace_set_index);
-        } else if(m->type==0x1b || m->type==0x1c) {
-            int namespace_set_index = swf_GetU30(tag);
-	    m->namespace_set_name = dict_getstr(pool->namespace_sets, namespace_set_index);
-	} else {
-	    printf("can't parse type %d multinames yet\n", m->type);
-	    return 0;
-	}
-	char*mname = multiname_to_string(m);
-        DEBUG printf("multiname %d) %s\n", t, mname);
-	dict_append(pool->multinames, mname, m);
-	free(mname);
-    }
-    
     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 = multiname_lookup(pool, return_type_index);
-	m->index = t;
+        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);
-            list_append(&m->parameters, multiname_lookup(pool, type_index));
+            
+            /* 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 = dict_getstr(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 */
-            abc_multiname_list_t*l = m->parameters;
+            multiname_list_t*l = m->parameters;
             while(l) {
-	        m->name = dict_getstr(pool->strings, swf_GetU30(tag));
+	        const char*name = pool_lookup_string(pool, swf_GetU30(tag));
                 l = l->next;
             }
 	}
-	dict_append(pool->methods, m->name, m);
+        m->index = array_length(file->methods);
+	array_append(file->methods, NO_KEY, m);
     }
             
-    parse_metadata(tag, pool);
+    parse_metadata(tag, file, pool);
 	
     /* skip classes, and scripts for now, and do the real parsing later */
     int num_classes = swf_GetU30(tag);
@@ -1224,563 +812,536 @@ 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));
-	dict_append(pool->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;
 	int inum = swf_GetU30(tag); //interface count
-        abc_multiname_list_t*list = 0;
+        cls->interfaces = 0;
         for(s=0;s<inum;s++) {
             int interface_index = swf_GetU30(tag);
-            const char*interface = dict_getstr(pool->multinames, interface_index);
-            abc_multiname_t* m = (abc_multiname_t*)dict_getdata(pool->multinames, interface_index);
-            list_append(&list, m);
-            DEBUG printf("  class %d interface: %s\n", t, interface);
+            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);
         }
 
-	cls->iinit = swf_GetU30(tag);
-	cls->traits = traits_parse(tag, pool);
+	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*)dict_getdata(pool->classes, t);
-	cls->static_constructor_index = swf_GetU30(tag); // cinit
-	cls->static_constructor_traits = traits_parse(tag, pool);
+        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);
     }
     int num_scripts = swf_GetU30(tag);
     DEBUG printf("%d scripts\n", num_scripts);
     for(t=0;t<num_scripts;t++) {
 	int init = swf_GetU30(tag);
-	dict_t*traits = traits_parse(tag, pool); //TODO: store
+        traits_skip(tag);
     }
 
     int num_method_bodies = swf_GetU30(tag);
     DEBUG printf("%d method bodies\n", num_method_bodies);
     for(t=0;t<num_method_bodies;t++) {
 	int methodnr = swf_GetU30(tag);
-	if(methodnr >= pool->methods->num) {
+	if(methodnr >= file->methods->num) {
 	    printf("Invalid method number: %d\n", methodnr);
 	    return 0;
 	}
-	abc_method_t*m = (abc_method_t*)dict_getdata(pool->methods, methodnr);
+	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->method_body_index = t;
 
-	c->tag = swf_InsertTag(0,0);
+	c->method = m;
+	m->body = c;
 
-	swf_CopyData(c->tag, tag, code_length);
+        int pos = tag->pos + code_length;
+        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);
         }
-	c->traits = traits_parse(tag, pool);
-	if(!c->traits) {
-	    fprintf(stderr, "Can't parse code traits\n");
-	    return 0;
-	}
-	DEBUG printf("method_body %d) (method %d), %d bytes of code", t, methodnr, code_length);
-	int r,l = code_length>32?32:code_length;
-	for(r=0;r<l;r++) {
-	    DEBUG printf("%02x ", c->tag->data[r]);
-	}
-	DEBUG printf("\n");
+        codelookup_free(codelookup);
+	c->traits = traits_parse(tag, pool, file);
 
-	dict_append(pool->method_bodies, 0, c);
+	DEBUG printf("method_body %d) (method %d), %d bytes of code\n", t, methodnr, code_length);
+
+	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;
     }
 
     swf_SetTagPos(tag, classes_pos);
     for(t=0;t<num_classes;t++) {
-        abc_class_t*cls = (abc_class_t*)dict_getdata(pool->classes, t);
+        abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t);
 
         int classname_index = swf_GetU30(tag);
         int superclass_index = swf_GetU30(tag);
-	cls->classname = dict_getstr(pool->multinames, classname_index);
-	cls->superclass = dict_getstr(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 = dict_getstr(pool->namespaces, ns_index);
+	    cls->protectedNS = namespace_clone(pool_lookup_namespace(pool, ns_index));
 	}
         
-        if(cls->flags&1) printf("sealed ");
-        if(cls->flags&2) printf("final ");
-        if(cls->flags&4) printf("interface ");
-        if(cls->flags&8) {
-            printf("protectedNS<%s> ", cls->protectedNS);
-        }
-
-	printf("class %s", cls->classname);
-        if(cls->superclass && cls->superclass[0]) {
-            printf(" extends %s", cls->superclass);
-            abc_multiname_list_t*ilist = cls->interfaces;
-            if(ilist)
-                printf(" implements");
-            while(ilist) {
-                char*s = multiname_to_string(ilist->abc_multiname);
-                printf(" %d", s);
-                free(s);
-                ilist = ilist->next;
-            }
-            ilist->next;
-            
-        }
-        if(cls->flags&0xf0) 
-            printf("extra flags=%02x\n", cls->flags&0xf0);
-	printf("{\n");
-	
-        dump_method("    ","staticconstructor", "", cls->static_constructor_index, pool);
-        dump_traits("    ", cls->static_constructor_traits, pool);
-	
         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);
         }
-	cls->iinit = swf_GetU30(tag);
-	dump_method("    ","constructor", cls->classname, cls->iinit, pool);
-	cls->traits = traits_parse(tag, pool);
-	if(!cls->traits) {
-	    fprintf(stderr, "Can't parse class traits\n");
-	    return 0;
-	}
-	dump_traits("    ",cls->traits, pool);
-	
-        printf("}\n");
+	int iinit = swf_GetU30(tag);
+        cls->constructor = (abc_method_t*)array_getvalue(file->methods, iinit);
+	cls->traits = traits_parse(tag, pool, file);
     }
     for(t=0;t<num_classes;t++) {
+        abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t);
         /* SKIP */
 	swf_GetU30(tag); // cindex
-	traits_parse(tag, pool); // TODO: free
+	cls->static_traits = traits_parse(tag, pool, file);
     }
     int num_scripts2 = swf_GetU30(tag);
-    printf("\n");
     for(t=0;t<num_scripts2;t++) {
 	int init = swf_GetU30(tag);
-        abc_method_t*m = (abc_method_t*)dict_getdata(pool->methods, init);
+        abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, init);
         
         abc_script_t*s = malloc(sizeof(abc_script_t));
         memset(s, 0, sizeof(abc_script_t));
         s->method = m;
-        s->traits = traits_parse(tag, pool);
-        dict_append(pool->scripts, 0, s);
-        if(!s->traits) {
-	    fprintf(stderr, "Can't parse script traits\n");
-            return 0;
-        }
-        dump_method("","initmethod", "init", init, pool);
-        dump_traits("", s->traits, pool);
+        s->traits = traits_parse(tag, pool, file);
+        array_append(file->scripts, NO_KEY, s);
     }
-    return pool;
+
+    pool_destroy(pool);
+    return file;
 }
 
-void swf_WriteABC(TAG*abctag, void*code)
+static pool_t*writeABC(TAG*abctag, void*code, pool_t*pool)
 {
-    abc_file_t*pool = (abc_file_t*)code;
+    abc_file_t*file = (abc_file_t*)code;
+    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, pool->methods->num);
-    for(t=0;t<pool->methods->num;t++) {
-	abc_method_t*m = (abc_method_t*)dict_getdata(pool->methods, t);
+
+    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);
+        m->index = t;
+    }
+    for(t=0;t<file->classes->num;t++) {
+	abc_class_t*c = (abc_class_t*)array_getvalue(file->classes, t);
+        c->index = t;
+    }
+    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->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;
-        abc_multiname_list_t*l = m->parameters;
-	swf_SetU30(tag, list_length(m->parameters));
-	swf_SetU30(tag, register_multiname(pool, m->return_type));
+        multiname_list_t*l = 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
+	    swf_SetU30(tag, 0);
 	int s;
         while(l) {
-	    swf_SetU30(tag, register_multiname(pool, l->abc_multiname));
+	    swf_SetU30(tag, pool_register_multiname(pool, l->multiname));
             l = l->next;
 	}
-	swf_SetU30(tag, 0); // name
-	swf_SetU8(tag, 0); //flags
-    }
-    
-    swf_SetU30(tag, 0);//metadata
+        if(m->name) {
+	    swf_SetU30(tag, pool_register_string(pool, m->name));
+        } else {
+	    swf_SetU30(tag, 0);
+        }
 
-    swf_SetU30(tag, pool->classes->num);
+        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;
+        }
 
-    for(t=0;t<pool->classes->num;t++) {
-	abc_class_t*c = (abc_class_t*)dict_getdata(pool->classes, t);
+	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;
+            }
+        }
+    }
    
-        int classname_index = multiname_index(pool, c->classname);
-        int superclass_index = multiname_index(pool, c->superclass);
+    /* write metadata */
+    swf_SetU30(tag, file->metadata->num);
+    for(t=0;t<file->metadata->num;t++) {
+        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));
+            int i2 = pool_register_string(pool, array_getvalue(items, s));
+            swf_SetU30(tag, i1);
+            swf_SetU30(tag, i2);
+        }
+    }
+
+    swf_SetU30(tag, file->classes->num);
+    for(t=0;t<file->classes->num;t++) {
+	abc_class_t*c = (abc_class_t*)array_getvalue(file->classes, t);
+   
+        int classname_index = pool_register_multiname(pool, c->classname);
+        int superclass_index = pool_register_multiname(pool, c->superclass);
 
 	swf_SetU30(tag, classname_index);
 	swf_SetU30(tag, superclass_index);
 
 	swf_SetU8(tag, c->flags); // flags
         if(c->flags&0x08) {
-            abc_namespace_t*ns = abc_protectednamespace(pool, c->protectedNS);
-            int ns_index = 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->iinit<0) {
-	    fprintf(stderr, "Error: Class %s has no constructor\n", c->classname);
-	    return;
-	}
-	swf_SetU30(tag, c->iinit);
-	write_traits(pool, tag, c->traits);
+        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);
+
+	traits_write(pool, tag, c->traits);
     }
-    for(t=0;t<pool->classes->num;t++) {
-	abc_class_t*c = (abc_class_t*)dict_getdata(pool->classes, t);
-	if(c->static_constructor_index<0) {
-	    fprintf(stderr, "Error: Class %s has no static constructor\n", c->classname);
-	    return;
-	}
-	swf_SetU30(tag, c->static_constructor_index);
-        write_traits(pool, tag, c->static_constructor_traits);
+    for(t=0;t<file->classes->num;t++) {
+	abc_class_t*c = (abc_class_t*)array_getvalue(file->classes, t);
+	assert(c->static_constructor);
+	swf_SetU30(tag, c->static_constructor->index);
+        
+        traits_write(pool, tag, c->static_traits);
     }
 
-    swf_SetU30(tag, pool->scripts->num);
-    for(t=0;t<pool->scripts->num;t++) {
-	abc_script_t*s = (abc_script_t*)dict_getdata(pool->scripts, t);
+    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, pool->method_bodies->num);
-    for(t=0;t<pool->method_bodies->num;t++) {
-	abc_method_body_t*c = (abc_method_body_t*)dict_getdata(pool->method_bodies, t);
+    swf_SetU30(tag, file->method_bodies->num);
+    for(t=0;t<file->method_bodies->num;t++) {
+	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->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->init_scope_depth);
-	swf_SetU30(tag, c->max_scope_depth);
-	swf_SetU30(tag, c->tag->len);
-	swf_SetBlock(tag, c->tag->data, c->tag->len);
-	swf_SetU30(tag, c->exception_count);
-        write_traits(pool, tag, c->traits);
+	swf_SetU30(tag, c->stats->max_scope_depth+
+                        c->init_scope_depth);
+
+        code_write(tag, c->code, pool, file);
+
+	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);
+    }
+   
+    /* 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 --
     
     tag = abctag;
 
-    for(t=1;t<pool->multinames->num;t++) {
-        abc_multiname_t*m = (abc_multiname_t*)dict_getdata(pool->multinames, t);
-        if(m->ns) {
-            register_namespace(pool, m->ns);
-        }
-        if(m->namespace_set_name) {
-            // FIXME
-        }
-        if(m->name)
-            dict_append_if_new(pool->strings, m->name, 0);
-    }
-    for(t=1;t<pool->namespaces->num;t++) {
-        char*namespace_name = (char*)dict_getstr(pool->namespaces, t);
-        dict_append_if_new(pool->strings, namespace_name, 0);
+    if(tag->id == ST_DOABC) {
+        swf_SetU32(tag, file->flags); // flags
+        swf_SetString(tag, file->name);
     }
 
-    swf_SetU32(tag, 1); // flags
-    swf_SetU8(tag, 0); //classname
-
     swf_SetU16(tag, 0x10); //version
     swf_SetU16(tag, 0x2e);
-
-    swf_SetU30(tag, pool->ints->num>1?pool->ints->num:0);
-    // ...
-    swf_SetU30(tag, pool->uints->num>1?pool->uints->num:0);
-    // ...
-    swf_SetU30(tag, pool->floats->num>1?pool->floats->num:0);
-    // ...
-    swf_SetU30(tag, pool->strings->num>1?pool->strings->num:0);
-    for(t=1;t<pool->strings->num;t++) {
-	swf_SetU30String(tag, dict_getstr(pool->strings, t));
-    }
-    swf_SetU30(tag, pool->namespaces->num>1?pool->namespaces->num:0);
-    for(t=1;t<pool->namespaces->num;t++) {
-	abc_namespace_t*ns= (abc_namespace_t*)dict_getdata(pool->namespaces, t);
-	const char*name = ns->name;
-	int i = dict_find(pool->strings, name);
-	if(i<0) {
-	    fprintf(stderr, "Couldn't find namespace \"%s\" in constant pool\n", name);
-	    return;
-	}
-	swf_SetU8(tag, ns->access);
-	swf_SetU30(tag, i);
-    }
-    swf_SetU30(tag, pool->sets->num>1?pool->sets->num:0);
-    // ...
-
-    swf_SetU30(tag, pool->multinames->num>1?pool->multinames->num:0);
-    // ...
-    for(t=1;t<pool->multinames->num;t++) {
-	abc_multiname_t*m = (abc_multiname_t*)dict_getdata(pool->multinames, t);
-	swf_SetU8(tag, m->type);
-
-        if(m->ns) {
-            assert(m->type==0x07 || m->type==0x0d);
-            /* fixme: might find wrong version */
-	    int i = dict_find2(pool->namespaces, m->ns->name, (void*)(ptroff_t)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);
-        }
-        if(m->namespace_set_name) {
-            assert(m->type==0x09 || m->type==0x0e || m->type==0x1c || m->type==0x1b);
-	    int i = dict_find(pool->namespace_sets, m->namespace_set_name);
-            if(i<0) fprintf(stderr, "internal error: unregistered namespace set\n");
-	    swf_SetU30(tag, i);
-        }
-        if(m->name) {
-            assert(m->type==0x09 || m->type==0x0e || m->type==0x07 || m->type==0x0d || m->type==0x0f || m->type==0x10);
-	    int i = dict_find(pool->strings, m->name);
-            if(i<0) fprintf(stderr, "internal error: unregistered name\n");
-	    swf_SetU30(tag, i);
-        }
-    }
-
+    
+    pool_write(pool, tag);
+    
     swf_SetBlock(tag, tmp->data, tmp->len);
 
     swf_DeleteTag(0, tmp);
+    return pool;
 }
 
-#include "abc_ops.c"
+void swf_WriteABC(TAG*abctag, void*code)
+{
+    pool_t*pool = writeABC(abctag, code, 0);
+    pool_optimize(pool);
+    swf_ResetTag(abctag, abctag->id);
+    writeABC(abctag, code, pool);
+    pool_destroy(pool);
+}
 
-void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events)
+void abc_file_free(abc_file_t*file)
 {
-    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;
+    if(!file)
+        return;
+    int t;
+    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;
     }
 
-    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;
-
-    abc_getlocal_0(c);
-    abc_pushscope(c);
-    abc_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;
-    
-    abc_debugfile(c, "constructor.as");
+    for(t=0;t<file->methods->num;t++) {
+        abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, t);
 
-    abc_getlocal_0(c);
-    abc_pushscope(c);
+        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;
 
-    abc_getlocal_0(c);
-    abc_constructsuper(c,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);file->methods=0;
 
-    abc_getlex(c, "[package]flash.system::Security");
-    abc_pushstring(c, "*");
-    abc_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 */
-                abc_findpropstrict(c,"[package]::addFrameScript");
-                abc_pushbyte(c,frame);
-                abc_getlex(c,framename);
-                abc_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;
-                abc_debugfile(f, "framescript.as");
-                abc_debugline(f, 1);
-                abc_getlocal_0(f);
-                abc_pushscope(f);
-            }
+    for(t=0;t<file->classes->num;t++) {
+        abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t);
+        traits_free(cls->traits);cls->traits=0;
+	traits_free(cls->static_traits);cls->static_traits=0;
 
-            if(tag->id == ST_DEFINEBUTTON || tag->id == ST_DEFINEBUTTON2) {
-                U16 id = swf_GetDefineID(tag);
-                sprintf(buttonname, "::button%d", swf_GetDefineID(tag));
-                abc_getlex(f,buttonname);
-                abc_getlex(f,"flash.events::MouseEvent");
-                abc_getproperty(f, "::CLICK");
-                sprintf(functionname, "::clickbutton%d", swf_GetDefineID(tag));
-                abc_getlex(f,functionname);
-                abc_callpropvoid(f, "::addEventListener" ,2);
-
-                if(stop_each_frame) {
-                    abc_findpropstrict(f, "[package]::stop");
-                    abc_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;
-                abc_getlocal_0(h);
-                abc_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) {
-                        abc_findpropstrict(h,"[package]::gotoAndStop");
-                        abc_pushbyte(h,framenr+1);
-                        abc_callpropvoid(h,"[package]::gotoAndStop", 1);
-                    } else {
-                        char framename[80];
-                        sprintf(framename, "frame%d", framenr);
-                        abc_getlocal_0(h); //this
-                        abc_findpropstrict(h, "[package]flash.events::TextEvent");
-                        abc_pushstring(h, "link");
-                        abc_pushtrue(h);
-                        abc_pushtrue(h);
-                        abc_pushstring(h, framename);
-                        abc_constructprop(h,"[package]flash.events::TextEvent", 4);
-                        abc_callpropvoid(h,"[package]::dispatchEvent", 1);
-                    }
-                } else if(oldaction && oldaction->op == ACTION__GETURL) {
-                    if(!events) {
-                        abc_findpropstrict(h,"flash.net::navigateToURL");
-                        abc_findpropstrict(h,"flash.net::URLRequest");
-                        abc_pushstring(h,oldaction->data); //url
-                        abc_constructprop(h,"flash.net::URLRequest", 1);
-                        abc_callpropvoid(h,"flash.net::navigateToURL", 1);
-                    } else {
-                        abc_getlocal_0(h); //this
-                        abc_findpropstrict(h, "[package]flash.events::TextEvent");
-                        abc_pushstring(h, "link");
-                        abc_pushtrue(h);
-                        abc_pushtrue(h);
-                        abc_pushstring(h,oldaction->data); //url
-                        abc_constructprop(h,"[package]flash.events::TextEvent", 4);
-                        abc_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);
-                }
-                abc_returnvoid(h);
-                swf_ActionFree(oldaction);
-            }
-            if(tag->id == ST_SHOWFRAME) {
-                if(f) {
-                    abc_returnvoid(f);
-                    f = 0;
-                }
-                frame++;
-            }
-            tag = tag->next;
+        if(cls->classname) {
+            multiname_destroy(cls->classname);
         }
-        if(f) {
-            abc_returnvoid(f);
+        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);
     }
-    abc_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");
+    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);s->traits=0;
+        free(s);
+    }
+    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);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;
         }
-        tag = tag->next;
+        list_free(body->exceptions);body->exceptions=0;
+        
+        free(body);
     }
+    array_free(file->method_bodies);file->method_bodies=0;
 
+    if(file->name) {
+        free((void*)file->name);file->name=0;
+    }
 
-    abc_script_t*s = abc_initscript(file, 0, 0);
-    c = (abc_method_body_t*)dict_getdata(file->method_bodies, s->method->method_body_index);
-    c->max_stack = 2;
-    c->local_count = 1;
-    c->init_scope_depth = 1;
-    c->max_scope_depth = 9;
-    abc_getlocal_0(c);
-    abc_pushscope(c);
-    abc_getscopeobject(c, 0);
-    abc_getlex(c,"::Object");
-    abc_pushscope(c);
-    abc_getlex(c,"flash.events::EventDispatcher");
-    abc_pushscope(c);
-    abc_getlex(c,"flash.display::DisplayObject");
-    abc_pushscope(c);
-    abc_getlex(c,"flash.display::InteractiveObject");
-    abc_pushscope(c);
-    abc_getlex(c,"flash.display::DisplayObjectContainer");
-    abc_pushscope(c);
-    abc_getlex(c,"flash.display::Sprite");
-    abc_pushscope(c);
-    abc_getlex(c,"flash.display::MovieClip");
-    abc_pushscope(c);
-    abc_getlex(c,"flash.display::MovieClip");
-    abc_newclass(c,cls);
-    abc_popscope(c);
-    abc_popscope(c);
-    abc_popscope(c);
-    abc_popscope(c);
-    abc_popscope(c);
-    abc_popscope(c);
-    abc_popscope(c);
-    abc_initproperty(c,"rfx::MainTimeline");
-    abc_returnvoid(c);
-
-    //abc_method_body_addClassTrait(c, "rfx:MainTimeline", 1, cls);
-    abc_initscript_addClassTrait(s, "rfx::MainTimeline", 1, cls);
-
-    swf_WriteABC(abctag, file);
+    free(file);
+}
+
+void swf_FreeABC(void*code)
+{
+    abc_file_t*file= (abc_file_t*)code;
+    abc_file_free(file);
 }