X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fregistry.h;h=c51bf2a4a8aaaae2dadf7f625cd3c7759bd35c04;hb=b8aa0577aae67db4da5221459102202febc5c103;hp=930d32051286302ae15c33887d22dc662ae7d9c7;hpb=27c4a9c78e7a4a1a0736fd29e718a2a19ab16022;p=swftools.git

diff --git a/lib/as3/registry.h b/lib/as3/registry.h
index 930d320..c51bf2a 100644
--- a/lib/as3/registry.h
+++ b/lib/as3/registry.h
@@ -26,90 +26,176 @@
 
 #include "pool.h"
 
+DECLARE(slotinfo);
 DECLARE(classinfo);
-DECLARE_LIST(classinfo);
 DECLARE(memberinfo);
-
+DECLARE(methodinfo);
+DECLARE(unresolvedinfo);
+DECLARE(varinfo);
+DECLARE_LIST(classinfo);
+DECLARE_LIST(slotinfo);
+
+/* member/class flags */
+#define FLAG_FINAL 1
+#define FLAG_BUILTIN 128
+
+/* member flags */
+#define FLAG_STATIC 2
+#define FLAG_OVERRIDE 8
+#define FLAG_NATIVE 16
+#define FLAG_CONST 32
+
+/* class flags */
+#define FLAG_DYNAMIC 8
+#define FLAG_INTERFACE 16
+
+#define INFOTYPE_VAR 1
+#define INFOTYPE_METHOD 2
+#define INFOTYPE_CLASS 3
+#define INFOTYPE_UNRESOLVED 4
+#define SUBTYPE_GET 1
+#define SUBTYPE_SET 2
+#define SUBTYPE_GETSET 3
+
+struct _slotinfo {
+    U8 kind,subtype,flags,access;
+    const char*package;
+    const char*name;
+    int slot;
+};
+struct _unresolvedinfo {
+    U8 kind,subtype,flags,access;
+    const char*package;
+    const char*name;
+    int slot;
+    namespace_list_t*nsset;
+};
 struct _classinfo {
-    /* this is very similar to a QNAME */
-    U8 access;
-    U8 flags;
+    U8 kind,subtype,flags,access;
     const char*package;
     const char*name;
-
+    int slot;
     classinfo_t*superclass;
     dict_t members;
+    void*data; //TODO: get rid of this- parser.y should pass type/value/code triples around
     classinfo_t*interfaces[];
 };
-char classinfo_equals(classinfo_t*c1, classinfo_t*c2);
-
-#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 kind,subtype,flags,access;
+    const char*package;
     const char*name;
+    int slot;
     union {
         classinfo_t*return_type;
         classinfo_t*type;
     };
+    classinfo_t*parent;
+};
+struct _methodinfo /*extends memberinfo*/ {
+    U8 kind,subtype,flags,access;
+    const char*package;
+    const char*name;
+    int slot;
+    classinfo_t*return_type;
+    classinfo_t*parent;
     classinfo_list_t*params;
+};
+struct _varinfo /*extends memberinfo*/ {
+    U8 kind,subtype,flags,access;
+    const char*package;
+    const char*name;
     int slot;
+    classinfo_t*type;
+    classinfo_t*parent;
+    constant_t*value;
 };
 
-extern type_t classinfo_type;
-extern type_t function_signature_type;
+extern type_t memberinfo_type;
+extern type_t slotinfo_type;
+char slotinfo_equals(slotinfo_t*c1, slotinfo_t*c2);
 
 void registry_init();
         
