X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fregistry.h;h=c51bf2a4a8aaaae2dadf7f625cd3c7759bd35c04;hb=b8aa0577aae67db4da5221459102202febc5c103;hp=31267bf2a86fa02655371478990ae4e006653073;hpb=36a1fac8ea3a7457f25b1b4209b5fc918cc6af44;p=swftools.git

diff --git a/lib/as3/registry.h b/lib/as3/registry.h
index 31267bf..c51bf2a 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();
@@ -158,38 +165,37 @@ classinfo_t* registry_getclassclass(classinfo_t*a);
 classinfo_t* registry_getnamespaceclass();
 
 char* infotypename(slotinfo_t*s);
+void slotinfo_dump(slotinfo_t*s);
 
 /* convenience functions */
 #define sig2mname(x) (x->superclass,classinfo_to_multiname((slotinfo_t*)(x)))
-#define TYPE_ANY                  registry_getanytype()
-#define TYPE_IS_ANY(t)    ((t) == registry_getanytype())
-#define TYPE_INT                  registry_getintclass()
-#define TYPE_IS_INT(t)    ((t) == registry_getintclass())
-#define TYPE_UINT                 registry_getuintclass()
-#define TYPE_IS_UINT(t)   ((t) == registry_getuintclass())
-#define TYPE_NUMBER               registry_getnumberclass()
-#define TYPE_IS_NUMBER(t) ((t) == registry_getnumberclass())
-#define TYPE_FLOAT                registry_getnumberclass()
-#define TYPE_IS_FLOAT(t)  ((t) == registry_getnumberclass())
-#define TYPE_BOOLEAN              registry_getbooleanclass()
-#define TYPE_IS_BOOLEAN(t)((t) == registry_getbooleanclass())
-#define TYPE_STRING               registry_getstringclass()
-#define TYPE_IS_STRING(t) ((t) == registry_getstringclass())
-#define TYPE_REGEXP               registry_getregexpclass()
-#define TYPE_IS_REGEXP(t) ((t) == registry_getregexpclass())
+
+#define TYPE_ANY             (0)
+#define TYPE_IS_ANY(t)       ((t) == 0)
+#define TYPE_INT                     registry_getintclass()
+#define TYPE_IS_INT(t)       ((t) == registry_getintclass())
+#define TYPE_UINT                    registry_getuintclass()
+#define TYPE_IS_UINT(t)      ((t) == registry_getuintclass())
+#define TYPE_NUMBER                  registry_getnumberclass()
+#define TYPE_IS_NUMBER(t)    ((t) == registry_getnumberclass())
+#define TYPE_FLOAT                   registry_getnumberclass()
+#define TYPE_IS_FLOAT(t)     ((t) == registry_getnumberclass())
+#define TYPE_BOOLEAN                 registry_getbooleanclass()
+#define TYPE_IS_BOOLEAN(t)   ((t) == registry_getbooleanclass())
+#define TYPE_STRING                  registry_getstringclass()
+#define TYPE_IS_STRING(t)    ((t) == registry_getstringclass())
+#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_NAMESPACE            registry_getnamespaceclass()
 #define TYPE_IS_NAMESPACE(t) ((t) == registry_getnamespaceclass())
-
-#define TYPE_OBJECT               registry_getobjectclass()
-
-#define TYPE_FUNCTION(f)          ((f)->return_type,slotinfo_asclass((slotinfo_t*)(f)))
-#define TYPE_IS_FUNCTION(t)       registry_isfunctionclass(t)
-
-#define TYPE_CLASS(f)             ((f)->superclass,slotinfo_asclass((slotinfo_t*)(f)))
-#define TYPE_IS_CLASS(t)          registry_isclassclass(t)
-
-#define TYPE_NULL                 registry_getnullclass()
-#define TYPE_IS_NULL(t)   ((t) == registry_getnullclass())
+#define TYPE_FUNCTION(f)     ((f)->return_type,slotinfo_asclass((slotinfo_t*)(f)))
+#define TYPE_IS_FUNCTION(t)  registry_isfunctionclass(t)
+#define TYPE_CLASS(f)        ((f)->superclass,slotinfo_asclass((slotinfo_t*)(f)))
+#define TYPE_IS_CLASS(t)     registry_isclassclass(t)
+#define TYPE_NULL            registry_getnullclass()
+#define TYPE_IS_NULL(t)      ((t) == registry_getnullclass())
         
 #define TYPE_IS_BUILTIN_SIMPLE(type) (TYPE_IS_INT(type) || \
                                       TYPE_IS_UINT(type) || \