renamed abc_AddSlot to abc_class_slot
[swftools.git] / lib / as3 / abc.c
index 5b2f91c..5c9b87b 100644 (file)
@@ -40,7 +40,7 @@ int abc_RegisterPrivateNameSpace(abc_file_t*file, const char*name);
 /* TODO: switch to a datastructure with just values */
 #define NO_KEY ""
 
-static char* params_to_string(multiname_list_t*list)
+static char* params_tostring(multiname_list_t*list)
 {
     multiname_list_t*l;
     int n = list_length(list);
@@ -50,7 +50,7 @@ static char* params_to_string(multiname_list_t*list)
     n = 0;
     int size = 0;
     while(l) {
-        names[n] = multiname_to_string(l->multiname);
+        names[n] = multiname_tostring(l->multiname);
         size += strlen(names[n]) + 2;
         n++;l=l->next;
     }
@@ -124,23 +124,19 @@ abc_file_t*abc_file_new()
     f->classes = array_new();
     f->scripts = array_new();
     f->method_bodies = array_new();
+    f->flags = ABCFILE_LAZY;
 
     return f;
 }
 
-#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*file, multiname_t*classname, multiname_t*superclass) {
     
     NEW(abc_class_t,c);
     array_append(file->classes, NO_KEY, c);
 
     c->file = file;
-    c->classname = classname;
-    c->superclass = superclass;
+    c->classname = multiname_clone(classname);
+    c->superclass = multiname_clone(superclass);
     c->flags = 0;
     c->constructor = 0;
     c->static_constructor = 0;
@@ -171,10 +167,10 @@ void abc_class_protectedNS(abc_class_t*c, char*namespace)
 }
 void abc_class_add_interface(abc_class_t*c, multiname_t*interface)
 {
-    list_append(c->interfaces, interface);
+    list_append(c->interfaces, multiname_clone(interface));
 }
 
