X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fregistry.h;h=4d58394c8887a0d9b4853178a0acbacc5b8996d8;hb=15d3df10f09bd780efa101d0c253db96716eb145;hp=0640a78dab7dabb9e77bf51d11a7bf6d5d391e14;hpb=a7f8303c6822e40c2e6d3d8d635032de01fe4735;p=swftools.git

diff --git a/lib/as3/registry.h b/lib/as3/registry.h
index 0640a78..4d58394 100644
--- a/lib/as3/registry.h
+++ b/lib/as3/registry.h
@@ -30,8 +30,10 @@ DECLARE(slotinfo);
 DECLARE(classinfo);
 DECLARE(memberinfo);
 DECLARE(methodinfo);
+DECLARE(unresolvedinfo);
 DECLARE(varinfo);
 DECLARE_LIST(classinfo);
+DECLARE_LIST(slotinfo);
 
 /* member/class flags */
 #define FLAG_FINAL 1
@@ -49,6 +51,7 @@ DECLARE_LIST(classinfo);
 #define INFOTYPE_SLOT 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
@@ -59,6 +62,13 @@ struct _slotinfo {
     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 {
     U8 kind,subtype,flags,access;
     const char*package;
@@ -67,7 +77,7 @@ struct _classinfo {
     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[];
+    classinfo_t*interfaces[0];
 };
 struct _memberinfo {
     U8 kind,subtype,flags,access;
@@ -105,14 +115,18 @@ char slotinfo_equals(slotinfo_t*c1, slotinfo_t*c2);
 void registry_init();
         
 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*name);
+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*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*name, char superclasses);
+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);
 multiname_t* classinfo_to_multiname(slotinfo_t*cls);