X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fregistry.h;h=b2a8084652f902c850510f534c210f7896d2a437;hb=639ac6b9f7a89f10d02c5d9ef41bca3bad4eaf2b;hp=8075ab6599bd64d8ee118500dd7429a1a791885e;hpb=3dea7306ae2c9590673c10dec1fbabcd6d7e1806;p=swftools.git

diff --git a/lib/as3/registry.h b/lib/as3/registry.h
index 8075ab6..b2a8084 100644
--- a/lib/as3/registry.h
+++ b/lib/as3/registry.h
@@ -43,12 +43,13 @@ DECLARE_LIST(slotinfo);
 #define FLAG_STATIC 2
 #define FLAG_OVERRIDE 8
 #define FLAG_NATIVE 16
+#define FLAG_CONST 32
 
 /* class flags */
 #define FLAG_DYNAMIC 8
 #define FLAG_INTERFACE 16
 
-#define INFOTYPE_SLOT 1
+#define INFOTYPE_VAR 1
 #define INFOTYPE_METHOD 2
 #define INFOTYPE_CLASS 3
 #define INFOTYPE_UNRESOLVED 4
@@ -90,7 +91,7 @@ struct _memberinfo {
     };
     classinfo_t*parent;
 };
-struct _methodinfo {
+struct _methodinfo /*extends memberinfo*/ {
     U8 kind,subtype,flags,access;
     const char*package;
     const char*name;
@@ -99,7 +100,7 @@ struct _methodinfo {
     classinfo_t*parent;
     classinfo_list_t*params;
 };
-struct _varinfo {
+struct _varinfo /*extends memberinfo*/ {
     U8 kind,subtype,flags,access;
     const char*package;
     const char*name;
@@ -130,6 +131,12 @@ memberinfo_t* registry_findmember(classinfo_t*cls, const char*ns, const char*nam
 memberinfo_t* registry_findmember_nsset(classinfo_t*cls, namespace_list_t*ns, const char*name, char superclasses);
 
 void registry_fill_multiname(multiname_t*m, namespace_t*n, slotinfo_t*c);
+#define MULTINAME(m,x) \
+    multiname_t m;\
+    namespace_t m##_ns;\
+    (x)->package; \
+    registry_fill_multiname(&m, &m##_ns, (slotinfo_t*)(x));
+                    
 multiname_t* classinfo_to_multiname(slotinfo_t*cls);
 
 char registry_isfunctionclass();
@@ -151,13 +158,19 @@ classinfo_t* registry_getstringclass();
 classinfo_t* registry_getintclass();
 classinfo_t* registry_getuintclass();
 classinfo_t* registry_getnullclass();
+classinfo_t* registry_getvoidclass();
+classinfo_t* registry_getarrayclass();
 classinfo_t* registry_getregexpclass();
+classinfo_t* registry_getxmlclass();
+classinfo_t* registry_getxmllistclass();
 classinfo_t* registry_getbooleanclass();
 classinfo_t* registry_getMovieClip();
 classinfo_t* registry_getclassclass(classinfo_t*a);
 classinfo_t* registry_getnamespaceclass();
+extern classinfo_t voidclass;
 
 char* infotypename(slotinfo_t*s);
+void slotinfo_dump(slotinfo_t*s);
 
 /* convenience functions */
 #define sig2mname(x) (x->superclass,classinfo_to_multiname((slotinfo_t*)(x)))
@@ -180,6 +193,8 @@ char* infotypename(slotinfo_t*s);
 #define TYPE_IS_OBJECT(t)    ((t) == registry_getobjectclass())
 #define TYPE_REGEXP                  registry_getregexpclass()
 #define TYPE_IS_REGEXP(t)    ((t) == registry_getregexpclass())
+#define TYPE_ARRAY                   registry_getarrayclass()
+#define TYPE_IS_ARRAY(t)     ((t) == registry_getarrayclass())
 #define TYPE_NAMESPACE            registry_getnamespaceclass()
 #define TYPE_IS_NAMESPACE(t) ((t) == registry_getnamespaceclass())
 #define TYPE_FUNCTION(f)     ((f)->return_type,slotinfo_asclass((slotinfo_t*)(f)))
@@ -188,6 +203,12 @@ char* infotypename(slotinfo_t*s);
 #define TYPE_IS_CLASS(t)     registry_isclassclass(t)
 #define TYPE_NULL            registry_getnullclass()
 #define TYPE_IS_NULL(t)      ((t) == registry_getnullclass())
+#define TYPE_VOID            registry_getvoidclass()
+#define TYPE_IS_VOID(t)      ((t) == registry_getvoidclass())
+#define TYPE_XML            registry_getxmlclass()
+#define TYPE_IS_XML(t)      ((t) == registry_getxmlclass())
+#define TYPE_XMLLIST        registry_getxmllistclass()
+#define TYPE_IS_XMLLIST(t)  ((t) == registry_getxmllistclass())
         
 #define TYPE_IS_BUILTIN_SIMPLE(type) (TYPE_IS_INT(type) || \
                                       TYPE_IS_UINT(type) || \
@@ -195,5 +216,7 @@ char* infotypename(slotinfo_t*s);
                                       TYPE_IS_BOOLEAN(type) || \
                                       TYPE_IS_STRING(type))
 
+#define IS_NUMBER_OR_INT(a) (TYPE_IS_INT((a)) || TYPE_IS_UINT((a)) || TYPE_IS_NUMBER((a)))
+
 
 #endif