-abc_method_body_t* add_method(abc_file_t*file, abc_class_t*cls, char*returntype, int num_params, va_list va)
+abc_method_body_t* add_method(abc_file_t*file, abc_class_t*cls, multiname_t*returntype, int num_params, va_list va)
 {
     /* construct code (method body) object */
     NEW(abc_method_body_t,c);
@@ -187,11 +183,8 @@ abc_method_body_t* add_method(abc_file_t*file, abc_class_t*cls, char*returntype,
     NEW(abc_method_t,m);
     array_append(file->methods, NO_KEY, m);
 
-    if(returntype && strcmp(returntype, "void")) {
-       m->return_type = multiname_fromstring(returntype);
-    } else {
-       m->return_type = 0;
-    }
+    m->return_type = returntype;
+
     int t;
     for(t=0;t<num_params;t++) {
        const char*param = va_arg(va, const char*);
@@ -205,7 +198,7 @@ abc_method_body_t* add_method(abc_file_t*file, abc_class_t*cls, char*returntype,
     return c;
 }
 
-abc_method_body_t* abc_class_constructor(abc_class_t*cls, char*returntype, int num_params, ...) 
+abc_method_body_t* abc_class_constructor(abc_class_t*cls, multiname_t*returntype, int num_params, ...) 
 {
     va_list va;
     va_start(va, num_params);
@@ -215,7 +208,7 @@ abc_method_body_t* abc_class_constructor(abc_class_t*cls, char*returntype, int n
     return c;
 }
 
-abc_method_body_t* abc_class_staticconstructor(abc_class_t*cls, char*returntype, int num_params, ...) 
+abc_method_body_t* abc_class_staticconstructor(abc_class_t*cls, multiname_t*returntype, int num_params, ...) 
 {
     va_list va;
     va_start(va, num_params);
@@ -260,7 +253,7 @@ trait_t*trait_new_method(multiname_t*name, abc_method_t*m)
     return trait;
 }
 
-abc_method_body_t* abc_class_method(abc_class_t*cls, char*returntype, char*name, int num_params, ...)
+abc_method_body_t* abc_class_method(abc_class_t*cls, multiname_t*returntype, char*name, int num_params, ...)
 {
     abc_file_t*file = cls->file;
     va_list va;
@@ -271,14 +264,15 @@ abc_method_body_t* abc_class_method(abc_class_t*cls, char*returntype, char*name,
     return c;
 }
 
-void abc_AddSlot(abc_class_t*cls, char*name, int slot, char*type)
+trait_t* abc_class_slot(abc_class_t*cls, char*name, multiname_t*type)
 {
     abc_file_t*file = cls->file;
     multiname_t*m_name = multiname_fromstring(name);
-    multiname_t*m_type = multiname_fromstring(type);
+    multiname_t*m_type = type;
     trait_t*t = trait_new_member(m_type, m_name, 0);
     t->slot_id = list_length(cls->traits);
     list_append(cls->traits, t);
+    return t;
 }
 
 void abc_method_body_addClassTrait(abc_method_body_t*code, char*multiname, int slotid, abc_class_t*cls)
@@ -303,7 +297,7 @@ int abc_initscript_addClassTrait(abc_script_t*script, multiname_t*multiname, abc
     return slotid;
 }
 
-abc_script_t* abc_initscript(abc_file_t*file, char*returntype, int num_params, ...) 
+abc_script_t* abc_initscript(abc_file_t*file, multiname_t*returntype, int num_params, ...) 
 {
     va_list va;
     va_start(va, num_params);
@@ -323,10 +317,10 @@ static void dump_method(FILE*fo, const char*prefix, const char*type, const char*
 {
     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("void");
-    char*paramstr = params_to_string(m->parameters);
+    char*paramstr = params_tostring(m->parameters);
     fprintf(fo, "%s%s %s %s=%s %s (%d params)\n", prefix, type, return_type, name, m->name, paramstr, list_length(m->parameters));
     free(paramstr);paramstr=0;
     free(return_type);return_type=0;
@@ -336,7 +330,21 @@ static void dump_method(FILE*fo, const char*prefix, const char*type, const char*
         return;
     }
     
-    fprintf(fo, "%s[stack:%d locals:%d scope:%d-%d flags:%02x]\n", prefix, c->max_stack, c->local_count, c->init_scope_depth, c->max_scope_depth, c->method->flags);
+    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, "]\n");
+
 
     char prefix2[80];
     sprintf(prefix2, "%s    ", prefix);
@@ -365,6 +373,12 @@ static void traits_free(trait_list_t*traits)
     }
     list_free(traits);
 }
+            
+static char trait_is_method(trait_t*trait)
+{
+    return (trait->kind == TRAIT_METHOD || trait->kind == TRAIT_GETTER || 
+            trait->kind == TRAIT_SETTER || trait->kind == TRAIT_FUNCTION);
+}
 
 static trait_list_t* traits_parse(TAG*tag, pool_t*pool, abc_file_t*file)
 {
@@ -382,7 +396,7 @@ static trait_list_t* traits_parse(TAG*tag, pool_t*pool, abc_file_t*file)
        trait->name = multiname_clone(pool_lookup_multiname(pool, swf_GetU30(tag))); // always a QName (ns,name)
 
        const char*name = 0;
-       DEBUG name = multiname_to_string(trait->name);
+       DEBUG name = multiname_tostring(trait->name);
        U8 kind = swf_GetU8(tag);
         U8 attributes = kind&0xf0;
         kind&=0x0f;
@@ -412,7 +426,7 @@ static trait_list_t* traits_parse(TAG*tag, pool_t*pool, abc_file_t*file)
                int vkind = swf_GetU8(tag);
                 trait->value = constant_fromindex(pool, vindex, vkind);
            }
-           DEBUG printf("  slot %s %d %s (%s)\n", name, trait->slot_id, trait->type_name->name, constant_to_string(trait->value));
+           DEBUG printf("  slot %s %d %s (%s)\n", name, trait->slot_id, trait->type_name->name, constant_tostring(trait->value));
        } else {
            fprintf(stderr, "Can't parse trait type %d\n", kind);
        }
@@ -503,7 +517,7 @@ static void traits_dump(FILE*fo, const char*prefix, trait_list_t*traits, abc_fil
     int t;
     while(traits) {
        trait_t*trait = traits->trait;
-       char*name = multiname_to_string(trait->name);
+       char*name = multiname_tostring(trait->name);
        U8 kind = trait->kind;
         U8 attributes = trait->attributes;
        if(kind == TRAIT_METHOD) {
@@ -527,8 +541,8 @@ static void traits_dump(FILE*fo, const char*prefix, trait_list_t*traits, abc_fil
             }
        } else if(kind == TRAIT_SLOT || kind == TRAIT_CONST) { // slot, const
            int slot_id = trait->slot_id;
-           char*type_name = multiname_to_string(trait->type_name);
-            char*value = constant_to_string(trait->value);
+           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 ":"", type_name, name, 
                     value?"=":"", value);
@@ -574,23 +588,23 @@ void* swf_DumpABC(FILE*fo, void*code, char*prefix)
         if(cls->flags&2) fprintf(fo, "final ");
         if(cls->flags&4) fprintf(fo, "interface ");
         if(cls->flags&8) {
-            char*s = namespace_to_string(cls->protectedNS);
+            char*s = namespace_tostring(cls->protectedNS);
             fprintf(fo, "protectedNS(%s) ", s);
             free(s);
         }
 
-        char*classname = multiname_to_string(cls->classname);
+        char*classname = multiname_tostring(cls->classname);
        fprintf(fo, "class %s", classname);
         free(classname);
         if(cls->superclass) {
-            char*supername = multiname_to_string(cls->superclass);
+            char*supername = multiname_tostring(cls->superclass);
             fprintf(fo, " extends %s", supername);
             free(supername);
             multiname_list_t*ilist = cls->interfaces;
             if(ilist)
                 fprintf(fo, " implements");
             while(ilist) {
-                char*s = multiname_to_string(ilist->multiname);
+                char*s = multiname_tostring(ilist->multiname);
                 fprintf(fo, " %s", s);
                 free(s);
                 ilist = ilist->next;
@@ -603,14 +617,15 @@ void* swf_DumpABC(FILE*fo, void*code, char*prefix)
 
         if(cls->static_constructor)
             dump_method(fo, prefix2,"staticconstructor", "", cls->static_constructor, file);
-        traits_dump(fo, prefix2, cls->static_constructor_traits, file);
+        traits_dump(fo, prefix2, cls->static_traits, file);
        
-        char*n = multiname_to_string(cls->classname);
+        char*n = multiname_tostring(cls->classname);
         if(cls->constructor)
            dump_method(fo, prefix2, "constructor", n, cls->constructor, file);
         free(n);
        traits_dump(fo, prefix2,cls->traits, file);
         fprintf(fo, "%s}\n", prefix);
+
     }
     fprintf(fo, "%s\n", prefix);
 
@@ -670,7 +685,7 @@ void* swf_ReadABC(TAG*tag)
 
        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 %s flags=%02x\n", t, m->name, params_tostring(m->parameters), m->flags);
 
         if(m->flags&0x08) {
             /* TODO optional parameters */
@@ -705,13 +720,13 @@ void* swf_ReadABC(TAG*tag)
        abc_class_t*cls = malloc(sizeof(abc_class_t));
        memset(cls, 0, sizeof(abc_class_t));
        
-        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;
@@ -724,12 +739,14 @@ void* swf_ReadABC(TAG*tag)
             DEBUG printf("  class %d interface: %s\n", t, m->name);
         }
 
-       swf_GetU30(tag); //iinit
+       int iinit = swf_GetU30(tag); //iinit
+        DEBUG printf("--iinit-->%d\n", iinit);
        traits_skip(tag);
     }
     for(t=0;t<num_classes;t++) {
         abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t);
        int cinit = swf_GetU30(tag);
+        DEBUG printf("--cinit(%d)-->%d\n", t, cinit);
         cls->static_constructor = (abc_method_t*)array_getvalue(file->methods, cinit);
         traits_skip(tag);
     }
@@ -751,10 +768,12 @@ void* swf_ReadABC(TAG*tag)
        abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, methodnr);
        abc_method_body_t*c = malloc(sizeof(abc_method_body_t));
        memset(c, 0, sizeof(abc_method_body_t));
-       c->max_stack = swf_GetU30(tag);
-       c->local_count = swf_GetU30(tag);
-       c->init_scope_depth = swf_GetU30(tag);
-       c->max_scope_depth = swf_GetU30(tag);
+       c->old.max_stack = swf_GetU30(tag);
+       c->old.local_count = swf_GetU30(tag);
+       c->old.init_scope_depth = swf_GetU30(tag);
+       c->old.max_scope_depth = swf_GetU30(tag);
+
+        c->init_scope_depth = c->old.init_scope_depth;
        int code_length = swf_GetU30(tag);
 
        c->method = m;
@@ -769,7 +788,7 @@ void* swf_ReadABC(TAG*tag)
         int s;
         c->exceptions = list_new();
         for(s=0;s<exception_count;s++) {
-            exception_t*e = malloc(sizeof(exception_t));
+            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));
@@ -784,7 +803,7 @@ void* swf_ReadABC(TAG*tag)
         codelookup_free(codelookup);
        c->traits = traits_parse(tag, pool, file);
 
-       DEBUG printf("method_body %d) (method %d), %d bytes of code", t, methodnr, code_length);
+       DEBUG printf("method_body %d) (method %d), %d bytes of code\n", t, methodnr, code_length);
 
        array_append(file->method_bodies, NO_KEY, c);
     }
@@ -811,7 +830,7 @@ void* swf_ReadABC(TAG*tag)
         int num_interfaces = swf_GetU30(tag); //interface count
         int s;
         for(s=0;s<num_interfaces;s++) {
-            swf_GetU30(tag); // multiname index TODO
+            swf_GetU30(tag);
         }
        int iinit = swf_GetU30(tag);
         cls->constructor = (abc_method_t*)array_getvalue(file->methods, iinit);
@@ -821,7 +840,7 @@ void* swf_ReadABC(TAG*tag)
         abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t);
         /* SKIP */
        swf_GetU30(tag); // cindex
-       cls->static_constructor_traits = traits_parse(tag, pool, file);
+       cls->static_traits = traits_parse(tag, pool, file);
     }
     int num_scripts2 = swf_GetU30(tag);
     for(t=0;t<num_scripts2;t++) {
@@ -833,10 +852,6 @@ void* swf_ReadABC(TAG*tag)
         s->method = m;
         s->traits = traits_parse(tag, pool, file);
         array_append(file->scripts, NO_KEY, s);
-        if(!s->traits) {
-           fprintf(stderr, "Can't parse script traits\n");
-            return 0;
-        }
     }
 
     pool_destroy(pool);
