}
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) {
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);
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;
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;
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;
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 */
+ 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;
} else if(f->kind == INFOTYPE_CLASS) {
c->name = "Class";
c->superclass = registry_getobjectclass();
- } else if(f->kind == INFOTYPE_SLOT) {
+ } else if(f->kind == INFOTYPE_VAR) {
c->name = "Object";
} else {
c->name = "undefined";
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;
}
}
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 &&
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");
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)
{
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");
+}
+