X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fas3%2Fpool.c;h=ce279a3428c5be57119c8e36e9e9a3d5e885cd05;hp=65e7793585d19734727d60e8f7e963a4a2b6d3f4;hb=d7367b3ec772ea163ebca6b7497639a0cb45c20c;hpb=af62622d69d19c801da2a804569fc0d69654ff6e

diff --git a/lib/as3/pool.c b/lib/as3/pool.c
index 65e7793..ce279a3 100644
--- a/lib/as3/pool.c
+++ b/lib/as3/pool.c
@@ -21,68 +21,333 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <assert.h>
 #include "pool.h"
 
-char* access2str(int type)
+
+// ----------------------------- float ----------------------------------
+
+void* float_clone(const void*_v) {
+    if(_v==0) 
+        return 0;
+    const double*v1=_v;
+    double*v2 = malloc(sizeof(double));
+    *v2 = *v1;
+    return v2;
+}
+unsigned int float_hash(const void*_v) {
+    if(!_v)
+        return 0;
+    const unsigned char*b=_v;
+    unsigned int h=0;
+    int t;
+    for(t=0;t<8;t++)
+        h = crc32_add_byte(h, b[t]);
+    return h;
+}
+void float_destroy(void*_v) {
+    double*v = (double*)_v;
+    if(v)
+        free(v);
+}
+char float_equals(const void*_v1, const void*_v2) {
+    const double*v1=_v1;
+    const double*v2=_v2;
+    if(!v1 || !v2) 
+        return v1==v2;
+    
+    if(*v1==*v2) return 1;
+    if(*v1!=*v1 && *v2!=*v2) return 1; //both values are NaN
+    return 0;
+}
+
+type_t float_type = {
+    dup: float_clone,
+    hash: float_hash,
+    free: float_destroy,
+    equals: float_equals
+};
+
+// ----------------------------- uint ----------------------------------
+
+unsigned int undefined_uint = 0;
+
+void*uint_clone(const void*_v) {
+    if(!_v)
+        return 0;
+    const unsigned int*v1=_v;
+    unsigned int*v2 = malloc(sizeof(unsigned int));
+    *v2 = *v1;
+    return v2;
+}
+unsigned int uint_hash(const void*_v) {
+    if(!_v)
+        return 0;
+    const unsigned int*v=_v;
+    return *v;
+}
+void uint_destroy(void*_v) {
+    unsigned int*v = (unsigned int*)_v;
+    if(v)
+        free(v);
+}
+char uint_equals(const void*_v1, const void*_v2) {
+    const unsigned int*v1=_v1;
+    const unsigned int*v2=_v2;
+    if(!v1 || !v2)
+        return v1==v2;
+    return *v1==*v2;
+}
+
+type_t uint_type = {
+    dup: (dup_func)uint_clone,
+    hash: (hash_func)uint_hash,
+    free: (free_func)uint_destroy,
+    equals: (equals_func)uint_equals
+};
+
+// ----------------------------- namespace ----------------------------------
+
+unsigned int namespace_hash(namespace_t*n)
 {
-    if(type==0x08) return "";
-    else if(type==0x16) return "package";
-    else if(type==0x17) return "packageinternal";
-    else if(type==0x18) return "protected";
-    else if(type==0x19) return "explicit";
-    else if(type==0x1A) return "staticprotected";
-    else if(type==0x05) return "private";
-    else return "undefined";
+    if(!n)
+        return 0;
+    unsigned int hash = 0;
+    hash = crc32_add_byte(hash, n->access);
+    hash = crc32_add_string(hash, n->name);
+    return hash;
 }
 
