1 files changed, 25 insertions, 19 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;