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

diff --git a/lib/as3/registry.h b/lib/as3/registry.h
index b2a8084..c9a21b0 100644
--- a/lib/as3/registry.h
+++ b/lib/as3/registry.h
@@ -24,8 +24,10 @@
 #ifndef __abc_registry_h__
 #define __abc_registry_h__
 
-#include "pool.h"
+#include "abc.h"
 
+DECLARE(asset_bundle);
+DECLARE_LIST(asset_bundle);
 DECLARE(slotinfo);
 DECLARE(classinfo);
 DECLARE(memberinfo);
@@ -38,6 +40,7 @@ DECLARE_LIST(slotinfo);
 /* member/class flags */
 #define FLAG_FINAL 1
 #define FLAG_BUILTIN 128
+#define FLAG_USED 64
 
 /* member flags */
 #define FLAG_STATIC 2
@@ -77,7 +80,9 @@ struct _classinfo {
     int slot;
     classinfo_t*superclass;
     dict_t members;
+    dict_t static_members;
     void*data; //TODO: get rid of this- parser.y should pass type/value/code triples around
+    asset_bundle_t*assets;
     classinfo_t*interfaces[];
 };
 struct _memberinfo {
@@ -110,6 +115,12 @@ struct _varinfo /*extends memberinfo*/ {
     constant_t*value;
 };
 
+struct _asset_bundle {
+    abc_file_t*file;
+    asset_bundle_list_t*dependencies;
+    char used;
+};
+
 extern type_t memberinfo_type;
 extern type_t slotinfo_type;
 char slotinfo_equals(slotinfo_t*c1, slotinfo_t*c2);
@@ -117,9 +128,9 @@ char slotinfo_equals(slotinfo_t*c1, slotinfo_t*c2);
 void registry_init();
         
 classinfo_t* classinfo_register(int access, const char*package, const char*name, int num_interfaces);
-methodinfo_t* methodinfo_register_onclass(classinfo_t*cls, U8 access, const char*ns, const char*name);
+methodinfo_t* methodinfo_register_onclass(classinfo_t*cls, U8 access, const char*ns, const char*name, char is_static);
 methodinfo_t* methodinfo_register_global(U8 access, const char*package, const char*name);
-varinfo_t* varinfo_register_onclass(classinfo_t*cls, U8 access,  const char*ns, const char*name);
+varinfo_t* varinfo_register_onclass(classinfo_t*cls, U8 access,  const char*ns, const char*name, char is_static);
 varinfo_t* varinfo_register_global(U8 access, const char*package, const char*name);
 
 slotinfo_t* registry_resolve(slotinfo_t*s);
@@ -127,8 +138,8 @@ void registry_resolve_all();
 
 slotinfo_t* registry_find(const char*package, const char*name);
 void registry_dump();
-memberinfo_t* registry_findmember(classinfo_t*cls, const char*ns, const char*name, char superclasses);
-memberinfo_t* registry_findmember_nsset(classinfo_t*cls, namespace_list_t*ns, const char*name, char superclasses);
+memberinfo_t* registry_findmember(classinfo_t*cls, const char*ns, const char*name, char superclasses, char is_static);
+memberinfo_t* registry_findmember_nsset(classinfo_t*cls, namespace_list_t*ns, const char*name, char superclasses, char is_static);
 
 void registry_fill_multiname(multiname_t*m, namespace_t*n, slotinfo_t*c);
 #define MULTINAME(m,x) \
@@ -147,14 +158,20 @@ classinfo_t* slotinfo_gettype(slotinfo_t*);
 
 namespace_t access2namespace(U8 access, char*package);
 
-char registry_ispackage(char*package);
+char registry_ispackage(const char*package);
+
+void registry_add_asset(asset_bundle_t*bundle);
+void registry_use(slotinfo_t*s);
+asset_bundle_list_t*registry_getassets();
 
 // static multinames
+classinfo_t voidclass;
 classinfo_t* registry_getanytype();
 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();
@@ -189,10 +206,14 @@ 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()