X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fq.h;h=4674cf496ab01e942ffe885f0c6d396320df4c4d;hb=e4687b3aa2aed49fb16ba9e9561344d808750297;hp=9e50000bf9e27fde4593f47c22c6d045d7960093;hpb=434d5040b814eae784d080c695fe8c3d370a166b;p=swftools.git

diff --git a/lib/q.h b/lib/q.h
index 9e50000..4674cf4 100644
--- a/lib/q.h
+++ b/lib/q.h
@@ -110,8 +110,7 @@ typedef struct _stringarray_t
 } stringarray_t;
 
 /* heap */
-typedef struct _heap
-{
+typedef struct _heap {
     void**elements;
     char*data;
     int elem_size;
@@ -120,13 +119,20 @@ typedef struct _heap
     int(*compare)(const void *, const void *);
 } heap_t;
 
-typedef struct _trie {
-    struct _trie*row[256];
+/* trie (with rollback) */
+typedef struct _trielayer {
+    struct _trielayer*row[256];
     unsigned char*rest;
-} trie_t;
+    void*data;
+} trielayer_t;
 
+typedef struct _trie {
+    trielayer_t* start;
+    void*rollback;
+} trie_t;
 
 char* strdup_n(const char*str, int size);
+char* allocprintf(const char*str, ...);
 
 unsigned int crc32_add_byte(unsigned int crc32, unsigned char b);
 unsigned int crc32_add_string(unsigned int crc32, const char*s);
@@ -211,8 +217,14 @@ void* heap_chopmax(heap_t*h);
 void heap_dump(heap_t*h, FILE*fi);
 void** heap_flatten(heap_t*h);
 
-void trie_put(trie_t**t, unsigned const char*id);
-int trie_lookup(trie_t*t, unsigned const char*id);
+trie_t*trie_new();
+void trie_put(trie_t*t, unsigned const char*id, void*data);
+char trie_remove(trie_t*t, unsigned const char*id);
+void*trie_lookup(trie_t*t, unsigned const char*id);
+int trie_contains(trie_t*t, unsigned const char*id);
+void trie_remember(trie_t*t);
+void trie_rollback(trie_t*t);
+void trie_dump(trie_t*t);
 
 array_t* array_new();
 array_t* array_new2(type_t*type);
@@ -247,7 +259,7 @@ void list_concat_(void*l1, void*l2);
 #define list_prepend(list, e) {sizeof((list)->next);list_prepend_(&(list),(e));}
 #define list_free(list) {sizeof((list)->next);list_free_(&(list));}
 #define list_deep_free(list) {sizeof((list)->next);list_deep_free_(&(list));}
-#define list_clone(list) (sizeof((list)->next),list_clone_(&(list)))
+#define list_clone(list) (sizeof((list)->next),(list?list_clone_(&(list)):0))
 #define list_length(list) (sizeof((list)->next),list_length_(list))
 
 #ifdef __cplusplus