-char* multiname_to_string(multiname_t*m)
+unsigned char namespace_equals(const namespace_t*n1, const namespace_t*n2)
 {
-    char*mname = 0;
-    if(m->type==0x07 || m->type==0x0d) {
-        mname = malloc(strlen(m->ns->name)+strlen(m->name)+32);
-        sprintf(mname, "<%s>\0", access2str(m->ns->access));
-        strcat(mname, m->ns->name);
-        strcat(mname, "::");
-        strcat(mname, m->name);
-    } else if(m->type==0x0f || m->type==0x10) {
-        mname = strdup(m->name);
-    } else if(m->type==0x11 || m->type==0x12) {
-        mname = strdup("");
-    } else if(m->type==0x09 || m->type==0x0e) {
-        char*s = namespace_set_to_string(m->namespace_set);
-        mname = malloc(strlen(s)+strlen(m->name)+16);
-        strcpy(mname, s);
-        free(s);
-        strcat(mname, "::");
-        strcat(mname, m->name);
-    } else if(m->type==0x1b || m->type==0x1c) {
-        mname = namespace_set_to_string(m->namespace_set);
+    if(!n1 || !n2)
+        return n1==n2;
+    if(n1->access != n2->access)
+        return 0;
+    if(!(n1->name) != !(n2->name))
+        return 0;
+    if(n1->name && n2->name && strcmp(n1->name, n2->name))
+        return 0;
+    return 1;
+}
+
+char*escape_string(const char*str)
+{
+    if(!str)
+        return strdup("NULL");
+    int len=0;
+    unsigned const char*s=(unsigned const char*)str;
+    while(*s) {
+        if(*s<10) {
+            len+=2; // \d
+        } else if(*s<32) {
+            len+=3; // \dd
+        } else if(*s<127) {
+            len++;
+        } else {
+            len+=4; // \xhh
+        }
+        s++;
     }
-    return mname;
+    char*newstr = malloc(len+1);
+    char*dest = newstr;
+    s=(unsigned const char*)str;
+    while(*s) {
+        if(*s<9) {
+            dest+=sprintf(dest, "\\%d", *s);
+        } else if(*s<32) {
+            if(*s==13)
+                dest+=sprintf(dest, "\\r");
+            else if(*s==10) 
+                dest+=sprintf(dest, "\\n");
+            else if(*s==9) 
+                dest+=sprintf(dest, "\\t");
+            else 
+                dest+=sprintf(dest, "\\%2o", *s);
+        } else if(*s<127) {
+            *dest++=*s;
+        } else {
+            dest+=sprintf(dest, "\\x%02x", *s);
+        }
+        s++;
+    }
+    *dest = 0;
+    return newstr;
 }
 
-char* namespace_to_string(namespace_t*ns)
+char* namespace_tostring(namespace_t*ns)
 {
+    if(!ns)
+        return strdup("NULL");
     char*access = 0;
     U8 type = ns->access;
-    if(type==0x08) access = "";
-    else if(type==0x16) access = "Package";
-    else if(type==0x17) access = "PackageInternal";
-    else if(type==0x18) access = "Protected";
-    else if(type==0x19) access = "Explicit";
-    else if(type==0x1A) access = "StaticProtected";
-    else if(type==0x05) access = "Private";
-    else {
-        fprintf(stderr, "Undefined namespace type %02x\n", type);
-        access = "UnknownNS";
-    }
-    char*string = malloc(strlen(access)+strlen(ns->name)+3);
-    sprintf(string, "<%s>%s", access, ns->name);
+    access = access2str(type);
+    char*s = escape_string(ns->name);
+    char*string = (char*)malloc(strlen(access)+strlen(s)+7);
+    if(!s)
+        sprintf(string, "[%s]NULL", access);
+    else if(!*s)
+        sprintf(string, "[%s]\"\"", access);
+    else 
+        sprintf(string, "[%s]%s", access, s);
+    free(s);
     return string;
 }
 
-char* namespace_set_to_string(namespace_set_t*set)
+namespace_t* namespace_clone(namespace_t*other)
 {
+    if(!other)
+        return 0;
+    NEW(namespace_t,n);
+    n->access = other->access;
+    n->name = other->name?strdup(other->name):0;
+    return n;
+}
+
+namespace_t* namespace_fromstring(const char*name)
+{
+    namespace_t*ns = malloc(sizeof(namespace_t));
+    memset(ns, 0, sizeof(namespace_t));
+    if(name[0] == '[') {
+        U8 access = 0;
+        char*n = strdup(name);
+        char*bracket = strchr(n, ']');
+        if(bracket) {
+            *bracket = 0;
+            char*a = n+1;
+            name += (bracket-n)+1;
+            if(!strcmp(a, "")) access=0x16;
+            else if(!strcmp(a, "undefined")) access=0x08; // public??
+            else if(!strcmp(a, "package")) access=0x16;
+            else if(!strcmp(a, "public")) access=0x16;
+            else if(!strcmp(a, "packageinternal")) access=0x17;
+            else if(!strcmp(a, "protected")) access=0x18;
+            else if(!strcmp(a, "explicit")) access=0x19;
+            else if(!strcmp(a, "staticprotected")) access=0x1a;
+            else if(!strcmp(a, "private")) access=0x05;
+            else {
+                fprintf(stderr, "Undefined access level: [%s]\n", a);
+                free(n);
+                return 0;
+            }
+        }
+        ns->access = access;
+        ns->name = strdup(name);
+        free(n);
+        return ns;
+    } else {
+        ns->access = 0x16;
+        ns->name = strdup(name);
+        return ns;
+    }
+}
+
+namespace_t* namespace_new(U8 access, const char*name)
+{
+    namespace_t*ns = malloc(sizeof(namespace_t));
+    ns->access = access;
+    /* not sure what namespaces with empty strings are good for, but they *do* exist */
+    ns->name = name?strdup(name):0;
+    return ns;
+}
+namespace_t* namespace_new_namespace(const char*name) {
+    return namespace_new(0x08, name); // public?
+}
+namespace_t* namespace_new_package(const char*name) {
+    return namespace_new(0x16 , name);
+}
+namespace_t* namespace_new_packageinternal(const char*name) {
+    return namespace_new(0x17, name);
+}
+namespace_t* namespace_new_protected(const char*name) {
+    return namespace_new(0x18, name);
+}
+namespace_t* namespace_new_explicit(const char*name) {
+    return namespace_new(0x19, name);
+}
+namespace_t* namespace_new_staticprotected(const char*name) {
+    return namespace_new(0x1a, name);
+}
+namespace_t* namespace_new_private(const char*name) {
+    return namespace_new(0x05, name);
+}
+
+void namespace_destroy(namespace_t*n)
+{
+    if(n) {
+        free((char*)n->name);n->name=0;
+        n->access=0x00;
+        free(n);
+    }
+}
+
+type_t namespace_type = {
+    dup: (dup_func)namespace_clone,
+    hash: (hash_func)namespace_hash,
+    free: (free_func)namespace_destroy,
+    equals: (equals_func)namespace_equals
+};
+
+// ---------------------------namespace sets --------------------------------
+
+unsigned int namespace_set_hash(namespace_set_t*set)
+{
+    if(!set)
+        return 0;
+    namespace_list_t*l = set->namespaces;
+    unsigned int hash = 0;
+    while(l) {
+        hash = crc32_add_byte(hash, l->namespace->access);
+        hash = crc32_add_string(hash, l->namespace->name);
+        l = l->next;
+    }
+    return hash;
+}
+
+int namespace_set_equals(namespace_set_t*m1, namespace_set_t*m2)
+{
+    if(!m1 || !m2)
+        return m1==m2;
+    namespace_list_t*l1 = m1->namespaces;
+    namespace_list_t*l2 = m2->namespaces;
+    while(l1 && l2) {
+        if(l1->namespace->access != l2->namespace->access)
+            return 0;
+        if(!(l1->namespace->name) != !(l2->namespace->name))
+            return 0;
+        if(l1->namespace->name && l2->namespace->name && strcmp(l1->namespace->name, l2->namespace->name))
+            return 0;
+        l1 = l1->next;
+        l2 = l2->next;
+    }
+    if(l1||l2)
+        return 0;
+    return 1;
+}
+
+namespace_set_t* namespace_set_clone(namespace_set_t*other)
+{
+    if(!other)
+        return 0;
+    NEW(namespace_set_t,set);
+    set->namespaces = list_new();
+    namespace_list_t*l = other->namespaces;
+    while(l) {
+        list_append(set->namespaces, namespace_clone(l->namespace));
+        l = l->next;
+    }
+    return set;
+}
+namespace_set_t* namespace_set_new()
+{
+    NEW(namespace_set_t,set);
+    set->namespaces = list_new();
+    return set;
+}
+char* namespace_set_tostring(namespace_set_t*set)
+{
+    if(!set)
+        return strdup("NULL");
     /* TODO: is the order of the namespaces important (does it
        change the lookup order?). E.g. flex freely shuffles namespaces
        around.
@@ -92,7 +357,7 @@ char* namespace_set_to_string(namespace_set_t*set)
     int l = 0;
     namespace_list_t*lns = set->namespaces;
     while(lns) {
-        char*s = namespace_to_string(lns->namespace);
+        char*s = namespace_tostring(lns->namespace);
         l += strlen(s)+1;
         free(s);
         lns = lns->next;
@@ -101,108 +366,220 @@ char* namespace_set_to_string(namespace_set_t*set)
     strcpy(desc, "{");
     lns = set->namespaces;
     while(lns) {
-        char*s = namespace_to_string(lns->namespace);
+        char*s = namespace_tostring(lns->namespace);
         strcat(desc, s);
         free(s);
-        strcat(desc, ",");
         lns = lns->next;
+        if(lns)
+            strcat(desc, ",");
     }
     strcat(desc, "}");
     return desc;
 }
 
-
-int pool_register_string(pool_t*pool, const char*s)
+void namespace_set_destroy(namespace_set_t*set)
 {
-    return array_append_if_new(pool->strings, s, 0);
+    if(set) {
+        namespace_list_t*l = set->namespaces;
+        while(l) {
+            namespace_destroy(l->namespace);l->namespace=0;
+            l = l->next;
+        }
+        list_free(set->namespaces);
+        free(set);
+    }
 }
 
-int pool_register_namespace(pool_t*pool, namespace_t*ns)
+type_t namespace_set_type = {
+    dup: (dup_func)namespace_set_clone,
+    hash: (hash_func)namespace_set_hash,
+    free: (free_func)namespace_set_destroy,
+    equals: (equals_func)namespace_set_equals
+};
+
+// ----------------------------- multiname ----------------------------------
+
+unsigned int multiname_hash(multiname_t*m)
 {
-    if(!ns)
+    if(!m)
         return 0;
-    char*name = namespace_to_string(ns);
-    int i = array_append_if_new(pool->namespaces, name, ns);
-    free(name);
-    return i;
-}
-int pool_register_namespace_set(pool_t*pool, namespace_set_t*set)
-{
-    char*name = namespace_set_to_string(set);
-    int i = array_append_if_new(pool->namespace_sets, name, set);
-    free(name);
-    return i;
+    unsigned int hash = crc32_add_byte(0, m->type);
+    if(m->name) {
+        hash = crc32_add_string(hash, m->name);
+    }
+    if(m->ns) {
+        hash = crc32_add_byte(hash, m->ns->access);
+        hash = crc32_add_string(hash, m->ns->name);
+    }
+    if(m->namespace_set) {
+        namespace_list_t*l = m->namespace_set->namespaces;
+        while(l) {
+            hash = crc32_add_byte(hash, l->namespace->access);
+            hash = crc32_add_string(hash, l->namespace->name);
+            l = l->next;
+        }
+    }
+    return hash;
 }
-int pool_register_multiname(pool_t*pool, multiname_t*n)
+
+int multiname_equals(multiname_t*m1, multiname_t*m2)
 {
-    if(!n)
+    if(!m1 || !m2)
+        return m1==m2;
+    if(m1->type!=m2->type)
         return 0;
-    char*name = multiname_to_string(n);
-    int i =array_append_if_new(pool->multinames, name, n);
-    free(name);
-    return i;
+
+    if((!m1->name) != (!m2->name))
+        return 0;
+    if((!m1->ns) != (!m2->ns))
+        return 0;
+    if((!m1->namespace_set) != (!m2->namespace_set))
+        return 0;
+
+    if(m1->name && m2->name && strcmp(m1->name,m2->name))
+        return 0;
+    if(m1->ns && m2->ns) {
+        if(!namespace_equals(m1->ns, m2->ns))
+            return 0;
+    }
+    if(m1->namespace_set && m2->namespace_set) {
+        if(!namespace_set_equals(m1->namespace_set, m2->namespace_set))
+            return 0;
+    }
+    return 1;
 }
-int pool_register_multiname2(pool_t*pool, char*name)
+
+multiname_t* multiname_new(namespace_t*ns, const char*name)
 {
-    multiname_t*n = multiname_fromstring(name);
-    int i =array_append_if_new(pool->multinames, name, n);
-    return i;
+    NEW(multiname_t,m);
+    m->type = QNAME;
+    if(!ns) {
+        m->ns = namespace_new_packageinternal("");
+    } else {
+        m->ns = namespace_clone(ns);
+    }
+    m->name = strdup(name);
+    return m;
 }
-int pool_find_namespace(pool_t*pool, namespace_t*ns)
+
+multiname_t* multiname_clone(multiname_t*other)
 {
-    if(!ns)
+    if(!other)
         return 0;
-    char*name = namespace_to_string(ns);
-    int i = array_find(pool->namespaces, name);
-    if(i<0) {
-        fprintf(stderr, "Couldn't find namespace \"%s\" %08x in constant pool\n", name, ns);
-        return 0;
-    }
-    free(name);
-    return i;
+    NEW(multiname_t,m);
+    m->type = other->type;
+    if(other->ns)
+        m->ns = namespace_clone(other->ns);
+    if(other->namespace_set)
+        m->namespace_set = namespace_set_clone(other->namespace_set);
+    if(other->name)
+        m->name = strdup(other->name);
+    return m;
 }
-int pool_find_namespace_set(pool_t*pool, namespace_set_t*set)
+
+
+char* access2str(int type)
 {
-    char*name = namespace_set_to_string(set);
-    int i = array_find(pool->namespace_sets, name);
-    free(name);
-    if(i<0) {
-        fprintf(stderr, "Couldn't find namespace_set \"%s\" in constant pool\n", name);
-        return 0;
+    if(type==0x08) return "namespace";
+    else if(type==0x16) return "public";
+    else if(type==0x17) return "packageinternal";
+    else if(type==0x18) return "protected";
+    else if(type==0x19) return "explicit";
+    else if(type==0x1A) return "staticprotected";
+    else if(type==0x05) return "private";
+    else if(type==0x00) return "any";
+    else {
+        fprintf(stderr, "Undefined access type %02x\n", type);
+        return "undefined";
     }
-    return i;
 }
-int pool_find_string(pool_t*pool, const char*s)
+
+
+char multiname_late_namespace(multiname_t*m)
 {
-    int i = array_find(pool->strings, s);
-    if(i<0) {
-        fprintf(stderr, "Couldn't find string \"%s\" in constant pool\n", s);
-        *(int*)0=0;
+    if(!m)
         return 0;
-    }
-    return i;
+    return (m->type==RTQNAME || m->type==RTQNAMEA ||
+            m->type==RTQNAMEL || m->type==RTQNAMELA);
 }
-int pool_find_multiname(pool_t*pool, multiname_t*name)
+
+char multiname_late_name(multiname_t*m)
 {
-    char*n = multiname_to_string(name);
-    int i = array_find(pool->multinames, n);
-    if(i<0) {
-        fprintf(stderr, "Couldn't find multiname \"%s\" in constant pool\n", n);
+    if(!m)
         return 0;
-    }
-    return i;
+    return m->type==RTQNAMEL || m->type==RTQNAMELA ||
+           m->type==MULTINAMEL || m->type==MULTINAMELA;
 }
 
-multiname_t*pool_lookup_multiname(pool_t*pool, int i)
+char* multiname_tostring(multiname_t*m)
 {
-    multiname_t*m = (multiname_t*)array_getvalue(pool->multinames, i);
-    return m;
+    char*mname = 0;
+    if(!m)
+        return strdup("NULL");
+    if(m->type==0xff)
+        return strdup("--<MULTINAME 0xff>--");
+
+    char*name = m->name?escape_string(m->name):strdup("*");
+    int namelen = strlen(name);
+
+    if(m->type==QNAME || m->type==QNAMEA || m->type==POSTFIXTYPE) {
+        char*nsname = m->ns?escape_string(m->ns->name):strdup("NULL");
+        mname = malloc(strlen(nsname)+namelen+32);
+        strcpy(mname, "<q");
+        if(m->type == QNAMEA)
+            strcat(mname, ",attr");
+	strcat(mname, ">");
+	if(m->ns) {
+	    strcat(mname,"[");
+	    strcat(mname,access2str(m->ns->access));
+	    strcat(mname, "]");
+	}
+        strcat(mname, nsname);
+        free(nsname);
+        strcat(mname, "::");
+        strcat(mname, name);
+    } else if(m->type==RTQNAME || m->type==RTQNAMEA) {
+        mname = malloc(namelen+32);
+        strcpy(mname, "<rt");
+        if(m->type == RTQNAMEA) 
+            strcat(mname, ",attr");
+        strcat(mname, ">");
+        strcat(mname, name);
+    } else if(m->type==RTQNAMEL) {
+        mname = strdup("<rt,l>");
+    } else if(m->type==RTQNAMELA) {
+        mname = strdup("<rt,l,attr>");
+    } else if(m->type==MULTINAME || m->type==MULTINAMEA) {
+        char*s = namespace_set_tostring(m->namespace_set);
+        mname = malloc(strlen(s)+namelen+16);
+        if(m->type == MULTINAME)
+            strcpy(mname,"<multi>");
+        else //MULTINAMEA
+            strcpy(mname,"<multi,attr>");
+        strcat(mname, s);
+        strcat(mname, "::");
+        strcat(mname, name);
+        free(s);
+    } else if(m->type==MULTINAMEL || m->type==MULTINAMELA) {
+        char*s = namespace_set_tostring(m->namespace_set);
+        mname = malloc(strlen(s)+16);
+        if(m->type == MULTINAMEL)
+            strcpy(mname,"<l,multi>");
+        else //MULTINAMELA
+            strcpy(mname,"<l,multi,attr>");
+        strcat(mname,s);
+        free(s);
+    } else {
+        return strdup("<invalid>");
+    }
+    free(name);
+    return mname;
 }
 
 multiname_t* multiname_fromstring(const char*name2)
 {
     if(!name2)
-	name2 = "::";
+        return 0;
     char*n = strdup(name2);
     char*p = strstr(n, "::");
     char*namespace=0,*name=0;
@@ -228,36 +605,488 @@ multiname_t* multiname_fromstring(const char*name2)
     memset(m, 0, sizeof(multiname_t));
     m->type = QNAME;
     m->namespace_set = 0;
-    NEW(namespace_t,ns);
-    ns->name= namespace;
-    m->ns = ns;
-    m->name = name;
+    m->ns = namespace_fromstring(namespace);
+    m->name = name?strdup(name):0;
+    free(n);
     return m;
 }
 
+void multiname_destroy(multiname_t*m)
+{
+    if(m) {
+        if(m->name) {
+            free((void*)m->name);m->name = 0;
+        }
+        if(m->ns) {
+            namespace_destroy(m->ns);m->ns = 0;
+        }
+        if(m->namespace_set) {
+            namespace_set_destroy(m->namespace_set);m->namespace_set = 0;
+        }
+        m->type=0;
+        free(m);
+    }
+}
+
+type_t multiname_type = {
+    dup: (dup_func)multiname_clone,
+    hash: (hash_func)multiname_hash,
+    free: (free_func)multiname_destroy,
+    equals: (equals_func)multiname_equals
+};
+
+
+// ------------------------------- constants -------------------------------------
+
+#define UNIQUE_CONSTANT(x) ((x) == CONSTANT_TRUE || (x) == CONSTANT_FALSE || (x) == CONSTANT_NULL || (x) == CONSTANT_UNDEFINED)
+
+constant_t* constant_new_int(int i) 
+{
+    NEW(constant_t,c);
+    c->i = i;
+    c->type = CONSTANT_INT;
+    return c;
+}
+constant_t* constant_new_uint(unsigned int u)
+{
+    NEW(constant_t,c);
+    c->u = u;
+    c->type = CONSTANT_UINT;
+    return c;
+}
+constant_t* constant_new_float(double f)
+{
+    NEW(constant_t,c);
+    c->f = f;
+    c->type = CONSTANT_FLOAT;
+    return c;
+}
+constant_t* constant_new_string(const char*s)
+{
+    NEW(constant_t,c);
+    c->s = string_new4(s);
+    c->type = CONSTANT_STRING;
+    return c;
+}
+constant_t* constant_new_string2(const char*s, int len)
+{
+    NEW(constant_t,c);
+    c->s = string_new3(s, len);
+    c->type = CONSTANT_STRING;
+    return c;
+}
+constant_t* constant_new_namespace(namespace_t*ns)
+{
+    NEW(constant_t,c);
+    c->ns = namespace_clone(ns);
+    c->type = ns->access;
+    assert(NS_TYPE(c->type));
+    return c;
+}
+constant_t* constant_new_true()
+{
+    NEW(constant_t,c);
+    c->type = CONSTANT_TRUE;
+    return c;
+}
+constant_t* constant_new_false()
+{
+    NEW(constant_t,c);
+    c->type = CONSTANT_FALSE;
+    return c;
+}
+constant_t* constant_new_null()
+{
+    NEW(constant_t,c);
+    c->type = CONSTANT_NULL;
+    return c;
+}
+constant_t* constant_new_undefined()
+{
+    NEW(constant_t,c);
+    c->type = CONSTANT_UNDEFINED;
+    return c;
+}
+constant_t* constant_clone(constant_t*other)
+{
+    if(!other) return 0;
+    constant_t*c = malloc(sizeof(constant_t));
+    memcpy(c, other, sizeof(constant_t));
+    if(NS_TYPE(c->type)) {
+        c->ns = namespace_clone(other->ns);
+    } else if(c->type == CONSTANT_STRING) {
+        c->s = string_dup3(other->s);
+    }
+    return c;
+}
+constant_t* constant_fromindex(pool_t*pool, int index, int type)
+{
+    if(!index) {
+        /* even for nonvalued constants (like TRUE/FALSE etc.), a nonzero
+           index is present to indicate that a type is coming */
+        return 0;
+    } 
+    NEW(constant_t,c);
+    c->type = type;
+    if(NS_TYPE(c->type)) {
+        c->ns = namespace_clone(pool_lookup_namespace(pool, index));
+    } else if(c->type == CONSTANT_INT) {
+        c->i = pool_lookup_int(pool, index);
+    } else if(c->type == CONSTANT_UINT) {
+        c->u = pool_lookup_uint(pool, index);
+    } else if(c->type == CONSTANT_FLOAT) {
+        c->f = pool_lookup_float(pool, index);
+    } else if(c->type == CONSTANT_STRING) {
+        string_t s = pool_lookup_string2(pool, index);
+        c->s = string_dup3(&s);
+    } else if(UNIQUE_CONSTANT(c->type)) {
+        // ok
+    } else {
+        fprintf(stderr, "invalid constant type %02x\n", c->type);
+    }
+    return c;
+}
+char* constant_tostring(constant_t*c)
+{
+    if(!c)
+        return strdup("NULL");
+    char buf[32];
+    if(NS_TYPE(c->type)) {
+        return namespace_tostring(c->ns);
+    } else if(c->type == CONSTANT_INT) {
+        sprintf(buf, "%d", c->i);
+        return strdup(buf);
+    } else if(c->type == CONSTANT_UINT) {
+        sprintf(buf, "%u", c->u);
+        return strdup(buf);
+    } else if(c->type == CONSTANT_FLOAT) {
+        char buf[1024];
+        sprintf(buf, "%f", c->f);
+        return strdup(buf);
+    } else if(c->type == CONSTANT_STRING) {
+        /* should we escape the string? \0 bytes won't be printed */
+        return strdup_n(c->s->str,c->s->len);
+    } else if(c->type == CONSTANT_TRUE) {
+        return strdup("true");
+    } else if(c->type == CONSTANT_FALSE) {
+        return strdup("false");
+    } else if(c->type == CONSTANT_NULL) {
+        return strdup("null");
+    } else if(c->type == CONSTANT_UNDEFINED) {
+        return strdup("undefined");
+    } else {
+        fprintf(stderr, "invalid constant type %02x\n", c->type);
+        return 0;
+    }
+}
+char constant_has_index(constant_t*c) 
+{
+    if(!c)
+        return 0;
+    return !UNIQUE_CONSTANT(c->type);
+}
+int constant_get_index(pool_t*pool, constant_t*c)
+{
+    if(!c)
+        return 0;
+    if(NS_TYPE(c->type)) {
+        assert(c->ns);
+        /*if(c->type!=c->ns->access) {
+            printf("%02x<->%02x\n", c->type, c->ns->access);
+        }*/
+        assert(c->type == c->ns->access);
+        return pool_register_namespace(pool, c->ns);
+    } else if(c->type == CONSTANT_INT) {
+        return pool_register_int(pool, c->i);
+    } else if(c->type == CONSTANT_UINT) {
+        return pool_register_uint(pool, c->u);
+    } else if(c->type == CONSTANT_FLOAT) {
+        return pool_register_float(pool, c->f);
+    } else if(c->type == CONSTANT_STRING) {
+        return pool_register_string2(pool, c->s);
+    } else if(c->type == CONSTANT_UNDEFINED) {
+        /* write undefined with index 0 (and no type). Otherwise, the FlashPlayer 
+           seems to throw an "attempt to read out of bounds" exception */
+        return 0;
+    } else if(!constant_has_index(c)) {
+        return 1;
+    } else {
+        fprintf(stderr, "invalid constant type %02x\n", c->type);
+        return 0;
+    }
+}
+void constant_free(constant_t*c)
+{
+    if(!c)
+        return;
+    if(c->type == CONSTANT_STRING) {
+        string_free(c->s);
+    } else if (NS_TYPE(c->type)) {
+        namespace_destroy(c->ns);c->ns=0;
+    }
+    free(c);
+}
+// --------------------------- optimizing -----------------------------------
+
+static int array_append_or_increase(array_t*array, void*key)
+{
+    int pos = array_find(array, key);
+    if(pos>=0) {
+        array->d[pos].data++;
+        return pos;
+    } else {
+        return array_append(array, key, 0);
+    }
+}
+static int compare_arrayentry(const void*_c1, const void*_c2)
+{
+    const array_entry_t*c1 = _c1;
+    const array_entry_t*c2 = _c2;
+    return c2->data - c1->data;
+}
+
+static void* nodup(const void*o) {return (void*)o;}
+
+static void reshuffle_array(array_t*array)
+{
+    qsort(array->d+1, array->num-1, sizeof(array->d[0]), compare_arrayentry);
+    type_t* old_type = array->entry2pos->key_type;
+    type_t old_type_nodup = *old_type;
+    old_type_nodup.dup = nodup;
+    dict_t*d = dict_new2(&old_type_nodup);
+    dict_destroy_shallow(array->entry2pos);
+    array->entry2pos = d;
+    int t;
+    for(t=0;t<array->num;t++) {
+        dict_put(array->entry2pos, array->d[t].name, (void*)(ptroff_t)(t+1));
+    }
+    d->key_type = old_type;
+
+}
+
+// ------------------------------- pool -------------------------------------
+
+int pool_register_uint(pool_t*p, unsigned int i)
+{
+    int pos = array_append_or_increase(p->x_uints, &i);
+    assert(pos!=0);
+    return pos;
+}
+int pool_register_int(pool_t*p, int i)
+{
+    int pos = array_append_or_increase(p->x_ints, &i);
+    assert(pos!=0);
+    return pos;
+}
+int pool_register_float(pool_t*p, double d)
+{
+    int pos = array_append_or_increase(p->x_floats, &d);
+    assert(pos!=0);
+    return pos;
+}
+int pool_register_string(pool_t*pool, const char*str)
+{
+    if(!str) return 0;
+    string_t s = string_new2(str);
+    int pos = array_append_or_increase(pool->x_strings, &s);
+    assert(pos!=0);
+    return pos;
+}
+int pool_register_string2(pool_t*pool, string_t*s)
+{
+    if(!s || !s->str) return 0;
+    int pos = array_append_or_increase(pool->x_strings, s);
+    assert(pos!=0);
+    return pos;
+}
+int pool_register_namespace(pool_t*pool, namespace_t*ns)
+{
+    if(!ns) return 0;
+    int pos = array_append_or_increase(pool->x_namespaces, ns);
+    assert(pos!=0 || ns->access==ZERONAMESPACE);
+    return pos;
+}
+int pool_register_namespace_set(pool_t*pool, namespace_set_t*set)
+{
+    if(!set) return 0;
+    int pos = array_append_or_increase(pool->x_namespace_sets, set);
+    assert(pos!=0);
+    return pos;
+}
+int pool_register_multiname(pool_t*pool, multiname_t*n)
+{
+    if(!n) return 0;
+    int pos = array_append_or_increase(pool->x_multinames, n);
+    assert(pos!=0);
+    return pos;
+}
+int pool_register_multiname2(pool_t*pool, char*name)
+{
+    if(!name) return 0;
+    multiname_t*n = multiname_fromstring(name);
+    int pos = array_append_or_increase(pool->x_multinames, n);
+    multiname_destroy(n);
+    assert(pos!=0);
+    return pos;
+}
+
+
+int pool_find_uint(pool_t*pool, unsigned int x)
+{
+    int i = array_find(pool->x_uints, &x);
+    if(i<=0) {
+        fprintf(stderr, "Couldn't find uint \"%d\" in constant pool\n", x);
+        return 0;
+    }
+    return i;
+}
+int pool_find_int(pool_t*pool, int x)
+{
+    int i = array_find(pool->x_ints, &x);
+    if(i<=0) {
+        fprintf(stderr, "Couldn't find int \"%d\" in constant pool\n", x);
+        return 0;
+    }
+    return i;
+}
+int pool_find_float(pool_t*pool, double x)
+{
+    int i = array_find(pool->x_ints, &x);
+    if(i<=0) {
+        fprintf(stderr, "Couldn't find int \"%f\" in constant pool\n", x);
+        return 0;
+    }
+    return i;
+}
+int pool_find_namespace(pool_t*pool, namespace_t*ns)
+{
+    if(!ns)
+        return 0;
+    int i = array_find(pool->x_namespaces, ns);
+    if(i<0) {
+        char*s = namespace_tostring(ns);
+        fprintf(stderr, "Couldn't find namespace \"%s\" %08x in constant pool\n", s, (int)ns);
+        free(s);
+        return 0;
+    }
+    return i;
+}
+int pool_find_namespace_set(pool_t*pool, namespace_set_t*set)
+{
+    if(!set)
+        return 0;
+    int i = array_find(pool->x_namespace_sets, set);
+    if(i<=0) {
+        char*s = namespace_set_tostring(set);
+        fprintf(stderr, "Couldn't find namespace_set \"%s\" in constant pool\n", s);
+        free(s);
+        return 0;
+    }
+    return i;
+}
+int pool_find_string(pool_t*pool, const char*str)
+{
+    if(!str)
+        return 0;
+    string_t s = string_new2(str);
+    int i = array_find(pool->x_strings, &s);
+    if(i<=0) {
+        fprintf(stderr, "Couldn't find string \"%s\" in constant pool\n", str);
+        return 0;
+    }
+    return i;
+}
+int pool_find_multiname(pool_t*pool, multiname_t*name)
+{
+    if(!name)
+        return 0;
+    int i = array_find(pool->x_multinames, name);
+    if(i<=0) {
+        char*s = multiname_tostring(name);
+        fprintf(stderr, "Couldn't find multiname \"%s\" in constant pool\n", s);
+        free(s);
+        return 0;
+    }
+    return i;
+}
+
+int pool_lookup_int(pool_t*pool, int i)
+{
+    if(!i) return 0;
+    return *(int*)array_getkey(pool->x_ints, i);
+}
+unsigned int pool_lookup_uint(pool_t*pool, int i)
+{
+    if(!i) return 0;
+    return *(unsigned int*)array_getkey(pool->x_uints, i);
+}
+double pool_lookup_float(pool_t*pool, int i)
+{
+    if(!i) return __builtin_nan("");
+    return *(double*)array_getkey(pool->x_floats, i);
+}
+const char*pool_lookup_string(pool_t*pool, int i)
+{
+    string_t*s = array_getkey(pool->x_strings, i);
+    if(!s) return 0;
+    return s->str;
+}
+string_t pool_lookup_string2(pool_t*pool, int i)
+{
+    string_t*s = array_getkey(pool->x_strings, i);
+    return *s;
+}
+namespace_t*pool_lookup_namespace(pool_t*pool, int i)
+{
+    return (namespace_t*)array_getkey(pool->x_namespaces, i);
+}
+namespace_set_t*pool_lookup_namespace_set(pool_t*pool, int i)
+{
+    return (namespace_set_t*)array_getkey(pool->x_namespace_sets, i);
+}
+multiname_t*pool_lookup_multiname(pool_t*pool, int i)
+{
+    return (multiname_t*)array_getkey(pool->x_multinames, i);
+}
+
+static namespace_t zeronamespace={ZERONAMESPACE,"*"};
 pool_t*pool_new()
 {
     NEW(pool_t, p);
 
-    p->ints = array_new();
-    array_append(p->ints, 0, (void*)(ptroff_t)0);
-    p->uints = array_new();
-    array_append(p->uints, 0, (void*)(ptroff_t)0);
-    p->floats = array_new();
-    array_append(p->floats, 0, 0);
-    p->strings = array_new();
-    array_append(p->strings, "--<UNDEFINED_STRING>--", 0);
-    p->namespaces = array_new();
-    array_append(p->namespaces, "--<UNDEFINED_NAMESPACE>--", 0);
-    p->namespace_sets = array_new();
-    array_append(p->namespace_sets, "--<UNDEFINED_NSSET>--", 0);
-    p->multinames = array_new();
-    array_append(p->multinames, "--<UNDEFINED_MULTINAME>--", 0);
+    p->x_ints = array_new2(&uint_type);
+    p->x_uints = array_new2(&uint_type);
+    p->x_floats = array_new2(&float_type);
+    p->x_strings = array_new2(&stringstruct_type);
+    p->x_namespaces = array_new2(&namespace_type);
+    p->x_namespace_sets = array_new2(&namespace_set_type);
+    p->x_multinames = array_new2(&multiname_type);
 
+    /* add a zero-index entry in each list */
+  
+    array_append(p->x_ints, 0, 0);
+    array_append(p->x_uints, 0, 0);
+    array_append(p->x_floats, 0, 0);
+    array_append(p->x_strings, 0, 0);
+    array_append(p->x_namespaces, &zeronamespace, 0);
+    array_append(p->x_namespace_sets, 0, 0);
+    array_append(p->x_multinames, 0, 0);
     return p;
 }
 
