list_append(c->interfaces, multiname_clone(interface));
}
-static abc_method_t* add_method(abc_file_t*file, abc_class_t*cls, multiname_t*returntype, char body, int num_params, va_list va)
+static abc_method_t* add_method(abc_file_t*file, abc_class_t*cls, multiname_t*returntype, char body)
{
/* construct method object */
NEW(abc_method_t,m);
array_append(file->methods, NO_KEY, m);
m->return_type = returntype;
- int t;
- for(t=0;t<num_params;t++) {
- const char*param = va_arg(va, const char*);
- list_append(m->parameters, multiname_fromstring(param));
- }
-
if(body) {
/* construct code (method body) object */
NEW(abc_method_body_t,c);
return m;
}
-abc_method_t* abc_class_constructor(abc_class_t*cls, multiname_t*returntype, int num_params, ...)
+abc_method_t* abc_class_getconstructor(abc_class_t*cls, multiname_t*returntype)
{
- va_list va;
- va_start(va, num_params);
- abc_method_t* m = add_method(cls->file, cls, returntype, 1, num_params, va);
- va_end(va);
+ if(cls->constructor) {
+ return cls->constructor;
+ }
+ abc_method_t* m = add_method(cls->file, cls, returntype, 1);
cls->constructor = m;
return m;
}
-abc_method_t* abc_class_staticconstructor(abc_class_t*cls, multiname_t*returntype, int num_params, ...)
+abc_method_t* abc_class_getstaticconstructor(abc_class_t*cls, multiname_t*returntype)
{
- va_list va;
- va_start(va, num_params);
- abc_method_t* m = add_method(cls->file, cls, returntype, 1, num_params, va);
- va_end(va);
+ if(cls->static_constructor) {
+ return cls->static_constructor;
+ }
+ abc_method_t* m = add_method(cls->file, cls, returntype, 1);
cls->static_constructor = m;
return m;
}
return trait;
}
-abc_method_t* abc_class_method(abc_class_t*cls, multiname_t*returntype, char*name, int num_params, ...)
+abc_method_t* abc_class_method(abc_class_t*cls, multiname_t*returntype, multiname_t*name)
{
abc_file_t*file = cls->file;
- va_list va;
- va_start(va, num_params);
- abc_method_t* m = add_method(cls->file, cls, returntype, !(cls->flags&CLASS_INTERFACE), num_params, va);
- va_end(va);
- trait_t*t = trait_new_method(multiname_fromstring(name), m);
- m->trait = t;
+ abc_method_t* m = add_method(cls->file, cls, returntype, !(cls->flags&CLASS_INTERFACE));
+ m->trait = trait_new_method(multiname_clone(name), m);
/* start assigning traits at position #1.
Weird things happen when assigning slot 0- slot 0 and 1 seem
to be identical */
- t->slot_id = list_length(cls->traits)+1;
- list_append(cls->traits, t);
+ m->trait->slot_id = list_length(cls->traits)+1;
+ list_append(cls->traits, m->trait);
+ 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 = add_method(cls->file, cls, returntype, !(cls->flags&CLASS_INTERFACE));
+ m->trait = trait_new_method(multiname_clone(name), m);
+ m->trait->slot_id = list_length(cls->static_traits)+1;
+ list_append(cls->static_traits, m->trait);
return m;
}
-trait_t* abc_class_slot(abc_class_t*cls, char*name, multiname_t*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_fromstring(name);
+ multiname_t*m_name = multiname_clone(name);
multiname_t*m_type = multiname_clone(type);
trait_t*t = trait_new_member(m_type, m_name, 0);
t->slot_id = list_length(cls->traits)+1;
list_append(cls->traits, t);
return t;
}
+trait_t* abc_class_staticslot(abc_class_t*cls, multiname_t*name, multiname_t*type)
+{
+ abc_file_t*file = cls->file;
+ multiname_t*m_name = multiname_clone(name);
+ multiname_t*m_type = multiname_clone(type);
+ trait_t*t = trait_new_member(m_type, m_name, 0);
+ t->slot_id = list_length(cls->static_traits)+1;
+ list_append(cls->static_traits, t);
+ return t;
+}
+
trait_t* abc_class_find_slotid(abc_class_t*cls, int slotid)
{
return slotid;
}
-abc_script_t* abc_initscript(abc_file_t*file, multiname_t*returntype, int num_params, ...)
+abc_script_t* abc_initscript(abc_file_t*file, multiname_t*returntype)
{
- va_list va;
- va_start(va, num_params);
- abc_method_t*m = add_method(file, 0, returntype, 1, num_params, va);
+ abc_method_t*m = add_method(file, 0, returntype, 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);
- va_end(va);
return s;
}
static void traits_dump(FILE*fo, const char*prefix, trait_list_t*traits, abc_file_t*file);
-static void dump_method(FILE*fo, const char*prefix, const char*type, const char*name, abc_method_t*m, abc_file_t*file)
+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)
{
char*return_type = 0;
if(m->return_type)
else
return_type = strdup("void");
char*paramstr = params_tostring(m->parameters);
- fprintf(fo, "%s%s %s %s=%s %s (%d params, %d optional)\n", prefix, type, return_type, name, m->name, paramstr,
+ fprintf(fo, "%s%s%s %s %s=%s %s (%d params, %d optional)\n", prefix, attr, type, return_type, name, m->name, paramstr,
list_length(m->parameters),
list_length(m->optional_parameters)
);
char*name = multiname_tostring(trait->name);
U8 kind = trait->kind;
U8 attributes = trait->attributes;
+
+ char a = attributes & (TRAIT_ATTR_OVERRIDE|TRAIT_ATTR_FINAL);
+ char* type = "";
+ if(a==TRAIT_ATTR_FINAL)
+ type = "final ";
+ else if(a==TRAIT_ATTR_OVERRIDE)
+ type = "override ";
+ else if(a==(TRAIT_ATTR_OVERRIDE|TRAIT_ATTR_FINAL))
+ type = "final override ";
+
+ if(attributes&TRAIT_ATTR_METADATA)
+ fprintf(fo, "<metadata>");
+
if(kind == TRAIT_METHOD) {
abc_method_t*m = trait->method;
- dump_method(fo, prefix, "method", name, m, file);
+ dump_method(fo, prefix, type, "method", name, m, file);
} else if(kind == TRAIT_GETTER) {
abc_method_t*m = trait->method;
- dump_method(fo, prefix, "getter", name, m, file);
+ dump_method(fo, prefix, type, "getter", name, m, file);
} else if(kind == TRAIT_SETTER) {
abc_method_t*m = trait->method;
- dump_method(fo, prefix, "setter", name, m, file);
+ dump_method(fo, prefix, type, "setter", name, m, file);
} else if(kind == TRAIT_FUNCTION) { // function
abc_method_t*m = trait->method;
- dump_method(fo, prefix, "function", name, m, file);
+ dump_method(fo, prefix, type, "function", name, m, file);
} else if(kind == TRAIT_CLASS) { // class
abc_class_t*cls = trait->cls;
if(!cls) {
fprintf(fo, "%s{\n", prefix);
if(cls->static_constructor)
- dump_method(fo, prefix2,"staticconstructor", "", cls->static_constructor, file);
+ dump_method(fo, prefix2, "", "staticconstructor", "", cls->static_constructor, file);
traits_dump(fo, prefix2, cls->static_traits, file);
char*n = multiname_tostring(cls->classname);
if(cls->constructor)
- dump_method(fo, prefix2, "constructor", n, cls->constructor, file);
+ dump_method(fo, prefix2, "", "constructor", n, cls->constructor, file);
free(n);
traits_dump(fo, prefix2,cls->traits, file);
fprintf(fo, "%s}\n", prefix);
for(t=0;t<file->scripts->num;t++) {
abc_script_t*s = (abc_script_t*)array_getvalue(file->scripts, t);
- dump_method(fo, prefix,"initmethod", "init", s->method, file);
+ dump_method(fo, prefix, "", "initmethod", "init", s->method, file);
traits_dump(fo, prefix, s->traits, file);
}
return file;
swf_SetU16(tag, 0);
swf_SetString(tag, "rfx.MainTimeline");
- c = abc_class_staticconstructor(cls, 0, 0)->body;
+ c = abc_class_getstaticconstructor(cls, 0)->body;
c->old.max_stack = 1;
c->old.local_count = 1;
c->old.init_scope_depth = 9;
__ pushscope(c);
__ returnvoid(c);
- c = abc_class_constructor(cls, 0, 0)->body;
+ c = abc_class_getconstructor(cls, 0)->body;
c->old.max_stack = 3;
c->old.local_count = 1;
c->old.init_scope_depth = 10;
__ getlex(c,framename);
__ callpropvoid(c,"[package]::addFrameScript",2);
- f = abc_class_method(cls, 0, framename, 0)->body;
+ f = abc_class_method(cls, 0, multiname_fromstring(framename))->body;
f->old.max_stack = 3;
f->old.local_count = 1;
f->old.init_scope_depth = 10;
needs_framescript = 1;
abc_method_body_t*h =
- abc_class_method(cls, 0, functionname, 1, "flash.events::MouseEvent")->body;
+ abc_class_method(cls, 0, multiname_fromstring(functionname))->body;
+ list_append(h->method->parameters, multiname_fromstring("flash.events::MouseEvent"));
+
h->old.max_stack = 6;
h->old.local_count = 2;
h->old.init_scope_depth = 10;
char buttonname[80];
sprintf(buttonname, "::button%d", swf_GetDefineID(tag));
multiname_t*s = multiname_fromstring(buttonname);
- abc_class_slot(cls, buttonname, s);
+ abc_class_slot(cls, multiname_fromstring(buttonname), s);
}
tag = tag->next;
}
- abc_script_t*s = abc_initscript(file, 0, 0);
+ abc_script_t*s = abc_initscript(file, 0);
c = s->method->body;
c->old.max_stack = 2;
c->old.local_count = 1;