X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fregistry.h;h=03dc00059bc417a75dea4660f3ee1fd3427fe463;hb=2b4a44df0c63679e7717d0c699b2785b9e5c0b6a;hp=b5769b0d3774e24315f2a420792b1774d69fba63;hpb=fb56342d9ce82d70ea6d5d544ff8df485fee3afc;p=swftools.git

diff --git a/lib/as3/registry.h b/lib/as3/registry.h
index b5769b0..03dc000 100644
--- a/lib/as3/registry.h
+++ b/lib/as3/registry.h
@@ -26,16 +26,38 @@
 
 #include "pool.h"
 
+DECLARE(packageinfo);
 DECLARE(classinfo);
-DECLARE_LIST(classinfo);
 DECLARE(memberinfo);
+DECLARE_LIST(classinfo);
+
+/* member/class flags */
+#define FLAG_PUBLIC 1
+#define FLAG_PROTECTED 2
+#define FLAG_NAMESPACE_ADOBE 4
+#define FLAG_PRIVATE 8
+#define FLAG_PACKAGEINTERNAL 16
+#define FLAG_FINAL 32
+
+/* member flags */
+#define FLAG_STATIC 64
+#define FLAG_OVERRIDE 128
+#define FLAG_NATIVE 256
+
+/* class flags */
+#define FLAG_METHOD 64
+#define FLAG_DYNAMIC 128
 
 struct _classinfo {
     U8 access;
     U8 flags;
     const char*package;
     const char*name;
-    int slot;
+    union {
+        ptroff_t slot;        // slot nr in initscript traits
+        classinfo_t*cls; // specific class of a Class type
+        memberinfo_t*function; //specific function of a Function type
+    };
 
     classinfo_t*superclass;
     dict_t members;
@@ -57,34 +79,38 @@ struct _memberinfo {
         classinfo_t*return_type;
         classinfo_t*type;
     };
+    classinfo_t*parent;
     classinfo_list_t*params;
     int slot;
 };
 
 extern type_t classinfo_type;
-extern type_t function_signature_type;
+extern type_t memberinfo_type;
 
 void registry_init();
         
-classinfo_t* classinfo_register(int access, char*package, char*name, int num_interfaces);
+classinfo_t* classinfo_register(int access, const char*package, const char*name, int num_interfaces);
 memberinfo_t* memberinfo_register(classinfo_t*cls, const char*name, U8 type);
+memberinfo_t* memberinfo_register_global(U8 access, const char*package, const char*name, U8 kind);
 
 // static multinames
 classinfo_t* registry_getanytype();
+classinfo_t* registry_getarrayclass();
 classinfo_t* registry_getobjectclass();
 classinfo_t* registry_getnumberclass();
 classinfo_t* registry_getstringclass();
 classinfo_t* registry_getintclass();
 classinfo_t* registry_getuintclass();
 classinfo_t* registry_getnullclass();
+classinfo_t* registry_getregexpclass();
 classinfo_t* registry_getbooleanclass();
-classinfo_t* registry_getfunctionclass();
 classinfo_t* registry_getMovieClip();
-classinfo_t* registry_getfunctionclass(memberinfo_t*f);
+classinfo_t* memberinfo_asclass(memberinfo_t*f);
 classinfo_t* registry_getclassclass(classinfo_t*a);
 
 classinfo_t* registry_findclass(const char*package, const char*name);
-memberinfo_t* registry_findmember(classinfo_t*cls, const char*name);
+void registry_dumpclasses();
+memberinfo_t* registry_findmember(classinfo_t*cls, const char*name, char superclasses);
 
 void registry_fill_multiname(multiname_t*m, namespace_t*n, classinfo_t*c);
 multiname_t* classinfo_to_multiname(classinfo_t*cls);
@@ -92,6 +118,10 @@ multiname_t* classinfo_to_multiname(classinfo_t*cls);
 char registry_isfunctionclass();
 char registry_isclassclass();
 
+classinfo_t* memberinfo_gettype(memberinfo_t*);
+
+namespace_t flags2namespace(int flags, char*package);
+
 /* convenience functions */
 #define sig2mname(x) classinfo_to_multiname(x)
 #define TYPE_ANY                  registry_getanytype()
@@ -108,8 +138,12 @@ char registry_isclassclass();
 #define TYPE_IS_BOOLEAN(t)((t) == registry_getbooleanclass())
 #define TYPE_STRING               registry_getstringclass()
 #define TYPE_IS_STRING(t) ((t) == registry_getstringclass())
+#define TYPE_REGEXP               registry_getregexpclass()
+#define TYPE_IS_REGEXP(t) ((t) == registry_getregexpclass())
+
+#define TYPE_OBJECT               registry_getobjectclass()
 
-#define TYPE_FUNCTION(f)          registry_getfunctionclass(f)
+#define TYPE_FUNCTION(f)          memberinfo_asclass(f)
 #define TYPE_IS_FUNCTION(t)       registry_isfunctionclass(t)
 
 #define TYPE_CLASS(f)             registry_getclassclass(f)