Some cleanup. Missing symbol.

.gitmodules

@@ -9,9 +9,7 @@
 [submodule "ext/spookyhash"]
     path = ext/spookyhash
     url = https://github.com/centaurean/spookyhash.git
-[submodule "ext/c-algorithms"]
-    path = ext/c-algorithms
-    url = https://github.com/fragglet/c-algorithms.git
 [submodule "ext/collections-c"]
-	path = ext/collections-c
-	url = https://github.com/srdja/Collections-C.git
+    path = ext/collections-c
+    url = https://github.com/scossu/Collections-C.git
+    branch = add_or_get

lakesuperior/cy_include/collections.pxd

@@ -4,20 +4,14 @@ ctypedef void* (*mem_alloc_ft)(size_t size)
 ctypedef void* (*mem_calloc_ft)(size_t blocks, size_t size)
 ctypedef void (*mem_free_ft)(void* block)
 ctypedef size_t (*hash_ft)(const void* key, int l, uint32_t seed)
-ctypedef int (*key_compare_ft)(const void* key1, const void* key2)
+ctypedef bint (*key_compare_ft)(const void* key1, const void* key2)
 
 
-#cdef extern from "array.c":
-#
-#    struct array_s:
-#        size_t          size
-#        size_t          capacity
-#        float           exp_factor
-#        void**          buffer
-#        mem_alloc_ft  mem_alloc
-#        mem_calloc_ft mem_calloc
-#        mem_free_ft   mem_free
+cdef extern from "common.h":
 
+    int cc_common_cmp_str(const void* key1, const void* key2)
+
+    int cc_common_cmp_ptr(const void* key1, const void* key2)
 
 cdef extern from "array.h":
 
@@ -32,10 +26,6 @@ cdef extern from "array.h":
         CC_ERR_OUT_OF_RANGE
         CC_ITER_END
 
-    int cc_common_cmp_str(void* key1, void* key2)
-
-    int cc_common_cmp_ptr(void* key1, void* key2)
-
     ctypedef struct Array:
         pass
 
@@ -45,9 +35,6 @@ cdef extern from "array.h":
         mem_alloc_ft  mem_alloc
         mem_calloc_ft mem_calloc
         mem_free_ft   mem_free
-        #void *(*mem_alloc)  (size_t size)
-        #void *(*mem_calloc) (size_t blocks, size_t size)
-        #void  (*mem_free)   (void *block)
 
     ctypedef struct ArrayIter:
         Array* ar
@@ -72,9 +59,9 @@ cdef extern from "array.h":
 
     void array_destroy_cb(Array* ar, _array_destroy_cb_cb_ft cb)
 
-    cc_stat array_add(Array* ar, void* element)
+    #cc_stat array_add(Array* ar, void* element)
 
-    cc_stat array_add_at(Array* ar, void* element, size_t index)
+    #cc_stat array_add_at(Array* ar, void* element, size_t index)
 
     cc_stat array_replace_at(Array* ar, void* element, size_t index, void** out)
 
@@ -167,40 +154,16 @@ cdef extern from "array.h":
 
 cdef extern from "hashtable.h":
 
-    struct table_entry_s:
+    ctypedef struct TableEntry:
         void*       key
         void*       value
         size_t      hash
-        table_entry_s* next
-
-    ctypedef table_entry_s TableEntry
-
-#cdef extern from "hashtable.c":
-#
-#    struct hashtable_s:
-#        size_t          capacity
-#        size_t          size
-#        size_t          threshold
-#        uint32_t        hash_seed
-#        int             key_len
-#        float           load_factor
-#        TableEntry**      buckets
-#
-#        #size_t (*hash)        (const void *key, int l, uint32_t seed)
-#        #bint    (*key_cmp) (const void *key1, const void *key2)
-#        #void *(*mem_alloc)  (size_t size)
-#        #void *(*mem_calloc) (size_t blocks, size_t size)
-#        #void  (*mem_free)   (void *block)
-#        hash_ft           hash
-#        key_compare_ft    key_cmp
-#        mem_alloc_ft      mem_alloc
-#        mem_calloc_ft     mem_calloc
-#        mem_free_ft       mem_free
+        TableEntry* next
 
     ctypedef struct HashTable:
         pass
 
-    struct hashtable_conf_s:
+    ctypedef struct HashTableConf:
         float               load_factor
         size_t              initial_capacity
         int                 key_length
@@ -211,22 +174,13 @@ cdef extern from "hashtable.h":
         mem_alloc_ft  mem_alloc
         mem_calloc_ft mem_calloc
         mem_free_ft   mem_free
-        #size_t (*hash)        (const void *key, int l, uint32_t seed)
-        #bint    (*key_compare) (const void *key1, const void *key2)
-        #void *(*mem_alloc)  (size_t size)
-        #void *(*mem_calloc) (size_t blocks, size_t size)
-        #void  (*mem_free)   (void *block)
-
-    ctypedef hashtable_conf_s HashTableConf
 
-    struct hashtable_iter_s:
+    ctypedef struct HashTableIter:
         HashTable* table
         size_t bucket_index
         TableEntry* prev_entry
         TableEntry* next_entry
 
