From d411691c6b0e5454f626ba0a8ee56f936cae9c8e Mon Sep 17 00:00:00 2001 From: kramm Date: Tue, 30 Dec 2008 23:02:09 +0000 Subject: [PATCH] new functions getfunctionclass() isfunctionclass() --- lib/as3/registry.c | 74 +++++++++++++++++++++++++++++++++++++++++++++------- lib/as3/registry.h | 9 ++++++- 2 files changed, 73 insertions(+), 10 deletions(-) diff --git a/lib/as3/registry.c b/lib/as3/registry.c index 293598f..e8206a7 100644 --- a/lib/as3/registry.c +++ b/lib/as3/registry.c @@ -91,6 +91,29 @@ classinfo_t* classinfo_register(int access, char*package, char*name) dict_init(&c->members,AVERAGE_NUMBER_OF_MEMBERS); 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); + } 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); + dict_put(&c->members, "__funcptr__", f); + + dict_put(functionobjects, f, c); + return c; +} + memberinfo_t* memberinfo_register(classinfo_t*cls, const char*name, U8 kind) { NEW(memberinfo_t,m); @@ -146,15 +169,48 @@ multiname_t* classinfo_to_multiname(classinfo_t*cls) } // ----------------------- builtin types ------------------------------ -classinfo_t* registry_getanytype() {return 0;/*FIXME*/} - -classinfo_t* registry_getobjectclass() {return registry_safefindclass("", "Object");} -classinfo_t* registry_getstringclass() {return registry_safefindclass("", "String");} -classinfo_t* registry_getintclass() {return registry_safefindclass("", "int");} -classinfo_t* registry_getuintclass() {return registry_safefindclass("", "uint");} -classinfo_t* registry_getbooleanclass() {return registry_safefindclass("", "Boolean");} -classinfo_t* registry_getnumberclass() {return registry_safefindclass("", "Number");} -classinfo_t* registry_getMovieClip() {return registry_safefindclass("flash.display", "MovieClip");} +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")); +} + +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 ------------------------- classinfo_t nullclass = { diff --git a/lib/as3/registry.h b/lib/as3/registry.h index bc547e7..7450468 100644 --- a/lib/as3/registry.h +++ b/lib/as3/registry.h @@ -49,7 +49,7 @@ struct _memberinfo { U8 kind; const char*name; union { - classinfo_t*returnvalue; + classinfo_t*return_type; classinfo_t*type; }; classinfo_list_t*params; @@ -73,7 +73,9 @@ classinfo_t* registry_getintclass(); classinfo_t* registry_getuintclass(); classinfo_t* registry_getnullclass(); classinfo_t* registry_getbooleanclass(); +classinfo_t* registry_getfunctionclass(); classinfo_t* registry_getMovieClip(); +classinfo_t* registry_getfunctionclass(memberinfo_t*f); classinfo_t* registry_findclass(const char*package, const char*name); memberinfo_t* registry_findmember(classinfo_t*cls, const char*name); @@ -81,6 +83,7 @@ memberinfo_t* registry_findmember(classinfo_t*cls, const char*name); void registry_fill_multiname(multiname_t*m, namespace_t*n, classinfo_t*c); multiname_t* classinfo_to_multiname(classinfo_t*cls); +char registry_isfunctionclass(); /* convenience functions */ #define sig2mname(x) classinfo_to_multiname(x) #define TYPE_ANY registry_getanytype() @@ -97,6 +100,10 @@ multiname_t* classinfo_to_multiname(classinfo_t*cls); #define TYPE_IS_BOOLEAN(t)((t) == registry_getbooleanclass()) #define TYPE_STRING registry_getstringclass() #define TYPE_IS_STRING(t) ((t) == registry_getstringclass()) + +#define TYPE_FUNCTION(f) registry_getfunctionclass(f) +#define TYPE_IS_FUNCTION(t) registry_isfunctionclass(t) + #define TYPE_NULL registry_getnullclass() #define TYPE_IS_NULL(t) ((t) == registry_getnullclass()) -- 1.7.10.4