moved opcodes stuff into code.c and opcodes.c

[swftools.git] / lib / as3 / abc.h

diff --git a/lib/as3/abc.h b/lib/as3/abc.h
index fd477c9..a298973 100644 (file)
--- a/lib/as3/abc.h
+++ b/lib/as3/abc.h
@@ -28,14 +28,17 @@
 #include "pool.h"
 
 DECLARE(abc_file);
+DECLARE(abc_method);
 DECLARE(abc_method_body);
 DECLARE(abc_interface);
-DECLARE(abc_code);
 DECLARE(abc_class);
 
+#include "code.h"
+#include "opcodes.h"
+
 DECLARE(trait);
 
-typedef struct _abc_method {
+struct _abc_method {
     multiname_t*return_type;
     multiname_list_t*parameters;
     const char*name;
@@ -43,7 +46,7 @@ typedef struct _abc_method {
     abc_method_body_t*body;
     
     int index; //filled in during writing
-} abc_method_t;
+};
 
 struct _abc_file {
     // abc_file
@@ -58,8 +61,17 @@ struct _abc_file {
 
 abc_file_t*abc_file_new();
 
+#define TRAIT_SLOT 0
+#define TRAIT_METHOD 1
+#define TRAIT_GETTER 2
+#define TRAIT_SETTER 3
+#define TRAIT_CLASS 4
+#define TRAIT_FUNCTION 5
+#define TRAIT_CONST 6
+
 struct _trait {
-    unsigned char type;
+    unsigned char kind;
+    unsigned char attributes;
     multiname_t*name;
 
     union {
@@ -82,7 +94,7 @@ struct _abc_class {
     
     multiname_t*classname;
     multiname_t*superclass;
-    const char*protectedNS;
+    namespace_t*protectedNS;
 
     multiname_list_t*interfaces;
 
@@ -97,34 +109,29 @@ struct _abc_class {
     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*pool, multiname_t*classname, multiname_t*superclass);
+abc_class_t* abc_class_new2(abc_file_t*pool, 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);
 
 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;
-};
-
 struct _abc_method_body {
     abc_file_t*pool;
     //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;
     trait_list_t*traits;
     
@@ -140,6 +147,8 @@ typedef struct _abc_script {
     trait_list_t*traits;
 } abc_script_t;
 
+abc_method_t* abc_nullmethod(abc_file_t*file);
+
 abc_script_t* abc_initscript(abc_file_t*pool, char*returntype, int num_params, ...);
 
 #define __