add check for double fmt_term()

Makefile

@@ -1,3 +1,6 @@
+# Copyright 2022 Darwin Schuppan <darwin@nobrain.org>
+# SPDX license identifier: MIT
+
 ################################
 #            Config            #
 ################################
@@ -50,8 +53,10 @@ else \
 fi
 endef
 
+TEST_HDR := generic/vec.h
 TESTS := generic/map generic/smap generic/vec error fmt
 
+_TEST_HDR := $(addprefix tests/,$(TEST_HDR))
 _TESTS := $(addsuffix $(EXE_EXT),$(addprefix tests/,$(TESTS)))
 
 .PHONY: test test_outputs test_leaks test_full test_debug
@@ -77,7 +82,7 @@ else
 	@echo "Options are: $(TESTS)"
 endif
 
-tests/%: tests/%.c ds.a $(_HDR)
+tests/%: tests/%.c ds.a $(_HDR) $(_TEST_HDR)
 	$(CC) -o $@ $< ds.a -I./include $(CFLAGS) $(LDFLAGS)
 
 ################################

include/ds/error.h

@@ -80,7 +80,7 @@ typedef struct Error {
 /* Returns true if the given error structure actually contains a real error. */
 static inline bool error_is(Error e) { return e.kind != ErrorNone; }
 /* Same as error_is but takes a pointer and does NULL checking. */
-static inline bool error_ptr_is(Error *e) { return e != NULL && e->kind != ErrorNone; }
+static inline bool error_ptr_is(Error *restrict e) { return e != NULL && e->kind != ErrorNone; }
 
 /* Call this at the beginning of any program that makes use of any of the more
  * advanced error features (those which involve heap allocation). */
@@ -92,9 +92,9 @@ void error_term();
 #include <ds/fmt.h>;
 fmt("%{Error:destroy}", err);
 */
-size_t error_to_string(char *buf, size_t size, Error e, bool destroy);
+size_t error_to_string(char *restrict buf, size_t size, Error e, bool destroy);
 
 Error *_error_heapify(Error e);
-Error _error_hereify(const char *file, size_t line, Error e);
+Error _error_hereify(const char *restrict file, size_t line, Error e);
 
 #endif

include/ds/generic/map.h

@@ -52,7 +52,7 @@ FUNCDECL(VTYPE *, _get)(NAME m, KTYPE key);
 FUNCDECL(Error, _set)(NAME *m, KTYPE key, VTYPE val);
 FUNCDECL(bool, _del)(NAME m, KTYPE key);
 FUNCDECL(Error, _rehash)(NAME *m, size_t new_minimum_cap);
-FUNCDECL(bool, _it_next)(NAME m, ITEM_TYPE **it);
+FUNCDECL(bool, _it_next)(NAME m, ITEM_TYPE **restrict it);
 
 #ifdef GENERIC_IMPL
 VARDEF(const char *, __val_fmt) = NULL;
@@ -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;
 		}
@@ -199,7 +204,7 @@ FUNCDEF(Error, _rehash)(NAME *m, size_t new_minimum_cap) {
 	return OK();
 }
 
