X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fregistry.c;h=a9cb163e3c62e0dc5c391da4a92b13ee13228ff9;hb=635acfee3d51f085a7a83f58b80aaf2cc6f28c6b;hp=637f67e82283d003f79c17762e58611535cb5ffd;hpb=8269438e4683cc34b74ed9bd9bdb828535d07d70;p=swftools.git

diff --git a/lib/as3/registry.c b/lib/as3/registry.c
index 637f67e..a9cb163 100644
--- a/lib/as3/registry.c
+++ b/lib/as3/registry.c
@@ -30,8 +30,10 @@ static dict_t*classes=0;
 
 // ----------------------- class signature ------------------------------
 
-char class_signature_equals(class_signature_t*c1, class_signature_t*c2)
+char classinfo_equals(classinfo_t*c1, classinfo_t*c2)
 {
+    if(!!c1 != !!c2)
+        return 0;
     /* notice: access right is *not* respected */
     if(!strcmp(c1->name, c2->name) &&
        !strcmp(c1->package, c2->package)) {
@@ -39,7 +41,7 @@ char class_signature_equals(class_signature_t*c1, class_signature_t*c2)
     }
     return 0;
 }
-static unsigned int class_signature_hash(class_signature_t*c)
+static unsigned int classinfo_hash(classinfo_t*c)
 {
     unsigned int hash = 0;
     hash = crc32_add_string(hash, c->package);
@@ -48,11 +50,11 @@ static unsigned int class_signature_hash(class_signature_t*c)
 }
 
 static void* dummy_clone(void*other) {return other;}
-static void dummy_destroy(class_signature_t*c) {}
+static void dummy_destroy(classinfo_t*c) {}
 
