as3: fixed some reconcile problems

[swftools.git] / lib / as3 / registry.h

diff --git a/lib/as3/registry.h b/lib/as3/registry.h
index c51bf2a..f2e1657 100644 (file)
--- a/lib/as3/registry.h
+++ b/lib/as3/registry.h
@@ -155,14 +155,20 @@ classinfo_t* registry_getarrayclass();
 classinfo_t* registry_getobjectclass();
 classinfo_t* registry_getnumberclass();
 classinfo_t* registry_getstringclass();
+classinfo_t* registry_getdateclass();
 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);
@@ -184,10 +190,16 @@ void slotinfo_dump(slotinfo_t*s);
 #define TYPE_IS_BOOLEAN(t)   ((t) == registry_getbooleanclass())
 #define TYPE_STRING                  registry_getstringclass()
 #define TYPE_IS_STRING(t)    ((t) == registry_getstringclass())
+#define TYPE_DATE                    registry_getdateclass()
+#define TYPE_IS_DATE(t)      ((t) == registry_getdateclass())
 #define TYPE_OBJECT                  registry_getobjectclass()
 #define TYPE_IS_OBJECT(t)    ((t) == registry_getobjectclass())
 #define TYPE_REGEXP                  registry_getregexpclass()
 #define TYPE_IS_REGEXP(t)    ((t) == registry_getregexpclass())
+#define TYPE_VOID                    registry_getvoidclass()
+#define TYPE_IS_VOID(t)      ((t) == registry_getvoidclass())
+#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)))
@@ -196,6 +208,12 @@ void slotinfo_dump(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) || \
@@ -203,5 +221,7 @@ void slotinfo_dump(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