X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fq.h;h=db55cd676b0040d290457ff99fbd67a598078ae2;hb=bb864e1a88e670c99d559c7dee4f74e9bf7d978b;hp=3834e1126b1098f0050cb72c6c9a76303021ca1c;hpb=067b8f578c7b189840383b979ea4ca8ccc88ebe9;p=swftools.git

diff --git a/lib/q.h b/lib/q.h
index 3834e11..db55cd6 100644
--- a/lib/q.h
+++ b/lib/q.h
@@ -174,6 +174,7 @@ void stringarray_destroy(stringarray_t*sa);
 dict_t*dict_new();
 dict_t*dict_new2(type_t*type);
 void dict_init(dict_t*dict, int size);
+void dict_init2(dict_t*dict, type_t*type, 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);
@@ -190,6 +191,9 @@ void dict_free_all(dict_t*h, char free_keys, void (*free_data_function)(void*));
 void dict_clear(dict_t*h);
 void dict_destroy_shallow(dict_t*dict);
 void dict_destroy(dict_t*dict);
+#define DICT_ITERATE_DATA(d,t,v) int v##_i;dictentry_t*v##_e;t v;for(v##_i=0;v##_i<(d)->hashsize;v##_i++) for(v##_e=(d)->slots[v##_i]; v##_e && ((v=(t)v##_e->data)||1); v##_e=v##_e->next)
+#define DICT_ITERATE_KEY(d,t,v)  int v##_i;dictentry_t*v##_e;t v;for(v##_i=0;v##_i<(d)->hashsize;v##_i++) for(v##_e=(d)->slots[v##_i];v##_e && ((v=(t)v##_e->key)||1);v##_e=v##_e->next)
+#define DICT_ITERATE_ITEMS(d,t1,v1,t2,v2) int v1##_i;dictentry_t*v1##_e;t1 v1;t2 v2;for(v1##_i=0;v1##_i<(d)->hashsize;v1##_i++) for(v1##_e=(d)->slots[v1##_i]; v1##_e && (((v1=(t1)v1##_e->key)&&(v2=(t2)v1##_e->data))||1); v1##_e=v1##_e->next)
 
 void map_init(map_t*map);
 void map_put(map_t*map, string_t t1, string_t t2);
@@ -208,6 +212,7 @@ void heap_dump(heap_t*h, FILE*fi);
 void** heap_flatten(heap_t*h);
 
 void trie_put(trie_t**t, unsigned const char*id);
+char trie_remove(trie_t*t, unsigned const char*id);
 int trie_lookup(trie_t*t, unsigned const char*id);
 
 array_t* array_new();