-    ctypedef hashtable_iter_s HashTableIter
-
     size_t get_table_index(HashTable *table, void *key)
 
     void hashtable_conf_init(HashTableConf* conf)
@@ -276,20 +230,6 @@ cdef extern from "hashtable.h":
     cc_stat hashtable_iter_remove(HashTableIter* iter, void** out)
 
 
-#cdef extern from "hashset.c":
-#
-#    struct hashset_s:
-#        HashTable*      table
-#        int*            dummy
-#
-#        mem_alloc_ft  mem_alloc
-#        mem_calloc_ft mem_calloc
-#        mem_free_ft   mem_free
-#        #void *(*mem_alloc)  (size_t size)
-#        #void *(*mem_calloc) (size_t blocks, size_t size)
-#        #void  (*mem_free)   (void *block)
-
-
 cdef extern from "hashset.h":
 
     ctypedef struct HashSet:

lakesuperior/model/graph/graph.pxd

@@ -20,8 +20,8 @@ ctypedef Buffer SPOBuffer[3]
 ctypedef Buffer *BufferPtr
 
 cdef:
-    int term_cmp_fn(const void* key1, const void* key2)
-    int triple_cmp_fn(const void* key1, const void* key2)
+    bint term_cmp_fn(const void* key1, const void* key2)
+    bint triple_cmp_fn(const void* key1, const void* key2)
     size_t trp_hash_fn(const void* key, int l, uint32_t seed)
     size_t hash_ptr_passthrough(const void* key, int l, uint32_t seed)
 

lakesuperior/model/graph/graph.pyx

@@ -50,7 +50,7 @@ def use_data(fn):
     return _wrapper
 
 
-cdef int term_cmp_fn(const void* key1, const void* key2):
+cdef bint term_cmp_fn(const void* key1, const void* key2):
     """
     Compare function for two Buffer objects.
     """
@@ -69,7 +69,7 @@ cdef int term_cmp_fn(const void* key1, const void* key2):
     return cmp == 0
 
 
-cdef int triple_cmp_fn(const void* key1, const void* key2):
+cdef bint triple_cmp_fn(const void* key1, const void* key2):
     """
     Compare function for two triples in a CAlg set.
 
@@ -109,7 +109,7 @@ cdef size_t hash_ptr_passthrough(const void* key, int l, uint32_t seed):
 
 
 cdef inline bint lookup_none_cmp_fn(
-        BufferTriple *trp, Buffer *t1, Buffer *t2):
+        const BufferTriple *trp, const Buffer *t1, const Buffer *t2):
     """
     Dummy callback for queries with all parameters unbound.
 
@@ -118,7 +118,7 @@ cdef inline bint lookup_none_cmp_fn(
     return True
 
 
-cdef inline bint lookup_s_cmp_fn(BufferTriple *trp, Buffer *t1, Buffer *t2):
+cdef inline bint lookup_s_cmp_fn(const BufferTriple *trp, const Buffer *t1, const Buffer *t2):
     """
     Lookup callback compare function for a given s in a triple.
 
@@ -130,27 +130,27 @@ cdef inline bint lookup_s_cmp_fn(BufferTriple *trp, Buffer *t1, Buffer *t2):
     return term_cmp_fn(t1, trp[0].s)
 
 
-cdef inline bint lookup_p_cmp_fn(BufferTriple *trp, Buffer *t1, Buffer *t2):
+cdef inline bint lookup_p_cmp_fn(const BufferTriple *trp, const Buffer *t1, const Buffer *t2):
     return term_cmp_fn(t1, trp[0].p)
 
 
-cdef inline bint lookup_o_cmp_fn(BufferTriple *trp, Buffer *t1, Buffer *t2):
+cdef inline bint lookup_o_cmp_fn(const BufferTriple *trp, const Buffer *t1, const Buffer *t2):
     return term_cmp_fn(t1, trp[0].o)
 
 
-cdef inline bint lookup_sp_cmp_fn(BufferTriple *trp, Buffer *t1, Buffer *t2):
+cdef inline bint lookup_sp_cmp_fn(const BufferTriple *trp, const Buffer *t1, const Buffer *t2):
     return (
             term_cmp_fn(t1, trp[0].s)
             and term_cmp_fn(t2, trp[0].p))
 
 
-cdef inline bint lookup_so_cmp_fn(BufferTriple *trp, Buffer *t1, Buffer *t2):
+cdef inline bint lookup_so_cmp_fn(const BufferTriple *trp, const Buffer *t1, const Buffer *t2):
     return (
             term_cmp_fn(t1, trp[0].s)
             and term_cmp_fn(t2, trp[0].o))
 
 
-cdef inline bint lookup_po_cmp_fn(BufferTriple *trp, Buffer *t1, Buffer *t2):
+cdef inline bint lookup_po_cmp_fn(const BufferTriple *trp, const Buffer *t1, const Buffer *t2):
     return (
             term_cmp_fn(t1, trp[0].p)
             and term_cmp_fn(t2, trp[0].o))