X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fabc.h;h=a180f85da3319d0a5aba3f0f1f33bbd4adec4edf;hb=f0d1089c6506371456902bfef02776e3da65c204;hp=27a536ddfdd24a39ec50fbb78cd87d3f3cb37341;hpb=9357273f55ebb7fd2e8bb265ab38ae607d8bf91f;p=swftools.git

diff --git a/lib/as3/abc.h b/lib/as3/abc.h
index 27a536d..a180f85 100644
--- a/lib/as3/abc.h
+++ b/lib/as3/abc.h
@@ -28,27 +28,45 @@
 #include "pool.h"
 
 DECLARE(abc_file);
+DECLARE(abc_method);
 DECLARE(abc_method_body);
 DECLARE(abc_interface);
-DECLARE(abc_code);
 DECLARE(abc_class);
+DECLARE(abc_exception);
+DECLARE_LIST(abc_exception);
+
+#include "code.h"
+#include "opcodes.h"
 
 DECLARE(trait);
 
-typedef struct _abc_method {
+
+#define METHOD_NEED_ARGUMENTS 1
+#define METHOD_NEED_ACTIVATION 2
+#define METHOD_NEED_REST 4
+#define METHOD_HAS_OPTIONAL 8
+#define METHOD_SET_DXNS 0x40
+#define METHOD_HAS_PARAM_NAMES 0x80
+
+struct _abc_method {
     multiname_t*return_type;
     multiname_list_t*parameters;
+    constant_list_t*optional_parameters;
     const char*name;
     U8 flags;
     abc_method_body_t*body;
+
+    trait_t*trait;
     
     int index; //filled in during writing
-} abc_method_t;
+};
 
+#define ABCFILE_LAZY 1
 struct _abc_file {
     // abc_file
 
     const char*name;
+    U32 flags;
     array_t*metadata;
     array_t*methods;
     array_t*classes;
@@ -66,6 +84,7 @@ abc_file_t*abc_file_new();
 #define TRAIT_FUNCTION 5
 #define TRAIT_CONST 6
 
+
 struct _trait {
     unsigned char kind;
     unsigned char attributes;
@@ -82,74 +101,91 @@ struct _trait {
         multiname_t*type_name;
         int data2;
     };
-    int vindex;
-    int vkind;
+    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*pool;
+    abc_file_t*file;
     
     multiname_t*classname;
     multiname_t*superclass;
-    const char*protectedNS;
+    namespace_t*protectedNS;
 
     multiname_list_t*interfaces;
 
     abc_method_t*constructor;
-    U8 flags;
+    trait_list_t*traits;
     
     abc_method_t*static_constructor;
+    trait_list_t*static_traits;
+    
+    U8 flags;
 
-    trait_list_t*static_constructor_traits;
-    trait_list_t*traits;
+    int init_scope_depth; // volatile, might be increased during code verification
     
     int index; //filled in during writing
 };
 
-abc_class_t* abc_class_new(abc_file_t*pool, char*classname, char*superclass);
+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);
 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);
+
+trait_t* abc_class_find_slotid(abc_class_t*c, int slotid);
 
-abc_method_body_t* abc_class_staticconstructor(abc_class_t*cls, char*returntype, int num_params, ...);
-abc_method_body_t* abc_class_constructor(abc_class_t*cls, char*returntype, int num_params, ...);
-abc_method_body_t* abc_class_method(abc_class_t*cls, char*returntype, char*name, int num_params, ...);
-
-struct _abc_code {
-    U8 opcode;
-    U8 len;
-    void*params[2];
-    abc_code_t*next;
-    abc_code_t*prev;
-    abc_code_t*parent;
+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 _abc_exception {
+    code_t*from;
+    code_t*to;
+    code_t*target;
+    multiname_t*exc_type;
+    multiname_t*var_name;
 };
 
 struct _abc_method_body {
-    abc_file_t*pool;
+    abc_file_t*file;
     //abc_class_t*cls;
     abc_method_t*method;
-    abc_code_t*code;
-    int max_stack;
-    int local_count;
-    int init_scope_depth;
-    int max_scope_depth;
-    int exception_count;
+    code_t*code;
+
+    struct {
+        //for dumping: filled in during parsing
+        int max_stack;
+        int local_count;
+        int max_scope_depth;
+        int init_scope_depth;
+    } old;
+
+    int init_scope_depth; // volatile, might be increased during code verification
+
+    abc_exception_list_t* exceptions;
+
     trait_list_t*traits;
     
     int index; // filled in during writing
+    codestats_t*stats; //filled in during writing
 };
 
-typedef struct _abc_label {
-} abc_label_t;
-
 typedef struct _abc_script {
     abc_method_t*method;
-    abc_file_t*pool;
+    abc_file_t*file;
     trait_list_t*traits;
 } abc_script_t;
 
-abc_script_t* abc_initscript(abc_file_t*pool, char*returntype, int num_params, ...);
+abc_method_t* abc_nullmethod(abc_file_t*file);
+abc_script_t* abc_initscript(abc_file_t*file, multiname_t*returntype, int num_params, ...);
 
 #define __