+void pool_optimize(pool_t*p)
+{
+    reshuffle_array(p->x_ints);
+    reshuffle_array(p->x_uints);
+    reshuffle_array(p->x_floats);
+    reshuffle_array(p->x_strings);
+    reshuffle_array(p->x_namespaces);
+    reshuffle_array(p->x_namespace_sets);
+    reshuffle_array(p->x_multinames);
+}
+
 #define DEBUG if(0)
+//#define DEBUG
 
 void pool_read(pool_t*pool, TAG*tag)
 {
@@ -265,17 +1094,17 @@ void pool_read(pool_t*pool, TAG*tag)
     DEBUG printf("%d ints\n", num_ints);
     int t;
     for(t=1;t<num_ints;t++) {
-        S32 v = swf_GetS30(tag);
+        S32 v = swf_GetABCS32(tag);
         DEBUG printf("int %d) %d\n", t, v);
-        array_append(pool->ints, 0, (void*)(ptroff_t)v);
+        array_append(pool->x_ints, &v, 0);
     }
 
     int num_uints = swf_GetU30(tag);
     DEBUG printf("%d uints\n", num_uints);
     for(t=1;t<num_uints;t++) {
-        U32 v = swf_GetU30(tag);
+        U32 v = swf_GetABCU32(tag);
         DEBUG printf("uint %d) %d\n", t, v);
-        array_append(pool->uints, 0, (void*)(ptroff_t)v);
+        array_append(pool->x_uints, &v, 0);
     }
     
     int num_floats = swf_GetU30(tag);
@@ -283,30 +1112,30 @@ void pool_read(pool_t*pool, TAG*tag)
     for(t=1;t<num_floats;t++) {
         double d = swf_GetD64(tag);
         DEBUG printf("float %d) %f\n", t, d);
-        array_append(pool->floats, 0, 0);
+        array_append(pool->x_floats, &d, 0);
     }
     
     int num_strings = swf_GetU30(tag);
     DEBUG printf("%d strings\n", num_strings);
     for(t=1;t<num_strings;t++) {
 	int len = swf_GetU30(tag);
-	char*s = malloc(len+1);
-	swf_GetBlock(tag, s, len);
-	s[len] = 0;
-	array_append(pool->strings, s, 0);
-	DEBUG printf("%d) \"%s\"\n", t, pool->strings->d[t].name);
+        string_t s = string_new((char*)&tag->data[tag->pos], len);
+	swf_GetBlock(tag, 0, len);
+	array_append(pool->x_strings, &s, 0);
+	DEBUG printf("%d) \"%s\"\n", t, ((string_t*)array_getkey(pool->x_strings, t))->str);
     }
     int num_namespaces = swf_GetU30(tag);
     DEBUG printf("%d namespaces\n", num_namespaces);
     for(t=1;t<num_namespaces;t++) {
 	U8 type = swf_GetU8(tag);
 	int namenr = swf_GetU30(tag);
-	const char*name = array_getkey(pool->strings, namenr);
-        NEW(namespace_t, ns);
-        memset(ns, 0, sizeof(namespace_t));
-        ns->access = type;
-        ns->name = strdup(name);
-	array_append(pool->namespaces, name, ns);
+	const char*name = 0; 
+        if(namenr)
+            name = pool_lookup_string(pool, namenr);
+        namespace_t*ns = namespace_new(type, name);
+	array_append(pool->x_namespaces, ns, 0);
+	DEBUG printf("%d) %02x \"%s\"\n", t, type, namespace_tostring(ns));
+        namespace_destroy(ns);
     }
     int num_sets = swf_GetU30(tag);
     DEBUG printf("%d namespace sets\n", num_sets);
@@ -317,74 +1146,252 @@ void pool_read(pool_t*pool, TAG*tag)
         NEW(namespace_set_t, nsset);
         for(s=0;s<count;s++) {
             int nsnr = swf_GetU30(tag);
-            namespace_t*ns = (namespace_t*)array_getvalue(pool->namespaces, nsnr);
-            list_append(nsset->namespaces, ns);
+            if(!nsnr)
+                fprintf(stderr, "Zero entry in namespace set\n");
+            namespace_t*ns = (namespace_t*)array_getkey(pool->x_namespaces, nsnr);
+            list_append(nsset->namespaces, namespace_clone(ns));
         }
-        char*desc = namespace_set_to_string(nsset);
-
-        array_append(pool->namespace_sets, desc, nsset);
-        DEBUG printf("set %d) %s\n", t, desc);
+        array_append(pool->x_namespace_sets, nsset, 0);
+        DEBUG printf("set %d) %s\n", t, namespace_set_tostring(nsset));
+        namespace_set_destroy(nsset);
     }
 
     int num_multinames = swf_GetU30(tag);
     DEBUG printf("%d multinames\n", num_multinames);
     for(t=1;t<num_multinames;t++) {
+        multiname_t m;
+        memset(&m, 0, sizeof(multiname_t));
         
-        NEW(multiname_t,m);
-	m->type = swf_GetU8(tag);
-	if(m->type==0x07 || m->type==0x0d) {
+        /*int s;
+        for(s=0;s<8;s++)
+            printf("0x%02x ", tag->data[tag->pos+s]);
+        printf("\n");*/
+
+	m.type = swf_GetU8(tag);
+	if(m.type==0x07 || m.type==0x0d) {
 	    int namespace_index = swf_GetU30(tag);
-            m->ns = (namespace_t*)array_getvalue(pool->namespaces, namespace_index);
+            m.ns = (namespace_t*)array_getkey(pool->x_namespaces, namespace_index);
+	    if(!m.ns) {
+		fprintf(stderr, "Error: Illegal reference to namespace #%d in constant pool.\n", namespace_index);
+	    }
             int name_index = swf_GetU30(tag);
-	    m->name = array_getkey(pool->strings, name_index);
-	} else if(m->type==0x0f || m->type==0x10) {
+            if(name_index) // 0 = '*' (any)
+	        m.name = pool_lookup_string(pool, name_index);
+	} else if(m.type==0x0f || m.type==0x10) {
             int name_index = swf_GetU30(tag);
-	    m->name = array_getkey(pool->strings, name_index);
-	} else if(m->type==0x11 || m->type==0x12) {
-	} else if(m->type==0x09 || m->type==0x0e) {
+            if(name_index) // 0 = '*' (any name)
+	        m.name = pool_lookup_string(pool, name_index);
+	} else if(m.type==0x11 || m.type==0x12) {
+	} else if(m.type==0x09 || m.type==0x0e) {
             int name_index = swf_GetU30(tag);
             int namespace_set_index = swf_GetU30(tag);
-	    m->name = array_getkey(pool->strings, name_index);
-	    m->namespace_set = (namespace_set_t*)array_getvalue(pool->namespace_sets, namespace_set_index);
-        } else if(m->type==0x1b || m->type==0x1c) {
+            if(name_index)
+	        m.name = pool_lookup_string(pool, name_index);
+	    m.namespace_set = (namespace_set_t*)array_getkey(pool->x_namespace_sets, namespace_set_index);
+        } else if(m.type==0x1b || m.type==0x1c) {
             int namespace_set_index = swf_GetU30(tag);
-	    m->namespace_set = (namespace_set_t*)array_getvalue(pool->namespace_sets, namespace_set_index);
+	    m.namespace_set = (namespace_set_t*)array_getkey(pool->x_namespace_sets, namespace_set_index);
+        } else if(m.type==0x1d) {
+            int v1 = swf_GetU30(tag); //multiname
+            int v2 = swf_GetU30(tag); //counter?
+            int v3 = swf_GetU30(tag); //multiname
+            // e.g. Vector<int> ... we only store the parent object
+            m = *(multiname_t*)array_getkey(pool->x_multinames, v1);
 	} else {
-	    printf("can't parse type %d multinames yet\n", m->type);
+	    printf("can't parse type %d multinames yet\n", m.type);
 	}
-	char*mname = multiname_to_string(m);
-        DEBUG printf("multiname %d) %s\n", t, mname);
-	array_append(pool->multinames, mname, m);
-	free(mname);
+        DEBUG printf("multiname %d) %s\n", t, multiname_tostring(&m));
+	array_append(pool->x_multinames, &m, 0);
     }
 } 
 