@@ -851,24 +866,32 @@ void swf_WriteABC(TAG*abctag, void*code)
     TAG*tmp = swf_InsertTag(0,0);
     TAG*tag = tmp;
     int t;
-   
-    char need_null_method=0;
+  
+    /* 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 || !c->static_constructor) {
-            need_null_method=1;
-            break;
+        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);
+                body->method = m; m->body = body;
+                __ returnvoid(body);
+                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;
+            __ returnvoid(body);
+            c->static_constructor = m;
         }
     }
 
-    abc_method_t*nullmethod = 0;
-    if(need_null_method) {
-        nullmethod = malloc(sizeof(abc_method_t));
-        memset(nullmethod, 0, sizeof(abc_method_t));
-        /*TODO: might be more efficient to have this at the beginning */
-        array_append(file->methods, NO_KEY, nullmethod);
-    }
-   
+
     swf_SetU30(tag, file->methods->num);
     /* enumerate classes, methods and method bodies */
     for(t=0;t<file->methods->num;t++) {
@@ -890,6 +913,43 @@ void swf_WriteABC(TAG*abctag, void*code)
         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;
@@ -969,21 +1029,17 @@ void swf_WriteABC(TAG*abctag, void*code)
             interface = interface->next;
         }
 
-       if(!c->constructor) {
-            swf_SetU30(tag, nullmethod->index);
-       } else {
-           swf_SetU30(tag, c->constructor->index);
-        }
+       assert(c->constructor);
+       swf_SetU30(tag, c->constructor->index);
+
        traits_write(pool, tag, c->traits);
     }
     for(t=0;t<file->classes->num;t++) {
        abc_class_t*c = (abc_class_t*)array_getvalue(file->classes, t);
-       if(!c->static_constructor) {
-            swf_SetU30(tag, nullmethod->index);
-       } else {
-           swf_SetU30(tag, c->static_constructor->index);
-        }
-        traits_write(pool, tag, c->static_constructor_traits);
+       assert(c->static_constructor);
+       swf_SetU30(tag, c->static_constructor->index);
+        
+        traits_write(pool, tag, c->static_traits);
     }
 
     swf_SetU30(tag, file->scripts->num);
