X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fregistry.c;h=f160b5c9181925cb8475e72943cb8947f0e6d4a4;hb=3fb75ef418267cb0f7370d365b3a37b8013fbee9;hp=e8206a78e45bd78e32e9221746e5f27785fd4d71;hpb=d411691c6b0e5454f626ba0a8ee56f936cae9c8e;p=swftools.git

diff --git a/lib/as3/registry.c b/lib/as3/registry.c
index e8206a7..f160b5c 100644
--- a/lib/as3/registry.c
+++ b/lib/as3/registry.c
@@ -81,9 +81,10 @@ type_t memberinfo_type = {
 // ------------------------- constructors --------------------------------
 
 #define AVERAGE_NUMBER_OF_MEMBERS 8
-classinfo_t* classinfo_register(int access, char*package, char*name)
+classinfo_t* classinfo_register(int access, char*package, char*name, int num_interfaces)
 {
-    NEW(classinfo_t,c);
+    classinfo_t*c = rfx_calloc(sizeof(classinfo_t)+(sizeof(classinfo_t*)*(num_interfaces+1)));
+    c->interfaces[0] = 0;
     c->access = access;
     c->package = package;
     c->name = name;
@@ -92,13 +93,12 @@ classinfo_t* classinfo_register(int access, char*package, char*name)
     return c;
 }
 
-/* function pointers get their own type class */
-static dict_t* functionobjects = 0;
-classinfo_t* registry_getfunctionclass(memberinfo_t*f) {
-    if(!functionobjects) {
-        functionobjects = dict_new2(&ptr_type);
+static dict_t* classobjects = 0;
+classinfo_t* registry_getclassclass(classinfo_t*a) {
+    if(!classobjects) {
+        classobjects = dict_new2(&ptr_type);
     } else {
-        classinfo_t*c = dict_lookup(functionobjects, f);
+        classinfo_t*c = dict_lookup(classobjects, a);
         if(c)
             return c;
     }
@@ -106,11 +106,11 @@ classinfo_t* registry_getfunctionclass(memberinfo_t*f) {
     NEW(classinfo_t,c);
     c->access = ACCESS_PUBLIC;
     c->package = "";
-    c->name = "Function";
+    c->name = "Class";
     dict_init(&c->members,1);
-    dict_put(&c->members, "__funcptr__", f);
+    c->cls = a;
 
-    dict_put(functionobjects, f, c);
+    dict_put(classobjects, a, c);
     return c;
 }
 
@@ -168,6 +168,43 @@ multiname_t* classinfo_to_multiname(classinfo_t*cls)
     return multiname_new(ns,cls->name);
 }
 
+// ----------------------- memberinfo methods ------------------------------
+
+/* function and class pointers get their own type class */
+static dict_t* functionobjects = 0;
+classinfo_t* memberinfo_asclass(memberinfo_t*f) {
+    if(!functionobjects) {
+        functionobjects = dict_new2(&ptr_type);
+    } else {
+        classinfo_t*c = dict_lookup(functionobjects, f);
+        if(c)
+            return c;
+    }
+
+    NEW(classinfo_t,c);
+    c->access = ACCESS_PUBLIC;
+    c->package = "";
+    c->name = "Function";
+    
+    dict_init(&c->members,1);
+    c->function = f;
+
+    dict_put(functionobjects, f, c);
+    return c;
+}
+
+classinfo_t* memberinfo_gettype(memberinfo_t*f)
+{
+    if(f) {
+       if(f->kind == MEMBER_METHOD) {
+           return memberinfo_asclass(f);
+       } else {
+           return f->type;
+       }
+    } else {
+       return registry_getanytype();
+    }
+}
 // ----------------------- builtin types ------------------------------
 classinfo_t* registry_getanytype() {return 0;}
 
@@ -175,6 +212,10 @@ char registry_isfunctionclass(classinfo_t*c) {
     return (c && c->package && c->name && 
             !strcmp(c->package, "") && !strcmp(c->name, "Function"));
 }
+char registry_isclassclass(classinfo_t*c) {
+    return (c && c->package && c->name && 
+            !strcmp(c->package, "") && !strcmp(c->name, "Class"));
+}
 
 classinfo_t* registry_getobjectclass() {
     static classinfo_t*c = 0;
@@ -186,6 +227,11 @@ classinfo_t* registry_getstringclass() {
     if(!c) c = registry_safefindclass("", "String");
     return c;
 }
+classinfo_t* registry_getarrayclass() {
+    static classinfo_t*c = 0;
+    if(!c) c = registry_safefindclass("", "Array");
+    return c;
+}
 classinfo_t* registry_getintclass() {
     static classinfo_t*c = 0;
     if(!c) c = registry_safefindclass("", "int");