-void pool_destroy(pool_t*pool)
+void pool_dump(pool_t*pool, FILE*fo, char flags)
 {
     int t;
-    array_free(pool->ints);
-    array_free(pool->uints);
-    array_free(pool->floats);
+    fprintf(fo, "%d integers\n", pool->x_ints->num);
+    for(t=1;t<pool->x_ints->num;t++) {
+        S32 val = *(int*)array_getkey(pool->x_ints, t);
+        int freq = (int)(ptroff_t)array_getvalue(pool->x_ints, t);
+        if(flags&1) fprintf(fo, "%5d %d) %d\n", freq, t, val);
+    }
+    fprintf(fo, "%d unsigned integers\n", pool->x_uints->num);
+    for(t=1;t<pool->x_uints->num;t++) {
+        U32 val = *(unsigned int*)array_getkey(pool->x_uints, t);
+        int freq = (int)(ptroff_t)array_getvalue(pool->x_uints, t);
+        if(flags&1) fprintf(fo, "%5d %d) %d\n", freq, t, val);
+    }
+    fprintf(fo, "%d floats\n", pool->x_floats->num);
+    for(t=1;t<pool->x_floats->num;t++) {
+        double d = pool_lookup_float(pool, t);
+        int freq = (int)(ptroff_t)array_getvalue(pool->x_floats, t);
+        if(flags&2) fprintf(fo, "%5d %d) %f\n", freq, t, d);
+    }
+    fprintf(fo, "%d strings\n", pool->x_strings->num);
+    for(t=1;t<pool->x_strings->num;t++) {
+        string_t str = pool_lookup_string2(pool, t);
+        int freq = (int)(ptroff_t)array_getvalue(pool->x_strings, t);
+        if(flags&1) fprintf(fo, "%5d %d) ", freq, t);
+        if(flags&1) fwrite(str.str, str.len, 1, fo);
+        if(flags&1) fprintf(fo, "\n");
+    }
+    fprintf(fo, "%d namespaces\n", pool->x_namespaces->num);
+    for(t=1;t<pool->x_namespaces->num;t++) {
+	namespace_t*ns= (namespace_t*)array_getkey(pool->x_namespaces, t);
+        char*s = namespace_tostring(ns);
+        int freq = (int)(ptroff_t)array_getvalue(pool->x_namespaces, t);
+        if(flags&1) fprintf(fo, "%5d %d) %s\n", freq, t, s);
+        free(s);
+    }
+    fprintf(fo, "%d namespace sets\n", pool->x_namespace_sets->num);
+    for(t=1;t<pool->x_namespace_sets->num;t++) {
+        namespace_set_t*set = (namespace_set_t*)array_getkey(pool->x_namespace_sets, t);
+        char*s = namespace_set_tostring(set);
+        int freq = (int)(ptroff_t)array_getvalue(pool->x_namespace_sets, t);
+        if(flags&1) fprintf(fo, "%5d %d) %s\n", freq, t, s);
+        free(s);
+    }
 
-    for(t=1;t<pool->strings->num;t++) {
-        free((void*)array_getkey(pool->strings, t));
+    fprintf(fo, "%d multinames\n", pool->x_multinames->num);
+    for(t=1;t<pool->x_multinames->num;t++) {
+	multiname_t*m = (multiname_t*)array_getkey(pool->x_multinames, t);
+        char*s = multiname_tostring(m);
+        int freq = (int)(ptroff_t)array_getvalue(pool->x_multinames, t);
+        if(flags&1) fprintf(fo, "%5d %d) %s\n", freq, t, s);
+        free(s);
     }
-    array_free(pool->strings);
+} 
+
+void pool_write(pool_t*pool, TAG*tag)
+{
+    int t;
+    
+    /* make sure that all namespaces used by multinames / namespace sets
+       and all strings used by namespaces exist */
 
-    for(t=1;t<pool->namespaces->num;t++) {
-        free(array_getvalue(pool->namespaces, t));
+    for(t=1;t<pool->x_multinames->num;t++) {
+        multiname_t*m = (multiname_t*)array_getkey(pool->x_multinames, t);
+        if(m->ns) {
+            pool_register_namespace(pool, m->ns);
+        }
+        if(m->namespace_set) {
+            pool_register_namespace_set(pool, m->namespace_set);
+        }
+        if(m->name) {
+            pool_register_string(pool, m->name);
+        }
     }
-    array_free(pool->namespaces);
-   
-    for(t=1;t<pool->namespace_sets->num;t++) {
-        namespace_set_t*set = (namespace_set_t*)array_getvalue(pool->namespace_sets, t);
-        list_free(set->namespaces);
-        free(set);
+    for(t=1;t<pool->x_namespace_sets->num;t++) {
+        namespace_set_t*set = (namespace_set_t*)array_getkey(pool->x_namespace_sets, t);
+        namespace_list_t*i = set->namespaces;
+        while(i) {
+            pool_register_namespace(pool, i->namespace);
+            i = i->next;
+        }
+    }
+    for(t=1;t<pool->x_namespaces->num;t++) {
+	namespace_t*ns= (namespace_t*)array_getkey(pool->x_namespaces, t);
+        /*  The spec says (page 22): "a value of zero denotes an empty string".
+            However when actually using zero strings as empty namespaces, the
+            flash player breaks.*/
+        //if(ns->name && ns->name[0])
+        pool_register_string(pool, ns->name);
+    }
+
+    //pool_register_int(pool, 15);
+    //pool_register_int(pool, 1);
+    //pool_register_int(pool, 0);
+    
+    /* write data */
+    swf_SetU30(tag, pool->x_ints->num>1?pool->x_ints->num:0);
+    for(t=1;t<pool->x_ints->num;t++) {
+        S32 val = *(int*)array_getkey(pool->x_ints, t);
+        swf_SetABCS32(tag, val);
+    }
+    swf_SetU30(tag, pool->x_uints->num>1?pool->x_uints->num:0);
+    for(t=1;t<pool->x_uints->num;t++) {
+        swf_SetABCU32(tag, *(unsigned int*)array_getkey(pool->x_uints, t));
+    }
+    swf_SetU30(tag, pool->x_floats->num>1?pool->x_floats->num:0);
+    for(t=1;t<pool->x_floats->num;t++) {
+        double d = pool_lookup_float(pool, t);
+        swf_SetD64(tag, d);
+    }
+    swf_SetU30(tag, pool->x_strings->num>1?pool->x_strings->num:0);
+    for(t=1;t<pool->x_strings->num;t++) {
+        string_t str = pool_lookup_string2(pool, t);
+	swf_SetU30String(tag, str.str, str.len);
+    }
+    swf_SetU30(tag, pool->x_namespaces->num>1?pool->x_namespaces->num:0);
+    for(t=1;t<pool->x_namespaces->num;t++) {
+	namespace_t*ns= (namespace_t*)array_getkey(pool->x_namespaces, t);
+	swf_SetU8(tag, ns->access);
+	const char*name = ns->name;
+	int i = 0;
+        
+        //if(name && name[0])
+        i = pool_find_string(pool, name);
+
+	swf_SetU30(tag, i);
     }
-    array_free(pool->namespace_sets);
+    swf_SetU30(tag, pool->x_namespace_sets->num>1?pool->x_namespace_sets->num:0);
+    for(t=1;t<pool->x_namespace_sets->num;t++) {
+        namespace_set_t*set = (namespace_set_t*)array_getkey(pool->x_namespace_sets, t);
+        namespace_list_t*i = set->namespaces; 
+        int len = list_length(i);
+        swf_SetU30(tag, len);
+        while(i) {
+            int index = pool_find_namespace(pool, i->namespace);
+            swf_SetU30(tag, index);
+            i = i->next;
+        }
+    }
+
+    swf_SetU30(tag, pool->x_multinames->num>1?pool->x_multinames->num:0);
+    for(t=1;t<pool->x_multinames->num;t++) {
+	multiname_t*m = (multiname_t*)array_getkey(pool->x_multinames, t);
+	swf_SetU8(tag, m->type);
 
-    for(t=1;t<pool->multinames->num;t++) {
-        free(array_getvalue(pool->multinames, t));
+        if(m->ns) {
+            assert(m->type==0x07 || m->type==0x0d);
+	    int i = pool_find_namespace(pool, m->ns);
+            if(i<0) fprintf(stderr, "internal error: unregistered namespace %02x %s %s\n", m->ns->access, access2str(m->ns->access), m->ns->name);
+	    swf_SetU30(tag, i);
+        } else {
+            assert(m->type!=0x07 && m->type!=0x0d);
+        }
+	
+        if(m->name) {
+            assert(m->type==0x09 || m->type==0x0e || m->type==0x07 || m->type==0x0d || m->type==0x0f || m->type==0x10);
+	    int i = pool_find_string(pool, m->name);
+            if(i<0) fprintf(stderr, "internal error: unregistered name\n");
+	    swf_SetU30(tag, i);
+        } else {
+	    if(m->type == 0x09) {
+		swf_SetU30(tag, 0);
+	    }
+            assert(m->type!=0x0e && m->type!=0x07 && m->type!=0x0d && m->type!=0x0f && m->type!=0x10);
+        }
+        if(m->namespace_set) {
+            assert(m->type==0x09 || m->type==0x0e || m->type==0x1c || m->type==0x1b);
+	    int i = pool_find_namespace_set(pool, m->namespace_set);
+            if(i<0) fprintf(stderr, "internal error: unregistered namespace set\n");
+	    swf_SetU30(tag, i);
+        } else {
+            assert(m->type!=0x09 && m->type!=0x0e && m->type!=0x1c && m->type!=0x1b);
+        }
     }
-    array_free(pool->multinames);
+}
+
+
+void pool_destroy(pool_t*pool)
+{
+    int t;
+    array_free(pool->x_ints);
+    array_free(pool->x_uints);
+    array_free(pool->x_floats);
+    array_free(pool->x_strings);
+    array_free(pool->x_namespaces);
+    array_free(pool->x_namespace_sets);
+    array_free(pool->x_multinames);
+    free(pool);
 }