X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fregistry.c;h=5f45c6a836a18fcbb6fe574a9da7178cecf2d00e;hb=4dacf8e5890fb8cd0f53afbd4305c8b9ff9e7986;hp=2789fdf7e021129421d16967b5cbf71aa93ab941;hpb=36a1fac8ea3a7457f25b1b4209b5fc918cc6af44;p=swftools.git

diff --git a/lib/as3/registry.c b/lib/as3/registry.c
index 2789fdf..5f45c6a 100644
--- a/lib/as3/registry.c
+++ b/lib/as3/registry.c
@@ -97,7 +97,7 @@ static void schedule_for_resolve(slotinfo_t*s)
 }
 static void resolve_on_slot(slotinfo_t*_member)
 {
-    if(_member->kind == INFOTYPE_SLOT) {
+    if(_member->kind == INFOTYPE_VAR) {
         varinfo_t*member = (varinfo_t*)_member;
         member->type = (classinfo_t*)registry_resolve((slotinfo_t*)member->type);
     } else if(_member->kind == INFOTYPE_METHOD) {
@@ -129,7 +129,7 @@ void registry_resolve_all()
         slotinfo_t*_s = unresolved->slotinfo;
         if(_s->kind == INFOTYPE_CLASS) {
             resolve_on_class(_s);
-        } else if(_s->kind == INFOTYPE_METHOD || _s->kind == INFOTYPE_SLOT) {
+        } else if(_s->kind == INFOTYPE_METHOD || _s->kind == INFOTYPE_VAR) {
             resolve_on_slot(_s);
         } else {
             fprintf(stderr, "Internal Error: object %s.%s has bad type\n", _s->package, _s->name);
@@ -170,7 +170,7 @@ methodinfo_t* methodinfo_register_onclass(classinfo_t*cls, U8 access, const char
 varinfo_t* varinfo_register_onclass(classinfo_t*cls, U8 access, const char*ns, const char*name)
 {
     NEW(varinfo_t,m);
-    m->kind = INFOTYPE_SLOT;
+    m->kind = INFOTYPE_VAR;
     m->access = access;
     m->name = name;
     m->package = ns;
@@ -195,7 +195,7 @@ methodinfo_t* methodinfo_register_global(U8 access, const char*package, const ch
 varinfo_t* varinfo_register_global(U8 access, const char*package, const char*name)
 {
     NEW(varinfo_t, m);
-    m->kind = INFOTYPE_SLOT;
+    m->kind = INFOTYPE_VAR;
     m->flags = FLAG_STATIC;
     m->access = access;
     m->package = package;
@@ -264,6 +264,9 @@ memberinfo_t* registry_findmember(classinfo_t*cls, const char*ns, const char*nam
         s = s->superclass;
 
     while(s) {
+        if(s->kind == INFOTYPE_UNRESOLVED)
+            break;
+
         m = (slotinfo_t*)dict_lookup(&s->members, &tmp);
         if(m) {
             return (memberinfo_t*)m;
@@ -290,12 +293,20 @@ memberinfo_t* registry_findmember(classinfo_t*cls, const char*ns, const char*nam
 
 memberinfo_t* registry_findmember_nsset(classinfo_t*cls, namespace_list_t*ns, const char*name, char superclasses)
 {
+    memberinfo_t*m = 0;
     while(ns) {
-        memberinfo_t*m = registry_findmember(cls, ns->namespace->name, name, superclasses);
+        m = registry_findmember(cls, ns->namespace->name, name, superclasses);
         if(m) return m;
         ns = ns->next;
     }
-    return registry_findmember(cls, "", name, superclasses);
+    m = registry_findmember(cls, "", name, superclasses);
+    if(m) return m;
+    /* TODO: it maybe would be faster to just store the builtin namespace as "" in
+             builtins.c (update: some members (e.g. XML.length) are present both for
+            "" and "http:...builtin") */
+    m = registry_findmember(cls, "http://adobe.com/AS3/2006/builtin", name, superclasses);
+    if(m) return m;
+    return 0;
 }
 
 
@@ -334,13 +345,15 @@ classinfo_t* slotinfo_asclass(slotinfo_t*f) {
     classinfo_t*c = rfx_calloc(sizeof(classinfo_t)+sizeof(classinfo_t*));
     c->access = ACCESS_PUBLIC;
     c->package = "";
-    if(f->kind == INFOTYPE_METHOD)
+    if(f->kind == INFOTYPE_METHOD) {
         c->name = "Function";
-    else if(f->kind == INFOTYPE_CLASS)
+        c->superclass = registry_getobjectclass();
+    } else if(f->kind == INFOTYPE_CLASS) {
         c->name = "Class";
-    else if(f->kind == INFOTYPE_SLOT)
+        c->superclass = registry_getobjectclass();
+    } else if(f->kind == INFOTYPE_VAR) {
         c->name = "Object";
-    else {
+    } else {
         c->name = "undefined";
     }
     
@@ -355,13 +368,13 @@ classinfo_t* slotinfo_gettype(slotinfo_t*f)
     if(f) {
        if(f->kind == INFOTYPE_METHOD) {
            return slotinfo_asclass(f);
-       } else if(f->kind == INFOTYPE_SLOT) {
+       } else if(f->kind == INFOTYPE_VAR) {
            varinfo_t*v = (varinfo_t*)f;
            return v->type;
        } else 
            return 0;
     } else {
-       return registry_getanytype();
+       return TYPE_ANY;
     }
 }
 
@@ -372,7 +385,6 @@ char registry_ispackage(char*package)
     return !strncmp(package, "flash", 5);
 }
 // ----------------------- builtin types ------------------------------
-classinfo_t* registry_getanytype() {return 0;}
 
 char registry_isfunctionclass(classinfo_t*c) {
     return (c && c->package && c->name && 
@@ -423,6 +435,21 @@ classinfo_t* registry_getregexpclass() {
     if(!c) c = (classinfo_t*)registry_safefind("", "RegExp");
     return c;
 }
+classinfo_t* registry_getdateclass() {
+    static classinfo_t*c = 0;
+    if(!c) c = (classinfo_t*)registry_safefind("", "Date");
+    return c;
+}
+classinfo_t* registry_getxmlclass() {
+    static classinfo_t*c = 0;
+    if(!c) c = (classinfo_t*)registry_safefind("", "XML");
+    return c;
+}
+classinfo_t* registry_getxmllistclass() {
+    static classinfo_t*c = 0;
+    if(!c) c = (classinfo_t*)registry_safefind("", "XMLList");
+    return c;
+}
 classinfo_t* registry_getnamespaceclass() {
     static classinfo_t*c = 0;
     if(!c) c = (classinfo_t*)registry_safefind("", "Namespace");
@@ -441,6 +468,12 @@ classinfo_t nullclass = {
 classinfo_t* registry_getnullclass() {
     return &nullclass;
 }
+classinfo_t voidclass = {
+    INFOTYPE_CLASS,0,0,ACCESS_PACKAGE, "", "void", 0, 0, 0
+};
+classinfo_t* registry_getvoidclass() {
+    return &voidclass;
+}
 
 namespace_t access2namespace(U8 access, char*package)
 {
@@ -453,8 +486,34 @@ namespace_t access2namespace(U8 access, char*package)
 char* infotypename(slotinfo_t*s)
 {
     if(s->kind == INFOTYPE_CLASS) return "class";
-    else if(s->kind == INFOTYPE_SLOT) return "member";
-    else if(s->kind == INFOTYPE_METHOD) return "method";
+    else if(s->kind == INFOTYPE_VAR) return "var";
+    else if(s->kind == INFOTYPE_METHOD) return "function";
     else return "object";
 }
 
+void slotinfo_dump(slotinfo_t*s)
+{
+    if(s->package[0]) {
+        printf("%s %s.%s", infotypename(s), s->package, s->name);
+    } else {
+        printf("%s %s", infotypename(s), s->name);
+    }
+    if(s->kind == INFOTYPE_CLASS) {
+        classinfo_t*c = (classinfo_t*)s;
+    }
+    else if(s->kind == INFOTYPE_VAR) {
+        varinfo_t*v = (varinfo_t*)s;
+        printf(":%s", v->type?v->type->name:"*");
+        if(v->value)
+            printf("=%s", constant_tostring(v->value));
+        if(v->slot)
+            printf(" (slot:%d)", v->slot);
+    }
+    else if(s->kind == INFOTYPE_METHOD) {
+        methodinfo_t*m = (methodinfo_t*)s;
+    }
+    else {
+    }
+    printf("\n");
+}
+