extern "C" {
#endif
-#define NEW(t,y) t*y = (t*)malloc(sizeof(t));memset(y, 0, sizeof(t));
+#define NEW(t,y) t*y = (t*)rfx_calloc(sizeof(t));
/* dynamically growing mem section */
typedef struct _mem_t {
void*internal;
} map_t;
+/* type information */
+typedef char (*equals_func)(const void*o1, const void*o2);
+typedef unsigned int (*hash_func)(const void*o);
+typedef void* (*dup_func)(const void*o);
+typedef void (*free_func)(void*o);
+
+typedef struct _type_t {
+ equals_func equals;
+ hash_func hash;
+ dup_func dup;
+ free_func free;
+} type_t;
+
+extern type_t charptr_type;
+extern type_t stringstruct_type;
+extern type_t ptr_type;
+
typedef struct _dictentry {
- const char*s;
- int len;
+ void*key;
unsigned int hash;
void*data;
struct _dictentry*next;
/* (void*) pointers referenced by strings */
typedef struct _dict {
dictentry_t**slots;
+ type_t*key_type;
int hashsize;
int num;
} dict_t;
/* array of key/value pairs, with fast lookup */
typedef struct _array_entry {
- const char*name;
+ void*name;
void*data;
} array_entry_t;
char* strdup_n(const char*str, int size);
+unsigned int crc32_add_byte(unsigned int crc32, unsigned char b);
+unsigned int crc32_add_string(unsigned int crc32, const char*s);
+
void mem_init(mem_t*mem);
int mem_put(mem_t*m, void*data, int length);
int mem_putstring(mem_t*m, string_t str);
int ringbuffer_read(ringbuffer_t*r, void*buf, int size);
void ringbuffer_clear(ringbuffer_t*r);
+/* old style functions- should be renamed */
string_t string_new(const char*text, int len);
string_t string_new2(const char*text);
-unsigned int string_hash(string_t*str);
+void string_dup(string_t*str, const char*text);
+void string_dup2(string_t*str, const char*text, int len);
+
+char* string_cstr(string_t*str);
+char* string_escape(string_t*str);
+string_t* string_new3(const char*text, int len);
+string_t* string_new4(const char*text);
+void string_free(string_t*s);
+unsigned int string_hash(const string_t*str);
unsigned int string_hash2(const char*str);
unsigned int string_hash3(const char*str, int len);
void string_set(string_t*str, const char*text);
void string_set2(string_t*str, const char*text, int len);
-void string_dup(string_t*str, const char*text);
-void string_dup2(string_t*str, const char*text, int len);
+string_t*string_dup3(string_t*s);
int string_equals(string_t*str, const char*text);
void stringarray_init(stringarray_t*sa, int hashsize);
void stringarray_destroy(stringarray_t*sa);
dict_t*dict_new();
-void dict_init(dict_t*dict);
-void dict_put(dict_t*dict, string_t t1, void* t2);
-void dict_put2(dict_t*dict, const char* t1, void* t2);
-void dict_put3(dict_t*dict, const char* t1, int len, void* t2);
+dict_t*dict_new2(type_t*type);
+void dict_init(dict_t*dict, int size);
+dictentry_t*dict_put(dict_t*h, const void*key, void* data);
+void dict_put2(dict_t*h, const char*s, void*data);
int dict_count(dict_t*h);
void dict_dump(dict_t*h, FILE*fi, const char*prefix);
-void* dict_lookup3(dict_t*h, const char*s, const void*data);
-void* dict_lookup2(dict_t*h, const char*s, int len);
-void* dict_lookup(dict_t*h, const char*s);
-char dict_del(dict_t*h, const char*s);
-void dict_foreach_keyvalue(dict_t*h, void (*runFunction)(void*data, const char*key, void*val), void*data);
+dictentry_t* dict_get_slot(dict_t*h, const void*key);
+char dict_contains(dict_t*h, const void*s);
+void* dict_lookup(dict_t*h, const void*s);
+char dict_del(dict_t*h, const void*s);
+dict_t*dict_clone(dict_t*);
+
+void dict_foreach_keyvalue(dict_t*h, void (*runFunction)(void*data, const void*key, void*val), void*data);
void dict_foreach_value(dict_t*h, void (*runFunction)(void*));
void dict_free_all(dict_t*h, void (*freeFunction)(void*));
void dict_clear(dict_t*h);
void** heap_flatten(heap_t*h);
array_t* array_new();
+array_t* array_new2(type_t*type);
void array_free(array_t*array);
-const char*array_getkey(array_t*array, int nr);
-char*array_getvalue(array_t*array, int nr);
-int array_append(array_t*array, const char*name, const void*data);
-int array_find(array_t*array, const char*name);
-int array_find2(array_t*array, const char*name, void*data);
-int array_update(array_t*array, const char*name, void*data);
-int array_append_if_new(array_t*array, const char*name, void*data);
+void*array_getkey(array_t*array, int nr);
+void*array_getvalue(array_t*array, int nr);
+int array_append(array_t*array, const void*name, void*data);
+#define array_contains(a,b) (array_find((a),(b))>=0)
+int array_find(array_t*array, const void*name);
+int array_find2(array_t*array, const void*name, void*data);
+int array_update(array_t*array, const void*name, void*data);
+int array_append_if_new(array_t*array, const void*name, void*data);
+#define array_length(a) ((a)->num)
#define DECLARE(x) struct _##x;typedef struct _##x x##_t;
#define DECLARE_LIST(x) \
struct _##x##_list*next; \
}; \
typedef struct _##x##_list x##_list_t;
-int list_length(void*_list);
+int list_length_(void*_list);
+void*list_clone_(void*_list);
void list_append_(void*_list, void*entry);
+void list_prepend_(void*_list, void*entry);
void list_free_(void*_list);
#define list_new() ((void*)0)
#define list_append(list, e) {sizeof((list)->next);list_append_(&(list),(e));}
+#define list_prepend(list, e) {sizeof((list)->next);list_prepend_(&(list),(e));}
#define list_free(list) {sizeof((list)->next);list_free_(&(list));}
+#define list_clone(list) (sizeof((list)->next),list_clone_(&(list)))
+#define list_length(list) (sizeof((list)->next),list_length_(list))
#ifdef __cplusplus
}