static classinfo_t*resolve_class(char*filename, char*what, multiname_t*n)
{
if(!n) return 0;
- if(!n->name[0] || !strcmp(n->name, "void")) return 0;
+ if(!n->name[0]) return 0;
+ if(!strcmp(n->name, "void"))
+ return &voidclass;
classinfo_t*c = 0;
if(n->ns && n->ns->name) {
const char*package = strdup(cls->classname->ns->name);
const char*name = strdup(cls->classname->name);
-
+
multiname_list_t*i=cls->interfaces;
classinfo_t*c = classinfo_register(access, package, name, list_length(i));
c->flags|=FLAG_BUILTIN;
l = cls->static_traits;
is_static = 1;
}
+ dict_t*names = dict_new();
while(l) {
trait_t*trait = l->trait;
U8 access = trait->name->ns->access;
+
if(access==ACCESS_PRIVATE)
goto cont;
const char*name = trait->name->name;
- char* ns= ACCESS_NAMESPACE?strdup(trait->name->ns->name):"";
+ char* ns = access==ACCESS_NAMESPACE?strdup(trait->name->ns->name):"";
if(registry_findmember(c, ns, name, 0))
goto cont;
name = strdup(name);
if(trait->kind == TRAIT_METHOD) {
s = (memberinfo_t*)methodinfo_register_onclass(c, access, ns, name);
s->return_type = resolve_class(filename, "return type", trait->method->return_type);
- } else if(trait->kind == TRAIT_SLOT ||
- trait->kind == TRAIT_GETTER) {
+ dict_put(names, name, 0);
+ } else if(trait->kind == TRAIT_SLOT) {
s = (memberinfo_t*)varinfo_register_onclass(c, access, ns, name);
s->type = resolve_class(filename, "type", trait->type_name);
+ dict_put(names, name, 0);
+ } else if(trait->kind == TRAIT_GETTER) {
+ s = (memberinfo_t*)varinfo_register_onclass(c, access, ns, name);
+ s->type = resolve_class(filename, "type", trait->method->return_type);
+ dict_put(names, name, 0);
+ } else if(trait->kind == TRAIT_CONST) {
+ /* some variables (e.g. XML.length) are apparently both a method and a slot.
+ needs split of static/non-static first */
+ if(!dict_contains(names, name)) {
+ varinfo_t*v = (varinfo_t*)varinfo_register_onclass(c, access, ns, name);
+ v->type = resolve_class(filename, "type", trait->type_name);
+ v->flags |= FLAG_CONST;
+ /* leave this alone for now- it blows up the file too much
+ v->value = constant_clone(trait->value);*/
+ s = (memberinfo_t*)v;
+ dict_put(names, name, 0);
+ } else
+ goto cont;
+
} else {
goto cont;
}
is_static = 1;
}
}
+ dict_destroy(names);
}
# define IS_PUBLIC_MEMBER(trait) ((trait)->kind != TRAIT_CLASS && (trait)->name->ns->access != ACCESS_PRIVATE)
varinfo_t*v = varinfo_register_global(access, package, name);
v->type = resolve_class(filename, "type", trait->type_name);
v->value = constant_clone(trait->value);
+ v->flags |= trait->kind==TRAIT_CONST?FLAG_CONST:0;
m = (memberinfo_t*)v;
}
m->flags |= FLAG_BUILTIN;