@@ -999,10 +1055,10 @@ void swf_WriteABC(TAG*abctag, void*code)
        abc_method_t*m = c->method;
        swf_SetU30(tag, m->index);
 
-       //swf_SetU30(tag, c->max_stack);
-       //swf_SetU30(tag, c->local_count);
-       //swf_SetU30(tag, c->init_scope_depth);
-       //swf_SetU30(tag, c->max_scope_depth);
+       //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);
         if(list_length(c->method->parameters)+1 <= c->stats->local_count)
@@ -1016,14 +1072,14 @@ void swf_WriteABC(TAG*abctag, void*code)
         code_write(tag, c->code, pool, file);
 
        swf_SetU30(tag, list_length(c->exceptions));
-        exception_list_t*l = 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->exception->from->pos);
-            swf_SetU30(tag, l->exception->to->pos);
-            swf_SetU30(tag, l->exception->target->pos);
-            swf_SetU30(tag, pool_register_multiname(pool, l->exception->exc_type));
-            swf_SetU30(tag, pool_register_multiname(pool, l->exception->var_name));
+            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;
         }
 
@@ -1042,7 +1098,7 @@ void swf_WriteABC(TAG*abctag, void*code)
     tag = abctag;
 
     if(tag->id == ST_DOABC) {
-        swf_SetU32(tag, 1); // flags
+        swf_SetU32(tag, file->flags); // flags
         swf_SetString(tag, file->name);
     }
 
