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);
+ if(file)
+ array_append(file->classes, NO_KEY, c);
c->file = file;
c->classname = multiname_clone(classname);
/* notice: traits of a method (body) belonging to an init script
and traits of the init script are *not* the same thing */
-int abc_initscript_addClassTrait(abc_script_t*script, multiname_t*multiname, abc_class_t*cls)
+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);
trait_t*trait = trait_new(TRAIT_CLASS, m, slotid, 0, 0);
trait->cls = cls;
list_append(script->traits, trait);
- return slotid;
+ return trait;
}
abc_script_t* abc_initscript(abc_file_t*file)
if(m->return_type)
return_type = multiname_tostring(m->return_type);
else
- return_type = strdup("void");
+ return_type = strdup("*");
fprintf(fo, "%s", prefix);
fprintf(fo, "%s %s ", attr, type);
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");
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!
traits_write(pool, tag, s->traits);
}