X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fregistry.h;h=0fb84a30860107b4bac2de6da5eb73666a6426b6;hb=3fb75ef418267cb0f7370d365b3a37b8013fbee9;hp=c3a8b96e194321f16469c776a959537f3b7fbea6;hpb=fd15f7bfa29ae82d7548d438428cf626f846615f;p=swftools.git

diff --git a/lib/as3/registry.h b/lib/as3/registry.h
index c3a8b96..0fb84a3 100644
--- a/lib/as3/registry.h
+++ b/lib/as3/registry.h
@@ -26,51 +26,81 @@
 
 #include "pool.h"
 
-DECLARE(class_signature);
-DECLARE_LIST(class_signature);
-DECLARE(function_signature);
+DECLARE(packageinfo);
+DECLARE(classinfo);
+DECLARE(memberinfo);
+DECLARE_LIST(classinfo);
 
-struct _class_signature {
-    /* this is very similar to a QNAME */
+struct _classinfo {
     U8 access;
+    U8 flags;
     const char*package;
     const char*name;
+    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
+    };
 
-    class_signature_t*superclass;
+    classinfo_t*superclass;
     dict_t members;
-    class_signature_t*interfaces[];
+    classinfo_t*interfaces[];
 };
-char class_signature_equals(class_signature_t*c1, class_signature_t*c2);
-extern type_t class_signature_type;
+char classinfo_equals(classinfo_t*c1, classinfo_t*c2);
 
-struct _function_signature {
+#define MEMBER_SLOT 1
+#define MEMBER_GET 2
+#define MEMBER_SET 4
+#define MEMBER_GETSET 6
+#define MEMBER_METHOD 8
+
+struct _memberinfo {
+    U8 kind;
+    U8 flags;
     const char*name;
-    class_signature_list_t*params;
+    union {
+        classinfo_t*return_type;
+        classinfo_t*type;
+    };
+    classinfo_list_t*params;
+    int slot;
 };
-extern type_t function_signature_type;
+
+extern type_t classinfo_type;
+extern type_t memberinfo_type;
 
 void registry_init();
         
-class_signature_t* class_signature_register(int access, char*package, char*name);
+classinfo_t* classinfo_register(int access, char*package, char*name, int num_interfaces);
+memberinfo_t* memberinfo_register(classinfo_t*cls, const char*name, U8 type);
 
 // static multinames
-class_signature_t* registry_getanytype();
-class_signature_t* registry_getobjectclass();
-class_signature_t* registry_getnumberclass();
-class_signature_t* registry_getstringclass();
-class_signature_t* registry_getintclass();
-class_signature_t* registry_getuintclass();
-class_signature_t* registry_getnullclass();
-class_signature_t* registry_getbooleanclass();
-class_signature_t* registry_getMovieClip();
-
-class_signature_t* registry_findclass(const char*package, const char*name);
-
-void registry_fill_multiname(multiname_t*m, namespace_t*n, class_signature_t*c);
-multiname_t* class_signature_to_multiname(class_signature_t*cls);
+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_getbooleanclass();
+classinfo_t* registry_getMovieClip();
+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_fill_multiname(multiname_t*m, namespace_t*n, classinfo_t*c);
+multiname_t* classinfo_to_multiname(classinfo_t*cls);
+
+char registry_isfunctionclass();
+char registry_isclassclass();
+
+classinfo_t* memberinfo_gettype(memberinfo_t*);
 
 /* convenience functions */
-#define sig2mname(x) class_signature_to_multiname(x)
+#define sig2mname(x) classinfo_to_multiname(x)
 #define TYPE_ANY                  registry_getanytype()
 #define TYPE_IS_ANY(t)    ((t) == registry_getanytype())
 #define TYPE_INT                  registry_getintclass()
@@ -85,6 +115,15 @@ multiname_t* class_signature_to_multiname(class_signature_t*cls);
 #define TYPE_IS_BOOLEAN(t)((t) == registry_getbooleanclass())
 #define TYPE_STRING               registry_getstringclass()
 #define TYPE_IS_STRING(t) ((t) == registry_getstringclass())
+
+#define TYPE_OBJECT               registry_getobjectclass()
+
+#define TYPE_FUNCTION(f)          memberinfo_asclass(f)
+#define TYPE_IS_FUNCTION(t)       registry_isfunctionclass(t)
+
+#define TYPE_CLASS(f)             registry_getclassclass(f)
+#define TYPE_IS_CLASS(t)          registry_isclassclass(t)
+
 #define TYPE_NULL                 registry_getnullclass()
 #define TYPE_IS_NULL(t)   ((t) == registry_getnullclass())