X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=lib%2Fas3%2Fabc.h;h=54749f7b04d6946c4d1c32a6c9304e2d0560a09d;hb=7f5afe64a73c106637df5f37f42069817227af95;hp=998f34ac159fb1eee811a4f6bec1efb05827eb22;hpb=f674f67572814639b77ef5337590d719bda36c3e;p=swftools.git

diff --git a/lib/as3/abc.h b/lib/as3/abc.h
index 998f34a..54749f7 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"
@@ -59,10 +59,12 @@ struct _abc_method {
     int index; //filled in during writing
 };
 
+#define ABCFILE_LAZY 1
 struct _abc_file {
     // abc_file
 
     const char*name;
+    U32 flags;
     array_t*metadata;
     array_t*methods;
     array_t*classes;
@@ -110,12 +112,14 @@ 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_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
 };
@@ -128,11 +132,11 @@ 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, ...);
+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, ...);
 
-struct _exception {
+struct _abc_exception {
     code_t*from;
     code_t*to;
     code_t*target;
@@ -146,12 +150,17 @@ struct _abc_method_body {
     abc_method_t*method;
     code_t*code;
 
-    int max_stack;
-    int local_count;
-    int init_scope_depth;
-    int max_scope_depth;
+    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
 
-    exception_list_t* exceptions;
+    abc_exception_list_t* exceptions;
 
     trait_list_t*traits;
     
@@ -166,7 +175,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, char*returntype, int num_params, ...);
+abc_script_t* abc_initscript(abc_file_t*file, multiname_t*returntype, int num_params, ...);
 
 #define __