#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);
/* member/class flags */
#define FLAG_FINAL 1
#define FLAG_BUILTIN 128
+#define FLAG_USED 64
/* member flags */
#define FLAG_STATIC 2
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 {
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);
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);
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) \
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();
#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()