X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fas3%2Fabc.h;h=3b6a134e96f6c1f8b4bf083d5e29111c53f220c1;hp=bc4355b46db5f9d593e057a772bbd0601866acec;hb=9ed9a87914fc9a590967d46de404e0f6290b7bb2;hpb=0e36e7af23c9e55097f02f3cac55df6da3f18c9b

diff --git a/lib/as3/abc.h b/lib/as3/abc.h
index bc4355b..3b6a134 100644
--- a/lib/as3/abc.h
+++ b/lib/as3/abc.h
@@ -32,8 +32,11 @@ DECLARE(abc_method);
 DECLARE(abc_method_body);
 DECLARE(abc_interface);
 DECLARE(abc_class);
-DECLARE(exception);
-DECLARE_LIST(exception);
+DECLARE(abc_exception);
+DECLARE(abc_asset);
+DECLARE_LIST(abc_asset);
+DECLARE_LIST(abc_exception);
+DECLARE_LIST(TAG);
 
 #include "code.h"
 #include "opcodes.h"
@@ -55,6 +58,8 @@ struct _abc_method {
     const char*name;
     U8 flags;
     abc_method_body_t*body;
+
+    trait_t*trait;
     
     int index; //filled in during writing
 };
@@ -81,6 +86,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 {
@@ -102,6 +111,14 @@ 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
+#define CLASS_PROTECTED_NS 8
+
 struct _abc_class {
     abc_file_t*file;
     
@@ -119,11 +136,15 @@ struct _abc_class {
     
     U8 flags;
 
+    abc_asset_t*asset; // swf tags needed for this class
+
     int init_scope_depth; // volatile, might be increased during code verification
-    
     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);
@@ -131,12 +152,19 @@ void abc_class_final(abc_class_t*c);
 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);
+char*abc_class_fullname(abc_class_t*cls);
+
+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_body_t* abc_class_staticconstructor(abc_class_t*cls, multiname_t*returntype, int num_params, ...);
-abc_method_body_t* abc_class_constructor(abc_class_t*cls, multiname_t*returntype, int num_params, ...);
-abc_method_body_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_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 _exception {
+struct _abc_exception {
     code_t*from;
     code_t*to;
     code_t*target;
@@ -160,7 +188,7 @@ struct _abc_method_body {
 
     int init_scope_depth; // volatile, might be increased during code verification
 
-    exception_list_t* exceptions;
+    abc_exception_list_t* exceptions;
 
     trait_list_t*traits;
     
@@ -174,8 +202,14 @@ typedef struct _abc_script {
     trait_list_t*traits;
 } abc_script_t;
 
+struct _abc_asset {
+    TAG_list_t*tags;
+    abc_asset_list_t*dependencies;
+};
+
 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 __