1 files changed, 79 insertions, 7 deletions

diff --git a/arr.c b/arr.c
index 6ec7db2..8bc66e2 100644
--- a/arr.c
+++ b/arr.c
@@ -17,33 +17,105 @@ static inline size_t arr_len(void *arr) {
 
 static void arr_resv_(void **arr, size_t n, size_t item_sz) {
 	if (*arr == NULL) {
-		ArrHeader *hdr = err_malloc(item_sz * n + sizeof(ArrHeader));
+		ArrHeader *hdr = err_malloc(item_sz * n + sizeof(ArrHeader) + 1); /* +1 => prevent ptr overflow */
 		hdr->len = 0;
 		hdr->cap = n;
 		*arr = hdr->data;
 	} else {
 		ArrHeader *hdr = arr_hdr(*arr);
 		hdr->cap = n;
-		hdr = realloc(hdr, item_sz * n + sizeof(ArrHeader));
+		hdr = err_realloc(hdr, item_sz * n + sizeof(ArrHeader) + 1);
 		if (hdr->len > hdr->cap) hdr->len = hdr->cap;
 		*arr = hdr->data;
-	}
-		
+	}		
+}
+static void arr_resva_(void **arr, size_t n, size_t item_sz, Allocator *a) {
+	if (*arr == NULL) {
+		ArrHeader *hdr = allocr_malloc(a, item_sz * n + sizeof(ArrHeader) + 1); /* +1 => prevent ptr overflow */
+		hdr->len = 0;
+		hdr->cap = n;
+		*arr = hdr->data;
+	} else {
+		ArrHeader *hdr = arr_hdr(*arr);
+		hdr->cap = n;
+		hdr = allocr_realloc(a, hdr, item_sz * n + sizeof(ArrHeader) + 1);
+		if (hdr->len > hdr->cap) hdr->len = hdr->cap;
+		*arr = hdr->data;
+	}		
+}
+
+
+static void arr_set_len_(void **arr, size_t n, size_t item_sz) {
+	arr_resv_(arr, n, item_sz);
+	arr_hdr(arr)->len = n;
 }
 
 static void *arr_add_(void **arr, size_t item_sz) {
 	ArrHeader *hdr;
     if (*arr == NULL) {
-		arr_resv_(*arr, 10, item_sz);
+		arr_resv_(arr, 10, item_sz);
 		hdr = arr_hdr(*arr);
 	} else {
 		hdr = arr_hdr(*arr);
 		if (hdr->len >= hdr->cap) {
-			arr_resv_(*arr, hdr->len * 2, item_sz);
+			arr_resv_(arr, hdr->len * 2, item_sz);
 			hdr = arr_hdr(*arr);
 		}
 	}
 	return &(((char *)hdr->data)[(hdr->len++) * item_sz]);
 }
+static void *arr_adda_(void **arr, size_t item_sz, Allocator *a) {
+	ArrHeader *hdr;
+    if (*arr == NULL) {
+		arr_resva_(arr, 10, item_sz, a);
+		hdr = arr_hdr(*arr);
+	} else {
+		hdr = arr_hdr(*arr);
+		if (hdr->len >= hdr->cap) {
+			arr_resva_(arr, hdr->len * 2, item_sz, a);
+			hdr = arr_hdr(*arr);
+		}
+	}
+	return &(((char *)hdr->data)[(hdr->len++) * item_sz]);
+}
+
+static void arr_clear_(void **arr) {
+	if (*arr) {
+		free(arr_hdr(*arr));
+		*arr = NULL;
+	}
+}
 
-#define arr_add(arr) arr_add_((void **)arr, sizeof **arr)
+static void *arr_last_(void *arr, size_t item_sz) {
+	if (arr) {
+		ArrHeader *hdr = arr_hdr(arr);
+		return (char *)hdr->data + hdr->len * item_sz;
+	} else {
+		return NULL;
+	}
+}
+
+#define arr_add(arr) arr_add_((void **)(arr), sizeof **(arr))
+#define arr_adda(arr, allocr) arr_adda_((void **)(arr), sizeof **(arr), allocr)
+#define arr_resv(arr, n) arr_resv_((void **)(arr), n, sizeof **(arr))
+#define arr_resva(arr, n, allocr) arr_resva_((void **)(arr), n, sizeof **(arr), allocr)
+#define arr_set_len(arr, n) arr_set_len_((void **)(arr), n, sizeof **(arr))
+#define arr_clear(arr) arr_clear_((void **)(arr))
+#define arr_last(arr) arr_last_((void *)(arr), sizeof *(arr))
+#define arr_foreach(arr, type, var) for (type *var = arr, *var##_foreach_end = arr_last(arr); var != var##_foreach_end; var++)
+
+static void arr_test(void) {
+	int *foos = NULL;
+	for (int i = 0; i < 1000; i++) {
+		*(int *)arr_add(&foos) = i;
+	}
+	for (int i = 0; i < (int)arr_len(foos); i++) {
+		assert(foos[i] == i);
+	}
+	int lastx = -1;
+	arr_foreach(foos, int, x) {
+		assert(*x == lastx + 1);
+		lastx = *x;
+	}
+	arr_clear(&foos);
+}