structure: remove CStringTrie

examples/CMakeLists.txt

@@ -73,8 +73,6 @@ endif ()
 
 add_executable(substring_test substring_test.c)
 
-add_executable(cstringtrie_test cstringtrie_test.c)
-
 if (NOT WIN32)
     add_executable(ipaddr6_test ipaddr6_test.c)
 endif ()

examples/cstringtrie_test.c

@@ -1,88 +0,0 @@
-/**
- * @file cstringtrie_test.c
- * @author Ambroz Bizjak <ambrop7@gmail.com>
- * 
- * @section LICENSE
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the author nor the
- *    names of its contributors may be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-
-#include <misc/debug.h>
-#include <misc/array_length.h>
-#include <structure/CStringTrie.h>
-
-#include "cstringtrie_test_trie.h"
-#include <structure/CStringTrie_decl.h>
-
-#include "cstringtrie_test_trie.h"
-#include <structure/CStringTrie_impl.h>
-
-const char *strings[] = {
-    "hello", "world", "hell", "he", "war", "warning", "warned", "", "heap", "why", "not", "nowhere", "neither",
-    "normal", "how", "apple", "apear", "appreciate", "systematic", "systemic", "system", "self", "serious"
-};
-#define NUM_STRINGS B_ARRAY_LENGTH(strings)
-
-const char *other_strings[] = {
-    "warn", "wor", "helloo", "norma", "systems", "server", "no", "when", "nothing"
-};
-#define NUM_OTHER_STRINGS B_ARRAY_LENGTH(other_strings)
-
-int main ()
-{
-    int res;
-    
-    MyTrie trie;
-    res = MyTrie_Init(&trie);
-    ASSERT_FORCE(res);
-    
-    for (int i = 0; i < NUM_STRINGS; i++) {
-        res = MyTrie_Set(&trie, strings[i], i);
-        ASSERT_FORCE(res);
-    }
-    
-    for (int i = 0; i < NUM_STRINGS; i++) {
-        int value = MyTrie_Get(&trie, strings[i]);
-        ASSERT_FORCE(value == i);
-    }
-    
-    for (int i = 0; i < NUM_STRINGS; i++) {
-        res = MyTrie_Set(&trie, strings[i], NUM_STRINGS - 1 - i);
-        ASSERT_FORCE(res);
-    }
-    
-    for (int i = 0; i < NUM_STRINGS; i++) {
-        int value = MyTrie_Get(&trie, strings[i]);
-        ASSERT_FORCE(value == NUM_STRINGS - 1 - i);
-    }
-    
-    for (int i = 0; i < NUM_OTHER_STRINGS; i++) {
-        int value = MyTrie_Get(&trie, other_strings[i]);
-        ASSERT_FORCE(value == -1);
-    }
-    
-    MyTrie_Free(&trie);
-    return 0;
-}

examples/cstringtrie_test_trie.h

@@ -1,4 +0,0 @@
-#define CSTRINGTRIE_PARAM_NAME MyTrie
-#define CSTRINGTRIE_PARAM_VALUE int
-#define CSTRINGTRIE_PARAM_DEFAULT ((int)-1)
-#define CSTRINGTRIE_PARAM_SIGNIFICANT_BITS CHAR_BIT

structure/CStringTrie.h

@@ -1,41 +0,0 @@
-/**
- * @file CStringTrie.h
- * @author Ambroz Bizjak <ambrop7@gmail.com>
- * 
- * @section LICENSE
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the author nor the
- *    names of its contributors may be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef BADVPN_CSTRINGTRIE_H
-#define BADVPN_CSTRINGTRIE_H
-
-#include <stddef.h>
-#include <limits.h>
-#include <string.h>
-
-#include <misc/debug.h>
-#include <misc/balloc.h>
-#include <misc/merge.h>
-
-#endif

structure/CStringTrie_decl.h

@@ -1,48 +0,0 @@
-/**
- * @file CStringTrie_decl.h
- * @author Ambroz Bizjak <ambrop7@gmail.com>
- * 
- * @section LICENSE
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the author nor the
- *    names of its contributors may be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "CStringTrie_header.h"
-
-struct CStringTrie__node {
-    CStringTrieValue value;
-    int links[CStringTrie__DEGREE];
-};
-
-typedef struct {
-    struct CStringTrie__node *arr;
-    int count;
-    int capacity;
-} CStringTrie;
-
-static int CStringTrie_Init (CStringTrie *o) WARN_UNUSED;
-static void CStringTrie_Free (CStringTrie *o);
-static int CStringTrie_Set (CStringTrie *o, const char *key, CStringTrieValue value) WARN_UNUSED;
-static CStringTrieValue CStringTrie_Get (const CStringTrie *o, const char *key);
-
-#include "CStringTrie_footer.h"

structure/CStringTrie_footer.h

@@ -1,45 +0,0 @@
-/**
- * @file CStringTrie_footer.h
- * @author Ambroz Bizjak <ambrop7@gmail.com>
- * 
- * @section LICENSE
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the author nor the
- *    names of its contributors may be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#undef CSTRINGTRIE_PARAM_NAME
-#undef CSTRINGTRIE_PARAM_VALUE
-#undef CSTRINGTRIE_PARAM_DEFAULT
-#undef CSTRINGTRIE_PARAM_SIGNIFICANT_BITS
-
-#undef CStringTrie
-#undef CStringTrieValue
-
-#undef CStringTrie_Init
-#undef CStringTrie_Free
-#undef CStringTrie_Set
-#undef CStringTrie_Get
-
-#undef CStringTrie__DEGREE
-#undef CStringTrie__node
-#undef CStringTrie__new_node

structure/CStringTrie_header.h

@@ -1,49 +0,0 @@
-/**
- * @file CStringTrie_header.h
- * @author Ambroz Bizjak <ambrop7@gmail.com>
- * 
- * @section LICENSE
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the author nor the
- *    names of its contributors may be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// Preprocessor inputs:
-// CSTRINGTRIE_PARAM_NAME - name of trie object and prefix for other identifiers
-// CSTRINGTRIE_PARAM_VALUE - type of value
-// CSTRINGTRIE_PARAM_DEFAULT - default value
-// CSTRINGTRIE_PARAM_SIGNIFICANT_BITS - how many low bits of characters are significant
-
-// types
-#define CStringTrie CSTRINGTRIE_PARAM_NAME
-#define CStringTrieValue CSTRINGTRIE_PARAM_VALUE
-
-// public functions
-#define CStringTrie_Init MERGE(CStringTrie, _Init)
-#define CStringTrie_Free MERGE(CStringTrie, _Free)
-#define CStringTrie_Set MERGE(CStringTrie, _Set)
-#define CStringTrie_Get MERGE(CStringTrie, _Get)
-
-// private things
-#define CStringTrie__DEGREE (((size_t)1) << CSTRINGTRIE_PARAM_SIGNIFICANT_BITS)
-#define CStringTrie__node MERGE(CStringTrie, __node)
-#define CStringTrie__new_node MERGE(CStringTrie, __new_node)

structure/CStringTrie_impl.h

@@ -1,146 +0,0 @@
-/**
- * @file CStringTrie_impl.h
- * @author Ambroz Bizjak <ambrop7@gmail.com>
- * 
- * @section LICENSE
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the author nor the
- *    names of its contributors may be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "CStringTrie_header.h"
-
-static int CStringTrie__new_node (CStringTrie *o, int *out_nodeidx)
-{
-    ASSERT(o->count <= o->capacity)
-    ASSERT(o->capacity > 0)
-    ASSERT(o->count >= 0)
-    ASSERT(out_nodeidx)
-    
-    if (o->count == o->capacity) {
-        if (o->capacity > INT_MAX / 2 || o->capacity > SIZE_MAX / 2) {
-            return 0;
-        }
-        int newcap = 2 * o->capacity;
-        
-        struct CStringTrie__node *newarr = (struct CStringTrie__node *)BAllocArray(newcap, sizeof(newarr[0]));
-        if (!newarr) {
-            return 0;
-        }
-        
-        memcpy(newarr, o->arr, o->count * sizeof(newarr[0]));
-        BFree(o->arr);
-        
-        o->arr = newarr;
-        o->capacity = newcap;
-    }
-    
-    struct CStringTrie__node *node = &o->arr[o->count];
-    
-    node->value = CSTRINGTRIE_PARAM_DEFAULT;
-    
-    for (int i = 0; i < CStringTrie__DEGREE; i++) {
-        node->links[i] = -1;
-    }
-    
-    *out_nodeidx = o->count;
-    o->count++;
-    
-    return 1;
-}
-
-static int CStringTrie_Init (CStringTrie *o)
-{
-    o->count = 0;
-    o->capacity = 1;
-    
-    if (!(o->arr = (struct CStringTrie__node *)BAllocArray(o->capacity, sizeof(o->arr[0])))) {
-        return 0;
-    }
-    
-    int idx0;
-    CStringTrie__new_node(o, &idx0);
-    
-    return 1;
-}
-
-static void CStringTrie_Free (CStringTrie *o)
-{
-    BFree(o->arr);
-}
-
-static int CStringTrie_Set (CStringTrie *o, const char *key, CStringTrieValue value)
-{
-    ASSERT(key)
-    
-    const unsigned char *ukey = (const unsigned char *)key;
-    int nodeidx = 0;
-    
-    while (*ukey) {
-        unsigned char mod = *ukey % CStringTrie__DEGREE;
-        ASSERT(o->arr[nodeidx].links[mod] >= -1)
-        
-        int new_nodeidx;
-        
-        if (o->arr[nodeidx].links[mod] >= 0) {
-            new_nodeidx = o->arr[nodeidx].links[mod];
-        } else {
-            if (!CStringTrie__new_node(o, &new_nodeidx)) {
-                return 0;
-            }
-            o->arr[nodeidx].links[mod] = new_nodeidx;
-        }
-        
-        ASSERT(new_nodeidx >= 0)
-        ASSERT(new_nodeidx < o->count)
-        
-        nodeidx = new_nodeidx;
-        ukey++;
-    }
-    
-    o->arr[nodeidx].value = value;
-    
-    return 1;
-}
-
-static CStringTrieValue CStringTrie_Get (const CStringTrie *o, const char *key)
-{
-    ASSERT(key)
-    
-    const unsigned char *ukey = (const unsigned char *)key;
-    int nodeidx = 0;
-    
-    while (*ukey) {
-        unsigned char mod = *ukey % CStringTrie__DEGREE;
-        nodeidx = o->arr[nodeidx].links[mod];
-        ASSERT(nodeidx >= -1)
-        if (nodeidx < 0) {
-            return CSTRINGTRIE_PARAM_DEFAULT;
-        }
-        ASSERT(nodeidx < o->count)
-        ukey++;
-    }
-    
-    return o->arr[nodeidx].value;
-}
-
-#include "CStringTrie_footer.h"