-type_t class_signature_type = {
-    hash: (hash_func)class_signature_hash,
-    equals: (equals_func)class_signature_equals,
+type_t classinfo_type = {
+    hash: (hash_func)classinfo_hash,
+    equals: (equals_func)classinfo_equals,
     /* all signatures are static */
     dup: (dup_func)dummy_clone,
     free: (free_func)dummy_destroy,
@@ -60,17 +62,17 @@ type_t class_signature_type = {
 
 // ----------------------- function signature ------------------------------
 
-static char function_signature_equals(function_signature_t*f1, function_signature_t*f2)
+static char memberinfo_equals(memberinfo_t*f1, memberinfo_t*f2)
 {
     return !strcmp(f1->name, f2->name);
 }
-static unsigned int function_signature_hash(function_signature_t*f)
+static unsigned int memberinfo_hash(memberinfo_t*f)
 {
     return crc32_add_string(0, f->name);
 }
-type_t function_signature_type = {
-    hash: (hash_func)function_signature_hash,
-    equals: (equals_func)function_signature_equals,
+type_t memberinfo_type = {
+    hash: (hash_func)memberinfo_hash,
+    equals: (equals_func)memberinfo_equals,
     /* all signatures are static */
     dup: (dup_func)dummy_clone,
     free: (free_func)dummy_destroy,
@@ -78,40 +80,77 @@ type_t function_signature_type = {
 
 // ------------------------- constructors --------------------------------
 
-class_signature_t* class_signature_register(int access, char*package, char*name)
+#define AVERAGE_NUMBER_OF_MEMBERS 8
+classinfo_t* classinfo_register(int access, char*package, char*name, int num_interfaces)
 {
-    class_signature_t*c = malloc(sizeof(class_signature_t));
+    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;
     dict_put(classes, c, c);
+    dict_init(&c->members,AVERAGE_NUMBER_OF_MEMBERS);
+    return c;
+}
+
+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(classobjects, a);
+        if(c)
+            return c;
+    }
+
+    NEW(classinfo_t,c);
+    c->access = ACCESS_PUBLIC;
+    c->package = "";
+    c->name = "Class";
+    dict_init(&c->members,1);
+    c->cls = a;
+
+    dict_put(classobjects, a, c);
     return c;
 }
 
+memberinfo_t* memberinfo_register(classinfo_t*cls, const char*name, U8 kind)
+{
+    NEW(memberinfo_t,m);
+    m->kind = kind;
+    m->name = strdup(name);
+    dict_put(&cls->members, name, m);
+    return m;
+}
+
 // --------------- builtin classes (from builtin.c) ----------------------
 
 void registry_init()
 {
     classes = builtin_getclasses();
 }
-class_signature_t* registry_safefindclass(const char*package, const char*name)
+classinfo_t* registry_safefindclass(const char*package, const char*name)
 {
-    class_signature_t*c = registry_findclass(package, name);
-    if(!c)
-        printf("%s.%s\n", package, name);
+    classinfo_t*c = registry_findclass(package, name);
     assert(c);
     return c;
 }
-class_signature_t* registry_findclass(const char*package, const char*name)
+classinfo_t* registry_findclass(const char*package, const char*name)
 {
     assert(classes);
-    class_signature_t tmp;
+    classinfo_t tmp;
     tmp.package = package;
     tmp.name = name;
-    class_signature_t* c = (class_signature_t*)dict_lookup(classes, &tmp);
+    classinfo_t* c = (classinfo_t*)dict_lookup(classes, &tmp);
+    /*if(c)
+        printf("%s.%s->%08x (%s.%s)\n", package, name, c, c->package, c->name);*/
     return c;
 }
-void registry_fill_multiname(multiname_t*m, namespace_t*n, class_signature_t*c)
+memberinfo_t* registry_findmember(classinfo_t*cls, const char*name)
+{
+    return (memberinfo_t*)dict_lookup(&cls->members, name);
+}
+void registry_fill_multiname(multiname_t*m, namespace_t*n, classinfo_t*c)
 {
     m->type = QNAME;
     m->ns = n;
@@ -120,7 +159,7 @@ void registry_fill_multiname(multiname_t*m, namespace_t*n, class_signature_t*c)
     m->name = c->name;
     m->namespace_set = 0;
 }
-multiname_t* class_signature_to_multiname(class_signature_t*cls)
+multiname_t* classinfo_to_multiname(classinfo_t*cls)
 {
     if(!cls)
         return 0;
@@ -129,22 +168,96 @@ multiname_t* class_signature_to_multiname(class_signature_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 ------------------------------
-class_signature_t* registry_getanytype() {return 0;/*FIXME*/}
+classinfo_t* registry_getanytype() {return 0;}
+
+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"));
+}
 
-class_signature_t* registry_getobjectclass() {return registry_safefindclass("", "Object");}
-class_signature_t* registry_getstringclass() {return registry_safefindclass("", "String");}
-class_signature_t* registry_getintclass() {return registry_safefindclass("", "int");}
-class_signature_t* registry_getuintclass() {return registry_safefindclass("", "uint");}
-class_signature_t* registry_getbooleanclass() {return registry_safefindclass("", "Boolean");}
-class_signature_t* registry_getnumberclass() {return registry_safefindclass("", "Number");}
-class_signature_t* registry_getMovieClip() {return registry_safefindclass("flash.display", "MovieClip");}
+classinfo_t* registry_getobjectclass() {
+    static classinfo_t*c = 0;
+    if(!c) c = registry_safefindclass("", "Object");
+    return c;
+}
+classinfo_t* registry_getstringclass() {
+    static classinfo_t*c = 0;
+    if(!c) c = registry_safefindclass("", "String");
+    return c;
+}
+classinfo_t* registry_getintclass() {
+    static classinfo_t*c = 0;
+    if(!c) c = registry_safefindclass("", "int");
+    return c;
+}
+classinfo_t* registry_getuintclass() {
+    static classinfo_t*c = 0;
+    if(!c) c = registry_safefindclass("", "uint");
+    return c;
+}
+classinfo_t* registry_getbooleanclass() {
+    static classinfo_t*c = 0;
+    if(!c) c = registry_safefindclass("", "Boolean");
+    return c;
+}
+classinfo_t* registry_getnumberclass() {
+    static classinfo_t*c = 0;
+    if(!c) c = registry_safefindclass("", "Number");
+    return c;
+}
+classinfo_t* registry_getMovieClip() {
+    static classinfo_t*c = 0;
+    if(!c) c = registry_safefindclass("flash.display", "MovieClip");
+    return c;
+}
 
 // ----------------------- builtin dummy types -------------------------
-class_signature_t nullclass = {
-    ACCESS_PACKAGE, "", "null", 0, 0, 0,
+classinfo_t nullclass = {
+    ACCESS_PACKAGE, 0, "", "null", 0, 0, 0,
 };
-class_signature_t* registry_getnullclass() {
+classinfo_t* registry_getnullclass() {
     return &nullclass;
 }