From fb56342d9ce82d70ea6d5d544ff8df485fee3afc Mon Sep 17 00:00:00 2001 From: kramm Date: Tue, 30 Dec 2008 23:02:36 +0000 Subject: [PATCH] added class type --- lib/as3/registry.c | 32 +++++++++++++++++++++++++++++++- lib/as3/registry.h | 15 +++++++++++++-- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/lib/as3/registry.c b/lib/as3/registry.c index 2263038..06ae5c5 100644 --- a/lib/as3/registry.c +++ b/lib/as3/registry.c @@ -93,7 +93,7 @@ classinfo_t* classinfo_register(int access, char*package, char*name, int num_int return c; } -/* function pointers get their own type class */ +/* function and class pointers get their own type class */ static dict_t* functionobjects = 0; classinfo_t* registry_getfunctionclass(memberinfo_t*f) { if(!functionobjects) { @@ -114,6 +114,32 @@ classinfo_t* registry_getfunctionclass(memberinfo_t*f) { dict_put(functionobjects, f, c); 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"; + + NEW(memberinfo_t,m); + m->kind = MEMBER_SLOT; + m->name = "prototype"; + m->type = a; + + dict_init(&c->members,1); + dict_put(&c->members, "prototype", m); + + dict_put(classobjects, a, c); + return c; +} memberinfo_t* memberinfo_register(classinfo_t*cls, const char*name, U8 kind) { @@ -176,6 +202,10 @@ 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")); +} classinfo_t* registry_getobjectclass() { static classinfo_t*c = 0; diff --git a/lib/as3/registry.h b/lib/as3/registry.h index 062e5dd..b5769b0 100644 --- a/lib/as3/registry.h +++ b/lib/as3/registry.h @@ -31,11 +31,11 @@ DECLARE_LIST(classinfo); DECLARE(memberinfo); struct _classinfo { - /* this is very similar to a QNAME */ U8 access; U8 flags; const char*package; const char*name; + int slot; classinfo_t*superclass; dict_t members; @@ -44,9 +44,14 @@ struct _classinfo { char classinfo_equals(classinfo_t*c1, classinfo_t*c2); #define MEMBER_SLOT 1 -#define MEMBER_METHOD 2 +#define MEMBER_GET 2 +#define MEMBER_SET 4 +#define MEMBER_GETSET 6 +#define MEMBER_METHOD 8 + struct _memberinfo { U8 kind; + U8 flags; const char*name; union { classinfo_t*return_type; @@ -76,6 +81,7 @@ classinfo_t* registry_getbooleanclass(); classinfo_t* registry_getfunctionclass(); classinfo_t* registry_getMovieClip(); classinfo_t* registry_getfunctionclass(memberinfo_t*f); +classinfo_t* registry_getclassclass(classinfo_t*a); classinfo_t* registry_findclass(const char*package, const char*name); memberinfo_t* registry_findmember(classinfo_t*cls, const char*name); @@ -84,6 +90,8 @@ void registry_fill_multiname(multiname_t*m, namespace_t*n, classinfo_t*c); multiname_t* classinfo_to_multiname(classinfo_t*cls); char registry_isfunctionclass(); +char registry_isclassclass(); + /* convenience functions */ #define sig2mname(x) classinfo_to_multiname(x) #define TYPE_ANY registry_getanytype() @@ -104,6 +112,9 @@ char registry_isfunctionclass(); #define TYPE_FUNCTION(f) registry_getfunctionclass(f) #define TYPE_IS_FUNCTION(t) registry_isfunctionclass(t) +#define TYPE_CLASS(f) registry_getclassclass(f) +#define TYPE_IS_CLASS(t) registry_isclassclass(t) + #define TYPE_NULL registry_getnullclass() #define TYPE_IS_NULL(t) ((t) == registry_getnullclass()) -- 1.7.10.4