use generic conts

4 files changed, 29 insertions, 90 deletions

diff --git a/src/ast.c b/src/ast.c
index f491b55..7c0225d 100644
--- a/src/ast.c
+++ b/src/ast.c
@@ -15,11 +15,18 @@
 #include <math.h>
 
 #include <fwd/ast.h>
-#include <fwd/vec.h>
 #include <fwd/scope.h>
 
-static struct vec nodes = {0};
-static struct vec types = {0};
+#define VEC_NAME ast_vec
+#define VEC_TYPE struct ast *
+#include <conts/vec.h>
+
+#define VEC_NAME type_vec
+#define VEC_TYPE struct type *
+#include <conts/vec.h>
+
+static struct ast_vec nodes;
+static struct type_vec types;
 
 static void destroy_ast_node(struct ast *n)
 {
@@ -45,22 +52,20 @@ static void destroy_type(struct type *n)
 
 static void destroy_ast_nodes()
 {
-	foreach_vec(ni, nodes) {
-		struct ast *n = vect_at(struct ast *, nodes, ni);
-		destroy_ast_node(n);
+	foreach(ast_vec, n, &nodes) {
+		destroy_ast_node(*n);
 	}
 
-	vec_destroy(&nodes);
+	ast_vec_destroy(&nodes);
 }
 
 static void destroy_types()
 {
-	foreach_vec(ti, types) {
-		struct type *t = vect_at(struct type *, types, ti);
-		destroy_type(t);
+	foreach(type_vec, t, &types) {
+		destroy_type(*t);
 	}
 
-	vec_destroy(&types);
+	type_vec_destroy(&types);
 }
 
 void destroy_allocs()
@@ -71,9 +76,8 @@ void destroy_allocs()
 
 static struct ast *create_empty_ast()
 {
-	if (vec_uninit(nodes)) {
-		nodes = vec_create(sizeof(struct ast *));
-	}
+	if (ast_vec_uninit(&nodes))
+		nodes = ast_vec_create(1);
 
 	struct ast *n = calloc(1, sizeof(struct ast));
 	if (!n)
@@ -81,18 +85,17 @@ static struct ast *create_empty_ast()
 
 	/* just to be safe */
 	n->k = AST_EMPTY;
-	vect_append(struct ast *, nodes, &n);
+	ast_vec_append(&nodes, n);
 	return n;
 }
 
 static struct type *create_empty_type()
 {
-	if (vec_uninit(types)) {
-		types = vec_create(sizeof(struct type *));
-	}
+	if (type_vec_uninit(&types))
+		types = type_vec_create(1);
 
 	struct type *n = calloc(1, sizeof(struct type));
-	vect_append(struct ast *, types, &n);
+	type_vec_append(&types, n);
 	return n;
 }
 
@@ -130,6 +133,9 @@ struct type *tgen_type(enum type_kind kind,
                        struct src_loc loc)
 {
 	struct type *n = create_empty_type();
+	if (!n)
+		return NULL;
+
 	n->k = kind;
 	n->t0 = t0;
 	n->id = id;
diff --git a/src/lower.c b/src/lower.c
index 8d3e4ea..8849bd1 100644
--- a/src/lower.c
+++ b/src/lower.c
@@ -9,7 +9,6 @@
 
 #include <fwd/lower.h>
 #include <fwd/scope.h>
-#include <fwd/vec.h>
 
 /** @todo semantics in this file are a bit unclear, should probably do some kind
  * of "each function starts and ends on an indented empty line" or something */
diff --git a/src/move.c b/src/move.c
index e11c2be..dc50cac 100644
--- a/src/move.c
+++ b/src/move.c
@@ -8,7 +8,7 @@ struct ast_pair {
 #define SPTREE_TYPE struct ast_pair
 #define SPTREE_CMP(a, b) ((a).def - (b).def)
 #define SPTREE_NAME moved
-#include <fwd/sptree.h>
+#include <conts/sptree.h>
 
 struct state {
 	struct moved moved;
@@ -63,7 +63,9 @@ static struct rm_move remove_move(struct state *state, struct ast *def)
 	struct ast_pair *found = moved_find(&state->moved, search);
 	if (found) {
 		moved_remove_found(&state->moved, found);
-		return (struct rm_move){.data = *found, .owner = state};
+		struct rm_move r = {.data = *found, .owner = state};
+		moved_free_found(&state->moved, found);
+		return r;
 	}
 
 	return remove_move(state->parent, def);
diff --git a/src/vec.c b/src/vec.c
deleted file mode 100644
index be413a0..0000000
--- a/src/vec.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* SPDX-License-Identifier: copyleft-next-0.3.1 */
-/* Copyright 2024 Kim Kuparinen < kimi.h.kuparinen@gmail.com > */
-
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-
-#include <fwd/vec.h>
-
-struct vec vec_create(size_t ns)
-{
-	return (struct vec) {
-		       .n = 0,
-		       .s = 1,
-		       .ns = ns,
-		       .buf = malloc(ns),
-	};
-}
-
-size_t vec_len(struct vec *v)
-{
-	return v->n;
-}
-
-void *vec_at(struct vec *v, size_t i)
-{
-	assert(i < v->n && "out of vector bounds");
-	return v->buf + i * v->ns;
-}
-
-void *vec_back(struct vec *v)
-{
-	assert(v->n);
-	return v->buf + (v->n - 1) * v->ns;
-}
-
-void *vec_pop(struct vec *v)
-{
-	assert(v->n && "attempting to pop empty vector");
-	v->n--;
-	return v->buf + v->n * v->ns;
-}
-
-void vec_append(struct vec *v, void *n)
-{
-	v->n++;
-	if (v->n >= v->s) {
-		v->s *= 2;
-		v->buf = realloc(v->buf, v->s * v->ns);
-	}
-
-	void *p = vec_at(v, v->n - 1);
-	memcpy(p, n, v->ns);
-}
-
-void vec_reset(struct vec *v)
-{
-	v->n = 0;
-}
-
-void vec_destroy(struct vec *v) {
-	free(v->buf);
-}
-
-void vec_sort(struct vec *v, vec_comp_t comp)
-{
-	qsort(v->buf, v->n, v->ns, comp);
-}