git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
construct superclass in default constructor
[swftools.git]
/
lib
/
as3
/
registry.h
diff --git
a/lib/as3/registry.h
b/lib/as3/registry.h
index
01ca5c0
..
77d1f89
100644
(file)
--- a/
lib/as3/registry.h
+++ b/
lib/as3/registry.h
@@
-35,11
+35,7
@@
struct _classinfo {
U8 flags;
const char*package;
const char*name;
U8 flags;
const char*package;
const char*name;
- union {
- int slot; // slot nr in initscript traits
- classinfo_t*cls; // specific class of a Class type
- memberinfo_t*function; //specific function of a Function type
- };
+ int slot;
classinfo_t*superclass;
dict_t members;
classinfo_t*superclass;
dict_t members;
@@
-82,10
+78,9
@@
classinfo_t* registry_getintclass();
classinfo_t* registry_getuintclass();
classinfo_t* registry_getnullclass();
classinfo_t* registry_getbooleanclass();
classinfo_t* registry_getuintclass();
classinfo_t* registry_getnullclass();
classinfo_t* registry_getbooleanclass();
-classinfo_t* memberinfo_asclass();
+classinfo_t* registry_getfunctionclass();
classinfo_t* registry_getMovieClip();
classinfo_t* registry_getMovieClip();
-classinfo_t* memberinfo_asclass(memberinfo_t*f);
-classinfo_t* registry_getclassclass(classinfo_t*a);
+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);
classinfo_t* registry_findclass(const char*package, const char*name);
memberinfo_t* registry_findmember(classinfo_t*cls, const char*name);
@@
-94,10
+89,6
@@
void registry_fill_multiname(multiname_t*m, namespace_t*n, classinfo_t*c);
multiname_t* classinfo_to_multiname(classinfo_t*cls);
char registry_isfunctionclass();
multiname_t* classinfo_to_multiname(classinfo_t*cls);
char registry_isfunctionclass();
-char registry_isclassclass();
-
-classinfo_t* memberinfo_gettype(memberinfo_t*);
-
/* convenience functions */
#define sig2mname(x) classinfo_to_multiname(x)
#define TYPE_ANY registry_getanytype()
/* convenience functions */
#define sig2mname(x) classinfo_to_multiname(x)
#define TYPE_ANY registry_getanytype()
@@
-115,14
+106,9
@@
classinfo_t* memberinfo_gettype(memberinfo_t*);
#define TYPE_STRING registry_getstringclass()
#define TYPE_IS_STRING(t) ((t) == registry_getstringclass())
#define TYPE_STRING registry_getstringclass()
#define TYPE_IS_STRING(t) ((t) == registry_getstringclass())
-#define TYPE_OBJECT registry_getobjectclass()
-
-#define TYPE_FUNCTION(f) memberinfo_asclass(f)
+#define TYPE_FUNCTION(f) registry_getfunctionclass(f)
#define TYPE_IS_FUNCTION(t) registry_isfunctionclass(t)
#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())
#define TYPE_NULL registry_getnullclass()
#define TYPE_IS_NULL(t) ((t) == registry_getnullclass())