X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fq.h;h=2ea7fe1faa923df5207a4d3f0ae777862cab46b6;hp=e1e9466e744c2ffc933c1d4d3760def02106e1bd;hb=2ddfa640af28b592ecf4295f0b1b7b43c923f707;hpb=526504e079a22cfa2981d86575dd6daf77f74931

diff --git a/lib/q.h b/lib/q.h
index e1e9466..2ea7fe1 100644
--- a/lib/q.h
+++ b/lib/q.h
@@ -23,6 +23,7 @@
 #define __q_h__
 
 #include <stdio.h>
+#include "mem.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -35,6 +36,7 @@ typedef struct _mem_t {
     char*buffer;
     int len;
     int pos;
+    int read_pos;
 } mem_t;
 
 /* fifo buffered growing mem region */
@@ -70,6 +72,8 @@ typedef struct _type_t {
 
 extern type_t charptr_type;
 extern type_t stringstruct_type;
+extern type_t ptr_type;
+extern type_t int_type;
 
 typedef struct _dictentry {
     void*key;
@@ -108,8 +112,7 @@ typedef struct _stringarray_t
 } stringarray_t;
 
 /* heap */
-typedef struct _heap
-{
+typedef struct _heap {
     void**elements;
     char*data;
     int elem_size;
@@ -118,7 +121,34 @@ typedef struct _heap
     int(*compare)(const void *, const void *);
 } heap_t;
 
+/* trie (with rollback) */
+typedef struct _trielayer {
+    struct _trielayer*row[256];
+    unsigned char*rest;
+    void*data;
+} trielayer_t;
+
+typedef struct _trie {
+    trielayer_t* start;
+    void*rollback;
+} trie_t;
+
+/* move to front list structure */
+typedef struct _mtf_item {
+    const void*key;
+    int num;
+    struct _mtf_item*next;
+} mtf_item_t;
+
+typedef struct _mtf {
+    mtf_item_t*first;
+    type_t*type;
+} mtf_t;
+
 char* strdup_n(const char*str, int size);
+char* allocprintf(const char*str, ...);
+
+float medianf(float*values, int n);
 
 unsigned int crc32_add_byte(unsigned int crc32, unsigned char b);
 unsigned int crc32_add_string(unsigned int crc32, const char*s);
@@ -126,6 +156,7 @@ 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 mem_get(mem_t*m, void*data, int length);
 void mem_clear(mem_t*mem);
 void mem_destroy(mem_t*mem);
 
@@ -134,15 +165,23 @@ void ringbuffer_put(ringbuffer_t*r, void*buf, int size);
 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);
+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);
@@ -157,18 +196,36 @@ 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);
 void dict_dump(dict_t*h, FILE*fi, const char*prefix);
+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);
+char dict_del2(dict_t*h, const void*key, void*data);
+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_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);
@@ -177,15 +234,31 @@ void map_dump(map_t*map, FILE*fi, const char*prefix);
 void map_clear(map_t*map);
 void map_destroy(map_t*map);
 
-void heap_init(heap_t*h,int n,int elem_size, int(*compare)(const void *, const void *));
+void heap_init(heap_t*h,int elem_size, int(*compare)(const void *, const void *));
+heap_t* heap_new(int elem_size, int(*compare)(const void *, const void *));
+heap_t* heap_clone(heap_t*o);
 void heap_clear(heap_t*h);
+void heap_destroy(heap_t*h);
 void heap_put(heap_t*h, void*e);
 int heap_size(heap_t*h);
-void* heap_max(heap_t*h);
+void* heap_peek(heap_t*h);
 void* heap_chopmax(heap_t*h);
 void heap_dump(heap_t*h, FILE*fi);
 void** heap_flatten(heap_t*h);
 
+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);
+
+mtf_t* mtf_new(type_t*type);
+void mtf_increase(mtf_t*m, const void*key);
+void mtf_destroy(mtf_t*m);
+
 array_t* array_new();
 array_t* array_new2(type_t*type);
 void array_free(array_t*array);
@@ -211,11 +284,15 @@ void*list_clone_(void*_list);
 void list_append_(void*_list, void*entry);
 void list_prepend_(void*_list, void*entry);
 void list_free_(void*_list);
+void list_deep_free_(void*_list);
+void list_concat_(void*l1, void*l2);
 #define list_new() ((void*)0)
 #define list_append(list, e) {sizeof((list)->next);list_append_(&(list),(e));}
+#define list_concat(l1, l2) {sizeof((l1)->next);sizeof((l2)->next);list_concat_(&(l1),&(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_clone(list) (sizeof((list)->next),list_clone_(&(list)))
+#define list_deep_free(list) {sizeof((list)->next);list_deep_free_(&(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