X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fabc.h;h=a180f85da3319d0a5aba3f0f1f33bbd4adec4edf;hb=309cfb29215471ef323da96e21d1e2c7c0508be0;hp=57a5c9b3c52f197ce0f52d69afa6460629a97153;hpb=c68811fbe7f54b25f683753c94659bf6e1c83999;p=swftools.git

diff --git a/lib/as3/abc.h b/lib/as3/abc.h
index 57a5c9b..a180f85 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;
     
@@ -112,12 +119,12 @@ struct _abc_class {
     multiname_list_t*interfaces;
 
     abc_method_t*constructor;
-    U8 flags;
+    trait_list_t*traits;
     
     abc_method_t*static_constructor;
-
-    trait_list_t*static_constructor_traits;
-    trait_list_t*traits;
+    trait_list_t*static_traits;
+    
+    U8 flags;
 
     int init_scope_depth; // volatile, might be increased during code verification
     
@@ -132,11 +139,14 @@ 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);
+
 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_slot(abc_class_t*cls, char*name, multiname_t*type);
 
-struct _exception {
+struct _abc_exception {
     code_t*from;
     code_t*to;
     code_t*target;
@@ -160,7 +170,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;