-FUNCDEF(bool, _it_next)(NAME m, ITEM_TYPE **it) {
+FUNCDEF(bool, _it_next)(NAME m, ITEM_TYPE **restrict it) {
 	*it == NULL ? *it = m.data : (*it)++;
 	while (*it < m.data + m.cap && (*it)->state != OCCUPIED) { (*it)++; }
 	return *it < m.data + m.cap;

include/ds/generic/smap.h

@@ -46,7 +46,7 @@ FUNCDECL(TYPE *, _get)(NAME m, const char *key);
 FUNCDECL(Error, _set)(NAME *m, const char *key, TYPE val);
 FUNCDECL(bool, _del)(NAME m, const char *key);
 FUNCDECL(Error, _rehash)(NAME *m, size_t new_minimum_cap);
-FUNCDECL(bool, _it_next)(NAME m, ITEM_TYPE **it);
+FUNCDECL(bool, _it_next)(NAME m, ITEM_TYPE **restrict it);
 
 #ifdef GENERIC_IMPL
 VARDEF(const char *, __val_fmt) = NULL;
@@ -108,9 +108,10 @@ FUNCDEF(NAME, )() {
 }
 
 FUNCDEF(void, _term)(NAME m) {
-	for (size_t i = 0; i < m.cap; i++) {
+	ITEM_TYPE *it = NULL;
-		if (m.data[i].key && m.data[i].key != TOMBSTONE)
+	while (FUNC(_it_next)(m, &it)) {
-			free(m.data[i].key);
+		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;
@@ -198,7 +200,7 @@ FUNCDEF(Error, _rehash)(NAME *m, size_t new_minimum_cap) {
 	return OK();
 }
 
-FUNCDEF(bool, _it_next)(NAME m, ITEM_TYPE **it) {
+FUNCDEF(bool, _it_next)(NAME m, ITEM_TYPE **restrict it) {
 	*it == NULL ? *it = m.data : (*it)++;
 	while (*it < m.data + m.cap && (!(*it)->key || (*it)->key == TOMBSTONE)) { (*it)++; }
 	return *it < m.data + m.cap;

include/ds/generic/vec.h

@@ -27,8 +27,8 @@
 
 #ifndef _GENERIC_VEC_ONCE
 #define _GENERIC_VEC_ONCE
-size_t vec_len(void *v);
+size_t vec_len(const void *v);
-size_t vec_cap(void *v);
+size_t vec_cap(const void *v);
 #endif
 
 typedef TYPE *NAME;
@@ -38,10 +38,8 @@ VARDECL(const char *, __val_fmt);
 FUNCDECL(NAME, )();
 FUNCDECL(void, _term)(NAME v);
 FUNCDECL(void, _fmt_register)(const char *val_fmt);
-static inline FUNCDEF(size_t, _len)(NAME v) { return vec_len((void*)v); }
+static inline FUNCDEF(size_t, _len)(const NAME v) { return vec_len((const void*)v); }
-static inline FUNCDEF(size_t, _cap)(NAME v) { return vec_cap((void*)v); }
+static inline FUNCDEF(size_t, _cap)(const NAME v) { return vec_cap((const void*)v); }
-FUNCDECL(size_t, _len)(NAME v);
-FUNCDECL(size_t, _cap)(NAME v);
 FUNCDECL(Error, _fit)(NAME *v, size_t new_minimum_cap);
 FUNCDECL(Error, _push)(NAME *v, TYPE val);
 FUNCDECL(TYPE, _pop)(NAME v);
@@ -60,11 +58,11 @@ typedef struct _VecHeader {
 	size_t cap, len;
 } _VecHeader;
 
-size_t vec_len(void *v) {
+size_t vec_len(const void *v) {
 	return v == NULL ? 0 : _VEC_HEADER(v)->len;
 }
 
-size_t vec_cap(void *v) {
+size_t vec_cap(const void *v) {
 	return v == NULL ? 0 : _VEC_HEADER(v)->cap;
 }
 #endif
@@ -90,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));
 }
 
@@ -128,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) {
@@ -137,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;
 }

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

include/ds/internal/generic/end.h

@@ -1,6 +1,8 @@
 // Copyright 2022 Darwin Schuppan <darwin@nobrain.org>
 // SPDX license identifier: MIT
 
+#undef GENERIC_TERM_ITEM
+
 #if defined(GENERIC_TYPE)
 #undef TYPE
 #undef GENERIC_TYPE

include/ds/number.h

@@ -1,3 +1,6 @@
+// Copyright 2022 Darwin Schuppan <darwin@nobrain.org>
+// SPDX license identifier: MIT
+
 #ifndef __DS_NUMBER_H__
 #define __DS_NUMBER_H__
 

src/ds/error.c

@@ -18,7 +18,7 @@ void error_term() {
 	free(error_reserved_for_error);
 }
 
-size_t error_to_string(char *buf, size_t size, Error e, bool destroy) {
+size_t error_to_string(char *restrict buf, size_t size, Error e, bool destroy) {
 	size_t written = 0;
 	if (e.has_location) {
 		written += snprintf(buf + written, sub_clamped(size, written), "%s:%zu: ", e.file, e.line);
@@ -66,7 +66,7 @@ Error *_error_heapify(Error e) {
 	return res;
 }
 
-Error _error_hereify(const char *file, size_t line, Error e) {
+Error _error_hereify(const char *restrict file, size_t line, Error e) {
 	e.has_location = true;
 	e.file = file;
 	e.line = line;

src/ds/fmt.c

@@ -272,7 +272,7 @@ static void _fmts_putc_func(FmtContext *restrict ctx, char c) {
 /********************************\
 |* The guts of any fmt function *|
 \********************************/
-static Error _fmt_main(bool use_err_location, const char *file, size_t line, FmtContext *ctx, const char *restrict format, va_list args) {
+static Error _fmt_main(bool use_err_location, const char *restrict file, size_t line, FmtContext *restrict ctx, const char *restrict format, va_list args) {
 	if (!initialized) {
 		const char *err_str = "fmt: fmt_init() must be called at the beginning of the program before using any other fmt functions, and fmt_term() must be called when done\n";
 		return use_err_location ? ERROR_STRING_LOCATION(file, line, err_str) : ERROR_STRING(err_str);
@@ -506,7 +506,7 @@ void fmt_register(const char *restrict keyword, FmtPrintFunc print_func) {
 	_print_func_map_set(&_print_funcs, keyword, print_func);
 }
 
-void _fmtv(const char *file, size_t line, const char *restrict format, va_list args) {
+void _fmtv(const char *restrict file, size_t line, const char *restrict format, va_list args) {
 	FmtContext ctx = {
 		.ctx_data = stdout,
 		.putc_func = _fmtf_putc_func,
@@ -514,7 +514,7 @@ void _fmtv(const char *file, size_t line, const char *restrict format, va_list a
 	_fmtcv(file, line, &ctx, format, args);
 }
 
-void _fmt(const char *file, size_t line, const char *restrict format, ...) {
+void _fmt(const char *restrict file, size_t line, const char *restrict format, ...) {
 	va_list args;
 	va_start(args, format);
 	_fmtv(file, line, format, args);
@@ -544,11 +544,11 @@ size_t _fmts(const char *restrict file, size_t line, char *restrict buf, size_t
 	return res;
 }
 
-void _fmtcv(const char *restrict file, size_t line, FmtContext *ctx, const char *restrict format, va_list args) {
+void _fmtcv(const char *restrict file, size_t line, FmtContext *restrict ctx, const char *restrict format, va_list args) {
 	ERROR_ASSERT(_fmt_main(true, file, line, ctx, format, args));
 }
 
-void _fmtc(const char *restrict file, size_t line, FmtContext *ctx, const char *restrict format, ...) {
+void _fmtc(const char *restrict file, size_t line, FmtContext *restrict ctx, const char *restrict format, ...) {
 	va_list args;
 	va_start(args, format);
 	_fmtcv(file, line, ctx, format, args);
@@ -576,5 +576,9 @@ void fmt_init() {
 }
 
 void fmt_term() {
+	if (!initialized) {
+		ERROR_ASSERT(ERROR_STRING("fmt: fmt_term() called while fmt uninitialized"));
+	}
+	initialized = false;
 	_print_func_map_term(_print_funcs);
 }

tests/generic/vec.c

@@ -1,18 +1,17 @@
 // Copyright 2022 Darwin Schuppan <darwin@nobrain.org>
 // SPDX license identifier: MIT
 
-#define GENERIC_IMPL_STATIC
+#define GENERIC_IMPL
 
-#define GENERIC_TYPE int
+#include "vec.h"
-#define GENERIC_NAME IntVec
-#define GENERIC_PREFIX int_vec
-#include <ds/generic/vec.h>
 
 #include <assert.h>
 #include <string.h>
 
 int main() {
 	fmt_init();
+	int_vec_fmt_register("%d");
+	int_vec_2d_fmt_register("%{IntVec}");
 
 	IntVec v = int_vec();
 
@@ -51,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();
 }

tests/generic/vec.h

@@ -0,0 +1,18 @@
+// Copyright 2022 Darwin Schuppan <darwin@nobrain.org>
+// SPDX license identifier: MIT
+
+#ifndef __TESTS_VEC_H__
+#define __TESTS_VEC_H__
+
+#define GENERIC_TYPE int
+#define GENERIC_NAME IntVec
+#define GENERIC_PREFIX int_vec
+#include <ds/generic/vec.h>
+
+#define GENERIC_TYPE IntVec
+#define GENERIC_NAME IntVec2D
+#define GENERIC_PREFIX int_vec_2d
+#define GENERIC_TERM_ITEM(_itm) int_vec_term(_itm)
+#include <ds/generic/vec.h>
+
+#endif