From 28642854f56eb1ae7df7f4d3bfe51e6ea9c0d61a Mon Sep 17 00:00:00 2001 From: r4 Date: Mon, 22 Aug 2022 22:50:30 -0400 Subject: [PATCH] allow specifying container item destructors --- include/ds/generic/map.h | 5 +++++ include/ds/generic/smap.h | 8 +++++--- include/ds/generic/vec.h | 9 ++++++++- include/ds/internal/generic/begin.h | 4 ++++ include/ds/internal/generic/end.h | 2 ++ tests/generic/vec.c | 19 ++++++++++++++++++- tests/generic/vec.h | 6 ++++++ 7 files changed, 48 insertions(+), 5 deletions(-) diff --git a/include/ds/generic/map.h b/include/ds/generic/map.h index db53196..500e158 100644 --- a/include/ds/generic/map.h +++ b/include/ds/generic/map.h @@ -116,6 +116,10 @@ FUNCDEF(NAME, )() { } FUNCDEF(void, _term)(NAME m) { + ITEM_TYPE *it = NULL; + while (FUNC(_it_next)(m, &it)) { + GENERIC_TERM_ITEM((it->val)); + } free(m.data); } @@ -163,6 +167,7 @@ FUNCDEF(bool, _del)(NAME m, KTYPE key) { size_t i = _fnv1a32(&key, sizeof(KTYPE)) & (m.cap - 1); while (m.data[i].state != EMPTY) { if (m.data[i].state != TOMBSTONE && memcmp(&m.data[i].key, &key, sizeof(KTYPE)) == 0) { + GENERIC_TERM_ITEM((m.data[i].val)); m.data[i].state = TOMBSTONE; return true; } diff --git a/include/ds/generic/smap.h b/include/ds/generic/smap.h index cc07ca7..a2f374d 100644 --- a/include/ds/generic/smap.h +++ b/include/ds/generic/smap.h @@ -108,9 +108,10 @@ FUNCDEF(NAME, )() { } FUNCDEF(void, _term)(NAME m) { - for (size_t i = 0; i < m.cap; i++) { - if (m.data[i].key && m.data[i].key != TOMBSTONE) - free(m.data[i].key); + ITEM_TYPE *it = NULL; + while (FUNC(_it_next)(m, &it)) { + GENERIC_TERM_ITEM((it->val)); + free(it->key); } free(m.data); } @@ -162,6 +163,7 @@ FUNCDEF(bool, _del)(NAME m, const char *key) { size_t i = _fnv1a32(key, strlen(key)) & (m.cap - 1); while (m.data[i].key) { if (m.data[i].key != TOMBSTONE && strcmp(m.data[i].key, key) == 0) { + GENERIC_TERM_ITEM((m.data[i].val)); free(m.data[i].key); m.data[i].key = TOMBSTONE; return true; diff --git a/include/ds/generic/vec.h b/include/ds/generic/vec.h index a704508..b2626cf 100644 --- a/include/ds/generic/vec.h +++ b/include/ds/generic/vec.h @@ -88,6 +88,9 @@ FUNCDEF(NAME, )() { } FUNCDEF(void, _term)(NAME v) { + for (size_t i = 0; i < vec_len(v); i++) { + GENERIC_TERM_ITEM((v[i])); + } free(_VEC_HEADER(v)); } @@ -126,7 +129,10 @@ FUNCDEF(Error, _push)(NAME *v, TYPE val) { } FUNCDEF(TYPE, _pop)(NAME v) { - return v[--_VEC_HEADER(v)->len]; + TYPE val = v[_VEC_HEADER(v)->len-1]; + GENERIC_TERM_ITEM((val)); + _VEC_HEADER(v)->len--; + return val; } FUNCDEF(TYPE *, _back)(NAME v) { @@ -135,6 +141,7 @@ FUNCDEF(TYPE *, _back)(NAME v) { FUNCDEF(TYPE, _del)(NAME v, size_t idx) { TYPE val = v[idx]; + GENERIC_TERM_ITEM((val)); memmove(v + idx, v + idx + 1, sizeof(TYPE) * (--_VEC_HEADER(v)->len - idx)); return val; } diff --git a/include/ds/internal/generic/begin.h b/include/ds/internal/generic/begin.h index 2a3a446..a05300b 100644 --- a/include/ds/internal/generic/begin.h +++ b/include/ds/internal/generic/begin.h @@ -68,3 +68,7 @@ #if defined(GENERIC_KEY_TYPE) #define KTYPE GENERIC_KEY_TYPE #endif + +#ifndef GENERIC_TERM_ITEM +#define GENERIC_TERM_ITEM(_itm) +#endif diff --git a/include/ds/internal/generic/end.h b/include/ds/internal/generic/end.h index 0a3b672..b1e5b96 100644 --- a/include/ds/internal/generic/end.h +++ b/include/ds/internal/generic/end.h @@ -1,6 +1,8 @@ // Copyright 2022 Darwin Schuppan // SPDX license identifier: MIT +#undef GENERIC_TERM_ITEM + #if defined(GENERIC_TYPE) #undef TYPE #undef GENERIC_TYPE diff --git a/tests/generic/vec.c b/tests/generic/vec.c index f483528..4b23569 100644 --- a/tests/generic/vec.c +++ b/tests/generic/vec.c @@ -10,6 +10,8 @@ int main() { fmt_init(); + int_vec_fmt_register("%d"); + int_vec_2d_fmt_register("%{IntVec}"); IntVec v = int_vec(); @@ -48,12 +50,27 @@ int main() { for (size_t i = 2; i < 256; i++) assert(v[i] == i); // Print via fmt - int_vec_fmt_register("%d"); char buf[4096]; fmts(buf, 4096, "%{IntVec}", v); assert(strcmp(buf, "{1, 999, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511}") == 0); int_vec_term(v); + // 2D vector + IntVec2D v2d = int_vec_2d(); + int_vec_2d_push(&v2d, int_vec()); + int_vec_2d_push(&v2d, int_vec()); + int_vec_push(&v2d[0], 1); + int_vec_push(&v2d[0], 2); + int_vec_push(&v2d[0], 3); + int_vec_push(&v2d[0], 4); + int_vec_push(&v2d[1], 69); + int_vec_push(&v2d[1], 420); + assert(v2d[1][1] == 420); + fmts(buf, 4096, "%{IntVec2D}", v2d); + assert(strcmp(buf, "{{1, 2, 3, 4}, {69, 420}}") == 0); + int_vec_2d_del(v2d, 0); + int_vec_2d_term(v2d); + fmt_term(); } diff --git a/tests/generic/vec.h b/tests/generic/vec.h index a6fc21d..09ad54e 100644 --- a/tests/generic/vec.h +++ b/tests/generic/vec.h @@ -9,4 +9,10 @@ #define GENERIC_PREFIX int_vec #include +#define GENERIC_TYPE IntVec +#define GENERIC_NAME IntVec2D +#define GENERIC_PREFIX int_vec_2d +#define GENERIC_TERM_ITEM(_itm) int_vec_term(_itm) +#include + #endif