From df0f4db2bb6ea55c0d45918e799b06a9970cec2b Mon Sep 17 00:00:00 2001 From: Tyge Løvset Date: Tue, 2 Feb 2021 18:18:12 +0100 Subject: Rewrote unordered map AA-tree csmap.h. Now uses array as memory pool instead of individual allocated nodes. 40% faster. V1 moved to examples. --- examples/csmap_ex2.c | 21 +++ examples/csmap_v1.h | 507 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 528 insertions(+) create mode 100644 examples/csmap_ex2.c create mode 100644 examples/csmap_v1.h (limited to 'examples') diff --git a/examples/csmap_ex2.c b/examples/csmap_ex2.c new file mode 100644 index 00000000..3c2d6cc7 --- /dev/null +++ b/examples/csmap_ex2.c @@ -0,0 +1,21 @@ +#include +#include +#include + +using_csmap(i, int, int); + +int main() +{ + csmap_i map = csmap_i_init(); + stc64_srandom(1); + c_forrange (i, 1000000) csmap_i_emplace(&map, stc64_random() & 0xffffff, i); + + size_t n = 0, sum = 0; + c_foreach (i, csmap_i, map) { + sum += i.ref->first; + if (n++ < 20) printf("%d: %d\n", i.ref->first, i.ref->second); + } + printf("size %zu: %zu\n", csmap_i_size(map), sum); + csmap_i_del(&map); + puts("done"); +} \ No newline at end of file diff --git a/examples/csmap_v1.h b/examples/csmap_v1.h new file mode 100644 index 00000000..806d6247 --- /dev/null +++ b/examples/csmap_v1.h @@ -0,0 +1,507 @@ +/* MIT License + * + * Copyright (c) 2021 Tyge Løvset, NORCE, www.norceresearch.no + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef CSMAP__H__ +#define CSMAP__H__ + +// Sorted/Ordered set and map - implemented as an AA-tree. +/* +#include +#include +using_csset(i, int); // Set of int +using_csmap(ic, int, char); // Map of int -> char + +int main(void) { + csset_sx s = csset_sx_init(); + csset_sx_insert(&s, 5); + csset_sx_insert(&s, 8); + c_foreach (i, csset_sx, s) + printf("set %d\n", i.ref->second); + csset_sx_del(&s); +} +*/ +#include "ccommon.h" +#include +#include + +#define using_csmap(...) \ + c_MACRO_OVERLOAD(using_csmap, __VA_ARGS__) + +#define using_csmap_3(X, Key, Mapped) \ + using_csmap_4(X, Key, Mapped, c_default_compare) + +#define using_csmap_4(X, Key, Mapped, keyCompare) \ + using_csmap_6(X, Key, Mapped, keyCompare, c_default_del, c_default_clone) + +#define using_csmap_6(X, Key, Mapped, keyCompare, mappedDel, mappedClone) \ + using_csmap_8(X, Key, Mapped, keyCompare, mappedDel, mappedClone, c_default_del, c_default_clone) + +#define using_csmap_8(X, Key, Mapped, keyCompare, mappedDel, mappedClone, keyDel, keyClone) \ + using_csmap_10(X, Key, Mapped, keyCompare, mappedDel, mappedClone, \ + keyDel, keyClone, c_default_to_raw, Key) + +#define using_csmap_10(X, Key, Mapped, keyCompareRaw, mappedDel, mappedClone, \ + keyDel, keyFromRaw, keyToRaw, RawKey) \ + _using_CBST(X, csmap, Key, Mapped, keyCompareRaw, mappedDel, keyDel, \ + keyFromRaw, keyToRaw, RawKey, mappedClone, c_default_to_raw, Mapped) + +/* csset: */ +#define using_csset(...) \ + c_MACRO_OVERLOAD(using_csset, __VA_ARGS__) + +#define using_csset_2(X, Key) \ + using_csset_3(X, Key, c_default_compare) + +#define using_csset_3(X, Key, keyCompare) \ + using_csset_5(X, Key, keyCompare, c_default_del, c_default_clone) + +#define using_csset_5(X, Key, keyCompare, keyDel, keyClone) \ + using_csset_7(X, Key, keyCompare, keyDel, keyClone, c_default_to_raw, Key) + +#define using_csset_7(X, Key, keyCompareRaw, keyDel, keyFromRaw, keyToRaw, RawKey) \ + _using_CBST(X, csset, Key, Key, keyCompareRaw, _UNUSED_, keyDel, \ + keyFromRaw, keyToRaw, RawKey, _UNUSED_, _UNUSED_, void) + +/* csset_str, csmap_str, csmap_strkey, csmap_strval: */ +#define using_csset_str() \ + _using_CBST_strkey(str, csset, cstr_t, _UNUSED_, _UNUSED_) +#define using_csmap_str() \ + _using_CBST(str, csmap, cstr_t, cstr_t, cstr_compare_raw, cstr_del, cstr_del, \ + cstr_from, cstr_to_raw, const char*, cstr_from, cstr_to_raw, const char*) + +#define using_csmap_strkey(...) \ + c_MACRO_OVERLOAD(using_csmap_strkey, __VA_ARGS__) + +#define using_csmap_strkey_2(X, Mapped) \ + _using_CBST_strkey(X, csmap, Mapped, c_default_del, c_default_clone) + +#define using_csmap_strkey_4(X, Mapped, mappedDel, mappedClone) \ + _using_CBST_strkey(X, csmap, Mapped, mappedDel, mappedClone) + +#define _using_CBST_strkey(X, C, Mapped, mappedDel, mappedClone) \ + _using_CBST(X, C, cstr_t, Mapped, cstr_compare_raw, mappedDel, cstr_del, \ + cstr_from, cstr_to_raw, const char*, mappedClone, c_default_to_raw, Mapped) + +#define using_csmap_strval(...) \ + c_MACRO_OVERLOAD(using_csmap_strval, __VA_ARGS__) + +#define using_csmap_strval_2(X, Key) \ + using_csmap_strval_3(X, Key, c_default_compare) + +#define using_csmap_strval_3(X, Key, keyCompare) \ + using_csmap_strval_5(X, Key, keyCompare, c_default_del, c_default_clone) + +#define using_csmap_strval_5(X, Key, keyCompare, keyDel, keyClone) \ + using_csmap_strval_7(X, Key, keyCompare, keyDel, keyClone, c_default_to_raw, Key) + +#define using_csmap_strval_7(X, Key, keyCompare, keyDel, keyFromRaw, keyToRaw, RawKey) \ + _using_CBST(X, csmap, Key, cstr_t, keyCompare, cstr_del, keyDel, \ + keyFromRaw, keyToRaw, RawKey, cstr_from, cstr_to_raw, const char*) + +#define SET_ONLY_csset(...) __VA_ARGS__ +#define SET_ONLY_csmap(...) +#define MAP_ONLY_csset(...) +#define MAP_ONLY_csmap(...) __VA_ARGS__ +#define KEY_REF_csset(vp) (vp) +#define KEY_REF_csmap(vp) (&(vp)->first) + +#define _using_CBST_types(X, C, Key, Mapped) \ + typedef Key C##_##X##_key_t; \ + typedef Mapped C##_##X##_mapped_t; \ +\ + typedef SET_ONLY_##C( C##_##X##_key_t ) \ + MAP_ONLY_##C( struct {C##_##X##_key_t first; \ + C##_##X##_mapped_t second;} ) \ + C##_##X##_value_t; \ +\ + typedef struct C##_##X##_node { \ + struct C##_##X##_node *link[2]; \ + uint8_t level; \ + C##_##X##_value_t value; \ + } C##_##X##_node_t; \ +\ + typedef struct { \ + C##_##X##_value_t *ref; \ + int _top; \ + C##_##X##_node_t *_tn, *_st[50]; \ + } C##_##X##_iter_t + + +#define _using_CBST(X, C, Key, Mapped, keyCompareRaw, mappedDel, keyDel, \ + keyFromRaw, keyToRaw, RawKey, mappedFromRaw, mappedToRaw, RawMapped) \ + _using_CBST_types(X, C, Key, Mapped); \ +\ + typedef struct { \ + C##_##X##_node_t* root; \ + size_t size; \ + } C##_##X; \ +\ + typedef RawKey C##_##X##_rawkey_t; \ + typedef RawMapped C##_##X##_rawmapped_t; \ + typedef SET_ONLY_##C( C##_##X##_rawkey_t ) \ + MAP_ONLY_##C( struct {C##_##X##_rawkey_t first; \ + C##_##X##_rawmapped_t second;} ) \ + C##_##X##_rawvalue_t; \ +\ + typedef struct { \ + C##_##X##_value_t *first; \ + bool second; \ + } C##_##X##_result_t; \ +\ + STC_API C##_##X \ + C##_##X##_init(void); \ + STC_INLINE bool \ + C##_##X##_empty(C##_##X m) {return m.size == 0;} \ + STC_INLINE size_t \ + C##_##X##_size(C##_##X m) {return m.size;} \ +\ + STC_API void \ + C##_##X##_del_r_(C##_##X##_node_t* tn); \ +\ + STC_INLINE void \ + C##_##X##_del(C##_##X* self) {C##_##X##_del_r_(self->root);} \ + STC_INLINE void \ + C##_##X##_clear(C##_##X* self) {C##_##X##_del(self); *self = C##_##X##_init();} \ + STC_INLINE void \ + C##_##X##_swap(C##_##X* a, C##_##X* b) {c_swap(C##_##X, *a, *b);} \ +\ + STC_INLINE void \ + C##_##X##_value_del(C##_##X##_value_t* val) { \ + keyDel(KEY_REF_##C(val)); \ + MAP_ONLY_##C( mappedDel(&val->second); ) \ + } \ + STC_INLINE C##_##X##_value_t \ + C##_##X##_value_clone(C##_##X##_value_t val) { \ + *KEY_REF_##C(&val) = keyFromRaw(keyToRaw(KEY_REF_##C(&val))); \ + MAP_ONLY_##C( val.second = mappedFromRaw(mappedToRaw(&val.second)); ) \ + return val; \ + } \ +\ + STC_API C##_##X##_node_t* C##_##X##_clone_r_(C##_##X##_node_t *tn); \ + STC_INLINE C##_##X \ + C##_##X##_clone(C##_##X bst) { \ + C##_##X clone = {C##_##X##_clone_r_(bst.root), bst.size}; \ + return clone; \ + } \ +\ + STC_API C##_##X##_value_t* \ + C##_##X##_find_it(const C##_##X* self, RawKey rkey, C##_##X##_iter_t* out); \ +\ + STC_INLINE C##_##X##_value_t* \ + C##_##X##_find(const C##_##X* self, RawKey rkey) { \ + C##_##X##_iter_t it; \ + return C##_##X##_find_it(self, rkey, &it); \ + } \ + STC_INLINE bool \ + C##_##X##_contains(const C##_##X* self, RawKey rkey) { \ + return C##_##X##_find(self, rkey) != NULL; \ + } \ +\ + STC_API C##_##X##_result_t \ + C##_##X##_insert_key(C##_##X* self, RawKey rkey); \ +\ + STC_INLINE C##_##X##_result_t \ + C##_##X##_emplace(C##_##X* self, RawKey rkey MAP_ONLY_##C(, RawMapped rmapped) ) { \ + C##_##X##_result_t res = C##_##X##_insert_key(self, rkey); \ + MAP_ONLY_##C( if (res.second) res.first->second = mappedFromRaw(rmapped); ) \ + return res; \ + } \ + STC_INLINE C##_##X##_result_t \ + C##_##X##_insert(C##_##X* self, C##_##X##_rawvalue_t raw) { \ + return SET_ONLY_##C( C##_##X##_insert_key(self, raw) ) \ + MAP_ONLY_##C( C##_##X##_emplace(self, raw.first, raw.second) ); \ + } \ + STC_INLINE void \ + C##_##X##_push_n(C##_##X* self, const C##_##X##_rawvalue_t arr[], size_t n) { \ + for (size_t i=0; isecond); \ + res.first->second = mappedFromRaw(rmapped); return res; \ + } \ + STC_INLINE C##_##X##_result_t \ + C##_##X##_insert_or_assign(C##_##X* self, RawKey rkey, RawMapped rmapped) { \ + return C##_##X##_put(self, rkey, rmapped); \ + } \ + STC_INLINE C##_##X##_result_t \ + C##_##X##_put_mapped(C##_##X* self, RawKey rkey, Mapped mapped) { \ + C##_##X##_result_t res = C##_##X##_insert_key(self, rkey); \ + if (!res.second) mappedDel(&res.first->second); \ + res.first->second = mapped; return res; \ + } \ + STC_INLINE C##_##X##_mapped_t* \ + C##_##X##_at(const C##_##X* self, RawKey rkey) { \ + C##_##X##_iter_t it; \ + return &C##_##X##_find_it(self, rkey, &it)->second; \ + }) \ +\ + STC_INLINE C##_##X##_value_t* \ + C##_##X##_front(C##_##X* self) { \ + C##_##X##_node_t *tn = self->root; \ + while (tn->link[0]->level) tn = tn->link[0]; \ + return &tn->value; \ + } \ + STC_INLINE C##_##X##_value_t* \ + C##_##X##_back(C##_##X* self) { \ + C##_##X##_node_t *tn = self->root; \ + while (tn->link[1]->level) tn = tn->link[1]; \ + return &tn->value; \ + } \ +\ + STC_API void \ + C##_##X##_next(C##_##X##_iter_t* it); \ +\ + STC_INLINE C##_##X##_iter_t \ + C##_##X##_begin(C##_##X* self) { \ + C##_##X##_iter_t it = {NULL, 0, self->root}; \ + C##_##X##_next(&it); return it; \ + } \ + STC_INLINE C##_##X##_iter_t \ + C##_##X##_end(C##_##X* self) {\ + C##_##X##_iter_t it = {NULL}; return it; \ + } \ + STC_INLINE C##_##X##_mapped_t* \ + C##_##X##_itval(C##_##X##_iter_t it) {return SET_ONLY_##C( it.ref ) \ + MAP_ONLY_##C( &it.ref->second );} \ +\ + STC_API C##_##X##_node_t* \ + C##_##X##_erase_r_(C##_##X##_node_t *tn, const C##_##X##_rawkey_t* rkey, int *erased); \ +\ + STC_INLINE size_t \ + C##_##X##_erase(C##_##X* self, RawKey rkey) { \ + int erased = 0; \ + self->root = C##_##X##_erase_r_(self->root, &rkey, &erased); \ + self->size -= erased; return erased; \ + } \ + STC_INLINE size_t \ + C##_##X##_erase_at(C##_##X* self, C##_##X##_iter_t pos) { \ + return C##_##X##_erase(self, keyToRaw(KEY_REF_##C(pos.ref))); \ + } \ +\ + _implement_CBST(X, C, Key, Mapped, keyCompareRaw, mappedDel, keyDel, \ + keyFromRaw, keyToRaw, RawKey, mappedFromRaw, mappedToRaw, RawMapped) \ + typedef C##_##X C##_##X##_t + +/* -------------------------- IMPLEMENTATION ------------------------- */ + +#if !defined(STC_HEADER) || defined(STC_IMPLEMENTATION) +#define _implement_CBST(X, C, Key, Mapped, keyCompareRaw, mappedDel, keyDel, \ + keyFromRaw, keyToRaw, RawKey, mappedFromRaw, mappedToRaw, RawMapped) \ + STC_DEF C##_##X \ + C##_##X##_init(void) { \ + C##_##X m = {(C##_##X##_node_t *) &cbst_nil, 0}; \ + return m; \ + } \ +\ + STC_DEF C##_##X##_value_t* \ + C##_##X##_find_it(const C##_##X* self, C##_##X##_rawkey_t rkey, C##_##X##_iter_t* out) { \ + C##_##X##_node_t *tn = self->root; \ + out->_top = 0; \ + while (tn->level) { \ + C##_##X##_rawkey_t rx = keyToRaw(KEY_REF_##C(&tn->value)); \ + switch (keyCompareRaw(&rx, &rkey)) { \ + case -1: tn = tn->link[1]; break; \ + case 1: out->_st[out->_top++] = tn; tn = tn->link[0]; break; \ + case 0: out->_tn = tn->link[1]; return (out->ref = &tn->value); \ + } \ + } \ + return (out->ref = NULL); \ + } \ +\ + STC_DEF void \ + C##_##X##_next(C##_##X##_iter_t *it) { \ + C##_##X##_node_t *tn = it->_tn; \ + if (it->_top || tn->level) { \ + while (tn->level) { \ + it->_st[it->_top++] = tn; \ + tn = tn->link[0]; \ + } \ + tn = it->_st[--it->_top]; \ + it->_tn = tn->link[1]; \ + it->ref = &tn->value; \ + } else \ + it->ref = NULL; \ + } \ +\ + static C##_##X##_node_t * \ + C##_##X##_skew_(C##_##X##_node_t *tn) { \ + if (tn->link[0]->level == tn->level && tn->level) { \ + C##_##X##_node_t *tmp = tn->link[0]; \ + tn->link[0] = tmp->link[1]; \ + tmp->link[1] = tn; \ + tn = tmp; \ + } \ + return tn; \ + } \ +\ + static C##_##X##_node_t * \ + C##_##X##_split_(C##_##X##_node_t *tn) { \ + if (tn->link[1]->link[1]->level == tn->level && tn->level) { \ + C##_##X##_node_t *tmp = tn->link[1]; \ + tn->link[1] = tmp->link[0]; \ + tmp->link[0] = tn; \ + tn = tmp; \ + ++tn->level; \ + } \ + return tn; \ + } \ +\ +/*\ + static C##_##X##_node_t* ** recursive version ** \ + C##_##X##_insert_key_r_(C##_##X##_node_t* tn, const C##_##X##_rawkey_t* rkey, C##_##X##_result_t* res) { \ + if (tn->level == 0) { \ + tn = c_new_1(C##_##X##_node_t); \ + res->first = &tn->value, res->second = true; \ + tn->link[0] = tn->link[1] = (C##_##X##_node_t*) &cbst_nil, tn->level = 1; \ + *KEY_REF_##C(&tn->value) = keyFromRaw(*rkey); \ + return tn; \ + } \ + C##_##X##_rawkey_t r = keyToRaw(KEY_REF_##C(&tn->value)); \ + int c = keyCompareRaw(&r, rkey); \ + if (c == 0) { res->first = &tn->value; return tn; } \ + tn->link[c == -1] = C##_##X##_insert_key_r_(tn->link[c == -1], rkey, res); \ + tn = C##_##X##_skew_(tn); \ + tn = C##_##X##_split_(tn); \ + return tn; \ + } \ +\ + static C##_##X##_size_t ** recursive version, array based ** \ + C##_##X##_insert_key_r_(C##_##X* self, C##_##X##_size_t tn, const C##_##X##_rawkey_t* rkey, C##_##X##_result_t* res) { \ + if (tn == 0) { \ + tn = C##_##X##_node_new_(self); \ + *KEY_REF_##C(&self->data[tn].value) = keyFromRaw(*rkey); \ + res->first = &self->data[tn].value, res->second = true; \ + return tn; \ + } \ + C##_##X##_rawkey_t r = keyToRaw(KEY_REF_##C(&self->data[tn].value)); \ + int c = keyCompareRaw(&r, rkey), dir; \ + if (c == 0) { res->first = &self->data[tn].value; return tn; } \ + dir = (c == -1); \ + C##_##X##_size_t node = C##_##X##_insert_key_r_(self, self->data[tn].link[dir], rkey, res); \ + C##_##X##_node_t *d = self->data; \ + d[tn].link[dir] = node; \ + tn = C##_##X##_skew_(d, tn); \ + tn = C##_##X##_split_(d, tn); \ + return tn; \ + } \ +*/\ + static inline C##_##X##_node_t* \ + C##_##X##_insert_key_i_(C##_##X##_node_t* tn, const C##_##X##_rawkey_t* rkey, C##_##X##_result_t* res) { \ + C##_##X##_node_t *up[64], *it = tn; \ + int c, top = 0, dir = 0; \ + while (it->level) { \ + up[top++] = it; \ + C##_##X##_rawkey_t r = keyToRaw(KEY_REF_##C(&it->value)); \ + if ((c = keyCompareRaw(&r, rkey)) == 0) {res->first = &it->value; return tn;} \ + it = it->link[(dir = (c == -1))]; \ + } \ + tn = c_new_1(C##_##X##_node_t); \ + *KEY_REF_##C(&tn->value) = keyFromRaw(*rkey); \ + res->first = &tn->value, res->second = true; \ + tn->link[0] = tn->link[1] = (C##_##X##_node_t*) &cbst_nil, tn->level = 1; \ + if (top == 0) return tn; \ + up[top - 1]->link[dir] = tn; \ + while (top--) { \ + if (top) dir = (up[top - 1]->link[1] == up[top]); \ + up[top] = C##_##X##_skew_(up[top]); \ + up[top] = C##_##X##_split_(up[top]); \ + if (top) up[top - 1]->link[dir] = up[top]; \ + } \ + return up[0]; \ + } \ +\ + STC_DEF C##_##X##_result_t \ + C##_##X##_insert_key(C##_##X* self, RawKey rkey) { \ + C##_##X##_result_t res = {NULL, false}; \ + self->root = C##_##X##_insert_key_i_(self->root, &rkey, &res); \ + self->size += res.second; \ + return res; \ + } \ +\ + STC_DEF C##_##X##_node_t* \ + C##_##X##_erase_r_(C##_##X##_node_t *tn, const C##_##X##_rawkey_t* rkey, int *erased) { \ + if (tn->level == 0) \ + return tn; \ + C##_##X##_rawkey_t r = keyToRaw(KEY_REF_##C(&tn->value)); \ + int c = keyCompareRaw(&r, rkey); \ + if (c != 0) \ + tn->link[c == -1] = C##_##X##_erase_r_(tn->link[c == -1], rkey, erased); \ + else { \ + if (tn->link[0]->level && tn->link[1]->level) { \ + C##_##X##_node_t *h = tn->link[0]; \ + while (h->link[1]->level) \ + h = h->link[1]; \ + tn->value = h->value; \ + r = keyToRaw(KEY_REF_##C(&tn->value)); \ + tn->link[0] = C##_##X##_erase_r_(tn->link[0], &r, erased); \ + } else { \ + C##_##X##_node_t *tmp = tn; \ + tn = tn->link[tn->link[0]->level == 0]; \ + C##_##X##_value_del(&tmp->value); \ + free(tmp); \ + *erased = 1; \ + } \ + } \ + if (tn->link[0]->level < tn->level - 1 || tn->link[1]->level < tn->level - 1) { \ + if (tn->link[1]->level > --tn->level) \ + tn->link[1]->level = tn->level; \ + tn = C##_##X##_skew_(tn); \ + tn = C##_##X##_split_(tn); \ + } \ + return tn; \ + } \ +\ + STC_DEF C##_##X##_node_t* \ + C##_##X##_clone_r_(C##_##X##_node_t *tn) { \ + if (! tn->level) return tn; \ + C##_##X##_node_t *cn = c_new_1(C##_##X##_node_t); \ + cn->link[0] = C##_##X##_clone_r_(tn->link[0]); \ + cn->link[1] = C##_##X##_clone_r_(tn->link[1]); \ + cn->level = tn->level; \ + cn->value = C##_##X##_value_clone(tn->value); \ + return cn; \ + } \ +\ + STC_DEF void \ + C##_##X##_del_r_(C##_##X##_node_t* tn) { \ + if (tn->level != 0) { \ + C##_##X##_del_r_(tn->link[0]); \ + C##_##X##_del_r_(tn->link[1]); \ + C##_##X##_value_del(&tn->value); \ + c_free(tn); \ + } \ + } + + +_using_CBST_types(_, csmap, int, int); +static csmap___node_t cbst_nil = {&cbst_nil, &cbst_nil, 0}; + +#else +#define _implement_CBST(X, C, Key, Mapped, keyCompareRaw, mappedDel, keyDel, \ + keyFromRaw, keyToRaw, RawKey, mappedFromRaw, mappedToRaw, RawMapped) +#endif + +#endif -- cgit v1.2.3