-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);
+classinfo_t* classinfo_register(int access, const char*package, const char*name, int num_interfaces);
+methodinfo_t* methodinfo_register_onclass(classinfo_t*cls, U8 access, const char*ns, const char*name);
+methodinfo_t* methodinfo_register_global(U8 access, const char*package, const char*name);
+varinfo_t* varinfo_register_onclass(classinfo_t*cls, U8 access,  const char*ns, const char*name);
+varinfo_t* varinfo_register_global(U8 access, const char*package, const char*name);
+
+slotinfo_t* registry_resolve(slotinfo_t*s);
+void registry_resolve_all();
+
+slotinfo_t* registry_find(const char*package, const char*name);
+void registry_dump();
+memberinfo_t* registry_findmember(classinfo_t*cls, const char*ns, const char*name, char superclasses);
+memberinfo_t* registry_findmember_nsset(classinfo_t*cls, namespace_list_t*ns, const char*name, char superclasses);
+
+void registry_fill_multiname(multiname_t*m, namespace_t*n, slotinfo_t*c);
+#define MULTINAME(m,x) \
+    multiname_t m;\
+    namespace_t m##_ns;\
+    (x)->package; \
+    registry_fill_multiname(&m, &m##_ns, (slotinfo_t*)(x));
+                    
+multiname_t* classinfo_to_multiname(slotinfo_t*cls);
+
+char registry_isfunctionclass();
+char registry_isclassclass();
+
+classinfo_t* slotinfo_asclass(slotinfo_t*f);
+classinfo_t* slotinfo_gettype(slotinfo_t*);
+
+namespace_t access2namespace(U8 access, char*package);
+
+char registry_ispackage(char*package);
 
 // 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* registry_findclass(const char*package, const char*name);
-memberinfo_t* registry_findmember(classinfo_t*cls, const char*name);
+classinfo_t* registry_getclassclass(classinfo_t*a);
+classinfo_t* registry_getnamespaceclass();
 
-void registry_fill_multiname(multiname_t*m, namespace_t*n, classinfo_t*c);
-multiname_t* classinfo_to_multiname(classinfo_t*cls);
+char* infotypename(slotinfo_t*s);
+void slotinfo_dump(slotinfo_t*s);
 
-char registry_isfunctionclass();
 /* convenience functions */
-#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()
-#define TYPE_IS_INT(t)    ((t) == registry_getintclass())
-#define TYPE_UINT                 registry_getuintclass()
-#define TYPE_IS_UINT(t)   ((t) == registry_getuintclass())
-#define TYPE_NUMBER               registry_getnumberclass()
-#define TYPE_IS_NUMBER(t) ((t) == registry_getnumberclass())
-#define TYPE_FLOAT                registry_getnumberclass()
-#define TYPE_IS_FLOAT(t)  ((t) == registry_getnumberclass())
-#define TYPE_BOOLEAN              registry_getbooleanclass()
-#define TYPE_IS_BOOLEAN(t)((t) == registry_getbooleanclass())
-#define TYPE_STRING               registry_getstringclass()
-#define TYPE_IS_STRING(t) ((t) == registry_getstringclass())
-
-#define TYPE_FUNCTION(f)          registry_getfunctionclass(f)
-#define TYPE_IS_FUNCTION(t)       registry_isfunctionclass(t)
-
-#define TYPE_NULL                 registry_getnullclass()
-#define TYPE_IS_NULL(t)   ((t) == registry_getnullclass())
+#define sig2mname(x) (x->superclass,classinfo_to_multiname((slotinfo_t*)(x)))
+
+#define TYPE_ANY             (0)
+#define TYPE_IS_ANY(t)       ((t) == 0)
+#define TYPE_INT                     registry_getintclass()
+#define TYPE_IS_INT(t)       ((t) == registry_getintclass())
+#define TYPE_UINT                    registry_getuintclass()
+#define TYPE_IS_UINT(t)      ((t) == registry_getuintclass())
+#define TYPE_NUMBER                  registry_getnumberclass()
+#define TYPE_IS_NUMBER(t)    ((t) == registry_getnumberclass())
+#define TYPE_FLOAT                   registry_getnumberclass()
+#define TYPE_IS_FLOAT(t)     ((t) == registry_getnumberclass())
+#define TYPE_BOOLEAN                 registry_getbooleanclass()
+#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_IS_OBJECT(t)    ((t) == registry_getobjectclass())
+#define TYPE_REGEXP                  registry_getregexpclass()
+#define TYPE_IS_REGEXP(t)    ((t) == registry_getregexpclass())
+#define TYPE_NAMESPACE            registry_getnamespaceclass()
+#define TYPE_IS_NAMESPACE(t) ((t) == registry_getnamespaceclass())
+#define TYPE_FUNCTION(f)     ((f)->return_type,slotinfo_asclass((slotinfo_t*)(f)))
+#define TYPE_IS_FUNCTION(t)  registry_isfunctionclass(t)
+#define TYPE_CLASS(f)        ((f)->superclass,slotinfo_asclass((slotinfo_t*)(f)))
+#define TYPE_IS_CLASS(t)     registry_isclassclass(t)
+#define TYPE_NULL            registry_getnullclass()
+#define TYPE_IS_NULL(t)      ((t) == registry_getnullclass())
         
 #define TYPE_IS_BUILTIN_SIMPLE(type) (TYPE_IS_INT(type) || \
                                       TYPE_IS_UINT(type) || \