@@ -1060,15 +1116,17 @@ void swf_WriteABC(TAG*abctag, void*code)
 void abc_file_free(abc_file_t*file)
 {
     int t;
-    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));
+    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(items);
+        array_free(file->metadata);file->metadata=0;
     }
-    array_free(file->metadata);
 
     for(t=0;t<file->methods->num;t++) {
         abc_method_t*m = (abc_method_t*)array_getvalue(file->methods, t);
@@ -1095,12 +1153,12 @@ void abc_file_free(abc_file_t*file)
         }
         free(m);
     }
-    array_free(file->methods);
+    array_free(file->methods);file->methods=0;
 
     for(t=0;t<file->classes->num;t++) {
         abc_class_t*cls = (abc_class_t*)array_getvalue(file->classes, t);
         traits_free(cls->traits);cls->traits=0;
-       traits_free(cls->static_constructor_traits);cls->static_constructor_traits=0;
+       traits_free(cls->static_traits);cls->static_traits=0;
 
         if(cls->classname) {
             multiname_destroy(cls->classname);
@@ -1121,23 +1179,23 @@ void abc_file_free(abc_file_t*file)
         }
         free(cls);
     }
-    array_free(file->classes);
+    array_free(file->classes);file->classes=0;
 
     for(t=0;t<file->scripts->num;t++) {
         abc_script_t*s = (abc_script_t*)array_getvalue(file->scripts, t);
         traits_free(s->traits);s->traits=0;
         free(s);
     }
