X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fabc.h;h=d58f2d77c4195f0768a52e31831edd655a6b442e;hb=639ac6b9f7a89f10d02c5d9ef41bca3bad4eaf2b;hp=aa11115565e5eafeacbba945885e68a29b61af25;hpb=91367529e4244dd1e652c9c5fe118ef563336ce9;p=swftools.git

diff --git a/lib/as3/abc.h b/lib/as3/abc.h
index aa11115..d58f2d7 100644
--- a/lib/as3/abc.h
+++ b/lib/as3/abc.h
@@ -83,6 +83,10 @@ abc_file_t*abc_file_new();
 #define TRAIT_CLASS 4
 #define TRAIT_FUNCTION 5
 #define TRAIT_CONST 6
+            
+#define TRAIT_ATTR_FINAL 0x10
+#define TRAIT_ATTR_OVERRIDE 0x20
+#define TRAIT_ATTR_METADATA 0x40
 
 
 struct _trait {
@@ -104,6 +108,9 @@ struct _trait {
     constant_t*value;
 };
 
+trait_t*trait_new_method(trait_list_t**traits, multiname_t*name, abc_method_t*m);
+trait_t*trait_new_member(trait_list_t**traits, multiname_t*type, multiname_t*name, constant_t*v);
+
 #define CLASS_SEALED 1
 #define CLASS_FINAL 2
 #define CLASS_INTERFACE 4
@@ -131,6 +138,9 @@ struct _abc_class {
     int index; //filled in during writing
 };
 
+void abc_method_init(abc_method_t*m, abc_file_t*file, multiname_t*returntype, char body);
+abc_method_t* abc_method_new(abc_file_t*file, multiname_t*returntype, char body);
+
 abc_class_t* abc_class_new(abc_file_t*file, multiname_t*classname, multiname_t*superclass);
 abc_class_t* abc_class_new2(abc_file_t*file, char*classname, char*superclass);
 void abc_class_sealed(abc_class_t*c);
@@ -139,12 +149,15 @@ void abc_class_interface(abc_class_t*c);
 void abc_class_protectedNS(abc_class_t*c, char*namespace);
 void abc_class_add_interface(abc_class_t*c, multiname_t*interface);
 
-trait_t* abc_class_find_slotid(abc_class_t*c, int slotid);
+trait_t* traits_find_slotid(trait_list_t*traits, int slotid);
+
+abc_method_t* abc_class_getconstructor(abc_class_t*cls, multiname_t*returntype);
+abc_method_t* abc_class_getstaticconstructor(abc_class_t*cls, multiname_t*returntype);
 
-abc_method_t* abc_class_staticconstructor(abc_class_t*cls, multiname_t*returntype, int num_params, ...);
-abc_method_t* abc_class_constructor(abc_class_t*cls, multiname_t*returntype, int num_params, ...);
-abc_method_t* abc_class_method(abc_class_t*cls, multiname_t*returntype, char*name, int num_params, ...);
-trait_t*           abc_class_slot(abc_class_t*cls, char*name, multiname_t*type);
+abc_method_t* abc_class_method(abc_class_t*cls, multiname_t*returntype, multiname_t*name);
+abc_method_t* abc_class_staticmethod(abc_class_t*cls, multiname_t*returntype, multiname_t*name);
+trait_t*      abc_class_slot(abc_class_t*cls, multiname_t*name, multiname_t*type);
+trait_t*      abc_class_staticslot(abc_class_t*cls, multiname_t*name, multiname_t*type);
 
 struct _abc_exception {
     code_t*from;
@@ -185,7 +198,8 @@ typedef struct _abc_script {
 } abc_script_t;
 
 abc_method_t* abc_nullmethod(abc_file_t*file);
-abc_script_t* abc_initscript(abc_file_t*file, multiname_t*returntype, int num_params, ...);
+abc_script_t* abc_initscript(abc_file_t*file);
+trait_t*abc_initscript_addClassTrait(abc_script_t*script, multiname_t*multiname, abc_class_t*cls);
 
 #define __