X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fas3%2Fabc.h;h=c08482cfca7f35fe5d7f69f48c6a76fb0dd0068b;hb=95373c20bb54780d9b38d1cb3877c8a6303afa49;hp=bc4355b46db5f9d593e057a772bbd0601866acec;hpb=0e36e7af23c9e55097f02f3cac55df6da3f18c9b;p=swftools.git

diff --git a/lib/as3/abc.h b/lib/as3/abc.h
index bc4355b..c08482c 100644
--- a/lib/as3/abc.h
+++ b/lib/as3/abc.h
@@ -32,8 +32,8 @@ DECLARE(abc_method);
 DECLARE(abc_method_body);
 DECLARE(abc_interface);
 DECLARE(abc_class);
-DECLARE(exception);
-DECLARE_LIST(exception);
+DECLARE(abc_exception);
+DECLARE_LIST(abc_exception);
 
 #include "code.h"
 #include "opcodes.h"
@@ -55,6 +55,8 @@ struct _abc_method {
     const char*name;
     U8 flags;
     abc_method_body_t*body;
+
+    trait_t*trait;
     
     int index; //filled in during writing
 };
@@ -102,6 +104,11 @@ struct _trait {
     constant_t*value;
 };
 
+#define CLASS_SEALED 1
+#define CLASS_FINAL 2
+#define CLASS_INTERFACE 4
+#define CLASS_PROTECTED_NS 8
+
 struct _abc_class {
     abc_file_t*file;
     
@@ -132,11 +139,16 @@ 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);
 
-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, ...);
+trait_t* abc_class_find_slotid(abc_class_t*c, int slotid);
+
+abc_method_t* abc_class_constructor(abc_class_t*cls, multiname_t*returntype);
+abc_method_t* abc_class_method(abc_class_t*cls, multiname_t*returntype, multiname_t*name);
+abc_method_t* abc_class_staticconstructor(abc_class_t*cls, multiname_t*returntype);
+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 +172,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;
     
@@ -175,7 +187,7 @@ 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, multiname_t*returntype);
 
 #define __