-    array_free(file->scripts);
+    array_free(file->scripts);file->scripts=0;
 
     for(t=0;t<file->method_bodies->num;t++) {
         abc_method_body_t*body = (abc_method_body_t*)array_getvalue(file->method_bodies, t);
         code_free(body->code);body->code=0;
        traits_free(body->traits);body->traits=0;
 
-        exception_list_t*ee = body->exceptions;
+        abc_exception_list_t*ee = body->exceptions;
         while(ee) {
-            exception_t*e=ee->exception;ee->exception=0;
+            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;
@@ -1148,7 +1206,7 @@ void abc_file_free(abc_file_t*file)
         
         free(body);
     }
-    array_free(file->method_bodies);
+    array_free(file->method_bodies);file->method_bodies=0;
 
     if(file->name) {
         free((void*)file->name);file->name=0;
@@ -1190,20 +1248,20 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events)
     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;
+    c->old.max_stack = 1;
+    c->old.local_count = 1;
+    c->old.init_scope_depth = 9;
+    c->old.max_scope_depth = 10;
 
     __ getlocal_0(c);
     __ pushscope(c);
     __ returnvoid(c);
 
     c = abc_class_constructor(cls, 0, 0);
-    c->max_stack = 3;
-    c->local_count = 1;
-    c->init_scope_depth = 10;
-    c->max_scope_depth = 11;
+    c->old.max_stack = 3;
+    c->old.local_count = 1;
+    c->old.init_scope_depth = 10;
+    c->old.max_scope_depth = 11;
     
     debugfile(c, "constructor.as");
 
@@ -1236,14 +1294,18 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events)
                 __ 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;
+                f->old.max_stack = 3;
+                f->old.local_count = 1;
+                f->old.init_scope_depth = 10;
+                f->old.max_scope_depth = 11;
                 __ debugfile(f, "framescript.as");
                 __ debugline(f, 1);
                 __ getlocal_0(f);
                 __ pushscope(f);
+                if(stop_each_frame) {
+                    __ findpropstrict(f, "[package]::stop");
+                    __ callpropvoid(f, "[package]::stop", 0);
+                }
             }
 
             if(tag->id == ST_DEFINEBUTTON || tag->id == ST_DEFINEBUTTON2) {
@@ -1256,18 +1318,14 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events)
                 __ getlex(f,functionname);
                 __ callpropvoid(f, "::addEventListener" ,2);
 
-                if(stop_each_frame) {
-                    __ findpropstrict(f, "[package]::stop");
-                    __ callpropvoid(f, "[package]::stop", 0);
-                }
                 needs_framescript = 1;
 
                 abc_method_body_t*h =
-                    abc_class_method(cls, "::void", functionname, 1, "flash.events::MouseEvent");
-                h->max_stack = 6;
-                h->local_count = 2;
-                h->init_scope_depth = 10;
-                h->max_scope_depth = 11;
+                    abc_class_method(cls, 0, functionname, 1, "flash.events::MouseEvent");
+                h->old.max_stack = 6;
+                h->old.local_count = 2;
+                h->old.init_scope_depth = 10;
+                h->old.max_scope_depth = 11;
                 __ getlocal_0(h);
                 __ pushscope(h);
 
@@ -1337,7 +1395,8 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events)
         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");
+            multiname_t*s = multiname_fromstring(buttonname);
+            abc_class_slot(cls, buttonname, s);
         }
         tag = tag->next;
     }
@@ -1345,10 +1404,10 @@ void swf_AddButtonLinks(SWF*swf, char stop_each_frame, char events)
 
     abc_script_t*s = abc_initscript(file, 0, 0);
     c = s->method->body;
-    c->max_stack = 2;
-    c->local_count = 1;
-    c->init_scope_depth = 1;
-    c->max_scope_depth = 9;
+    c->old.max_stack = 2;
+    c->old.local_count = 1;
+    c->old.init_scope_depth = 1;
+    c->old.max_scope_depth = 9;
 
     __ getlocal_0(c);
     __ pushscope(c);