Reformat uuid

Makefile

@@ -10,7 +10,7 @@ INSTALL_PREFIX = dist
 RUNTIME_ASSERT = true
 
 # Internal variables
-override CFLAGS              = -Wall -Wextra -Werror -pedantic -Isrc -D_LARGEFILE64_SOURCE
+override CFLAGS              = -Wall -Wextra -Werror -pedantic -Isrc
 override LIBFLAGS            = -fPIC
 override CSTD               := -std=gnu11
 override CXXSTD             := -std=gnu++11
@@ -21,14 +21,13 @@ override TEST_INCLUDE       := -Isrc $(shell find tests -type d | xargs -I{} ech
 override TEST_SRC           := $(shell find tests -type f -name "*.c" | xargs -I{} echo -n "{} ")
 override TEST_C_SRC         := src/wapp.c $(TEST_SRC)
 override TEST_CXX_SRC       := $(shell find tests -type f -name "*.cc" | xargs -I{} echo -n "{} ")
-override LIB_BASENAME       := wapp
+override LIB_NAME           := wapp
-override OBJ_OUT            := $(BUILD_DIR)/$(LIB_BASENAME).o
+override OBJ_OUT            := $(BUILD_DIR)/$(LIB_NAME).o
-override LIB_STATIC_NAME    := lib$(LIB_BASENAME).a
+override LIB_OUT            := $(BUILD_DIR)/lib$(LIB_NAME).a
-override LIB_OUT            := $(BUILD_DIR)/$(LIB_STATIC_NAME)
 override TEST_C_OUT         := $(BUILD_DIR)/wapptest
 override TEST_CXX_OUT       := $(BUILD_DIR)/wapptestcc
 override ABS_INSTALL_PREFIX := $(shell mkdir -p $(INSTALL_PREFIX) && realpath $(INSTALL_PREFIX))
-override INCLUDE_INSTALL    := $(ABS_INSTALL_PREFIX)/include/$(LIB_BASENAME)
+override INCLUDE_INSTALL    := $(ABS_INSTALL_PREFIX)/include/$(LIB_NAME)
 override LIB_INSTALL        := $(ABS_INSTALL_PREFIX)/lib
 override HEADER_INSTALL_CMD := scripts/header_install.sh
 
@@ -146,8 +145,6 @@ uuid: install
 
 clean:
 	@rm -rf "$(BUILD_DIR)"
-	@rm -rf "$(INCLUDE_INSTALL)"
-	@rm -f "$(LIB_INSTALL)/$(LIB_STATIC_NAME)"
 
 builddir:
 	@mkdir -p "$(BUILD_DIR)"

build.ps1

@@ -52,6 +52,9 @@ mkdir -p $ObjDir > $null
 mkdir -p $OutDir > $null
 mkdir -p $TestsDir > $null
 
+# Run code generation
+Invoke-Expression "python -m codegen"
+
 # Build and run C tests
 Invoke-Expression "$Compiler $GeneralFlags $CStd $IncludeDirs $TestIncludeDirs $SrcFiles $TestCSrcFiles $TestCOutputFlags" -ErrorAction Stop
 Invoke-Expression "$TestsDir/$TestCOutputBasename.exe"

src/base/array/array.c

@@ -7,115 +7,66 @@
 #include "../../common/aliases/aliases.h"
 #include <stddef.h>
 
-#define _array_header(ARRAY) (ArrayHeader *)(wapp_pointer_offset(ARRAY, (i64)sizeof(ArrayHeader) * -1))
+#define _offset_pointer(PTR, OFFSET) ((void *)((uptr)(PTR) + (OFFSET)))
 
-wapp_persist inline void _array_validate(const GenericArray array, u64 item_size);
+wapp_persist inline void _array_validate(const GenericArray *array, u64 item_size);
 
-u64 _array_count(GenericArray array) {
+void *_array_get(GenericArray *array, u64 index, u64 item_size) {
-	wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(WAPP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
-
-	return header->count;
-}
-
-u64 _array_capacity(GenericArray array) {
-	wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(WAPP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
-
-	return header->capacity;
-}
-
-u64 _array_item_size(GenericArray array) {
-	wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(WAPP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
-
-	return header->item_size;
-}
-
-void _array_set_count(GenericArray array, u64 count) {
-	wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(WAPP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
-
-	header->count = count;
-}
-
-void *_array_get(GenericArray array, u64 index, u64 item_size) {
 	wapp_runtime_assert(array != NULL, "`array` should not be NULL");
 	_array_validate(array, item_size);
+	wapp_runtime_assert(index < array->count, "`index` is out of bounds");
 
-	ArrayHeader *header = _array_header(array);
+	return _offset_pointer(array->items, array->item_size * index);
-	wapp_runtime_assert(index < header->count, "`index` is out of bounds");
-
-	return wapp_pointer_offset(array, header->item_size * index);
 }
 
-void _array_set(GenericArray array, u64 index, void *value, u64 item_size) {
+void _array_set(GenericArray *array, u64 index, void *value, u64 item_size) {
 	void *item = _array_get(array, index, item_size);
-
+	memcpy(item, value, array->item_size);
-	ArrayHeader *header = _array_header(array);
-	memcpy(item, value, header->item_size);
 }
 
-void _array_append_capped(GenericArray array, void *value, u64 item_size) {
+void _array_append_capped(GenericArray *array, void *value, u64 item_size) {
 	wapp_runtime_assert(array != NULL, "`array` should not be NULL");
 	_array_validate(array, item_size);
 
-	ArrayHeader *header = _array_header(array);
+	if (array->count >= array->capacity) { return; }
-	if (header->count >= header->capacity) { return; }
 
-	u64 index = (header->count)++;
+	u64 index = (array->count)++;
 	_array_set(array, index, value, item_size);
 }
 
-void _array_extend_capped(GenericArray dst, const GenericArray src, u64 item_size) {
+void _array_extend_capped(GenericArray *dst, const GenericArray *src, u64 item_size) {
 	wapp_runtime_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
 	_array_validate(dst, item_size);
 	_array_validate(src, item_size);
 
-	ArrayHeader *src_header = _array_header(src);
+	u64 remaining_capacity = dst->capacity - dst->count;
-	ArrayHeader *dst_header = _array_header(dst);
-	u64 remaining_capacity = dst_header->capacity - dst_header->count;
 
-	u64 copy_count = src_header->count < remaining_capacity ? src_header->count : remaining_capacity;
+	u64 copy_count = src->count < remaining_capacity ? src->count : remaining_capacity;
-	void *dst_ptr  = wapp_pointer_offset(dst, dst_header->count * dst_header->item_size);
+	void *dst_ptr = _offset_pointer(dst->items, dst->count * dst->item_size);
-	memcpy(dst_ptr, src, copy_count * src_header->item_size);
+	memcpy(dst_ptr, src->items, copy_count * src->item_size);
-	dst_header->count += copy_count;
+	dst->count += copy_count;
 }
 
-void _array_copy_capped(GenericArray dst, const GenericArray src, u64 item_size) {
+void _array_copy_capped(GenericArray *dst, const GenericArray *src, u64 item_size) {
 	wapp_runtime_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
 	_array_validate(dst, item_size);
 	_array_validate(src, item_size);
 
 	_array_clear(dst, item_size);
-
+	u64 copy_count = src->count < dst->capacity ? src->count : dst->capacity;
-	ArrayHeader *src_header = _array_header(src);
+	memcpy(dst->items, src->items, copy_count * src->item_size);
-	ArrayHeader *dst_header = _array_header(dst);
+	dst->count = copy_count;
-	u64 copy_count = src_header->count < dst_header->capacity ? src_header->count : dst_header->capacity;
-	memcpy((void *)dst, (void *)src, copy_count * src_header->item_size);
-	dst_header->count = copy_count;
 }
 
-GenericArray _array_append_alloc(const Allocator *allocator, GenericArray array, void *value,
+GenericArray *_array_append_alloc(const Allocator *allocator, GenericArray *array, void *value, u64 item_size) {
-                                 ArrayInitFlags flags, u64 item_size) {
 	wapp_runtime_assert(allocator != NULL && array != NULL, "`allocator` and `array` should not be NULL");
 	_array_validate(array, item_size);
 
-	GenericArray output = array;
+	GenericArray *output = array;
 
-	ArrayHeader *header = _array_header(array);
+	if (array->count >= array->capacity) {
-	if (header->count >= header->capacity) {
+		u64 new_capacity	= wapp_misc_utils_u64_round_up_pow2(array->capacity * 2);
-		u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(header->capacity * 2);
+		output						= (GenericArray *)_array_alloc_capacity(allocator, new_capacity, array->item_size, false);
-		output           = (GenericArray )_array_alloc_capacity(allocator, new_capacity, flags,
-		                                                        header->item_size);
 		if (!output) {
 			output = array;
 			goto RETURN_ARRAY_APPEND_ALLOC;
@@ -125,29 +76,21 @@ GenericArray _array_append_alloc(const Allocator *allocator, GenericArray array,
 
 	_array_append_capped(output, value, item_size);
 
-	if ((flags & ARRAY_INIT_FILLED) == ARRAY_INIT_FILLED) {
-		_array_set_count(output, _array_capacity(output));
-	}
-
 RETURN_ARRAY_APPEND_ALLOC:
 	return output;
 }
 
-GenericArray _array_extend_alloc(const Allocator *allocator, GenericArray dst, const GenericArray src,
+GenericArray *_array_extend_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size) {
-                                 ArrayInitFlags flags, u64 item_size) {
 	wapp_runtime_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
 	_array_validate(dst, item_size);
 	_array_validate(src, item_size);
 
-	GenericArray output = dst;
+	GenericArray *output = dst;
 
-	ArrayHeader *src_header = _array_header(src);
+	u64 remaining_capacity = dst->capacity - dst->count;
-	ArrayHeader *dst_header = _array_header(dst);
+	if (src->count >= remaining_capacity) {
-	u64 remaining_capacity = dst_header->capacity - dst_header->count;
+		u64 new_capacity	= wapp_misc_utils_u64_round_up_pow2(dst->capacity * 2);
-	if (src_header->count >= remaining_capacity) {
+		output						= (GenericArray *)_array_alloc_capacity(allocator, new_capacity, dst->item_size, false);
-		u64 new_capacity  = wapp_misc_utils_u64_round_up_pow2(dst_header->capacity * 2);
-		output            = (GenericArray )_array_alloc_capacity(allocator, new_capacity,
-		                                                         flags, dst_header->item_size);
 		if (!output) {
 			output = dst;
 			goto RETURN_ARRAY_EXTEND_ALLOC;
@@ -157,28 +100,20 @@ GenericArray _array_extend_alloc(const Allocator *allocator, GenericArray dst, c
 
 	_array_extend_capped(output, src, item_size);
 
-	if ((flags & ARRAY_INIT_FILLED) == ARRAY_INIT_FILLED) {
-		_array_set_count(output, _array_capacity(output));
-	}
-
 RETURN_ARRAY_EXTEND_ALLOC:
 	return output;
 }
 
-GenericArray _array_copy_alloc(const Allocator *allocator, GenericArray dst, const GenericArray src,
+GenericArray *_array_copy_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size) {
-                               ArrayInitFlags flags, u64 item_size) {
 	wapp_runtime_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
 	_array_validate(dst, item_size);
 	_array_validate(src, item_size);
 
-	GenericArray output = dst;
+	GenericArray *output = dst;
 
-	ArrayHeader *src_header = _array_header(src);
+	if (src->count >= dst->capacity) {
-	ArrayHeader *dst_header = _array_header(dst);
+		u64 new_capacity	= wapp_misc_utils_u64_round_up_pow2(dst->capacity * 2);
-	if (src_header->count >= dst_header->capacity) {
+		output						= (GenericArray *)_array_alloc_capacity(allocator, new_capacity, src->item_size, false);
-		u64 new_capacity  = wapp_misc_utils_u64_round_up_pow2(dst_header->capacity * 2);
-		output            = (GenericArray )_array_alloc_capacity(allocator, new_capacity,
-		                                                         flags, src_header->item_size);
 		if (!output) {
 			output = dst;
 			goto RETURN_ARRAY_COPY_ALLOC;
@@ -187,80 +122,52 @@ GenericArray _array_copy_alloc(const Allocator *allocator, GenericArray dst, con
 
 	_array_copy_capped(output, src, item_size);
 
-	if ((flags & ARRAY_INIT_FILLED) == ARRAY_INIT_FILLED) {
-		_array_set_count(output, _array_capacity(output));
-	}
-
 RETURN_ARRAY_COPY_ALLOC:
 	return output;
 }
 
-void *_array_pop(GenericArray array, u64 item_size) {
+void *_array_pop(GenericArray *array, u64 item_size) {
 	wapp_runtime_assert(array != NULL, "`array` should not be NULL");
 	_array_validate(array, item_size);
 
-	ArrayHeader *header = _array_header(array);
+	if (array->count == 0) { return NULL; }
-	if (header->count == 0) { return NULL; }
 
-	u64 index = header->count - 1;
+	u64 index = array->count - 1;
 	void *out = _array_get(array, index, item_size);
-	--(header->count);
+	--(array->count);
 	return out;
 }
 
-void _array_clear(GenericArray array, u64 item_size) {
+void _array_clear(GenericArray *array, u64 item_size) {
 	wapp_runtime_assert(array != NULL, "`array` should not be NULL");
 	_array_validate(array, item_size);
 
-	ArrayHeader *header = _array_header(array);
+	array->count = 0;
-	header->count = 0;
 }
 
-u64 _array_calc_alloc_size(u64 capacity, u64 item_size) {
+GenericArray *_array_alloc_capacity(const Allocator *allocator, u64 capacity, u64 item_size, b8 fill) {
-	return sizeof(ArrayHeader) + item_size * capacity;
-}
-
-GenericArray _array_alloc_capacity(const Allocator *allocator, u64 capacity, ArrayInitFlags flags,
-                                   u64 item_size) {
 	wapp_runtime_assert(allocator != NULL, "`allocator` should not be NULL");
 
-	GenericArray output = NULL;
+	GenericArray *output = NULL;
 
-	u64 allocation_size = _array_calc_alloc_size(capacity, item_size);
+	u64 allocation_size = sizeof(GenericArray) + item_size * capacity;
-	void *buffer        = wapp_mem_allocator_alloc(allocator, allocation_size);
+
-	if (!buffer) {
+	output = wapp_mem_allocator_alloc(allocator, allocation_size);
+	if (!output) {
 		goto RETURN_ARRAY_ALLOC;
 	}
 
-	output = _array_from_preallocated_buffer(buffer, allocation_size, flags, item_size);
+	output->magic			= WAPP_ARRAY_MAGIC;
+	output->count			= fill ? capacity : 0;
+	output->capacity	= capacity;
+	output->item_size	= item_size;
+	output->items			= (void *)(output + 1);
 
 RETURN_ARRAY_ALLOC:
 	return output;
 }
 
-
+wapp_persist inline void _array_validate(const GenericArray *array, u64 item_size) {
-GenericArray _array_from_preallocated_buffer(void *buffer, u64 buffer_size, ArrayInitFlags flags,
+	wapp_runtime_assert(WAPP_ARRAY_MAGIC == array->magic, "`array` is not a valid wapp array");
-                                             u64 item_size) {
+	wapp_runtime_assert(item_size == array->item_size, "Invalid item type provided");
-	wapp_runtime_assert(buffer != NULL, "`buffer` should not be NULL");
-
-	i64 data_buffer_size = (i64)buffer_size - (i64)(sizeof(ArrayHeader));
-	if (data_buffer_size <= 0) {
-		return NULL;
-	}
-
-	u64 item_capacity   = (u64)data_buffer_size / item_size;
-	ArrayHeader *header = (ArrayHeader *)buffer;
-	GenericArray output = (u8 *)(header + 1);
-	header->magic       = WAPP_ARRAY_MAGIC;
-	header->count       = flags & ARRAY_INIT_FILLED ? item_capacity : 0;
-	header->capacity    = item_capacity;
-	header->item_size   = item_size;
-
-	return output;
-}
-
-wapp_persist inline void _array_validate(const GenericArray array, u64 item_size) {
-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(WAPP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
-	wapp_runtime_assert(item_size == header->item_size, "Invalid item type provided");
 }

src/base/array/array.h

@@ -17,197 +17,144 @@ BEGIN_C_LINKAGE
 #define _calc_array_count(TYPE, ...) wapp_misc_utils_va_args_count(TYPE, __VA_ARGS__)
 #define _calc_array_capacity(TYPE, ...) wapp_misc_utils_u64_round_up_pow2(_calc_array_count(TYPE, __VA_ARGS__) * 2)
 
-typedef struct Str8 Str8;
+#define wapp_array_alloc_capacity(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, CAPACITY, FILL)		\
+	((ARRAY_TYPE *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(ELEM_TYPE), FILL))
 
-// NOTE (Abdelrahman): Typedefs to distinguish arrays from regular pointers
+#define WAPP_DEF_ARRAY_TYPE(T, NAME)	\
-typedef void  *GenericArray;
+	typedef struct {										\
-typedef void **VoidPtrArray;
+		u64 magic;												\
-typedef c8    *C8Array;
+		u64 count;												\
-typedef c16   *C16Array;
+		u64 capacity;											\
-typedef c32   *C32Array;
+		u64 item_size;										\
-typedef u8    *U8Array;
+		T *items;													\
-typedef u16   *U16Array;
+	} NAME
-typedef u32   *U32Array;
-typedef u64   *U64Array;
-typedef b8    *B8Array;
-typedef i8    *I8Array;
-typedef i16   *I16Array;
-typedef i32   *I32Array;
-typedef i64   *I64Array;
-typedef f32   *F32Array;
-typedef f64   *F64Array;
-typedef f128  *F128Array;
-typedef uptr  *UptrArray;
-typedef iptr  *IptrArray;
-typedef Str8  *Str8Array;
-
-typedef enum {
-	ARRAY_INIT_NONE   = 0,
-	ARRAY_INIT_FILLED = 1 << 1,
-} ArrayInitFlags;
 
 #ifdef WAPP_PLATFORM_CPP
-#define wapp_array(TYPE, ...) ([&]() {                                                             \
+#define wapp_array(ELEM_TYPE, ARRAY_TYPE, ...) ([&]() {																	\
-	u64 capacity = _calc_array_capacity(TYPE, __VA_ARGS__);                                          \
+	wapp_persist ELEM_TYPE items[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE{}).items)) ?		\
+		_calc_array_capacity(ELEM_TYPE, __VA_ARGS__) : -1																		\
+	] = {__VA_ARGS__};																																		\
 																																												\
-	TYPE items[_calc_array_capacity(TYPE, __VA_ARGS__)] = {__VA_ARGS__};                             \
+	return ARRAY_TYPE{																																		\
-	                                                                                                 \
+		WAPP_ARRAY_MAGIC,																																		\
-	wapp_persist u8 array[                                                                           \
+		_calc_array_count(ELEM_TYPE, __VA_ARGS__),																					\
-		sizeof(ArrayHeader) + _calc_array_capacity(TYPE, __VA_ARGS__) * sizeof(TYPE)                   \
+		_calc_array_capacity(ELEM_TYPE, __VA_ARGS__),																				\
-	] = {0};                                                                                         \
+		sizeof(ELEM_TYPE),																																	\
-	ArrayHeader *header = (ArrayHeader *)array;                                                      \
+		items,																																							\
-	header->magic       = WAPP_ARRAY_MAGIC;                                                          \
+	};																																										\
-	header->count       = _calc_array_count(TYPE, __VA_ARGS__);                                      \
-	header->capacity    = _calc_array_capacity(TYPE, __VA_ARGS__);                                   \
-	header->item_size   = sizeof(TYPE);                                                              \
-	                                                                                                 \
-	u8 *buf = (u8 *)(header + 1);                                                                    \
-	memcpy(buf, items, capacity * sizeof(TYPE));                                                     \
-	return (TYPE *)buf;                                                                              \
 }())
-#define wapp_array_with_capacity(TYPE, CAPACITY, FLAGS) ([&]() {                                   \
+#define wapp_array_with_capacity(ELEM_TYPE, ARRAY_TYPE, CAPACITY, FILL) ([&]() {				\
-	wapp_persist u8 array[                                                                           \
+	wapp_persist ELEM_TYPE items[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE{}).items)) ?		\
-		sizeof(ArrayHeader) + CAPACITY * sizeof(TYPE)                                                  \
+		CAPACITY : -1] = {};																																\
-	] = {0};                                                                                         \
-	ArrayHeader *header = (ArrayHeader *)array;                                                      \
-	header->magic       = WAPP_ARRAY_MAGIC;                                                          \
-	header->count       = (FLAGS & ARRAY_INIT_FILLED) ? CAPACITY : 0;                                \
-	header->capacity    = CAPACITY;                                                                  \
-	header->item_size   = sizeof(TYPE);                                                              \
 																																												\
-	return (TYPE *)(header + 1);                                                                     \
+	return ARRAY_TYPE{																																		\
+		WAPP_ARRAY_MAGIC,																																		\
+		FILL ? CAPACITY : 0,																																\
+		CAPACITY,																																						\
+		sizeof(ELEM_TYPE),																																	\
+		items,																																							\
+	};																																										\
 }())
-#define wapp_array_pop(TYPE, ARRAY) ([&]() {                                                       \
+#define wapp_array_pop(ELEM_TYPE, ARRAY_PTR) ([&]() {																		\
-	if (ARRAY == NULL || _array_count((GenericArray)ARRAY) == 0) {                                   \
+	if (ARRAY_PTR == NULL || (ARRAY_PTR)->count == 0) {																		\
-		TYPE result{};                                                                                 \
+		ELEM_TYPE result{};																																	\
 		return result;																																			\
 	}																																											\
 																																												\
-	return *((TYPE *)_array_pop((GenericArray)ARRAY, sizeof(TYPE)));                                 \
+	return *((ELEM_TYPE *)_array_pop((GenericArray *)ARRAY_PTR, sizeof(ELEM_TYPE)));			\
 }())
 #else
-#define _stack_array(TYPE, SIZE) struct {ArrayHeader header;                                       \
+#define wapp_array(ELEM_TYPE, ARRAY_TYPE, ...)																			\
-                                         TYPE items[SIZE];                                         \
+	((ARRAY_TYPE){																																		\
-                                         wapp_misc_utils_reserve_padding(sizeof(ArrayHeader) +     \
-                                                                         sizeof(TYPE) * SIZE);}
-#define wapp_array(TYPE, ...)                                                                      \
-	((TYPE *)(                                                                                       \
-		(_stack_array(TYPE, _calc_array_capacity(TYPE, __VA_ARGS__))){                                 \
-			.header = {                                                                                  \
 		.magic		 = WAPP_ARRAY_MAGIC,																									\
-				.count     = _calc_array_count(TYPE, __VA_ARGS__),                                         \
+		.count		 = _calc_array_count(ELEM_TYPE, __VA_ARGS__),													\
-				.capacity  = _calc_array_capacity(TYPE, __VA_ARGS__),                                      \
+		.capacity	= _calc_array_capacity(ELEM_TYPE, __VA_ARGS__),												\
-				.item_size = sizeof(TYPE),                                                                 \
+		.item_size = sizeof(ELEM_TYPE),																									\
-			},                                                                                           \
+		.items		 = (ELEM_TYPE[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE){0}.items)) ?	\
-			.items  = {__VA_ARGS__},                                                                     \
+														_calc_array_capacity(ELEM_TYPE, __VA_ARGS__) :					\
-		}.items                                                                                        \
+														-1]){__VA_ARGS__}																				\
-	))
+	})
-#define wapp_array_with_capacity(TYPE, CAPACITY, FLAGS)                                            \
+#define wapp_array_with_capacity(ELEM_TYPE, ARRAY_TYPE, CAPACITY, FILL)							\
-	((TYPE *)(                                                                                       \
+	((ARRAY_TYPE){																																		\
-		(_stack_array(TYPE, CAPACITY)){                                                                \
-			.header = {                                                                                  \
 		.magic		 = WAPP_ARRAY_MAGIC,																									\
-				.count     = (FLAGS & ARRAY_INIT_FILLED) ? CAPACITY : 0,                                   \
+		.count		 = FILL ? CAPACITY : 0,																								\
 		.capacity	= CAPACITY,																														\
-				.item_size = sizeof(TYPE),                                                                 \
+		.item_size = sizeof(ELEM_TYPE),																									\
-			},                                                                                           \
+		.items		 = (ELEM_TYPE[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE){0}.items)) ?	\
-			.items  = {0},                                                                               \
+														CAPACITY : -1]){0}																			\
-		}.items                                                                                        \
+	})
-	))
+#define wapp_array_pop(ELEM_TYPE, ARRAY_PTR)																				\
-#define wapp_array_pop(TYPE, ARRAY)                                                                \
+	(ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ?																		\
-	(ARRAY == NULL || _array_count((GenericArray)ARRAY) == 0 ?                                       \
+		*((ELEM_TYPE *)_array_pop((GenericArray *)ARRAY_PTR, sizeof(ELEM_TYPE))) :			\
-		(TYPE){0} :                                                                                    \
+		(ELEM_TYPE){0}																																	\
-		*((TYPE *)_array_pop((GenericArray)ARRAY, sizeof(TYPE)))                                       \
 	)
 #endif // !WAPP_PLATFORM_CPP
 
-#define wapp_array_count(ARRAY)                                                                    \
+#define wapp_array_get(ELEM_TYPE, ARRAY_PTR, INDEX)																									\
-	(_array_count((GenericArray)ARRAY))
+	((ELEM_TYPE *)_array_get((GenericArray *)ARRAY_PTR, INDEX, sizeof(ELEM_TYPE)))
-#define wapp_array_capacity(ARRAY)                                                                 \
+#define wapp_array_set(ELEM_TYPE, ARRAY_PTR, INDEX, VALUE_PTR)																			\
-	(_array_capacity((GenericArray)ARRAY))
+	_array_set((GenericArray *)ARRAY_PTR, INDEX, (void *)VALUE_PTR, sizeof(ELEM_TYPE))
-#define wapp_array_item_size(ARRAY)                                                                \
+#define wapp_array_append_capped(ELEM_TYPE, ARRAY_PTR, VALUE_PTR)																		\
-	(_array_item_size((GenericArray)ARRAY))
+	_array_append_capped((GenericArray *)ARRAY_PTR, (void *)VALUE_PTR, sizeof(ELEM_TYPE))
-#define wapp_array_set_count(ARRAY, COUNT)                                                         \
+#define wapp_array_extend_capped(ELEM_TYPE, DST_ARRAY_PTR, SRC_ARRAY_PTR)														\
-	(_array_set_count((GenericArray)ARRAY, COUNT))
+	_array_extend_capped(																																							\
-#define wapp_array_get(TYPE, ARRAY, INDEX)                                                         \
+		(GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)									\
-	((TYPE *)_array_get((GenericArray)ARRAY,                                                         \
+	)
-	                    INDEX,                                                                       \
+#define wapp_array_copy_capped(ELEM_TYPE, DST_ARRAY_PTR, SRC_ARRAY_PTR)															\
-	                    sizeof(TYPE)))
+	_array_copy_capped(																																								\
-#define wapp_array_set(TYPE, ARRAY, INDEX, VALUE_PTR)                                              \
+		(GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)									\
-	(_array_set((GenericArray)ARRAY,                                                                 \
+	)
-	            INDEX,                                                                               \
+#define wapp_array_append_alloc(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, ARRAY_PTR, VALUE_PTR)					\
-	            (u8 *)VALUE_PTR,                                                                     \
+	(ARRAY_TYPE *)_array_append_alloc(																																\
-	            sizeof(TYPE)))
+		ALLOCATOR_PTR, (GenericArray *)ARRAY_PTR, (void *)VALUE_PTR, sizeof(ELEM_TYPE)									\
-#define wapp_array_append_capped(TYPE, ARRAY, VALUE_PTR)                                           \
+	)
-	(_array_append_capped((GenericArray)ARRAY,                                                       \
+#define wapp_array_extend_alloc(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, DST_ARRAY_PTR, SRC_ARRAY_PTR)	\
-	                      (u8 *)VALUE_PTR,                                                           \
+	(ARRAY_TYPE *)_array_extend_alloc(																																\
-	                      sizeof(TYPE)))
+		ALLOCATOR_PTR, (GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)	\
-#define wapp_array_extend_capped(TYPE, DST_ARRAY, SRC_ARRAY)                                       \
+	)
-	(_array_extend_capped((GenericArray)DST_ARRAY,                                                   \
+#define wapp_array_copy_alloc(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, DST_ARRAY_PTR, SRC_ARRAY_PTR)		\
-	                      (GenericArray)SRC_ARRAY,                                                   \
+	(ARRAY_TYPE *)_array_copy_alloc(																																	\
-	                      sizeof(TYPE)))
+		ALLOCATOR_PTR, (GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)	\
-#define wapp_array_copy_capped(TYPE, DST_ARRAY, SRC_ARRAY)                                         \
+	)
-	(_array_copy_capped((GenericArray)DST_ARRAY,                                                     \
+#define wapp_array_clear(ELEM_TYPE, ARRAY_PTR)																											\
-	                    (GenericArray)SRC_ARRAY,                                                     \
+	_array_clear((GenericArray *)ARRAY_PTR, sizeof(ELEM_TYPE))
-	                    sizeof(TYPE)))
-#define wapp_array_append_alloc(TYPE, ALLOCATOR_PTR, ARRAY, VALUE_PTR, FLAGS)                      \
-	((TYPE *)_array_append_alloc(ALLOCATOR_PTR,                                                      \
-	                             (GenericArray)ARRAY,                                                \
-	                             (u8 *)VALUE_PTR,                                                    \
-	                             FLAGS,                                                              \
-	                             sizeof(TYPE)))
-#define wapp_array_extend_alloc(TYPE, ALLOCATOR_PTR, DST_ARRAY, SRC_ARRAY, FLAGS)                  \
-	((TYPE *)_array_extend_alloc(ALLOCATOR_PTR,                                                      \
-	                             (GenericArray)DST_ARRAY,                                            \
-	                             (GenericArray)SRC_ARRAY,                                            \
-	                             FLAGS,                                                              \
-	                             sizeof(TYPE)))
-#define wapp_array_copy_alloc(TYPE, ALLOCATOR_PTR, DST_ARRAY, SRC_ARRAY, FLAGS)                    \
-	((TYPE *)_array_copy_alloc(ALLOCATOR_PTR,                                                        \
-	                           (GenericArray)DST_ARRAY,                                              \
-	                           (GenericArray)SRC_ARRAY,                                              \
-	                           FLAGS,                                                                \
-	                           sizeof(TYPE)))
-#define wapp_array_clear(TYPE, ARRAY)                                                              \
-	(_array_clear((GenericArray)ARRAY,                                                               \
-	             sizeof(TYPE)))
-#define wapp_array_calc_alloc_size(TYPE, CAPACITY) _array_calc_alloc_size(CAPACITY, sizeof(TYPE))
-#define wapp_array_alloc_capacity(TYPE, ALLOCATOR_PTR, CAPACITY, FLAGS)                            \
-	((TYPE *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, FLAGS, sizeof(TYPE)))
-#define wapp_array_from_preallcated_buffer(TYPE, BUFFER, BUFFER_SIZE)                              \
-	((TYPE *)_array_from_preallcated_buffer(BUFFER, BUFFER_SIZE, sizeof(TYPE)))
 
+WAPP_DEF_ARRAY_TYPE(void, GenericArray);
 
-typedef struct header ArrayHeader;
+void					*_array_get(GenericArray *array, u64 index, u64 item_size);
-struct header {
+void					_array_set(GenericArray *array, u64 index, void *value, u64 item_size);
-  u64 magic;
+void					_array_append_capped(GenericArray *array, void *value, u64 item_size);
-  u64 count;
+void					_array_extend_capped(GenericArray *dst, const GenericArray *src, u64 item_size);
-  u64 capacity;
+void					_array_copy_capped(GenericArray *dst, const GenericArray *src, u64 item_size);
-  u64 item_size;
+GenericArray	*_array_append_alloc(const Allocator *allocator, GenericArray *array, void *value, u64 item_size);
-};
+GenericArray	*_array_extend_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size);
+GenericArray	*_array_copy_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size);
+void					*_array_pop(GenericArray *array, u64 item_size);
+void					_array_clear(GenericArray *array, u64 item_size);
+GenericArray	*_array_alloc_capacity(const Allocator *allocator, u64 capacity, u64 item_size, b8 fill);
 
-u64          _array_count(GenericArray array);
+// Base array types
-u64          _array_capacity(GenericArray array);
+typedef struct str8 Str8;
-u64          _array_item_size(GenericArray array);
+
-void         _array_set_count(GenericArray array, u64 count);
+WAPP_DEF_ARRAY_TYPE(void *, VoidPtrArray);
-void        *_array_get(GenericArray array, u64 index, u64 item_size);
+WAPP_DEF_ARRAY_TYPE(c8		, C8Array);
-void         _array_set(GenericArray array, u64 index, void *value, u64 item_size);
+WAPP_DEF_ARRAY_TYPE(c16		, C16Array);
-void         _array_append_capped(GenericArray array, void *value, u64 item_size);
+WAPP_DEF_ARRAY_TYPE(c32		, C32Array);
-void         _array_extend_capped(GenericArray dst, const GenericArray src, u64 item_size);
+WAPP_DEF_ARRAY_TYPE(u8		, U8Array);
-void         _array_copy_capped(GenericArray dst, const GenericArray src, u64 item_size);
+WAPP_DEF_ARRAY_TYPE(u16		, U16Array);
-GenericArray _array_append_alloc(const Allocator *allocator, GenericArray array, void *value,
+WAPP_DEF_ARRAY_TYPE(u32		, U32Array);
-                                 ArrayInitFlags flags, u64 item_size);
+WAPP_DEF_ARRAY_TYPE(u64		, U64Array);
-GenericArray _array_extend_alloc(const Allocator *allocator, GenericArray dst, const GenericArray src,
+WAPP_DEF_ARRAY_TYPE(b8		, B8Array);
-                                 ArrayInitFlags flags, u64 item_size);
+WAPP_DEF_ARRAY_TYPE(i8		, I8Array);
-GenericArray _array_copy_alloc(const Allocator *allocator, GenericArray dst, const GenericArray src,
+WAPP_DEF_ARRAY_TYPE(i16		, I16Array);
-                               ArrayInitFlags flags, u64 item_size);
+WAPP_DEF_ARRAY_TYPE(i32	 	, I32Array);
-void        *_array_pop(GenericArray array, u64 item_size);
+WAPP_DEF_ARRAY_TYPE(i64	 	, I64Array);
-void         _array_clear(GenericArray array, u64 item_size);
+WAPP_DEF_ARRAY_TYPE(f32	 	, F32Array);
-u64          _array_calc_alloc_size(u64 capacity, u64 item_size);
+WAPP_DEF_ARRAY_TYPE(f64	 	, F64Array);
-GenericArray _array_alloc_capacity(const Allocator *allocator, u64 capacity, ArrayInitFlags flags,
+WAPP_DEF_ARRAY_TYPE(f128	, F128Array);
-                                   u64 item_size);
+WAPP_DEF_ARRAY_TYPE(uptr	, UptrArray);
-GenericArray _array_from_preallocated_buffer(void *buffer, u64 buffer_size, ArrayInitFlags flags,
+WAPP_DEF_ARRAY_TYPE(iptr	, IptrArray);
-                                             u64 item_size);
+WAPP_DEF_ARRAY_TYPE(Str8	, Str8Array);
 
 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE

src/base/dbl_list/dbl_list.c

@@ -7,7 +7,7 @@
 #include "../../common/platform/platform.h"
 #include <stddef.h>
 
-wapp_intern GenericList _node_to_list(GenericNode *node, u64 item_size);
+wapp_intern inline GenericList _node_to_list(GenericNode *node, u64 item_size);
 wapp_intern inline void _dbl_list_validate(const GenericList *list, u64 item_size);
 wapp_intern inline void _dbl_list_node_validate(const GenericList *list, const GenericNode *node, u64 item_size);
 
@@ -25,16 +25,15 @@ DBL_LIST_ALLOC_RETURN:
 	return list;
 }
 
-GenericNode *_dbl_list_node_alloc(const Allocator *allocator, void *item, u64 item_size) {
+GenericNode *_dbl_list_node_alloc(const Allocator *allocator, u64 item_size) {
 	wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
 
 	GenericNode *node = wapp_mem_allocator_alloc(allocator, sizeof(GenericNode));
 	if (!node) { goto DBL_LIST_NODE_ALLOC_RETURN; }
 
 	memset((void *)node, 0, sizeof(GenericNode));
-	node->item             = item;
+	node->magic			= WAPP_DBL_NODE_MAGIC;
-	node->header.magic     = WAPP_DBL_NODE_MAGIC;
+	node->item_size	= item_size;
-	node->header.item_size = item_size;
 
 DBL_LIST_NODE_ALLOC_RETURN:
 	return node;
@@ -48,7 +47,7 @@ GenericNode *_dbl_list_get(const GenericList *list, u64 index, u64 item_size) {
 	GenericNode *output		= NULL;
 	GenericNode *current	= list->first;
 	for (u64 i = 1; i <= index; ++i) {
-		current = current->header.next;
+		current = current->next;
 	}
 
 	output = current;
@@ -72,11 +71,11 @@ void _dbl_list_push_front(GenericList *list, GenericNode *node, u64 item_size) {
 
 	GenericNode *first = list->first;
 	if (first) {
-		first->header.prev = node_list.last;
+		first->prev = node_list.last;
 	}
 
 	list->first						= node_list.first;
-	node_list.last->header.next = first;
+	node_list.last->next	= first;
 }
 
 void _dbl_list_push_back(GenericList *list, GenericNode *node, u64 item_size) {
@@ -95,11 +94,11 @@ void _dbl_list_push_back(GenericList *list, GenericNode *node, u64 item_size) {
 
 	GenericNode *last = list->last;
 	if (last) {
-		last->header.next = node_list.first;
+		last->next = node_list.first;
 	}
 
 	list->last						= node_list.last;
-	node_list.first->header.prev = last;
+	node_list.first->prev	= last;
 }
 
 void _dbl_list_insert(GenericList *list, GenericNode *node, u64 index, u64 item_size) {
@@ -124,13 +123,13 @@ void _dbl_list_insert(GenericList *list, GenericNode *node, u64 index, u64 item_
 
 	list->node_count += node_list.node_count;
 
-	GenericNode *prev = dst_node->header.prev;
+	GenericNode *prev = dst_node->prev;
 
-	dst_node->header.prev = node_list.last;
+	dst_node->prev	= node_list.last;
-	prev->header.next     = node_list.first;
+	prev->next			= node_list.first;
 
-	node_list.first->header.prev = prev;
+	node_list.first->prev = prev;
-	node_list.last->header.next  = dst_node;
+	node_list.last->next	= dst_node;
 }
 
 GenericNode *_dbl_list_pop_front(GenericList *list, u64 item_size) {
@@ -140,22 +139,22 @@ GenericNode *_dbl_list_pop_front(GenericList *list, u64 item_size) {
 	GenericNode *output = NULL;
 
 	if (list->node_count == 0) {
-		goto RETURN_LIST_POP_FRONT;
+		goto RETURN_I32_LIST_POP_FRONT;
 	}
 
 	output = list->first;
 
 	if (list->node_count == 1) {
 		*list = (GenericList){.magic = WAPP_DBL_LIST_MAGIC, .item_size = item_size};
-		goto RETURN_LIST_POP_FRONT;
+		goto RETURN_I32_LIST_POP_FRONT;
 	}
 
 	--(list->node_count);
-	list->first = output->header.next;
+	list->first = output->next;
 
-	output->header.prev = output->header.next = NULL;
+	output->prev = output->next = NULL;
 
-RETURN_LIST_POP_FRONT:
+RETURN_I32_LIST_POP_FRONT:
 	return output;
 }
 
@@ -166,22 +165,22 @@ GenericNode *_dbl_list_pop_back(GenericList *list, u64 item_size) {
 	GenericNode *output = NULL;
 
 	if (list->node_count == 0) {
-		goto RETURN_LIST_POP_BACK;
+		goto RETURN_I32_LIST_POP_BACK;
 	}
 
 	output = list->last;
 
 	if (list->node_count == 1) {
 		*list = (GenericList){.magic = WAPP_DBL_LIST_MAGIC, .item_size = item_size};
-		goto RETURN_LIST_POP_BACK;
+		goto RETURN_I32_LIST_POP_BACK;
 	}
 
 	--(list->node_count);
-	list->last = output->header.prev;
+	list->last = output->prev;
 
-	output->header.prev = output->header.next = NULL;
+	output->prev = output->next = NULL;
 
-RETURN_LIST_POP_BACK:
+RETURN_I32_LIST_POP_BACK:
 	return output;
 }
 
@@ -193,25 +192,25 @@ GenericNode *_dbl_list_remove(GenericList *list, u64 index, u64 item_size) {
 
 	if (index == 0) {
 		output = _dbl_list_pop_front(list, item_size);
-		goto RETURN_LIST_REMOVE;
+		goto RETURN_I32_LIST_REMOVE;
 	} else if (index == list->node_count) {
 		output = _dbl_list_pop_back(list, item_size);
-		goto RETURN_LIST_REMOVE;
+		goto RETURN_I32_LIST_REMOVE;
 	}
 
 	output = _dbl_list_get(list, index, item_size);
 	if (!output) {
-		goto RETURN_LIST_REMOVE;
+		goto RETURN_I32_LIST_REMOVE;
 	}
 
-	output->header.prev->header.next = output->header.next;
+	output->prev->next = output->next;
-	output->header.next->header.prev = output->header.prev;
+	output->next->prev = output->prev;
 
 	--(list->node_count);
 
-	output->header.prev = output->header.next = NULL;
+	output->prev = output->next = NULL;
 
-RETURN_LIST_REMOVE:
+RETURN_I32_LIST_REMOVE:
 	return output;
 }
 
@@ -234,26 +233,26 @@ wapp_intern GenericList _node_to_list(GenericNode *node, u64 item_size) {
 		.item_size	= item_size,
 	};
 
-	while (output.first->header.prev != NULL) {
+	while (output.first->prev != NULL) {
-		output.first = output.first->header.prev;
+		output.first = output.first->prev;
 		++(output.node_count);
 	}
 
-	while (output.last->header.next != NULL) {
+	while (output.last->next != NULL) {
-		output.last = output.last->header.next;
+		output.last = output.last->next;
 		++(output.node_count);
 	}
 
 	return output;
 }
 
-wapp_intern inline void _dbl_list_validate(const GenericList *list, u64 item_size) {
+wapp_intern void _dbl_list_validate(const GenericList *list, u64 item_size) {
 	wapp_runtime_assert(list->magic == WAPP_DBL_LIST_MAGIC, "`list` isn't a valid wapp list type");
 	wapp_runtime_assert(list->item_size == item_size, "Invalid item provided");
 }
 
-wapp_intern inline void _dbl_list_node_validate(const GenericList *list, const GenericNode *node, u64 item_size) {
+wapp_intern void _dbl_list_node_validate(const GenericList *list, const GenericNode *node, u64 item_size) {
-	wapp_runtime_assert(node->header.magic == WAPP_DBL_NODE_MAGIC, "`node` isn't a valid wapp node type");
+	wapp_runtime_assert(node->magic == WAPP_DBL_NODE_MAGIC, "`node` isn't a valid wapp node type");
-	wapp_runtime_assert(list->item_size == node->header.item_size, "Mismatched `list` and `node` types");
+	wapp_runtime_assert(list->item_size == node->item_size, "Mismatched `list` and `node` types");
-	wapp_runtime_assert(node->header.item_size == item_size, "Invalid item provided");
+	wapp_runtime_assert(node->item_size == item_size, "Invalid item provided");
 }

src/base/dbl_list/dbl_list.h

@@ -14,160 +14,63 @@ BEGIN_C_LINKAGE
 #define WAPP_DBL_LIST_MAGIC (u64)0x57415f444c5354
 #define WAPP_DBL_NODE_MAGIC (u64)0x57415f444e44
 
-typedef struct GenericNode GenericNode;
+#define WAPP_DEF_DBL_LIST_TYPE(T, NODE_NAME, LIST_NAME)	\
-
+	typedef struct NODE_NAME NODE_NAME;										\
-typedef struct {
+	struct NODE_NAME {																		\
-	u64 magic;
+		u64 magic;																					\
-	u64 item_size;
+		T *item;																						\
-	GenericNode *prev;
+		NODE_NAME *prev;																		\
-	GenericNode *next;
+		NODE_NAME *next;																		\
-} NodeHeader;
+		u64 item_size;																			\
-
-struct GenericNode {
-	NodeHeader header;
-	void *item;
-};
-
-typedef struct {
-	u64 magic;
-	u64 node_count;
-	u64 item_size;
-	GenericNode *first;
-	GenericNode *last;
-} GenericList;
-
-// NOTE (Abdelrahman): GenericList typedefs for readability
-typedef GenericList VoidPtrList;
-typedef GenericList C8List;
-typedef GenericList C16List;
-typedef GenericList C32List;
-typedef GenericList U8List;
-typedef GenericList U16List;
-typedef GenericList U32List;
-typedef GenericList U64List;
-typedef GenericList B8List;
-typedef GenericList I8List;
-typedef GenericList I16List;
-typedef GenericList I32List;
-typedef GenericList I64List;
-typedef GenericList F32List;
-typedef GenericList F64List;
-typedef GenericList F128List;
-typedef GenericList UptrList;
-typedef GenericList IptrList;
-typedef GenericList Str8List;
-
-// NOTE (Abdelrahman): GenericNode typedefs for readability
-typedef GenericNode VoidPtrNode;
-typedef GenericNode C8Node;
-typedef GenericNode C16Node;
-typedef GenericNode C32Node;
-typedef GenericNode U8Node;
-typedef GenericNode U16Node;
-typedef GenericNode U32Node;
-typedef GenericNode U64Node;
-typedef GenericNode B8Node;
-typedef GenericNode I8Node;
-typedef GenericNode I16Node;
-typedef GenericNode I32Node;
-typedef GenericNode I64Node;
-typedef GenericNode F32Node;
-typedef GenericNode F64Node;
-typedef GenericNode F128Node;
-typedef GenericNode UptrNode;
-typedef GenericNode IptrNode;
-typedef GenericNode Str8Node;
-
-#ifdef WAPP_PLATFORM_CPP
-#define wapp_dbl_list(TYPE)                                                                        \
-	GenericList{WAPP_DBL_LIST_MAGIC, 0, sizeof(TYPE), nullptr, nullptr}
-#define _dbl_list_node(TYPE, ITEM_PTR) ([&]() {                                                    \
-	wapp_persist GenericNode node = {                                                                \
-		NodeHeader{WAPP_DBL_NODE_MAGIC, sizeof(TYPE), nullptr, nullptr},                               \
-		ITEM_PTR,                                                                                      \
 	};																										\
 																												\
-	return &node;                                                                                    \
+	typedef struct {																			\
-}())
+		u64 magic;																					\
+		NODE_NAME *first;																		\
+		NODE_NAME *last;																		\
+		u64 node_count;																			\
+		u64 item_size;																			\
+	} LIST_NAME
+
+#ifdef WAPP_PLATFORM_CPP
+#define wapp_dbl_list(ELEM_TYPE, LIST_TYPE)																			\
+	LIST_TYPE{WAPP_DBL_LIST_MAGIC, nullptr, nullptr, 0, sizeof(ELEM_TYPE)}
+#define wapp_dbl_list_node(ELEM_TYPE, NODE_TYPE, ELEM_PTR)											\
+	NODE_TYPE{WAPP_DBL_NODE_MAGIC, ELEM_PTR, nullptr, nullptr, sizeof(ELEM_TYPE)}
 #else
-#define wapp_dbl_list(TYPE) (                                                                      \
+#define wapp_dbl_list(ELEM_TYPE, LIST_TYPE) (																									\
-	(GenericList){.magic = WAPP_DBL_LIST_MAGIC, .item_size = sizeof(TYPE)}                           \
+	(LIST_TYPE){.magic = WAPP_DBL_LIST_MAGIC, .item_size = sizeof(ELEM_TYPE)}										\
 )
-#define _dbl_list_node(TYPE, ITEM_PTR) (                                                           \
+#define wapp_dbl_list_node(ELEM_TYPE, NODE_TYPE, ELEM_PTR) (																	\
-	&((GenericNode){.header = {.magic = WAPP_DBL_NODE_MAGIC, .item_size = sizeof(TYPE)},             \
+	(NODE_TYPE){.magic = WAPP_DBL_NODE_MAGIC, .item = ELEM_PTR, .item_size = sizeof(ELEM_TYPE)}	\
-	                .item = ITEM_PTR})                                                               \
 )
 #endif // !WAPP_PLATFORM_CPP
 
-#define wapp_dbl_list_alloc(TYPE, ALLOCATOR)                                                       \
+#define wapp_dbl_list_alloc(ELEM_TYPE, LIST_TYPE, ALLOCATOR)																				\
-	(_dbl_list_alloc(ALLOCATOR, sizeof(TYPE)))
+	(LIST_TYPE *)_dbl_list_alloc(ALLOCATOR, sizeof(ELEM_TYPE))
-#define wapp_dbl_list_get(TYPE, LIST_PTR, ITEM_INDEX)                                              \
+#define wapp_dbl_list_node_alloc(ELEM_TYPE, NODE_TYPE, ALLOCATOR)																		\
-	((TYPE *)(_dbl_list_get(LIST_PTR, ITEM_INDEX, sizeof(TYPE))->item))
+	(NODE_TYPE *)_dbl_list_node_alloc(ALLOCATOR, sizeof(ELEM_TYPE))
-#define wapp_dbl_list_get_node(TYPE, LIST_PTR, ITEM_INDEX)                                         \
+#define wapp_dbl_list_get(ELEM_TYPE, NODE_TYPE, LIST_PTR, ELEM_INDEX)																\
-	(_dbl_list_get(LIST_PTR, ITEM_INDEX, sizeof(TYPE)))
+	(NODE_TYPE *)_dbl_list_get((GenericList *)LIST_PTR, ELEM_INDEX, sizeof(ELEM_TYPE))
-#define wapp_dbl_list_get_node_item(TYPE, NODE_PTR)                                                \
+#define wapp_dbl_list_push_front(ELEM_TYPE, LIST_PTR, NODE_PTR)																			\
-	((TYPE *)(                                                                                       \
+	_dbl_list_push_front((GenericList *)LIST_PTR, (GenericNode *)NODE_PTR, sizeof(ELEM_TYPE))
-		(NODE_PTR == NULL) ?                                                                           \
+#define wapp_dbl_list_push_back(ELEM_TYPE, LIST_PTR, NODE_PTR)																			\
-		NULL :                                                                                         \
+	_dbl_list_push_back((GenericList *)LIST_PTR, (GenericNode *)NODE_PTR, sizeof(ELEM_TYPE))
-		(NODE_PTR)->item                                                                               \
+#define wapp_dbl_list_insert(ELEM_TYPE, LIST_PTR, NODE_PTR, ELEM_INDEX)															\
-	))
+	_dbl_list_insert((GenericList *)LIST_PTR, (GenericNode *)NODE_PTR, ELEM_INDEX, sizeof(ELEM_TYPE))
-#define wapp_dbl_list_push_front(TYPE, LIST_PTR, ITEM_PTR)                                         \
+#define wapp_dbl_list_pop_front(ELEM_TYPE, NODE_TYPE, LIST_PTR)																			\
-	(_dbl_list_push_front(LIST_PTR, _dbl_list_node(TYPE, ITEM_PTR), sizeof(TYPE)))
+	(NODE_TYPE *)_dbl_list_pop_front((GenericList *)LIST_PTR, sizeof(ELEM_TYPE))
-#define wapp_dbl_list_push_back(TYPE, LIST_PTR, ITEM_PTR)                                          \
+#define wapp_dbl_list_pop_back(ELEM_TYPE, NODE_TYPE, LIST_PTR)																			\
-	(_dbl_list_push_back(LIST_PTR, _dbl_list_node(TYPE, ITEM_PTR), sizeof(TYPE)))
+	(NODE_TYPE *)_dbl_list_pop_back((GenericList *)LIST_PTR, sizeof(ELEM_TYPE))
-#define wapp_dbl_list_insert(TYPE, LIST_PTR, ITEM_PTR, ITEM_INDEX)                                 \
+#define wapp_dbl_list_remove(ELEM_TYPE, NODE_TYPE, LIST_PTR, ELEM_INDEX)														\
-	(_dbl_list_insert(LIST_PTR, _dbl_list_node(TYPE, ITEM_PTR),                                      \
+	(NODE_TYPE *)_dbl_list_remove((GenericList *)LIST_PTR, ELEM_INDEX, sizeof(ELEM_TYPE))
-	                  ITEM_INDEX, sizeof(TYPE)))
+#define wapp_dbl_list_empty(ELEM_TYPE, LIST_PTR)																										\
-#define wapp_dbl_list_push_front_alloc(TYPE, ALLOCATOR, LIST_PTR, ITEM_PTR)                        \
+	_dbl_list_empty((GenericList *)LIST_PTR, sizeof(ELEM_TYPE))
-	(_dbl_list_push_front(LIST_PTR, _dbl_list_node_alloc(ALLOCATOR, ITEM_PTR, sizeof(TYPE)),         \
+
-	                      sizeof(TYPE)))
+WAPP_DEF_DBL_LIST_TYPE(void, GenericNode, GenericList);
-#define wapp_dbl_list_push_back_alloc(TYPE, ALLOCATOR, LIST_PTR, ITEM_PTR)                         \
-	(_dbl_list_push_back(LIST_PTR, _dbl_list_node_alloc(ALLOCATOR, ITEM_PTR, sizeof(TYPE)),          \
-	                     sizeof(TYPE)))
-#define wapp_dbl_list_insert_alloc(TYPE, ALLOCATOR, LIST_PTR, ITEM_PTR, ITEM_INDEX)                \
-	(_dbl_list_insert(LIST_PTR, _dbl_list_node_alloc(ALLOCATOR, ITEM_PTR, sizeof(TYPE)),             \
-	                  ITEM_INDEX, sizeof(TYPE)))
-#define wapp_dbl_list_pop_front(TYPE, LIST_PTR)                                                    \
-	((TYPE *)(                                                                                       \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
-		NULL :                                                                                         \
-		_dbl_list_pop_front(LIST_PTR, sizeof(TYPE))->item                                              \
-	))
-#define wapp_dbl_list_pop_back(TYPE, LIST_PTR)                                                     \
-	((TYPE *)(                                                                                       \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
-		NULL :                                                                                         \
-		_dbl_list_pop_back(LIST_PTR, sizeof(TYPE))->item                                               \
-	))
-#define wapp_dbl_list_remove(TYPE, LIST_PTR, ITEM_INDEX)                                           \
-	((TYPE *)(                                                                                       \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0 || ITEM_INDEX >= (LIST_PTR)->node_count) ?    \
-		NULL :                                                                                         \
-		_dbl_list_remove(LIST_PTR, ITEM_INDEX, sizeof(TYPE))->item                                     \
-	))
-#define wapp_dbl_list_pop_front_node(TYPE, LIST_PTR)                                               \
-	(                                                                                                \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
-		NULL :                                                                                         \
-		_dbl_list_pop_front(LIST_PTR, sizeof(TYPE))                                                    \
-	)
-#define wapp_dbl_list_pop_back_node(TYPE, LIST_PTR)                                                \
-	(                                                                                                \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
-		NULL :                                                                                         \
-		_dbl_list_pop_back(LIST_PTR, sizeof(TYPE))                                                     \
-	)
-#define wapp_dbl_list_remove_node(TYPE, LIST_PTR, ITEM_INDEX)                                      \
-	(                                                                                                \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0 || ITEM_INDEX >= (LIST_PTR)->node_count) ?    \
-		NULL :                                                                                         \
-		_dbl_list_remove(LIST_PTR, ITEM_INDEX, sizeof(TYPE))                                           \
-	)
-#define wapp_dbl_list_empty(TYPE, LIST_PTR)                                                        \
-	(_dbl_list_empty(LIST_PTR, sizeof(TYPE)))
 
 GenericList	*_dbl_list_alloc(const Allocator *allocator, u64 item_size);
-GenericNode *_dbl_list_node_alloc(const Allocator *allocator, void *item, u64 item_size);
+GenericNode	*_dbl_list_node_alloc(const Allocator *allocator, u64 item_size);
 GenericNode	*_dbl_list_get(const GenericList *list, u64 index, u64 item_size);
 void				_dbl_list_push_front(GenericList *list, GenericNode *node, u64 item_size);
 void				_dbl_list_push_back(GenericList *list, GenericNode *node, u64 item_size);
@@ -177,6 +80,29 @@ GenericNode *_dbl_list_pop_back(GenericList *list, u64 item_size);
 GenericNode	*_dbl_list_remove(GenericList *list, u64 index, u64 item_size);
 void				_dbl_list_empty(GenericList *list, u64 item_size);
 
+// Base list types
+typedef struct str8 Str8;
+
+WAPP_DEF_DBL_LIST_TYPE(void *	, VoidPtrNode	, VoidPtrList);
+WAPP_DEF_DBL_LIST_TYPE(c8			, C8Node			, C8List);
+WAPP_DEF_DBL_LIST_TYPE(c16		, C16Node			, C16List);
+WAPP_DEF_DBL_LIST_TYPE(c32		, C32Node			, C32List);
+WAPP_DEF_DBL_LIST_TYPE(u8			, U8Node			, U8List);
+WAPP_DEF_DBL_LIST_TYPE(u16		, U16Node			, U16List);
+WAPP_DEF_DBL_LIST_TYPE(u32		, U32Node			, U32List);
+WAPP_DEF_DBL_LIST_TYPE(u64		, U64Node			, U64List);
+WAPP_DEF_DBL_LIST_TYPE(b8			, B8Node			, B8List);
+WAPP_DEF_DBL_LIST_TYPE(i8			, I8Node			, I8List);
+WAPP_DEF_DBL_LIST_TYPE(i16		, I16Node			, I16List);
+WAPP_DEF_DBL_LIST_TYPE(i32		, I32Node			, I32List);
+WAPP_DEF_DBL_LIST_TYPE(i64		, I64Node			, I64List);
+WAPP_DEF_DBL_LIST_TYPE(f32		, F32Node			, F32List);
+WAPP_DEF_DBL_LIST_TYPE(f64		, F64Node			, F64List);
+WAPP_DEF_DBL_LIST_TYPE(f128		, F128Node		, F128List);
+WAPP_DEF_DBL_LIST_TYPE(uptr		, UptrNode		, UptrList);
+WAPP_DEF_DBL_LIST_TYPE(iptr		, IptrNode		, IptrList);
+WAPP_DEF_DBL_LIST_TYPE(Str8		, Str8Node		, Str8List);
+
 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP

src/base/mem/allocator/mem_allocator.h

@@ -17,8 +17,8 @@ typedef void  *(MemReallocFunc)(void *ptr, u64 old_size, u64 new_size, void *all
 typedef void	*(MemReallocAlignedFunc)(void *ptr, u64 old_size, u64 new_size, u64 alignment, void *alloc_obj);
 typedef void	(MemFreeFunc)(void **ptr, u64 size, void *alloc_obj);
 
-typedef struct Allocator Allocator;
+typedef struct allocator Allocator;
-struct Allocator {
+struct allocator {
 	void *obj;
 	MemAllocFunc *alloc;
 	MemAllocAlignedFunc *alloc_aligned;

src/base/mem/utils/mem_utils.c

@@ -3,12 +3,13 @@
 #include "mem_utils.h"
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/assert/assert.h"
-#include "../../../common/misc/misc_utils.h"
 #include <stddef.h>
 
+wapp_intern b8 is_power_of_two(u64 num) { return (num & (num - 1)) == 0; }
+
 void *wapp_mem_util_align_forward(void *ptr, u64 alignment) {
 	wapp_debug_assert(ptr != NULL, "`ptr` should not be NULL");
-	wapp_runtime_assert(wapp_is_power_of_two(alignment), "`alignment` value is not a power of two");
+	wapp_runtime_assert(is_power_of_two(alignment), "`alignment` value is not a power of two");
 
 	uptr p			= (uptr)ptr;
 	uptr align	= (uptr)alignment;

src/base/queue/queue.c

@@ -1,85 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "queue.h"
-#include "../array/array.h"
-#include "../../common/assert/assert.h"
-#include "../../common/misc/misc_utils.h"
-#include <string.h>
-
-void _queue_push(GenericQueue *queue, void *item, u64 item_size) {
-	wapp_debug_assert(queue != NULL, "`queue` should not be NULL");
-	wapp_runtime_assert(item_size == wapp_array_item_size(queue->items), "Invalid type");
-
-	u64 capacity = wapp_array_capacity(queue->items);
-	if (queue->count >= capacity) { return; }
-
-	u64 index = (queue->back)++;
-	_array_set(queue->items, index, item, item_size);
-	++(queue->count);
-
-	if (queue->back >= capacity) {
-		queue->back = 0;
-	}
-}
-
-GenericQueue *_queue_push_alloc(const Allocator *allocator, GenericQueue *queue, void *item, u64 item_size) {
-	wapp_debug_assert(allocator != NULL && queue != NULL && item != NULL,
-	                  "`allocator`, `queue` and `item` should not be NULL");
-	wapp_runtime_assert(item_size == wapp_array_item_size(queue->items), "Invalid type");
-
-	GenericQueue *output = queue;
-
-	u64 capacity = wapp_array_capacity(queue->items);
-	if (queue->count >= capacity) {
-		u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(capacity * 2);
-		u64 array_size   = _array_calc_alloc_size(new_capacity, item_size);
-		u64 alloc_size   = sizeof(GenericQueue) + array_size;
-		void *buffer     = wapp_mem_allocator_alloc(allocator, alloc_size);
-		if (!buffer) {
-			goto RETURN_QUEUE_PUSH_ALLOC;
-		}
-
-		memset((void *)buffer, 0, alloc_size);
-
-		output        = (GenericQueue *)buffer;
-		output->items = _array_from_preallocated_buffer((void *)(output + 1), array_size, ARRAY_INIT_FILLED, item_size);
-
-		// NOTE (Abdelrahman): When the queue is full, the front and back indices should
-		// always be the same
-		u64 front_count     = capacity - queue->front;
-		u64 back_count      = queue->back;
-		void *copy_boundary = (void *)((uptr)(queue->items) + (queue->front * item_size));
-
-		memcpy(output->items, copy_boundary, front_count * item_size);
-		if (back_count > 0) {
-			void *back_copy_dst = (void *)((uptr)(output->items) + (front_count * item_size));
-			memcpy(back_copy_dst, queue->items, back_count * item_size);
-		}
-
-		output->front = 0;
-		output->back  = front_count + back_count;
-		output->count = queue->count;
-	}
-
-	_queue_push(output, item, item_size);
-
-RETURN_QUEUE_PUSH_ALLOC:
-	return output;
-}
-
-void *_queue_pop(GenericQueue *queue, u64 item_size) {
-	wapp_debug_assert(queue != NULL, "`queue` should not be NULL");
-	wapp_runtime_assert(item_size == wapp_array_item_size(queue->items), "Invalid type");
-
-	if (queue->count == 0) { return NULL; }
-
-	u64 index = (queue->front)++;
-	--(queue->count);
-
-	u64 capacity = wapp_array_capacity(queue->items);
-	if (queue->front >= capacity) {
-		queue->front = 0;
-	}
-
-	return _array_get(queue->items, index, item_size);
-}

src/base/queue/queue.h

@@ -1,100 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef QUEUE_H
-#define QUEUE_H
-
-#include "../array/array.h"
-#include "../mem/allocator/mem_allocator.h"
-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-typedef struct {
-	GenericArray items;
-	u64 front;
-	u64 back;
-	u64 count;
-} GenericQueue;
-
-// NOTE (Abdelrahman): GenericQueue typedefs for readability
-typedef GenericQueue VoidPtrQueue;
-typedef GenericQueue C8Queue;
-typedef GenericQueue C16Queue;
-typedef GenericQueue C32Queue;
-typedef GenericQueue U8Queue;
-typedef GenericQueue U16Queue;
-typedef GenericQueue U32Queue;
-typedef GenericQueue U64Queue;
-typedef GenericQueue B8Queue;
-typedef GenericQueue I8Queue;
-typedef GenericQueue I16Queue;
-typedef GenericQueue I32Queue;
-typedef GenericQueue I64Queue;
-typedef GenericQueue F32Queue;
-typedef GenericQueue F64Queue;
-typedef GenericQueue F128Queue;
-typedef GenericQueue UptrQueue;
-typedef GenericQueue IptrQueue;
-typedef GenericQueue Str8Queue;
-
-#ifdef WAPP_PLATFORM_CPP
-#define wapp_queue(TYPE, CAPACITY) ([&]() {                                                        \
-	wapp_persist GenericArray arr   = wapp_array_with_capacity(TYPE, CAPACITY, ARRAY_INIT_FILLED);   \
-	wapp_persist GenericQueue queue = {                                                              \
-		arr,                                                                                           \
-		0,                                                                                             \
-		0,                                                                                             \
-		0,                                                                                             \
-	};                                                                                               \
-                                                                                                   \
-	return queue;                                                                                    \
-}())
-#define wapp_queue_alloc(TYPE, ALLOCATOR_PTR, CAPACITY) ([&]() {                                   \
-	wapp_persist GenericQueue queue = {                                                              \
-		wapp_array_alloc_capacity(TYPE, ALLOCATOR_PTR, CAPACITY, ARRAY_INIT_FILLED)                    \
-		0,                                                                                             \
-		0,                                                                                             \
-		0,                                                                                             \
-	};                                                                                               \
-                                                                                                   \
-	return queue;                                                                                    \
-}())
-#else
-#define wapp_queue(TYPE, CAPACITY) ((GenericQueue){                                                \
-	.items = wapp_array_with_capacity(TYPE, CAPACITY, ARRAY_INIT_FILLED),                            \
-	.front = 0,                                                                                      \
-	.back  = 0,                                                                                      \
-	.count = 0,                                                                                      \
-})
-#define wapp_queue_alloc(TYPE, ALLOCATOR_PTR, CAPACITY) ((GenericQueue){                           \
-	.items = wapp_array_alloc_capacity(TYPE, ALLOCATOR_PTR, CAPACITY, ARRAY_INIT_FILLED),            \
-	.front = 0,                                                                                      \
-	.back  = 0,                                                                                      \
-	.count = 0,                                                                                      \
-})
-#endif // !WAPP_PLATFORM_CPP
-
-#define wapp_queue_capacity(QUEUE_PTR) (wapp_array_capacity((QUEUE_PTR)->items))
-#define wapp_queue_item_size(QUEUE_PTR) (wapp_array_item_size((QUEUE_PTR)->items))
-#define wapp_queue_push(TYPE, QUEUE_PTR, VALUE_PTR) (                                              \
-	_queue_push(QUEUE_PTR, VALUE_PTR, sizeof(TYPE))                                                  \
-)
-#define wapp_queue_push_alloc(TYPE, ALLOCATOR_PTR, QUEUE_PTR, VALUE_PTR) (                         \
-	_queue_push_alloc(ALLOCATOR_PTR, QUEUE_PTR, VALUE_PTR, sizeof(TYPE))                             \
-)
-#define wapp_queue_pop(TYPE, QUEUE_PTR) (                                                          \
-	(TYPE *)_queue_pop(QUEUE_PTR, sizeof(TYPE))                                                      \
-)
-
-void _queue_push(GenericQueue *queue, void *item, u64 item_size);
-GenericQueue *_queue_push_alloc(const Allocator *allocator, GenericQueue *queue, void *item, u64 item_size);
-void *_queue_pop(GenericQueue *queue, u64 item_size);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !QUEUE_H

src/base/strings/str8/str8.c

@@ -275,15 +275,15 @@ void wapp_str8_to_upper(Str8 *dst, Str8RO *src) {
 	}
 }
 
-void wapp_str8_from_bytes(Str8 *dst, const U8Array src) {
+void wapp_str8_from_bytes(Str8 *dst, const U8Array *src) {
 	wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
 
-	u64 size = wapp_array_count(src) * wapp_array_item_size(src);
+	u64 size = src->count * src->item_size;
 
 	wapp_debug_assert(dst->capacity >= size, "`dst` does not have enough capacity");
 
 	dst->size = size;
-	memcpy(dst->buf, src, size);
+	memcpy(dst->buf, src->items, size);
 }
 
 i64 wapp_str8_find(Str8RO *str, Str8RO substr) {
@@ -333,12 +333,14 @@ i64 wapp_str8_rfind(Str8RO *str, Str8RO substr) {
 Str8List *wapp_str8_split_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits) {
 	wapp_debug_assert(allocator != NULL && str != NULL && delimiter != NULL, "`allocator`, `str` and `delimiter` should not be NULL");
 
-	Str8List *output = wapp_dbl_list_alloc(Str8, allocator);
+	Str8List *output = wapp_dbl_list_alloc(Str8, Str8List, allocator);
 
 	if (delimiter->size > str->size) {
 		Str8 *full			= wapp_str8_alloc_str8(allocator, str);
-		if (full) {
+		Str8Node *node	= wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
-			wapp_dbl_list_push_back_alloc(Str8, allocator, output, full);
+		if (node) {
+			node->item = full;
+			wapp_dbl_list_push_back(Str8, output, node);
 		}
 
 		goto RETURN_STR8_SPLIT;
@@ -356,8 +358,10 @@ Str8List *wapp_str8_split_with_max(const Allocator *allocator, Str8RO *str, Str8
 		}
 
 		before_str = wapp_str8_alloc_substr(allocator, str, start, start + end);
-		if (before_str) {
+		Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
-			wapp_dbl_list_push_back_alloc(Str8, allocator, output, before_str);
+		if (node && before_str) {
+			node->item = before_str;
+			wapp_dbl_list_push_back(Str8, output, node);
 		}
 
 		wapp_mem_allocator_free(allocator, (void **)&rest, sizeof(Str8));
@@ -369,8 +373,10 @@ Str8List *wapp_str8_split_with_max(const Allocator *allocator, Str8RO *str, Str8
 
 	// Ensure the last part of the string after the delimiter is added to the list
 	rest						= wapp_str8_alloc_substr(allocator, str, start, str->size);
-	if (rest) {
+	Str8Node *node	= wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
-		wapp_dbl_list_push_back_alloc(Str8, allocator, output, rest);
+	if (node && rest) {
+		node->item = rest;
+		wapp_dbl_list_push_back(Str8, output, node);
 	}
 
 RETURN_STR8_SPLIT:
@@ -380,12 +386,14 @@ RETURN_STR8_SPLIT:
 Str8List *wapp_str8_rsplit_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits) {
 	wapp_debug_assert(allocator != NULL && str != NULL && delimiter != NULL, "`allocator`, `str` and `delimiter` should not be NULL");
 
-	Str8List *output = wapp_dbl_list_alloc(Str8, allocator);
+	Str8List *output = wapp_dbl_list_alloc(Str8, Str8List, allocator);
 
 	if (delimiter->size > str->size) {
 		Str8 *full			= wapp_str8_alloc_str8(allocator, str);
-		if (full) {
+		Str8Node *node	= wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
-			wapp_dbl_list_push_back_alloc(Str8, allocator, output, full);
+		if (node && full) {
+			node->item = full;
+			wapp_dbl_list_push_back(Str8, output, node);
 		}
 
 		goto RETURN_STR8_SPLIT;
@@ -402,8 +410,10 @@ Str8List *wapp_str8_rsplit_with_max(const Allocator *allocator, Str8RO *str, Str
 		}
 
 		after_str = wapp_str8_alloc_substr(allocator, rest, end + delimiter->size, str->size);
-		if (after_str) {
+		Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
-			wapp_dbl_list_push_front_alloc(Str8, allocator, output, after_str);
+		if (node) {
+			node->item = after_str;
+			wapp_dbl_list_push_front(Str8, output, node);
 		}
 
 		wapp_mem_allocator_free(allocator, (void **)&rest, sizeof(Str8));
@@ -413,8 +423,10 @@ Str8List *wapp_str8_rsplit_with_max(const Allocator *allocator, Str8RO *str, Str
 	}
 
 	rest						= wapp_str8_alloc_substr(allocator, str, 0, rest->size);
-	if (rest) {
+	Str8Node *node	= wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
-		wapp_dbl_list_push_front_alloc(Str8, allocator, output, rest);
+	if (node && rest) {
+		node->item = rest;
+		wapp_dbl_list_push_front(Str8, output, node);
 	}
 
 RETURN_STR8_SPLIT:
@@ -429,16 +441,16 @@ Str8 *wapp_str8_join(const Allocator *allocator, const Str8List *list, Str8RO *d
 
 	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
 	// MSVC Spectre mitigation warnings
-	Str8 *node;
+	Str8Node *node;
 	u64 node_index	= 0;
 	b8 running			= node_index < list->node_count;
 	while (running) {
-		node = wapp_dbl_list_get(Str8, list, node_index);
+		node = wapp_dbl_list_get(Str8, Str8Node, list, node_index);
 		if (!node) {
 			break;
 		}
 
-		wapp_str8_concat_capped(output, node);
+		wapp_str8_concat_capped(output, node->item);
 
 		// NOTE (Abdelrahman): Comparison extracted to variable to silence
 		// MSVC Spectre mitigation warnings
@@ -461,17 +473,17 @@ u64 wapp_str8_list_total_size(const Str8List *list) {
 
 	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
 	// MSVC Spectre mitigation warnings
-	Str8 *node;
+	Str8Node* node;
 	u64 node_index	= 0;
 	u64 output			= 0;
 	b8 running			= node_index < list->node_count;
 	while (running) {
-		node = wapp_dbl_list_get(Str8, list, node_index);
+		node = wapp_dbl_list_get(Str8, Str8Node, list, node_index);
 		if (!node) {
 				break;
 		}
 
-		output += node->size;
+		output += node->item->size;
 		++node_index;
 		running = node_index < list->node_count;
 	}

src/base/strings/str8/str8.h

@@ -15,8 +15,8 @@
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP
 
-typedef struct Str8 Str8;
+typedef struct str8 Str8;
-struct Str8 {
+struct str8 {
 	u64 capacity;
 	u64 size;
 	c8 *buf;
@@ -58,9 +58,7 @@ typedef const Str8 Str8RO;
 // address of compound literals is valid in C to create a string on the stack
 #define wapp_str8_lit(STRING) ((Str8){.capacity	= (sizeof(STRING) - 1) * 2,	\
 																			.size			= sizeof(STRING) - 1,				\
-                                      .buf       = memcpy(&((c8 [sizeof(STRING) * 2]){0}), \
+																			.buf			= memcpy(&((c8 [sizeof(STRING) * 2]){0}), STRING, sizeof(STRING))})
-                                                          STRING,                          \
-                                                          sizeof(STRING))})
 #define wapp_str8_lit_ro(STRING) ((Str8RO){.capacity	= sizeof(STRING) - 1,	\
 																						.size			= sizeof(STRING) - 1,	\
 																						.buf			= (c8 *)STRING})
@@ -101,7 +99,7 @@ void wapp_str8_copy_to_cstr(char *dst, Str8RO *src, u64 dst_capacity);
 void	wapp_str8_format(Str8 *dst, const char *format, ...);
 void	wapp_str8_to_lower(Str8 *dst, Str8RO *src);
 void	wapp_str8_to_upper(Str8 *dst, Str8RO *src);
-void wapp_str8_from_bytes(Str8 *dst, const U8Array src);
+void	wapp_str8_from_bytes(Str8 *dst, const U8Array *src);
 
 /**
  * Str8 find functions
@@ -125,6 +123,27 @@ u64 wapp_str8_list_total_size(const Str8List *list);
 
 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE
+
+#include <type_traits>
+
+template <typename T>
+constexpr bool is_lvalue(T&&) {
+	return std::is_lvalue_reference<T>{};
+}
+
+#define wapp_str8_node_from_cstr(STRING) wapp_dbl_list_node(Str8, Str8Node, [&]() {	\
+	wapp_persist Str8 str = wapp_str8_lit(STRING);																		\
+	return &str;																																			\
+}())
+#define wapp_str8_node_from_str8(STRING) wapp_dbl_list_node(Str8, Str8Node, [&]() {	\
+	if (is_lvalue(STRING)) { return &STRING; }																				\
+																																										\
+	wapp_persist Str8 str = STRING;																										\
+	return &str;																																			\
+}())
+#else
+#define wapp_str8_node_from_cstr(STRING) wapp_dbl_list_node(Str8, Str8Node, &wapp_str8_lit(STRING))
+#define wapp_str8_node_from_str8(STRING) wapp_dbl_list_node(Str8, Str8Node, &(STRING))
 #endif // !WAPP_PLATFORM_CPP
 
 #endif // !STR8_H

src/base/wapp_base.c

@@ -6,7 +6,6 @@
 #include "wapp_base.h"
 #include "array/array.c"
 #include "dbl_list/dbl_list.c"
-#include "queue/queue.c"
 #include "mem/allocator/mem_allocator.c"
 #include "mem/utils/mem_utils.c"
 #include "strings/str8/str8.c"

src/base/wapp_base.h

@@ -3,9 +3,8 @@
 #ifndef WAPP_BASE_H
 #define WAPP_BASE_H
 
-#include "array/array.h"
 #include "dbl_list/dbl_list.h"
-#include "queue/queue.h"
+#include "array/array.h"
 #include "mem/allocator/mem_allocator.h"
 #include "mem/utils/mem_utils.h"
 #include "strings/str8/str8.h"

src/common/aliases/aliases.h

@@ -10,25 +10,25 @@
 	#include <uchar.h>
 
 	#if WAPP_PLATFORM_C_VERSION >= WAPP_PLATFORM_C23_VERSION
-		typedef char8_t c8;
+		#define c8 char8_t
 	#else
-		typedef uint8_t c8;
+		#define c8 uint8_t
 	#endif // !WAPP_PLATFORM_C23_VERSION
 
-	typedef char16_t c16;
+	#define c16 char16_t
-	typedef char32_t c32;
+	#define c32 char32_t
 #else
-	typedef uint8_t c8;
+	#define c8 uint8_t
-	typedef uint16_t c16;
+	#define c16 uint16_t
-	typedef uint32_t c32;
+	#define c32 uint32_t
 #endif // !WAPP_PLATFORM_C
 
-typedef uint8_t u8;
+#define u8 uint8_t
-typedef uint16_t u16;
+#define u16 uint16_t
-typedef uint32_t u32;
+#define u32 uint32_t
-typedef uint64_t u64;
+#define u64 uint64_t
 
-typedef uint8_t b8;
+#define b8 uint8_t
 
 #ifndef WAPP_PLATFORM_CPP
 
@@ -42,17 +42,17 @@ typedef uint8_t b8;
 
 #endif // !WAPP_PLATFORM_CPP
 
-typedef int8_t i8;
+#define i8 int8_t
-typedef int16_t i16;
+#define i16 int16_t
-typedef int32_t i32;
+#define i32 int32_t
-typedef int64_t i64;
+#define i64 int64_t
 
-typedef float f32;
+#define f32 float
-typedef double f64;
+#define f64 double
-typedef long double f128;
+#define f128 long double
 
-typedef uintptr_t uptr;
+#define uptr uintptr_t
-typedef intptr_t iptr;
+#define iptr intptr_t
 
 #define wapp_extern extern
 #define wapp_intern static

src/common/misc/misc_utils.h

@@ -23,7 +23,7 @@ BEGIN_C_LINKAGE
 #define PB(SIZE) (TB(SIZE)		* 1000llu)
 #define EB(SIZE) (PB(SIZE)		* 1000llu)
 
-#define wapp_misc_utils_reserve_padding(SIZE) u8 reserved_padding[sizeof(void *) - ((SIZE) % sizeof(void *))]
+#define wapp_misc_utils_padding_size(SIZE) u8 reserved_padding[sizeof(void *) - ((SIZE) % sizeof(void *))]
 
 #define U64_RSHIFT_OR_1(X)	(((u64)X) | (((u64)X) >> 1))
 #define U64_RSHIFT_OR_2(X)	(((u64)X) | (((u64)X) >> 2))
@@ -47,9 +47,6 @@ BEGIN_C_LINKAGE
 	) + 1																					\
 )
 
-#define wapp_is_power_of_two(NUM) ((NUM & (NUM - 1)) == 0)
-#define wapp_pointer_offset(PTR, OFFSET) ((void *)((uptr)(PTR) + (OFFSET)))
-
 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE
 

src/os/allocators/arena/mem_arena.c

@@ -6,6 +6,7 @@
 #include "../../../common/assert/assert.h"
 #include "../../../common/misc/misc_utils.h"
 #include "../../../base/mem/utils/mem_utils.h"
+#include <stdlib.h>
 #include <string.h>
 
 #ifndef DEFAULT_ALIGNMENT
@@ -16,70 +17,45 @@
 
 #define ARENA_MINIMUM_CAPACITY KiB(16) // Allocate minimum of 4 pages
 
-typedef enum {
+struct arena {
-	ARENA_STORAGE_TYPE_ALLOCATED,
-	ARENA_STORAGE_TYPE_BUFFER,
-} ArenaStorageType;
-
-struct Arena {
   u8 *buf;
   u8 *offset;
-	u8 *prev_offset;
   u64 capacity;
-	ArenaStorageType type;
   b8 committed;
 
-	wapp_misc_utils_reserve_padding(sizeof(u8 *) * 3 + sizeof(u64) + sizeof(ArenaStorageType) + sizeof(b8));
+#ifdef WAPP_PLATFORM_WINDOWS
+  wapp_misc_utils_padding_size(sizeof(u8 *) * 2 + sizeof(u64) + sizeof(b8));
+#endif // ifdef WAPP_PLATFORM_WINDOWS
 };
 
-b8 wapp_mem_arena_init_buffer(Arena **arena, u8 *buffer, u64 buffer_size) {
+b8 wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b8 zero_buffer) {
-	if (!arena || *arena || buffer_size < sizeof(Arena)) {
-		return false;
-	}
-
-	*arena           = (Arena *)buffer;
-	Arena *arena_ptr = *arena;
-
-	arena_ptr->buf         = (u8 *)(arena_ptr + 1);
-	arena_ptr->offset      = arena_ptr->buf;
-	arena_ptr->prev_offset = NULL;
-	arena_ptr->capacity    = buffer_size - sizeof(Arena);
-	arena_ptr->type        = ARENA_STORAGE_TYPE_BUFFER;
-	arena_ptr->committed   = true;
-
-	return true;
-}
-
-b8 wapp_mem_arena_init_allocated_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b8 zero_buffer) {
   if (!arena || *arena || base_capacity == 0) {
     return false;
   }
 
-	u64 size       = sizeof(Arena) + (base_capacity >= ARENA_MINIMUM_CAPACITY ? base_capacity : ARENA_MINIMUM_CAPACITY);
+  *arena = (Arena *)calloc(1, sizeof(Arena));
-	u64 alloc_size = wapp_misc_utils_u64_round_up_pow2(size);
+  Arena *arena_ptr = *arena;
-	u8 *allocated  = (u8 *)wapp_os_mem_alloc(NULL, alloc_size, WAPP_MEM_ACCESS_READ_WRITE, flags,
+  if (!arena_ptr) {
-	                                         zero_buffer ? WAPP_MEM_INIT_INITIALISED : WAPP_MEM_INIT_UNINITIALISED);
-	if (!allocated) {
     return false;
   }
 
-	b8 committed = (flags & WAPP_MEM_ALLOC_COMMIT) == WAPP_MEM_ALLOC_COMMIT;
+  u64 arena_capacity = wapp_misc_utils_u64_round_up_pow2(
+      base_capacity >= ARENA_MINIMUM_CAPACITY ?
+      base_capacity :
+      ARENA_MINIMUM_CAPACITY
+  );
 
-#ifdef WAPP_PLATFORM_WINDOWS
+  arena_ptr->buf = (u8 *)wapp_mem_util_alloc(NULL, arena_capacity, WAPP_MEM_ACCESS_READ_WRITE, flags,
-	if (!committed) {
+                                             zero_buffer ? WAPP_MEM_INIT_INITIALISED : WAPP_MEM_INIT_UNINITIALISED);
-		wapp_os_mem_alloc(allocated, sizeof(Arena), WAPP_MEM_ACCESS_READ_WRITE, WAPP_MEM_ALLOC_COMMIT,
-		                  WAPP_MEM_INIT_INITIALISED);
-	}
-#endif // ifdef WAPP_PLATFORM_WINDOWS
 
-	if (!wapp_mem_arena_init_buffer(arena, allocated, alloc_size)) {
+  if (!(arena_ptr->buf)) {
     wapp_mem_arena_destroy(arena);
     return false;
   }
 
-	Arena *arena_ptr     = *arena;
+  arena_ptr->capacity  = arena_capacity;
-	arena_ptr->type      = ARENA_STORAGE_TYPE_ALLOCATED;
+  arena_ptr->offset    = arena_ptr->buf;
-	arena_ptr->committed = committed;
+  arena_ptr->committed = (flags & WAPP_MEM_ALLOC_COMMIT) == WAPP_MEM_ALLOC_COMMIT;
 
   return true;
 }
@@ -101,8 +77,8 @@ void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) {
   arena->offset = output + size;
 
 #ifdef WAPP_PLATFORM_WINDOWS
-	if (arena->type == ARENA_STORAGE_TYPE_ALLOCATED && !(arena->committed)) {
+  if (!(arena->committed)) {
-		wapp_os_mem_alloc(alloc_start, (uptr)(arena->offset) - (uptr)(alloc_start),
+    wapp_mem_util_alloc(alloc_start, (uptr)(arena->offset) - (uptr)(alloc_start),
                         WAPP_MEM_ACCESS_READ_WRITE, WAPP_MEM_ALLOC_COMMIT,
                         WAPP_MEM_INIT_UNINITIALISED);
   }
@@ -114,8 +90,6 @@ void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) {
 }
 
 void *wapp_mem_arena_realloc(Arena *arena, void *ptr, u64 old_size, u64 new_size) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
-
   if ((u8*)ptr < arena->buf || (u8*)ptr > arena->offset ||
       arena->offset + new_size >= arena->buf + arena->capacity) {
     return NULL;
@@ -133,8 +107,6 @@ void *wapp_mem_arena_realloc(Arena *arena, void *ptr, u64 old_size, u64 new_size
 }
 
 void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64 new_size, u64 alignment) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
-
   if ((u8*)ptr < arena->buf || (u8*)ptr > arena->offset ||
       arena->offset + new_size >= arena->buf + arena->capacity) {
     return NULL;
@@ -151,27 +123,6 @@ void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64
   return new_ptr;
 }
 
-void wapp_mem_arena_temp_begin(Arena *arena) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
-
-	if (arena->prev_offset != NULL) {
-		return;
-	}
-
-	arena->prev_offset = arena->offset;
-}
-
-void wapp_mem_arena_temp_end(Arena *arena) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
-
-	if (arena->prev_offset == NULL) {
-		return;
-	}
-
-	arena->offset      = arena->prev_offset;
-	arena->prev_offset = NULL;
-}
-
 void wapp_mem_arena_clear(Arena *arena) {
   wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
 
@@ -183,10 +134,13 @@ void wapp_mem_arena_destroy(Arena **arena) {
   wapp_debug_assert(arena != NULL && (*arena) != NULL, "`arena` double pointer is not valid");
 
   Arena *arena_ptr = *arena;
-
+  if (arena_ptr->buf) {
-	if (arena_ptr->type == ARENA_STORAGE_TYPE_ALLOCATED) {
+    wapp_mem_util_free(arena_ptr->buf, arena_ptr->capacity);
-		wapp_os_mem_free(*arena, sizeof(Arena) + arena_ptr->capacity);
   }
 
+  arena_ptr->buf = arena_ptr->offset = NULL;
+  arena_ptr->capacity = 0;
+
+  free(*arena);
   *arena = NULL;
 }

src/os/allocators/arena/mem_arena.h

@@ -11,30 +11,27 @@
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP
 
-typedef struct Arena Arena;
+typedef struct arena Arena;
 
-#define wapp_mem_arena_init_allocated(arena_dptr, base_capacity)                                                           \
+#define wapp_mem_arena_init(arena_dptr, base_capacity)                         \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, false))
+  (wapp_mem_arena_init_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, false))
-#define wapp_mem_arena_init_allocated_commit(arena_dptr, base_capacity)                                                    \
+#define wapp_mem_arena_init_commit(arena_dptr, base_capacity)                  \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, false))
+  (wapp_mem_arena_init_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, false))
-#define wapp_mem_arena_init_allocated_zero(arena_dptr, base_capacity)                                                      \
+#define wapp_mem_arena_init_zero(arena_dptr, base_capacity)                    \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, true))
+  (wapp_mem_arena_init_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, true))
-#define wapp_mem_arena_init_allocated_commit_and_zero(arena_dptr, base_capacity)                                           \
+#define wapp_mem_arena_init_commit_and_zero(arena_dptr, base_capacity)         \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, true))
+  (wapp_mem_arena_init_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, true))
 
 /**
- * Arena initialisation function. `wapp_mem_arena_init_allocated_custom` provides the most
+ * Arena initialisation function. `wapp_mem_arena_init_custom` provides the most
  * control over how the Arena is initialised. Wrapper macros are provided for
  * easier use.
  */
-b8    wapp_mem_arena_init_allocated_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b8 zero_buffer);
+b8  wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b8 zero_buffer);
-b8    wapp_mem_arena_init_buffer(Arena **arena, u8 *buffer, u64 buffer_size);
 void *wapp_mem_arena_alloc(Arena *arena, u64 size);
 void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment);
 void *wapp_mem_arena_realloc(Arena *arena, void *ptr, u64 old_size, u64 new_size);
 void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64 new_size, u64 alignment);
-void  wapp_mem_arena_temp_begin(Arena *arena);
-void  wapp_mem_arena_temp_end(Arena *arena);
 void wapp_mem_arena_clear(Arena *arena);
 void wapp_mem_arena_destroy(Arena **arena);
 

src/os/allocators/arena/mem_arena_allocator.c

@@ -4,83 +4,55 @@
 #include "mem_arena.h"
 #include "../../mem/mem_os.h"
 #include "../../../common/aliases/aliases.h"
-#include "../../../common/assert/assert.h"
 
-wapp_intern void initialise_arena_allocator(Allocator *allocator);
+wapp_intern inline void *mem_arena_alloc(u64 size, void *alloc_obj);
-wapp_intern void *mem_arena_alloc(u64 size, void *alloc_obj);
+wapp_intern inline void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj);
-wapp_intern void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj);
+wapp_intern inline void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
-wapp_intern void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
+wapp_intern inline void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
-wapp_intern void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
                                                 void *alloc_obj);
 
-Allocator wapp_mem_arena_allocator_init_with_buffer(u8 *buffer, u64 buffer_size) {
-	Allocator allocator = {0};
-	b8 initialised = wapp_mem_arena_init_buffer((Arena **)(&allocator.obj), buffer, buffer_size);
-	if (!initialised) {
-		return allocator;
-	}
-
-	initialise_arena_allocator(&allocator);
-
-	return allocator;
-}
 
 Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, b8 zero_buffer) {
   Allocator allocator = {0};
-	b8 initialised = wapp_mem_arena_init_allocated_custom((Arena **)(&allocator.obj), base_capacity, flags, zero_buffer);
+  b8 initialised = wapp_mem_arena_init_custom((Arena **)(&allocator.obj), base_capacity, flags, zero_buffer);
   if (!initialised) {
     return allocator;
   }
 
-	initialise_arena_allocator(&allocator);
+  allocator.alloc           = mem_arena_alloc;
+  allocator.alloc_aligned   = mem_arena_alloc_aligned;
+  allocator.realloc         = mem_arena_realloc;
+  allocator.realloc_aligned = mem_arena_realloc_aligned;
 
   return allocator;
 }
 
-void wapp_mem_arena_allocator_temp_begin(const Allocator *allocator) {
-	wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
-	wapp_mem_arena_temp_begin((Arena *)(allocator->obj));
-}
-
-void wapp_mem_arena_allocator_temp_end(const Allocator *allocator) {
-	wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
-	wapp_mem_arena_temp_end((Arena *)(allocator->obj));
-}
-
 void wapp_mem_arena_allocator_clear(Allocator *allocator) {
-	wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
   wapp_mem_arena_clear((Arena *)(allocator->obj));
 }
 
 void wapp_mem_arena_allocator_destroy(Allocator *allocator) {
-	wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
   wapp_mem_arena_destroy((Arena **)(&(allocator->obj)));
   *allocator = (Allocator){0};
 }
 
-wapp_intern void initialise_arena_allocator(Allocator *allocator) {
-	allocator->alloc           = mem_arena_alloc;
-	allocator->alloc_aligned   = mem_arena_alloc_aligned;
-	allocator->realloc         = mem_arena_realloc;
-	allocator->realloc_aligned = mem_arena_realloc_aligned;
-}
 
-wapp_intern void *mem_arena_alloc(u64 size, void *alloc_obj) {
+wapp_intern inline void *mem_arena_alloc(u64 size, void *alloc_obj) {
   Arena *arena = (Arena *)alloc_obj;
   return wapp_mem_arena_alloc(arena, size);
 }
 
-wapp_intern void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj) {
+wapp_intern inline void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj) {
   Arena *arena = (Arena *)alloc_obj;
   return wapp_mem_arena_alloc_aligned(arena, size, alignment);
 }
 
-wapp_intern void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj) {
+wapp_intern inline void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj) {
   Arena *arena = (Arena *)alloc_obj;
   return wapp_mem_arena_realloc(arena, ptr, old_size, new_size);
 }
 
-wapp_intern void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
+wapp_intern inline void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
                                                 void *alloc_obj) {
   Arena *arena = (Arena *)alloc_obj;
   return wapp_mem_arena_realloc_aligned(arena, ptr, old_size, new_size, alignment);

src/os/allocators/arena/mem_arena_allocator.h

@@ -33,9 +33,6 @@ BEGIN_C_LINKAGE
  * the Arena is initialised. Wrapper macros are provided for easier use.
  */
 Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, b8 zero_buffer);
-Allocator wapp_mem_arena_allocator_init_with_buffer(u8 *buffer, u64 buffer_size);
-void      wapp_mem_arena_allocator_temp_begin(const Allocator *allocator);
-void      wapp_mem_arena_allocator_temp_end(const Allocator *allocator);
 void wapp_mem_arena_allocator_clear(Allocator *allocator);
 void wapp_mem_arena_allocator_destroy(Allocator *allocator);
 

src/os/cpath/cpath.c

@@ -29,23 +29,23 @@ u32 wapp_cpath_join_path(Str8 *dst, const Str8List *parts) {
   }
 
   // Handle first node
-	Str8 *first_node = wapp_dbl_list_get(Str8, parts, 0);
+  const Str8Node *first_node = wapp_dbl_list_get(Str8, Str8Node, parts, 0);
-	wapp_str8_copy_str8_capped(dst, first_node);
+  wapp_str8_copy_str8_capped(dst, first_node->item);
 
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
-	Str8 *node       = first_node;
+  const Str8Node *node = first_node;
   u64 node_index       = 1;
   b8 running          = node_index < parts->node_count;
-	while (running) {
+  while (running && node->next) {
-		node = wapp_dbl_list_get(Str8, parts, node_index);
+    node = node->next;
-		if (node->size == 0) {
+    if (node->item->size == 0) {
-			goto CPATH_JOIN_LOOP_END;
+      continue;
     }
 
     if (dst->size > 0) {
       char dst_last    = wapp_str8_get(dst, dst->size - 1);
-			char node_start = wapp_str8_get(node, 0);
+      char node_start  = wapp_str8_get(node->item, 0);
       b8 add_path_sep = dst_last != WAPP_PATH_SEP && node_start != WAPP_PATH_SEP;
 
       if (add_path_sep) {
@@ -53,9 +53,8 @@ u32 wapp_cpath_join_path(Str8 *dst, const Str8List *parts) {
       }
     }
 
-		wapp_str8_concat_capped(dst, node);
+    wapp_str8_concat_capped(dst, node->item);
 
-CPATH_JOIN_LOOP_END:
     ++node_index;
     running = node_index < parts->node_count;
   }
@@ -107,7 +106,7 @@ Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels) {
     wapp_str8_push_back(output, absolute ? WAPP_PATH_SEP : '.');
   } else {
     for (u64 i = 0; i < levels; ++i) {
-			wapp_dbl_list_pop_back(Str8, parts);
+      wapp_dbl_list_pop_back(Str8, Str8Node, parts);
     }
     
     u64 alignment  = sizeof(void *) * 2;

src/os/cpath/cpath.h

@@ -18,7 +18,7 @@ BEGIN_C_LINKAGE
 #define WAPP_PATH_MAX PATH_MAX
 #elif defined(WAPP_PLATFORM_WINDOWS)
 #define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <windows.h>
 #define WAPP_PATH_SEP '\\'
 #define WAPP_PATH_MAX MAX_PATH
 #else

src/os/file/file.c

@@ -6,68 +6,69 @@
 #include "../../common/aliases/aliases.h"
 #include "../../base/array/array.h"
 #include "../../base/strings/str8/str8.h"
+#include <stdio.h>
 
-WFile *wapp_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode) {
+File *wapp_file_open(Str8RO *filepath, FileAccessMode mode) {
-	wapp_debug_assert(allocator != NULL && filepath != NULL, "`allocator` and `filepath` should not be NULL");
+  wapp_persist const char *modes[FILE_ACCESS_MODE_COUNT] = {
+    [WAPP_FA_MODE_R]      = "r",
+    [WAPP_FA_MODE_W]      = "w",
+    [WAPP_FA_MODE_A]      = "a",
+    [WAPP_FA_MODE_R_EX]   = "r+",
+    [WAPP_FA_MODE_W_EX]   = "w+",
+    [WAPP_FA_MODE_A_EX]   = "a+",
+    [WAPP_FA_MODE_RB]     = "rb",
+    [WAPP_FA_MODE_WB]     = "wb",
+    [WAPP_FA_MODE_AB]     = "ab",
+    [WAPP_FA_MODE_RB_EX]  = "rb+",
+    [WAPP_FA_MODE_WB_EX]  = "wb+",
+    [WAPP_FA_MODE_AB_EX]  = "ab+",
+    [WAPP_FA_MODE_WX]     = "wx",
+    [WAPP_FA_MODE_WX_EX]  = "wx+",
+    [WAPP_FA_MODE_WBX]    = "wbx",
+    [WAPP_FA_MODE_WBX_EX] = "wbx+",
+  };
+  wapp_persist c8 tmp[WAPP_PATH_MAX] = {0};
   wapp_debug_assert(filepath->size < WAPP_PATH_MAX, "`filepath` exceeds max path limit.");
-	return _file_open(allocator, filepath, mode);
+
+  memset(tmp, 0, WAPP_PATH_MAX);
+  memcpy(tmp, filepath->buf, filepath->size);
+
+  return fopen((const char *)tmp, modes[mode]);
 }
 
-i64 wapp_file_get_current_position(WFile *file) {
+u64 wapp_file_get_current_position(File *file) {
   wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-	return _file_seek(file, 0, WAPP_SEEK_CURRENT);
+  return (u64)ftell(file);
 }
 
-i64 wapp_file_seek(WFile *file, i64 offset, FileSeekOrigin origin) {
+i32 wapp_file_seek(File *file, u64 offset, FileSeekOrigin origin) {
   wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-	return _file_seek(file, offset, origin);
+  // TODO (Abdelrahman): Revisit conversion to long
+  return fseek(file, (long)offset, origin);
 }
 
-i64 wapp_file_get_length(WFile *file) {
+u64 wapp_file_get_length(File *file) {
   wapp_debug_assert(file != NULL, "`file` should not be NULL.");
 
-	i64 current = wapp_file_get_current_position(file);
+  u64 current = wapp_file_get_current_position(file);
 
-	_file_seek(file, 0, WAPP_SEEK_END);
+  wapp_file_seek(file, 0, WAPP_SEEK_END);
 
-	i64 output = wapp_file_get_current_position(file);
+  u64 output = ftell(file);
 
   // Restore position
-	_file_seek(file, current, WAPP_SEEK_START);
+  wapp_file_seek(file, current, WAPP_SEEK_START);
 
   return output;
 }
 
-u64 wapp_file_read(void *dst_buf, WFile *file, u64 byte_count) {
+u64 wapp_file_read(GenericArray *dst_buf, File *file, u64 item_count) {
   wapp_debug_assert(dst_buf != NULL && file != NULL,
                     "`dst_buf` and `file` should not be NULL.");
 
-	i64 file_length = wapp_file_get_length(file);
+  u64 file_length       = wapp_file_get_length(file);
-	if (file_length < 0) {
+  u64 item_size         = dst_buf->item_size;
-		return 0;
+  u64 dst_byte_capacity = dst_buf->capacity * item_size;
-	}
-
-	return _file_read(dst_buf, byte_count, file, file_length);
-}
-
-i64 wapp_file_write(const void *src_buf, WFile *file, u64 byte_count) {
-	wapp_debug_assert(src_buf != NULL && file != NULL,
-	                  "`src_buf` and `file` should not be NULL.");
-	return _file_write(src_buf, file, byte_count);
-}
-
-u64 wapp_file_read_array(GenericArray dst_buf, WFile *file, u64 item_count) {
-	wapp_debug_assert(dst_buf != NULL && file != NULL,
-	                  "`dst_buf` and `file` should not be NULL.");
-
-	i64 _file_length = wapp_file_get_length(file);
-	if (_file_length < 0) {
-		return 0;
-	}
-
-	u64 file_length       = (u64)_file_length;
-	u64 item_size         = wapp_array_item_size(dst_buf);
-	u64 dst_byte_capacity = wapp_array_capacity(dst_buf) * item_size;
   u64 req_byte_count    = item_count * item_size;
   u64 copy_byte_count   = 0;
 
@@ -77,53 +78,32 @@ u64 wapp_file_read_array(GenericArray dst_buf, WFile *file, u64 item_count) {
     copy_byte_count = file_length <= dst_byte_capacity ? file_length : dst_byte_capacity;
   }
 
-	u64 byte_count = _file_read(dst_buf, copy_byte_count, file, file_length);
+  u64 count = fread(dst_buf->items, sizeof(u8), copy_byte_count, file);
-	if (byte_count == 0) {
+  if (ferror(file)) { return 0; }
-		return 0;
+
+  dst_buf->count = count / item_size;
+
+  return dst_buf->count;
 }
 
-	wapp_array_set_count(dst_buf, byte_count / item_size);
+u64 wapp_file_write(const GenericArray *src_buf, File *file, u64 item_count) {
-
-	return wapp_array_count(dst_buf);
-}
-
-i64 wapp_file_write_array(const GenericArray src_buf, WFile *file, u64 item_count) {
   wapp_debug_assert(src_buf != NULL && file != NULL,
                     "`src_buf` and `file` should not be NULL.");
 
-	u64 item_size      = wapp_array_item_size(src_buf);
+  u64 item_size      = src_buf->item_size;
-	u64 src_byte_count = wapp_array_count(src_buf) * item_size;
+  u64 src_byte_count = src_buf->count * item_size;
   u64 req_byte_count = item_count * item_size;
   u64 to_copy        = req_byte_count <= src_byte_count ? req_byte_count : src_byte_count;
 
-	i64 bytes_written = _file_write(src_buf, file, to_copy);
+  return fwrite(src_buf->items, sizeof(u8), to_copy, file);
-	if (bytes_written < 0) {
-		return 0;
 }
 
-	return (u64)bytes_written / item_size;
+i32 wapp_file_flush(File *file) {
-}
-
-i32 wapp_file_flush(WFile *file) {
   wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-	return _file_flush(file);
+  return fflush(file);
 }
 
-i32 wapp_file_close(WFile *file) {
+i32 wapp_file_close(File *file) {
   wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-	return _file_close(file);
+  return fclose(file);
-}
-
-i32 wapp_file_rename(Str8RO *old_filepath, Str8RO *new_filepath) {
-	wapp_debug_assert(old_filepath != NULL && new_filepath != NULL,
-	                  "`old_filepath` and `new_filepath` should not be NULL");
-	wapp_debug_assert(old_filepath->size < WAPP_PATH_MAX, "`old_filepath` exceeds max path limit.");
-	wapp_debug_assert(new_filepath->size < WAPP_PATH_MAX, "`new_filepath` exceeds max path limit.");
-	return _file_rename(old_filepath, new_filepath);
-}
-
-i32 wapp_file_remove(Str8RO *filepath) {
-	wapp_debug_assert(filepath != NULL, "`filepath` should not be NULL");
-	wapp_debug_assert(filepath->size < WAPP_PATH_MAX, "`filepath` exceeds max path limit.");
-	return _file_remove(filepath);
 }

src/os/file/file.h

@@ -3,58 +3,51 @@
 #ifndef FILE_H
 #define FILE_H
 
-#include "../../base/mem/allocator/mem_allocator.h"
 #include "../../common/aliases/aliases.h"
 #include "../../base/strings/str8/str8.h"
+#include <stdio.h>
 
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP
 
-typedef struct WFile WFile;
+typedef FILE File;
 
 typedef enum {
-	WAPP_ACCESS_READ,                       // Equivalent to r
+  WAPP_FA_MODE_R,      // Equivalent to r
-	WAPP_ACCESS_WRITE,                      // Equivalent to w
+  WAPP_FA_MODE_W,      // Equivalent to w
-	WAPP_ACCESS_APPEND,                     // Equivalent to a
+  WAPP_FA_MODE_A,      // Equivalent to a
-	WAPP_ACCESS_READ_EX,                    // Equivalent to r+
+  WAPP_FA_MODE_R_EX,   // Equivalent to r+
-	WAPP_ACCESS_WRITE_EX,                   // Equivalent to w+
+  WAPP_FA_MODE_W_EX,   // Equivalent to w+
-	WAPP_ACCESS_APPEND_EX,                  // Equivalent to a+
+  WAPP_FA_MODE_A_EX,   // Equivalent to a+
-	WAPP_ACCESS_WRITE_FAIL_ON_EXIST,        // Equivalent to wx
+  WAPP_FA_MODE_RB,     // Equivalent to rb
-	WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX,     // Equivalent to wx+
+  WAPP_FA_MODE_WB,     // Equivalent to wb
+  WAPP_FA_MODE_AB,     // Equivalent to ab
+  WAPP_FA_MODE_RB_EX,  // Equivalent to rb+
+  WAPP_FA_MODE_WB_EX,  // Equivalent to wb+
+  WAPP_FA_MODE_AB_EX,  // Equivalent to ab+
+  WAPP_FA_MODE_WX,     // Equivalent to wx
+  WAPP_FA_MODE_WX_EX,  // Equivalent to wx+
+  WAPP_FA_MODE_WBX,    // Equivalent to wbx
+  WAPP_FA_MODE_WBX_EX, // Equivalent to wbx+
 
   FILE_ACCESS_MODE_COUNT,
 } FileAccessMode;
 
 typedef enum {
-	WAPP_SEEK_START,
+  WAPP_SEEK_START   = SEEK_SET,
-	WAPP_SEEK_CURRENT,
+  WAPP_SEEK_CURRENT = SEEK_CUR,
-	WAPP_SEEK_END,
+  WAPP_SEEK_END     = SEEK_END,
-
-	FILE_SEEK_ORIGIN_COUNT,
 } FileSeekOrigin;
 
-WFile *wapp_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode);
+File *wapp_file_open(Str8RO *filename, FileAccessMode mode);
-i64    wapp_file_get_current_position(WFile *file);
+u64   wapp_file_get_current_position(File *file);
-i64    wapp_file_seek(WFile *file, i64 offset, FileSeekOrigin origin);
+i32   wapp_file_seek(File *file, u64 offset, FileSeekOrigin origin);
-i64    wapp_file_get_length(WFile *file);
+u64   wapp_file_get_length(File *file);
-u64    wapp_file_read(void *dst_buf, WFile *file, u64 byte_count);
+u64   wapp_file_read(GenericArray *dst_buf, File *file, u64 item_count);
-i64    wapp_file_write(const void *src_buf, WFile *file, u64 byte_count);
+u64   wapp_file_write(const GenericArray *src_buf, File *file, u64 item_count);
-u64    wapp_file_read_array(GenericArray dst_buf, WFile *file, u64 item_count);
+i32   wapp_file_flush(File *file);
-i64    wapp_file_write_array(const GenericArray src_buf, WFile *file, u64 item_count);
+i32   wapp_file_close(File *file);
-i32    wapp_file_flush(WFile *file);
-i32    wapp_file_close(WFile *file);
-i32    wapp_file_rename(Str8RO *old_filepath, Str8RO *new_filepath);
-i32    wapp_file_remove(Str8RO *filepath);
-
-extern WFile *_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode);
-extern i64    _file_seek(WFile *file, i64 offset, FileSeekOrigin origin);
-extern u64    _file_read(void *dst_buf, u64 byte_count, WFile *file, u64 file_length);
-extern i64    _file_write(const void *src_buf, WFile *file, u64 byte_count);
-extern i32    _file_flush(WFile *file);
-extern i32    _file_close(WFile *file);
-extern i32    _file_rename(Str8RO *old_filepath, Str8RO *new_filepath);
-extern i32    _file_remove(Str8RO *filepath);
 
 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE

src/os/file/posix/file_posix.c

@@ -1,118 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "file_posix.h"
-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_POSIX
-
-#include "../file.h"
-#include "../../cpath/cpath.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../base/array/array.h"
-#include "../../../base/strings/str8/str8.h"
-
-#ifdef WAPP_PLATFORM_APPLE
-#define _FILE_OFFSET_BITS 64
-#define lseek64 lseek
-#endif // !WAPP_PLATFORM_APPLE
-
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-wapp_intern i32 file_flags[FILE_ACCESS_MODE_COUNT] = {
-	[WAPP_ACCESS_READ]                       = O_RDONLY,
-	[WAPP_ACCESS_WRITE]                      = O_WRONLY | O_CREAT,
-	[WAPP_ACCESS_APPEND]                     = O_WRONLY | O_APPEND | O_CREAT,
-	[WAPP_ACCESS_READ_EX]                    = O_RDWR,
-	[WAPP_ACCESS_WRITE_EX]                   = O_RDWR | O_CREAT,
-	[WAPP_ACCESS_APPEND_EX]                  = O_RDWR | O_APPEND | O_CREAT,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST]        = O_WRONLY | O_CREAT | O_EXCL,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = O_RDWR | O_CREAT | O_EXCL,
-};
-
-wapp_intern mode_t file_modes[FILE_ACCESS_MODE_COUNT] = {
-	[WAPP_ACCESS_READ]                       = 0,
-	[WAPP_ACCESS_WRITE]                      = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-	[WAPP_ACCESS_APPEND]                     = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-	[WAPP_ACCESS_READ_EX]                    = 0,
-	[WAPP_ACCESS_WRITE_EX]                   = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-	[WAPP_ACCESS_APPEND_EX]                  = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST]        = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-};
-
-wapp_intern i32 file_seek_origins[FILE_SEEK_ORIGIN_COUNT] = {
-	[WAPP_SEEK_START]   = SEEK_SET,
-	[WAPP_SEEK_CURRENT] = SEEK_CUR,
-	[WAPP_SEEK_END]     = SEEK_END,
-};
-
-WFile *_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode) {
-	wapp_persist c8 tmp[WAPP_PATH_MAX] = {0};
-	memset(tmp, 0, WAPP_PATH_MAX);
-	memcpy(tmp, filepath->buf, filepath->size);
-
-	i32 fd = open((const char *)tmp, file_flags[mode], file_modes[mode]);
-	if (fd < 0) {
-		return NULL;
-	}
-
-	WFile *output = wapp_mem_allocator_alloc(allocator, sizeof(WFile));
-	if (output) {
-		output->fd = fd;
-	}
-
-	return output;
-}
-
-i64 _file_seek(WFile *file, i64 offset, FileSeekOrigin origin) {
-	return lseek64(file->fd, offset, file_seek_origins[origin]);
-}
-
-u64 _file_read(void *dst_buf, u64 byte_count, WFile *file, u64 file_length) {
-	u64 copy_byte_count = file_length <= byte_count ? file_length : byte_count;
-
-	i64 count = read(file->fd, dst_buf, copy_byte_count);
-	if (count < 0) { return 0; }
-
-	return count;
-}
-
-i64 _file_write(const void *src_buf, WFile *file, u64 byte_count) {
-	return write(file->fd, src_buf, byte_count);
-}
-
-i32 _file_flush(WFile *file) {
-	return fsync(file->fd);
-}
-
-i32 _file_close(WFile *file) {
-	return close(file->fd);
-}
-
-i32 _file_rename(Str8RO *old_filepath, Str8RO *new_filepath) {
-	wapp_persist c8 old_tmp[WAPP_PATH_MAX] = {0};
-	wapp_persist c8 new_tmp[WAPP_PATH_MAX] = {0};
-	memset(old_tmp, 0, WAPP_PATH_MAX);
-	memcpy(old_tmp, old_filepath->buf, old_filepath->size);
-	memset(new_tmp, 0, WAPP_PATH_MAX);
-	memcpy(new_tmp, new_filepath->buf, new_filepath->size);
-
-	i32 link_result = link((const char *)old_tmp, (const char *)new_tmp);
-	if (link_result == 0) {
-		_file_remove(old_filepath);
-	}
-
-	return link_result;
-}
-
-i32 _file_remove(Str8RO *filepath) {
-	wapp_persist c8 tmp[WAPP_PATH_MAX] = {0};
-	memset(tmp, 0, WAPP_PATH_MAX);
-	memcpy(tmp, filepath->buf, filepath->size);
-
-	return unlink((const char *)tmp);
-}
-
-#endif // !WAPP_PLATFORM_POSIX

src/os/file/posix/file_posix.h

@@ -1,27 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef FILE_POSIX_H
-#define FILE_POSIX_H
-
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#ifdef WAPP_PLATFORM_POSIX
-
-#define END_OF_LINE "\n"
-
-struct WFile {
-	i32 fd;
-};
-
-#endif // !WAPP_PLATFORM_POSIX
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !FILE_POSIX_H

src/os/file/win/file_win.c

@@ -1,159 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "file_win.h"
-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_WINDOWS
-
-#include "../file.h"
-#include "../../cpath/cpath.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../base/array/array.h"
-#include "../../../base/strings/str8/str8.h"
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#include <fileapi.h>
-#include <intsafe.h>
-
-wapp_intern DWORD file_accesses[FILE_ACCESS_MODE_COUNT] = {
-	[WAPP_ACCESS_READ]                       = FILE_READ_DATA,
-	[WAPP_ACCESS_WRITE]                      = FILE_WRITE_DATA,
-	[WAPP_ACCESS_APPEND]                     = FILE_APPEND_DATA,
-	[WAPP_ACCESS_READ_EX]                    = FILE_READ_DATA | FILE_WRITE_DATA,
-	[WAPP_ACCESS_WRITE_EX]                   = FILE_READ_DATA | FILE_WRITE_DATA,
-	[WAPP_ACCESS_APPEND_EX]                  = FILE_READ_DATA | FILE_APPEND_DATA,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST]        = FILE_WRITE_DATA,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = FILE_READ_DATA | FILE_WRITE_DATA,
-};
-
-wapp_intern DWORD creation_dispositions[FILE_ACCESS_MODE_COUNT] = {
-	[WAPP_ACCESS_READ]                       = OPEN_EXISTING,
-	[WAPP_ACCESS_WRITE]                      = CREATE_ALWAYS,
-	[WAPP_ACCESS_APPEND]                     = OPEN_ALWAYS,
-	[WAPP_ACCESS_READ_EX]                    = OPEN_EXISTING,
-	[WAPP_ACCESS_WRITE_EX]                   = CREATE_ALWAYS,
-	[WAPP_ACCESS_APPEND_EX]                  = OPEN_ALWAYS,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST]        = CREATE_NEW,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = CREATE_NEW,
-};
-
-wapp_intern DWORD sharing_modes[FILE_ACCESS_MODE_COUNT] = {
-	[WAPP_ACCESS_READ]                       = FILE_SHARE_READ | FILE_SHARE_WRITE,
-	[WAPP_ACCESS_WRITE]                      = FILE_SHARE_READ,
-	[WAPP_ACCESS_APPEND]                     = FILE_SHARE_READ,
-	[WAPP_ACCESS_READ_EX]                    = FILE_SHARE_READ | FILE_SHARE_WRITE,
-	[WAPP_ACCESS_WRITE_EX]                   = FILE_SHARE_READ,
-	[WAPP_ACCESS_APPEND_EX]                  = FILE_SHARE_READ,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST]        = FILE_SHARE_READ,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = FILE_SHARE_READ,
-};
-
-wapp_intern DWORD file_seek_origins[FILE_SEEK_ORIGIN_COUNT] = {
-	[WAPP_SEEK_START]   = FILE_BEGIN,
-	[WAPP_SEEK_CURRENT] = FILE_CURRENT,
-	[WAPP_SEEK_END]     = FILE_END,
-};
-
-WFile *_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode) {
-	wapp_persist c8 tmp[WAPP_PATH_MAX] = {0};
-	memset(tmp, 0, WAPP_PATH_MAX);
-	memcpy(tmp, filepath->buf, filepath->size);
-
-	HANDLE fh = CreateFileA((LPCSTR)tmp,
-	                        file_accesses[mode],
-	                        sharing_modes[mode],
-	                        NULL,
-	                        creation_dispositions[mode],
-	                        FILE_ATTRIBUTE_NORMAL,
-	                        NULL);
-	if (fh == INVALID_HANDLE_VALUE) {
-		return NULL;
-	}
-
-	WFile *output = wapp_mem_allocator_alloc(allocator, sizeof(WFile));
-	if (output) {
-		output->fh = fh;
-	}
-
-	return output;
-}
-
-i64 _file_seek(WFile *file, i64 offset, FileSeekOrigin origin) {
-	LARGE_INTEGER distance = {0};
-	LARGE_INTEGER output   = {0};
-
-	distance.QuadPart = offset;
-
-	if (!SetFilePointerEx(file->fh, distance, &output, file_seek_origins[origin])) {
-		return -1;
-	}
-
-	return output.QuadPart;
-}
-
-u64 _file_read(void* dst_buf, u64 byte_count, WFile* file, u64 file_length) {
-	u64 copy_byte_count = file_length <= byte_count ? file_length : byte_count;
-	wapp_debug_assert(copy_byte_count <= DWORD_MAX, "Attempting to read large number of bytes at once");
-
-	DWORD read_count = 0;
-	if (!ReadFile(file->fh, dst_buf, (DWORD)copy_byte_count, &read_count, NULL)) {
-		return 0;
-	}
-
-	return (u64)read_count;
-}
-
-i64 _file_write(const void *src_buf, WFile *file, u64 byte_count) {
-	wapp_debug_assert(byte_count <= DWORD_MAX, "Attempting to write large number of bytes at once");
-
-	DWORD write_count = 0;
-	if (!WriteFile(file->fh, src_buf, (DWORD)byte_count, &write_count, NULL)) {
-		return 0;
-	}
-	return (i64)write_count;
-}
-
-i32 _file_flush(WFile *file) {
-	if (!FlushFileBuffers(file->fh)) {
-		return -1;
-	}
-
-	return 0;
-}
-
-i32 _file_close(WFile *file) {
-	if (!CloseHandle(file->fh)) {
-		return -1;
-	}
-
-	return 0;
-}
-
-i32 _file_rename(Str8RO *old_filepath, Str8RO *new_filepath) {
-	wapp_persist c8 old_tmp[WAPP_PATH_MAX] = {0};
-	wapp_persist c8 new_tmp[WAPP_PATH_MAX] = {0};
-	memset(old_tmp, 0, WAPP_PATH_MAX);
-	memcpy(old_tmp, old_filepath->buf, old_filepath->size);
-	memset(new_tmp, 0, WAPP_PATH_MAX);
-	memcpy(new_tmp, new_filepath->buf, new_filepath->size);
-
-	if (!MoveFile((LPCSTR)old_tmp, (LPCSTR)new_tmp)) {
-		return -1;
-	}
-
-	return 0;
-}
-
-i32 _file_remove(Str8RO *filepath) {
-	wapp_persist c8 tmp[WAPP_PATH_MAX] = {0};
-	memset(tmp, 0, WAPP_PATH_MAX);
-	memcpy(tmp, filepath->buf, filepath->size);
-
-	if (!DeleteFile((LPCSTR)tmp)) {
-		return -1;
-	}
-
-	return 0;
-}
-
-#endif // !WAPP_PLATFORM_WINDOWS

src/os/file/win/file_win.h

@@ -1,31 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef FILE_WIN_H
-#define FILE_WIN_H
-
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#ifdef WAPP_PLATFORM_WINDOWS
-
-#define END_OF_LINE "\r\n"
-
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#include <fileapi.h>
-
-struct WFile {
-	HANDLE fh;
-};
-
-#endif // !WAPP_PLATFORM_WINDOWS
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !FILE_WIN_H

src/os/mem/mem_os.c

@@ -15,8 +15,8 @@
 #error "Unrecognised platform"
 #endif
 
-void *wapp_os_mem_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
+void *wapp_mem_util_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
-	void *output = os_mem_allocate(addr, size, access, flags, type);
+  void *output = mem_util_allocate(addr, size, access, flags, type);
 
   if (type == WAPP_MEM_INIT_INITIALISED) {
     memset(output, 0, size);
@@ -25,6 +25,6 @@ void *wapp_os_mem_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags fl
   return output;
 }
 
-void wapp_os_mem_free(void *ptr, u64 size) {
+void wapp_mem_util_free(void *ptr, u64 size) {
-	os_mem_free(ptr, size);
+  mem_util_free(ptr, size);
 }

src/os/mem/mem_os.h

@@ -20,11 +20,11 @@ BEGIN_C_LINKAGE
 #error "Unrecognised platform"
 #endif
 
-void *wapp_os_mem_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
+void *wapp_mem_util_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
-void wapp_os_mem_free(void *ptr, u64 size);
+void wapp_mem_util_free(void *ptr, u64 size);
 
-wapp_extern void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
+wapp_extern void *mem_util_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
-wapp_extern void os_mem_free(void *ptr, u64 size);
+wapp_extern void mem_util_free(void *ptr, u64 size);
 
 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE

src/os/mem/posix/mem_os_posix.c

@@ -18,7 +18,7 @@ wapp_intern const i32 access_types[] = {
     [WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PROT_READ | PROT_WRITE | PROT_EXEC,
 };
 
-void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
+void *mem_util_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
   (void)type;
   i32 alloc_flags = flags | MAP_ANON | MAP_PRIVATE;
 
@@ -29,7 +29,7 @@ void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flag
   return mmap(addr, size, access_types[access], alloc_flags, -1, 0);
 }
 
-void os_mem_free(void *ptr, u64 size) {
+void mem_util_free(void *ptr, u64 size) {
   munmap(ptr, size);
 }
 

src/os/mem/win/mem_os_win.c

@@ -21,7 +21,7 @@ wapp_intern const i32 access_types[] = {
     [WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PAGE_EXECUTE_READWRITE,
 };
 
-void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
+void *mem_util_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
   // Ensure memory is committed if it's meant to be initialised
   if (type == WAPP_MEM_INIT_INITIALISED) {
     flags |= WAPP_MEM_ALLOC_COMMIT;
@@ -30,7 +30,7 @@ void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flag
   return VirtualAlloc(addr, (SIZE_T)size, flags, access_types[access]);
 }
 
-void os_mem_free(void *ptr, u64 size) {
+void mem_util_free(void *ptr, u64 size) {
   VirtualFree(ptr, size, MEM_RELEASE);
 }
 

src/os/shell/commander/commander.c

@@ -17,8 +17,8 @@
 #define CMD_BUF_LEN 8192
 #define OUT_BUF_LEN 4096
 
-wapp_intern CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf);
+wapp_intern inline CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf);
-wapp_intern CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf);
+wapp_intern inline CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf);
 
 CMDResult wapp_shell_commander_execute(CMDOutHandling out_handling, Str8 *out_buf, const Str8List *cmd) {
   if (!cmd) {
@@ -43,7 +43,7 @@ CMDResult wapp_shell_commander_execute(CMDOutHandling out_handling, Str8 *out_bu
   return output;
 }
 
-wapp_intern CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf) {
+wapp_intern inline CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf) {
   char cmd_buf[CMD_BUF_LEN] = {0};
   wapp_str8_copy_to_cstr(cmd_buf, cmd, CMD_BUF_LEN);
 
@@ -83,7 +83,7 @@ EXECUTE_COMMAND_CLOSE:
   return output;
 }
 
-wapp_intern CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf) {
+wapp_intern inline CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf) {
   Str8 out = wapp_str8_buf(OUT_BUF_LEN);
 
   out.size = fread((void *)out.buf, sizeof(u8), out.capacity, fp);

src/os/shell/commander/commander_output.h

@@ -5,7 +5,6 @@
 
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/platform/platform.h"
-#include "../../../common/misc/misc_utils.h"
 
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
@@ -26,13 +25,16 @@ typedef enum {
   SHELL_ERR_PROC_EXIT_FAIL,
 } CMDError;
 
-typedef struct CMDResult CMDResult;
+typedef struct commander_result CMDResult;
-struct CMDResult {
+struct commander_result {
   i32 exit_code;
   CMDError error;
   b8 exited;
 
-	wapp_misc_utils_reserve_padding(sizeof(b8) + sizeof(i32) + sizeof(CMDError));
+#ifdef WAPP_PLATFORM_WINDOWS
+  #include "../../../../common/misc/misc_utils.h"
+  wapp_misc_utils_padding_size(sizeof(b8) + sizeof(i32) + sizeof(CMDError));
+#endif // !WAPP_PLATFORM_WINDOWS
 };
 
 #ifdef WAPP_PLATFORM_CPP

src/os/shell/termcolour/win/termcolour_win.c

@@ -7,19 +7,19 @@
 #ifdef WAPP_PLATFORM_WINDOWS
 
 #include "../terminal_colours.h"
-#include "../../../../common/misc/misc_utils.h"
+#include "../../../../../common/misc/misc_utils.h"
 #include <stdio.h>
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
-typedef struct TermcolourData TermcolourData;
+typedef struct termcolour_data TermcolourData;
-struct TermcolourData {
+struct termcolour_data {
   HANDLE handle;
   WORD   default_colour;
   WORD   current_colour;
 
-	wapp_misc_utils_reserve_padding(sizeof(HANDLE) + sizeof(WORD) + sizeof(WORD));
+  wapp_misc_utils_padding_size(sizeof(HANDLE) + sizeof(WORD) + sizeof(WORD));
 };
 
 wapp_intern void init_data(TermcolourData *data);

src/os/wapp_os.c

@@ -5,8 +5,6 @@
 
 #include "wapp_os.h"
 #include "file/file.c"
-#include "file/posix/file_posix.c"
-#include "file/win/file_win.c"
 #include "shell/termcolour/posix/termcolour_posix.c"
 #include "shell/termcolour/win/termcolour_win.c"
 #include "shell/termcolour/termcolour.c"

src/os/wapp_os.h

@@ -4,8 +4,6 @@
 #define WAPP_CORE_H
 
 #include "file/file.h"
-#include "file/posix/file_posix.h"
-#include "file/win/file_win.h"
 #include "shell/termcolour/termcolour.h"
 #include "shell/termcolour/terminal_colours.h"
 #include "shell/commander/commander.h"

src/prng/xorshift/xorshift.c

@@ -7,8 +7,8 @@
 #include <stdlib.h>
 #include <time.h>
 
-typedef struct SplitMix64State SplitMix64State;
+typedef struct split_mix_64_state SplitMix64State;
-struct SplitMix64State {
+struct split_mix_64_state {
   u64 seed;
 };
 

src/prng/xorshift/xorshift.h

@@ -10,8 +10,8 @@
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP
 
-typedef struct XOR256State XOR256State;
+typedef struct xor_256_state XOR256State;
-struct XOR256State {
+struct xor_256_state {
   u64 x;
   u64 y;
   u64 z;

src/testing/tester/tester.h

@@ -10,19 +10,21 @@
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
 
-#define wapp_tester_result(PASSED) (TestFuncResult{wapp_str8_lit_ro(__func__), PASSED, {}})
+#define wapp_tester_result(PASSED) (TestFuncResult{wapp_str8_lit_ro(__func__), PASSED})
 #else
 #define wapp_tester_result(PASSED) ((TestFuncResult){.name = wapp_str8_lit_ro(__func__), .passed = PASSED})
 #endif // !WAPP_PLATFORM_CPP
 
 #define wapp_tester_run_tests(...) run_tests(__VA_ARGS__, NULL)
 
-typedef struct TestFuncResult TestFuncResult;
+typedef struct test_func_result TestFuncResult;
-struct TestFuncResult {
+struct test_func_result {
   Str8 name;
   b8 passed;
 
-	wapp_misc_utils_reserve_padding(sizeof(Str8) + sizeof(b8));
+#ifdef WAPP_PLATFORM_WINDOWS
+  wapp_misc_utils_padding_size(sizeof(Str8RO) + sizeof(b8));
+#endif // WAPP_PLATFORM_WINDOWS
 };
 
 typedef TestFuncResult(TestFunc)(void);

src/uuid/uuid.c

@@ -9,8 +9,8 @@
 
 #define UUID_STR_FORMAT ("%.8" PRIx64 "-%.4" PRIx64 "-%.4" PRIx64 "-%.4" PRIx64 "-%.12" PRIx64)
 
-typedef struct UUID4 UUID4;
+typedef struct uuid4 UUID4;
-struct UUID4 {
+struct uuid4 {
 	u64 high;
 	u64 low;
 };

src/uuid/uuid.h

@@ -15,8 +15,8 @@ BEGIN_C_LINKAGE
 #define WAPP_UUID_SPEC WAPP_STR8_SPEC
 #define wapp_uuid_varg(WUUID) wapp_str8_varg((WUUID).uuid)
 
-typedef struct WUUID WUUID;
+typedef struct wapp_uuid WUUID;
-struct WUUID {
+struct wapp_uuid {
 	Str8 uuid;
 };
 

tests/allocator/test_allocator.c

@@ -2,13 +2,6 @@
 #include "wapp.h"
 #include <stdlib.h>
 
-// NOTE (Abdelrahman): Cannot query size of Arena here so it's hardcoded. Similarly, since arena
-// allocation are aligned to power of 2 boundaries, the number of i32 values needed is hardcoded.
-#define TEMP_BUF_SIZE (40 + sizeof(i32) * 8)
-
-wapp_intern u8 temp_buf[TEMP_BUF_SIZE] = {0};
-wapp_intern Allocator temp_allocator   = {0};
-
 TestFuncResult test_arena_allocator(void) {
   Allocator allocator = wapp_mem_arena_allocator_init(4096);
   b8 result          = allocator.obj != NULL && allocator.alloc != NULL &&
@@ -22,46 +15,3 @@ TestFuncResult test_arena_allocator(void) {
 
   return wapp_tester_result(result);
 }
-
-TestFuncResult test_arena_allocator_with_buffer(void) {
-	u8 buffer[KiB(4)] = {0};
-
-	Allocator allocator = wapp_mem_arena_allocator_init_with_buffer(buffer, KiB(4));
-	b8 result           = allocator.obj != NULL && allocator.alloc != NULL &&
-	                      allocator.alloc_aligned != NULL &&
-	                      allocator.realloc != NULL && allocator.realloc_aligned != NULL &&
-	                      allocator.free == NULL;
-	void *ptr           = wapp_mem_allocator_alloc(&allocator, 20);
-	result              = result && (ptr != NULL);
-
-	wapp_mem_arena_allocator_destroy(&allocator);
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_allocator_temp_begin(void) {
-	temp_allocator = wapp_mem_arena_allocator_init_with_buffer(temp_buf, TEMP_BUF_SIZE);
-
-	i32 *num1 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	b8 result = num1 != NULL;
-
-	wapp_mem_arena_allocator_temp_begin(&temp_allocator);
-	i32 *num2 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	result    = result && num2 != NULL;
-	i32 *num3 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	result    = result && num3 == NULL;
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_allocator_temp_end(void) {
-	wapp_mem_arena_allocator_temp_end(&temp_allocator);
-	i32 *num1 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	b8 result = num1 != NULL;
-	i32 *num2 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	result    = result && num2 == NULL;
-
-	wapp_mem_arena_allocator_destroy(&temp_allocator);
-
-	return wapp_tester_result(result);
-}

tests/allocator/test_allocator.cc

@@ -2,13 +2,6 @@
 #include "wapp.h"
 #include <stdlib.h>
 
-// NOTE (Abdelrahman): Cannot query size of Arena here so it's hardcoded. Similarly, since arena
-// allocation are aligned to power of 2 boundaries, the number of i32 values needed is hardcoded.
-#define TEMP_BUF_SIZE (40 + sizeof(i32) * 8)
-
-wapp_intern u8 temp_buf[TEMP_BUF_SIZE] = {};
-wapp_intern Allocator temp_allocator   = {};
-
 TestFuncResult test_arena_allocator(void) {
   Allocator allocator = wapp_mem_arena_allocator_init(4096);
   b8 result          = allocator.obj != nullptr && allocator.alloc != nullptr &&
@@ -22,46 +15,3 @@ TestFuncResult test_arena_allocator(void) {
 
   return wapp_tester_result(result);
 }
-
-TestFuncResult test_arena_allocator_with_buffer(void) {
-	u8 buffer[KiB(4)] = {0};
-
-	Allocator allocator = wapp_mem_arena_allocator_init_with_buffer(buffer, KiB(4));
-	b8 result           = allocator.obj != NULL && allocator.alloc != NULL &&
-	                      allocator.alloc_aligned != NULL &&
-	                      allocator.realloc != NULL && allocator.realloc_aligned != NULL &&
-	                      allocator.free == NULL;
-	void *ptr           = wapp_mem_allocator_alloc(&allocator, 20);
-	result              = result && (ptr != NULL);
-
-	wapp_mem_arena_allocator_destroy(&allocator);
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_allocator_temp_begin(void) {
-	temp_allocator = wapp_mem_arena_allocator_init_with_buffer(temp_buf, TEMP_BUF_SIZE);
-
-	i32 *num1 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	b8 result = num1 != NULL;
-
-	wapp_mem_arena_allocator_temp_begin(&temp_allocator);
-	i32 *num2 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	result    = result && num2 != NULL;
-	i32 *num3 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	result    = result && num3 == NULL;
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_allocator_temp_end(void) {
-	wapp_mem_arena_allocator_temp_end(&temp_allocator);
-	i32 *num1 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	b8 result = num1 != NULL;
-	i32 *num2 = (i32 *)wapp_mem_allocator_alloc(&temp_allocator, sizeof(i32));
-	result    = result && num2 == NULL;
-
-	wapp_mem_arena_allocator_destroy(&temp_allocator);
-
-	return wapp_tester_result(result);
-}

tests/allocator/test_allocator.h

@@ -4,8 +4,5 @@
 #include "wapp.h"
 
 TestFuncResult test_arena_allocator(void);
-TestFuncResult test_arena_allocator_with_buffer(void);
-TestFuncResult test_arena_allocator_temp_begin(void);
-TestFuncResult test_arena_allocator_temp_end(void);
 
 #endif // !TEST_ALLOCATOR_H

tests/arena/test_arena.c

@@ -3,26 +3,13 @@
 #include <stdlib.h>
 
 #define ARENA_CAPACITY KiB(16)
-#define ARENA_BUF_SIZE KiB(4)
-// NOTE (Abdelrahman): Cannot query size of Arena here so it's hardcoded. Similarly, since arena
-// allocation are aligned to power of 2 boundaries, the number of i32 values needed is hardcoded.
-#define TEMP_BUF_SIZE (40 + sizeof(i32) * 8)
 
 wapp_intern Arena *arena = NULL;
 wapp_intern i32 count    = 20;
 wapp_intern i32 *array   = NULL;
-wapp_intern Arena *buf_arena           = NULL;
-wapp_intern u8 buf[ARENA_BUF_SIZE]     = {0};
-wapp_intern Arena *temp_arena          = NULL;
-wapp_intern u8 temp_buf[TEMP_BUF_SIZE] = {0};
 
-TestFuncResult test_arena_init_buffer(void) {
+TestFuncResult test_arena_init(void) {
-	b8 result = wapp_mem_arena_init_buffer(&buf_arena, buf, ARENA_BUF_SIZE);
+  b8 result = wapp_mem_arena_init(&arena, ARENA_CAPACITY);
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_init_allocated(void) {
-	b8 result = wapp_mem_arena_init_allocated(&arena, ARENA_CAPACITY);
 
   return wapp_tester_result(result);
 }
@@ -30,7 +17,7 @@ TestFuncResult test_arena_init_allocated(void) {
 TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {
   Arena *large_arena = NULL;
   u64 capacity       = GiB(512);
-	b8 result          = wapp_mem_arena_init_allocated(&large_arena, capacity);
+  b8 result         = wapp_mem_arena_init(&large_arena, capacity);
   if (result) {
     wapp_mem_arena_destroy(&large_arena);
   }
@@ -38,17 +25,6 @@ TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {
   return wapp_tester_result(result);
 }
 
-TestFuncResult test_arena_alloc_with_buffer(void) {
-	i32 *arr  = (i32 *)wapp_mem_arena_alloc(arena, count * sizeof(i32));
-	b8 result = arr != NULL;
-
-	for (i32 i = 0; i < count; ++i) {
-		arr[i] = i * 10;
-	}
-
-	return wapp_tester_result(result);
-}
-
 TestFuncResult test_arena_alloc_succeeds_when_within_capacity(void) {
   array       = wapp_mem_arena_alloc(arena, count * sizeof(i32));
   b8 result  = array != NULL;
@@ -113,32 +89,6 @@ TestFuncResult test_arena_realloc_smaller_size(void) {
   return wapp_tester_result(true);
 }
 
-TestFuncResult test_arena_temp_begin(void) {
-	b8 result = wapp_mem_arena_init_buffer(&temp_arena, temp_buf, TEMP_BUF_SIZE);
-	i32 *num1 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num1 != NULL;
-
-	wapp_mem_arena_temp_begin(temp_arena);
-	i32 *num2 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num2 != NULL;
-	i32 *num3 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num3 == NULL;
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_temp_end(void) {
-	wapp_mem_arena_temp_end(temp_arena);
-	i32 *num1 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	b8 result = num1 != NULL;
-	i32 *num2 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num2 == NULL;
-
-	wapp_mem_arena_destroy(&temp_arena);
-
-	return wapp_tester_result(result);
-}
-
 TestFuncResult test_arena_clear(void) {
   wapp_mem_arena_clear(arena);
   b8 result = true;
@@ -153,14 +103,7 @@ TestFuncResult test_arena_clear(void) {
   return wapp_tester_result(result);
 }
 
-TestFuncResult test_arena_destroy_buffer(void) {
+TestFuncResult test_arena_destroy(void) {
-	wapp_mem_arena_destroy(&buf_arena);
-	b8 result = buf_arena == NULL;
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_destroy_allocated(void) {
   wapp_mem_arena_destroy(&arena);
   b8 result = arena == NULL;
 

tests/arena/test_arena.cc

@@ -3,26 +3,13 @@
 #include <stdlib.h>
 
 #define ARENA_CAPACITY KiB(16)
-#define ARENA_BUF_SIZE KiB(4)
-// NOTE (Abdelrahman): Cannot query size of Arena here so it's hardcoded. Similarly, since arena
-// allocation are aligned to power of 2 boundaries, the number of i32 values needed is hardcoded.
-#define TEMP_BUF_SIZE (40 + sizeof(i32) * 8)
 
-wapp_intern Arena *arena               = NULL;
+wapp_intern Arena *arena = nullptr;
 wapp_intern i32 count    = 20;
-wapp_intern i32 *array                 = NULL;
+wapp_intern i32 *array   = nullptr;
-wapp_intern Arena *buf_arena           = NULL;
-wapp_intern u8 buf[ARENA_BUF_SIZE]     = {};
-wapp_intern Arena *temp_arena          = NULL;
-wapp_intern u8 temp_buf[TEMP_BUF_SIZE] = {};
 
-TestFuncResult test_arena_init_buffer(void) {
+TestFuncResult test_arena_init(void) {
-	b8 result = wapp_mem_arena_init_buffer(&buf_arena, buf, ARENA_BUF_SIZE);
+  b8 result = wapp_mem_arena_init(&arena, ARENA_CAPACITY);
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_init_allocated(void) {
-	b8 result = wapp_mem_arena_init_allocated(&arena, ARENA_CAPACITY);
 
   return wapp_tester_result(result);
 }
@@ -30,7 +17,7 @@ TestFuncResult test_arena_init_allocated(void) {
 TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {
   Arena *large_arena = nullptr;
   u64 capacity       = GiB(512);
-	b8 result          = wapp_mem_arena_init_allocated(&large_arena, capacity);
+  b8 result         = wapp_mem_arena_init(&large_arena, capacity);
   if (result) {
     wapp_mem_arena_destroy(&large_arena);
   }
@@ -38,17 +25,6 @@ TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {
   return wapp_tester_result(result);
 }
 
-TestFuncResult test_arena_alloc_with_buffer(void) {
-	i32 *arr  = (i32 *)wapp_mem_arena_alloc(arena, count * sizeof(i32));
-	b8 result = arr != NULL;
-
-	for (i32 i = 0; i < count; ++i) {
-		arr[i] = i * 10;
-	}
-
-	return wapp_tester_result(result);
-}
-
 TestFuncResult test_arena_alloc_succeeds_when_within_capacity(void) {
   array       = (i32 *)wapp_mem_arena_alloc(arena, count * sizeof(i32));
   b8 result  = array != nullptr;
@@ -113,32 +89,6 @@ TestFuncResult test_arena_realloc_smaller_size(void) {
   return wapp_tester_result(true);
 }
 
-TestFuncResult test_arena_temp_begin(void) {
-	b8 result = wapp_mem_arena_init_buffer(&temp_arena, temp_buf, TEMP_BUF_SIZE);
-	i32 *num1 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num1 != NULL;
-
-	wapp_mem_arena_temp_begin(temp_arena);
-	i32 *num2 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num2 != NULL;
-	i32 *num3 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num3 == NULL;
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_temp_end(void) {
-	wapp_mem_arena_temp_end(temp_arena);
-	i32 *num1 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	b8 result = num1 != NULL;
-	i32 *num2 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
-	result    = result && num2 == NULL;
-
-	wapp_mem_arena_destroy(&temp_arena);
-
-	return wapp_tester_result(result);
-}
-
 TestFuncResult test_arena_clear(void) {
   wapp_mem_arena_clear(arena);
   b8 result = true;
@@ -153,14 +103,7 @@ TestFuncResult test_arena_clear(void) {
   return wapp_tester_result(result);
 }
 
-TestFuncResult test_arena_destroy_buffer(void) {
+TestFuncResult test_arena_destroy(void) {
-	wapp_mem_arena_destroy(&buf_arena);
-	b8 result = buf_arena == NULL;
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_destroy_allocated(void) {
   wapp_mem_arena_destroy(&arena);
   b8 result = arena == nullptr;
 

tests/arena/test_arena.h

@@ -3,18 +3,13 @@
 
 #include "wapp.h"
 
-TestFuncResult test_arena_init_buffer(void);
+TestFuncResult test_arena_init(void);
-TestFuncResult test_arena_init_allocated(void);
 TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void);
-TestFuncResult test_arena_alloc_with_buffer(void);
 TestFuncResult test_arena_alloc_succeeds_when_within_capacity(void);
 TestFuncResult test_arena_alloc_fails_when_over_capacity(void);
 TestFuncResult test_arena_realloc_bigger_size(void);
 TestFuncResult test_arena_realloc_smaller_size(void);
 TestFuncResult test_arena_clear(void);
-TestFuncResult test_arena_temp_begin(void);
+TestFuncResult test_arena_destroy(void);
-TestFuncResult test_arena_temp_end(void);
-TestFuncResult test_arena_destroy_buffer(void);
-TestFuncResult test_arena_destroy_allocated(void);
 
 #endif // !TEST_ARENA_H

tests/array/test_i32_array.c

@@ -4,15 +4,15 @@
 TestFuncResult test_i32_array(void) {
   b8 result;
 
-	I32Array array = wapp_array(i32, 1, 2, 3, 4, 5, 6, 7);
+  I32Array array = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7);
-	result = wapp_array_count(array) == 7 && wapp_array_capacity(array) == 16;
+  result = array.count == 7 && array.capacity == 16;
 
   i32 *item;
-	u64 count  = wapp_array_count(array);
+  u64 count   = array.count;
   u64 index   = 0;
   b8 running  = true;
   while (running) {
-		item   = wapp_array_get(i32, array, index);
+      item   = wapp_array_get(i32, &array, index);
       result = result && item && *item == (i32)(index + 1);
 
       ++index;
@@ -25,11 +25,11 @@ TestFuncResult test_i32_array(void) {
 TestFuncResult test_i32_array_with_capacity(void) {
   b8 result;
 
-	I32Array array1 = wapp_array_with_capacity(i32, 64, ARRAY_INIT_NONE);
+  I32Array array1 = wapp_array_with_capacity(i32, I32Array, 64, false);
-	result = wapp_array_count(array1) == 0 && wapp_array_capacity(array1) == 64;
+  result = array1.count == 0 && array1.capacity == 64;
 
-	I32Array array2 = wapp_array_with_capacity(i32, 64, ARRAY_INIT_FILLED);
+  I32Array array2 = wapp_array_with_capacity(i32, I32Array, 64, true);
-	result = wapp_array_count(array2) == 64 && wapp_array_capacity(array2) == 64;
+  result = array2.count == 64 && array2.capacity == 64;
 
   return wapp_tester_result(result);
 }
@@ -37,14 +37,14 @@ TestFuncResult test_i32_array_with_capacity(void) {
 TestFuncResult test_i32_array_get(void) {
   b8 result = true;
 
-	I32Array array = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
 
   i32 *item;
-	u64 count  = wapp_array_count(array);
+  u64 count   = array.count;
   u64 index   = 0;
   b8 running  = true;
   while (running) {
-		item   = wapp_array_get(i32, array, index);
+    item   = wapp_array_get(i32, &array, index);
     result = result && item && *item == (i32)index;
 
     ++index;
@@ -57,16 +57,16 @@ TestFuncResult test_i32_array_get(void) {
 TestFuncResult test_i32_array_set(void) {
   b8 result = true;
 
-	I32Array array = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
 
   i32 *item;
-	u64 count  = wapp_array_count(array);
+  u64 count   = array.count;
   u64 index   = 0;
   b8 running  = true;
   while (running) {
     i32 num = (i32)(index * 2);
-		wapp_array_set(i32, array, index, &num);
+    wapp_array_set(i32, &array, index, &num);
-		item   = wapp_array_get(i32, array, index);
+    item   = wapp_array_get(i32, &array, index);
     result = result && item && *item == (i32)(index * 2);
 
     ++index;
@@ -79,17 +79,17 @@ TestFuncResult test_i32_array_set(void) {
 TestFuncResult test_i32_array_append_capped(void) {
   b8 result;
 
-	I32Array array = wapp_array_with_capacity(i32, 64, ARRAY_INIT_NONE);
+  I32Array array = wapp_array_with_capacity(i32, I32Array, 64, false);
-	wapp_array_append_capped(i32, array, &((i32){10}));
+  wapp_array_append_capped(i32, &array, &((i32){10}));
 
-	result    = wapp_array_count(array) == 1;
+  result    = array.count == 1;
-	i32 *item = wapp_array_get(i32, array, 0);
+  i32 *item = wapp_array_get(i32, &array, 0);
   result = result && item && *item == 10;
 
-	array = wapp_array(i32, 1);
+  array = wapp_array(i32, I32Array, 1);
-	wapp_array_append_capped(i32, array, &((i32){10}));
+  wapp_array_append_capped(i32, &array, &((i32){10}));
 
-	result = result && wapp_array_count(array) == 2;
+  result = result && array.count == 2;
 
   return wapp_tester_result(result);
 }
@@ -97,14 +97,14 @@ TestFuncResult test_i32_array_append_capped(void) {
 TestFuncResult test_i32_array_extend_capped(void) {
   b8 result;
 
-	I32Array array1 = wapp_array(i32, 1, 2, 3, 4);
+  I32Array array1 = wapp_array(i32, I32Array, 1, 2, 3, 4);
-	I32Array array2 = wapp_array(i32, 10, 20);
+  I32Array array2 = wapp_array(i32, I32Array, 10, 20);
 
-	result = wapp_array_count(array1) == 4 && wapp_array_count(array2) == 2;
+  result = array1.count == 4 && array2.count == 2;
 
-	wapp_array_extend_capped(i32, array1, array2);
+  wapp_array_extend_capped(i32, &array1, &array2);
 
-	result = result && wapp_array_count(array1) == 6;
+  result = result && array1.count == 6;
 
   return wapp_tester_result(result);
 }
@@ -112,31 +112,31 @@ TestFuncResult test_i32_array_extend_capped(void) {
 TestFuncResult test_i32_array_copy_capped(void) {
   b8 result;
 
-	I32Array src  = wapp_array(i32, 1, 2, 3, 4, 5);
+  I32Array src  = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
-	I32Array dst1 = wapp_array(i32, 1, 2, 3, 4, 5, 6);
+  I32Array dst1 = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
-	I32Array dst2 = wapp_array(i32, 1, 2);
+  I32Array dst2 = wapp_array(i32, I32Array, 1, 2);
 
   u64 expected_count = 5;
-	wapp_array_copy_capped(i32, dst1, src);
+  wapp_array_copy_capped(i32, &dst1, &src);
-	result = wapp_array_count(dst1) == expected_count;
+  result = dst1.count == expected_count;
 
   u64 index    = 0;
   b8 running  = true;
   while (running) {
-		result = result && *wapp_array_get(i32, src, index) == *wapp_array_get(i32, dst1, index);
+    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst1, index);
 
     ++index;
     running = index < expected_count;
   }
 
   expected_count = 4;
-	wapp_array_copy_capped(i32, dst2, src);
+  wapp_array_copy_capped(i32, &dst2, &src);
-	result = result && wapp_array_count(dst2) == expected_count;
+  result = result && dst2.count == expected_count;
 
   index   = 0;
   running = true;
   while (running) {
-		result = result && *wapp_array_get(i32, src, index) == *wapp_array_get(i32, dst2, index);
+    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst2, index);
 
     ++index;
     running = index < expected_count;
@@ -150,9 +150,9 @@ TestFuncResult test_i32_array_alloc_capacity(void) {
 
   Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
   u64 capacity        = 32;
-	I32Array array      = wapp_array_alloc_capacity(i32, &allocator, capacity, ARRAY_INIT_NONE);
+  I32Array *array     = wapp_array_alloc_capacity(i32, I32Array, &allocator, capacity, false);
 
-	result = array && wapp_array_capacity(array) == capacity;
+  result = array && array->capacity == capacity;
 
   wapp_mem_arena_allocator_destroy(&allocator);
 
@@ -163,23 +163,23 @@ TestFuncResult test_i32_array_append_alloc(void) {
   b8 result;
 
   Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-	I32Array array1     = wapp_array(i32, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
-	I32Array array2     = wapp_array(i32, 1, 2);
+  I32Array array2     = wapp_array(i32, I32Array, 1, 2);
 
-	I32Array arr_ptr = wapp_array_append_alloc(i32, &allocator, array1, &((i32){10}), ARRAY_INIT_NONE);
+  I32Array *arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array1, &((i32){10}));
-	result = arr_ptr == array1;
+  result = arr_ptr == &array1;
 
   u64 count    = 4;
   u64 index    = 0;
   b8 running  = true;
   while (running) {
     i32 num = (i32)index;
-		arr_ptr = wapp_array_append_alloc(i32, &allocator, array2, &num, ARRAY_INIT_NONE);
+    arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array2, &num);
 
     ++index;
     running = index < count;
   }
-	result = result && arr_ptr != array2;
+  result = result && arr_ptr != &array2;
 
   wapp_mem_arena_allocator_destroy(&allocator);
 
@@ -190,15 +190,15 @@ TestFuncResult test_i32_array_extend_alloc(void) {
   b8 result;
 
   Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-	I32Array array1     = wapp_array(i32, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
-	I32Array array2     = wapp_array(i32, 1, 2);
+  I32Array array2     = wapp_array(i32, I32Array, 1, 2);
-	I32Array array3     = wapp_array(i32, 1, 2, 3, 4);
+  I32Array array3     = wapp_array(i32, I32Array, 1, 2, 3, 4);
 
-	I32Array arr_ptr = wapp_array_extend_alloc(i32, &allocator, array1, array3, ARRAY_INIT_NONE);
+  I32Array *arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array1, &array3);
-	result = arr_ptr == array1;
+  result = arr_ptr == &array1;
 
-	arr_ptr = wapp_array_extend_alloc(i32, &allocator, array2, array3, ARRAY_INIT_NONE);
+  arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array2, &array3);
-	result  = result && arr_ptr != array2;
+  result  = result && arr_ptr != &array2;
 
   wapp_mem_arena_allocator_destroy(&allocator);
 
@@ -209,32 +209,32 @@ TestFuncResult test_i32_array_copy_alloc(void) {
   b8 result;
 
   Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-	I32Array src        = wapp_array(i32, 1, 2, 3, 4, 5);
+  I32Array src        = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
-	I32Array dst1       = wapp_array(i32, 1, 2, 3, 4, 5, 6);
+  I32Array dst1       = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
-	I32Array dst2       = wapp_array(i32, 1, 2);
+  I32Array dst2       = wapp_array(i32, I32Array, 1, 2);
-	I32Array array      = NULL;
+  I32Array *array_ptr = NULL;
 
   u64 expected_count = 5;
-	array = wapp_array_copy_alloc(i32, &allocator, dst1, src, ARRAY_INIT_NONE);
+  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst1, &src);
-	result = wapp_array_count(array) == expected_count && array == dst1;
+  result = array_ptr->count == expected_count && array_ptr == &dst1;
 
   u64 index    = 0;
   b8 running  = true;
   while (running) {
-		result = result && *wapp_array_get(i32, src, index) == *wapp_array_get(i32, array, index);
+    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index);
 
     ++index;
     running = index < expected_count;
   }
 
   expected_count = 5;
-	array          = wapp_array_copy_alloc(i32, &allocator, dst2, src, ARRAY_INIT_NONE);
+  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst2, &src);
-	result         = result && wapp_array_count(array) == expected_count && array != dst2;
+  result = result && array_ptr->count == expected_count && array_ptr != &dst2;
 
   index   = 0;
   running = true;
   while (running) {
-		result = result && *wapp_array_get(i32, src, index) == *wapp_array_get(i32, array, index);
+    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index);
 
     ++index;
     running = index < expected_count;
@@ -248,11 +248,11 @@ TestFuncResult test_i32_array_copy_alloc(void) {
 TestFuncResult test_i32_array_pop(void) {
   b8 result;
 
-	I32Array array1 = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array1 = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-	I32Array array2 = wapp_array_with_capacity(i32, 32, ARRAY_INIT_NONE);
+  I32Array array2 = wapp_array_with_capacity(i32, I32Array, 32, false);
 
-	i32 item1 = wapp_array_pop(i32, array1);
+  i32 item1 = wapp_array_pop(i32, &array1);
-	i32 item2 = wapp_array_pop(i32, array2);
+  i32 item2 = wapp_array_pop(i32, &array2);
 
   result = item1 == 8 && item2 == 0;
 
@@ -262,12 +262,12 @@ TestFuncResult test_i32_array_pop(void) {
 TestFuncResult test_i32_array_clear(void) {
   b8 result;
 
-	I32Array array = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-	result = wapp_array_count(array) == 9;
+  result = array.count == 9;
 
-	wapp_array_clear(i32, array);
+  wapp_array_clear(i32, &array);
 
-	result = result && wapp_array_count(array) == 0;
+  result = result && array.count == 0;
 
   return wapp_tester_result(result);
 }

tests/array/test_i32_array.cc

@@ -4,15 +4,15 @@
 TestFuncResult test_i32_array(void) {
   b8 result;
 
-	I32Array array = wapp_array(i32, 1, 2, 3, 4, 5, 6, 7);
+  I32Array array = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7);
-	result = wapp_array_count(array) == 7 && wapp_array_capacity(array) == 16;
+  result = array.count == 7 && array.capacity == 16;
 
   i32 *item;
-	u64 count  = wapp_array_count(array);
+  u64 count    = array.count;
   u64 index    = 0;
   b8 running  = true;
   while (running) {
-			item   = wapp_array_get(i32, array, index);
+      item   = wapp_array_get(i32, &array, index);
       result = result && item && (*item == (i32)(index + 1));
 
       ++index;
@@ -25,11 +25,11 @@ TestFuncResult test_i32_array(void) {
 TestFuncResult test_i32_array_with_capacity(void) {
   b8 result;
 
-	I32Array array1 = wapp_array_with_capacity(i32, 64, ARRAY_INIT_NONE);
+  I32Array array1 = wapp_array_with_capacity(i32, I32Array, 64, false);
-	result = wapp_array_count(array1) == 0 && wapp_array_capacity(array1) == 64;
+  result = array1.count == 0 && array1.capacity == 64;
 
-	I32Array array2 = wapp_array_with_capacity(i32, 64, ARRAY_INIT_FILLED);
+  I32Array array2 = wapp_array_with_capacity(i32, I32Array, 64, true);
-	result = wapp_array_count(array2) == 64 && wapp_array_capacity(array2) == 64;
+  result = array2.count == 64 && array2.capacity == 64;
 
   return wapp_tester_result(result);
 }
@@ -37,14 +37,14 @@ TestFuncResult test_i32_array_with_capacity(void) {
 TestFuncResult test_i32_array_get(void) {
   b8 result = true;
 
-	I32Array array = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
 
   i32 *item;
-	u64 count  = wapp_array_count(array);
+  u64 count    = array.count;
   u64 index    = 0;
   b8 running  = true;
   while (running) {
-		item   = wapp_array_get(i32, array, index);
+    item   = wapp_array_get(i32, &array, index);
     result = result && item && (*item == (i32)index);
 
     ++index;
@@ -57,16 +57,16 @@ TestFuncResult test_i32_array_get(void) {
 TestFuncResult test_i32_array_set(void) {
   b8 result = true;
 
-	I32Array array = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
 
   i32 *item;
-	u64 count  = wapp_array_count(array);
+  u64 count    = array.count;
   u64 index    = 0;
   b8 running  = true;
   while (running) {
     i32 num = (i32)(index * 2);
-		wapp_array_set(i32, array, index, &num);
+    wapp_array_set(i32, &array, index, &num);
-		item   = wapp_array_get(i32, array, index);
+    item   = wapp_array_get(i32, &array, index);
     result = result && item && (*item == (i32)(index * 2));
 
     ++index;
@@ -79,19 +79,19 @@ TestFuncResult test_i32_array_set(void) {
 TestFuncResult test_i32_array_append_capped(void) {
   b8 result;
 
-	I32Array array = wapp_array_with_capacity(i32, 64, ARRAY_INIT_NONE);
+  I32Array array = wapp_array_with_capacity(i32, I32Array, 64, false);
   i32 item1 = 10;
-	wapp_array_append_capped(i32, array, &item1);
+  wapp_array_append_capped(i32, &array, &item1);
 
-	result = wapp_array_count(array) == 1;
+  result = array.count == 1;
-	i32 *item = wapp_array_get(i32, array, 0);
+  i32 *item = wapp_array_get(i32, &array, 0);
   result = result && item && *item == 10;
 
-	array = wapp_array(i32, 1);
+  array = wapp_array(i32, I32Array, 1);
   i32 item2 = 10;
-	wapp_array_append_capped(i32, array, &item2);
+  wapp_array_append_capped(i32, &array, &item2);
 
-	result = result && wapp_array_count(array) == 2;
+  result = result && array.count == 2;
 
   return wapp_tester_result(result);
 }
@@ -99,14 +99,14 @@ TestFuncResult test_i32_array_append_capped(void) {
 TestFuncResult test_i32_array_extend_capped(void) {
   b8 result;
 
-	I32Array array1 = wapp_array(i32, 1, 2, 3, 4);
+  I32Array array1 = wapp_array(i32, I32Array, 1, 2, 3, 4);
-	I32Array array2 = wapp_array(i32, 10, 20);
+  I32Array array2 = wapp_array(i32, I32Array, 10, 20);
 
-	result = wapp_array_count(array1) == 4 && wapp_array_count(array2) == 2;
+  result = array1.count == 4 && array2.count == 2;
 
-	wapp_array_extend_capped(i32, array1, array2);
+  wapp_array_extend_capped(i32, &array1, &array2);
 
-	result = result && wapp_array_count(array1) == 6;
+  result = result && array1.count == 6;
 
   return wapp_tester_result(result);
 }
@@ -114,31 +114,31 @@ TestFuncResult test_i32_array_extend_capped(void) {
 TestFuncResult test_i32_array_copy_capped(void) {
   b8 result;
 
-	I32Array src  = wapp_array(i32, 1, 2, 3, 4, 5);
+  I32Array src  = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
-	I32Array dst1 = wapp_array(i32, 1, 2, 3, 4, 5, 6);
+  I32Array dst1 = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
-	I32Array dst2 = wapp_array(i32, 1, 2);
+  I32Array dst2 = wapp_array(i32, I32Array, 1, 2);
 
   u64 expected_count = 5;
-	wapp_array_copy_capped(i32, dst1, src);
+  wapp_array_copy_capped(i32, &dst1, &src);
-	result = wapp_array_count(dst1) == expected_count;
+  result = dst1.count == expected_count;
 
   u64 index    = 0;
   b8 running  = true;
   while (running) {
-		result = result && (*wapp_array_get(i32, src, index) == *wapp_array_get(i32, dst1, index));
+    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst1, index));
 
     ++index;
     running = index < expected_count;
   }
 
   expected_count = 4;
-	wapp_array_copy_capped(i32, dst2, src);
+  wapp_array_copy_capped(i32, &dst2, &src);
-	result = result && wapp_array_count(dst2) == expected_count;
+  result = result && dst2.count == expected_count;
 
   index   = 0;
   running = true;
   while (running) {
-		result = result && (*wapp_array_get(i32, src, index) == *wapp_array_get(i32, dst2, index));
+    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst2, index));
 
     ++index;
     running = index < expected_count;
@@ -152,9 +152,9 @@ TestFuncResult test_i32_array_alloc_capacity(void) {
 
   Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
   u64 capacity        = 32;
-	I32Array array      = wapp_array_alloc_capacity(i32, &allocator, capacity, ARRAY_INIT_NONE);
+  I32Array *array     = wapp_array_alloc_capacity(i32, I32Array, &allocator, capacity, false);
 
-	result = array && wapp_array_capacity(array) == capacity;
+  result = array && array->capacity == capacity;
 
   wapp_mem_arena_allocator_destroy(&allocator);
 
@@ -165,24 +165,24 @@ TestFuncResult test_i32_array_append_alloc(void) {
   b8 result;
 
   Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-	I32Array array1     = wapp_array(i32, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
-	I32Array array2     = wapp_array(i32, 1, 2);
+  I32Array array2     = wapp_array(i32, I32Array, 1, 2);
 
   i32 num = 10;
-	I32Array arr_ptr = wapp_array_append_alloc(i32, &allocator, array1, &num, ARRAY_INIT_NONE);
+  I32Array *arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array1, &num);
-	result = arr_ptr == array1;
+  result = arr_ptr == &array1;
 
   u64 count    = 4;
   u64 index    = 0;
   b8 running  = true;
   while (running) {
     num = (i32)index;
-		arr_ptr = wapp_array_append_alloc(i32, &allocator, array2, &num, ARRAY_INIT_NONE);
+    arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array2, &num);
 
     ++index;
     running = index < count;
   }
-	result = result && arr_ptr != array2;
+  result = result && arr_ptr != &array2;
 
   wapp_mem_arena_allocator_destroy(&allocator);
 
@@ -193,15 +193,15 @@ TestFuncResult test_i32_array_extend_alloc(void) {
   b8 result;
 
   Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-	I32Array array1     = wapp_array(i32, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
-	I32Array array2     = wapp_array(i32, 1, 2);
+  I32Array array2     = wapp_array(i32, I32Array, 1, 2);
-	I32Array array3     = wapp_array(i32, 1, 2, 3, 4);
+  I32Array array3     = wapp_array(i32, I32Array, 1, 2, 3, 4);
 
-	I32Array array = wapp_array_extend_alloc(i32, &allocator, array1, array3, ARRAY_INIT_NONE);
+  I32Array *arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array1, &array3);
-	result = array == array1;
+  result = arr_ptr == &array1;
 
-	array = wapp_array_extend_alloc(i32, &allocator, array2, array3, ARRAY_INIT_NONE);
+  arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array2, &array3);
-	result  = result && array != array2;
+  result  = result && arr_ptr != &array2;
 
   wapp_mem_arena_allocator_destroy(&allocator);
 
@@ -212,32 +212,32 @@ TestFuncResult test_i32_array_copy_alloc(void) {
   b8 result;
 
   Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-	I32Array src        = wapp_array(i32, 1, 2, 3, 4, 5);
+  I32Array src        = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
-	I32Array dst1       = wapp_array(i32, 1, 2, 3, 4, 5, 6);
+  I32Array dst1       = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
-	I32Array dst2       = wapp_array(i32, 1, 2);
+  I32Array dst2       = wapp_array(i32, I32Array, 1, 2);
-	I32Array array      = nullptr;
+  I32Array *array_ptr = nullptr;
 
   u64 expected_count = 5;
-	array = wapp_array_copy_alloc(i32, &allocator, dst1, src, ARRAY_INIT_NONE);
+  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst1, &src);
-	result = wapp_array_count(array) == expected_count && array == dst1;
+  result = array_ptr->count == expected_count && array_ptr == &dst1;
 
   u64 index    = 0;
   b8 running  = true;
   while (running) {
-		result = result && (*wapp_array_get(i32, src, index) == *wapp_array_get(i32, array, index));
+    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index));
 
     ++index;
     running = index < expected_count;
   }
 
   expected_count = 5;
-	array          = wapp_array_copy_alloc(i32, &allocator, dst2, src, ARRAY_INIT_NONE);
+  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst2, &src);
-	result         = result && wapp_array_count(array) == expected_count && array != dst2;
+  result = result && array_ptr->count == expected_count && array_ptr != &dst2;
 
   index   = 0;
   running = true;
   while (running) {
-		result = result && (*wapp_array_get(i32, src, index) == *wapp_array_get(i32, array, index));
+    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index));
 
     ++index;
     running = index < expected_count;
@@ -251,12 +251,12 @@ TestFuncResult test_i32_array_copy_alloc(void) {
 TestFuncResult test_i32_array_clear(void) {
   b8 result;
 
-	I32Array array = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-	result = wapp_array_count(array) == 9;
+  result = array.count == 9;
 
-	wapp_array_clear(i32, array);
+  wapp_array_clear(i32, &array);
 
-	result = result && wapp_array_count(array) == 0;
+  result = result && array.count == 0;
 
   return wapp_tester_result(result);
 }
@@ -264,11 +264,11 @@ TestFuncResult test_i32_array_clear(void) {
 TestFuncResult test_i32_array_pop(void) {
   b8 result;
 
-	I32Array array1 = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array1 = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-	I32Array array2 = wapp_array_with_capacity(i32, 32, ARRAY_INIT_NONE);
+  I32Array array2 = wapp_array_with_capacity(i32, I32Array, 32, false);
 
-	i32 item1 = wapp_array_pop(i32, array1);
+  i32 item1 = wapp_array_pop(i32, &array1);
-	i32 item2 = wapp_array_pop(i32, array2);
+  i32 item2 = wapp_array_pop(i32, &array2);
 
   result = item1 == 8 && item2 == 0;
 

tests/array/test_str8_array.c

@@ -6,15 +6,15 @@ TestFuncResult test_str8_array(void) {
   b8 result;
 
   Str8 expected[] = {wapp_str8_lit("Hello"), wapp_str8_lit("Hi"), wapp_str8_lit("Bye")};
-	Str8Array array = wapp_array(Str8, wapp_str8_lit("Hello"), wapp_str8_lit("Hi"), wapp_str8_lit("Bye"));
+  Str8Array array = wapp_array(Str8, Str8Array, wapp_str8_lit("Hello"), wapp_str8_lit("Hi"), wapp_str8_lit("Bye"));
-	result = wapp_array_count(array) == 3 && wapp_array_capacity(array) == 8;
+  result = array.count == 3 && array.capacity == 8;
 
   Str8 *item;
-	u64 count  = wapp_array_count(array);
+  u64 count   = array.count;
   u64 index   = 0;
   b8 running = true;
   while (running) {
-		item   = wapp_array_get(Str8, array, index);
+      item   = wapp_array_get(Str8, &array, index);
       result = result && item && (wapp_str8_equal(item, &expected[index]));
 
       ++index;

tests/array/test_str8_array.cc

@@ -10,16 +10,16 @@ TestFuncResult test_str8_array(void) {
   Str8 str1       = wapp_str8_lit("Hello");
   Str8 str2       = wapp_str8_lit("Hi");
   Str8 str3       = wapp_str8_lit("Bye");
-	Str8Array array = wapp_array(Str8, str1, str2, str3);
+  Str8Array array = wapp_array(Str8, Str8Array, str1, str2, str3);
 
-	result = wapp_array_count(array) == 3 && wapp_array_capacity(array) == 8;
+  result = array.count == 3 && array.capacity == 8;
 
   Str8 *item;
-	u64 count  = wapp_array_count(array);
+  u64 count   = array.count;
   u64 index   = 0;
   b8 running = true;
   while (running) {
-		item   = wapp_array_get(Str8, array, index);
+    item   = wapp_array_get(Str8, &array, index);
     result = result && item && (wapp_str8_equal(item, &expected[index]));
 
     ++index;

tests/cpath/test_cpath.c

@@ -16,16 +16,16 @@ TestFuncResult test_cpath_join_path(void) {
   wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
   wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
 
-	Str8List parts = wapp_dbl_list(Str8);
+  Str8List parts = wapp_dbl_list(Str8, Str8List);
-	wapp_dbl_list_push_back(Str8, &parts, &tmp);
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_str8(tmp));
-	wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_lit("home"));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("home"));
-	wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_lit("abdelrahman"));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("abdelrahman"));
-	wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_lit("Documents"));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("Documents"));
 
   wapp_cpath_join_path(&out, &parts);
   result = wapp_str8_equal(&out, &expected);
 
-	wapp_dbl_list_pop_front(Str8, &parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
 
   wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
 
@@ -33,8 +33,8 @@ TestFuncResult test_cpath_join_path(void) {
   result = result && wapp_str8_equal(&out, &expected);
 
   wapp_str8_concat_capped(&tmp, &wapp_str8_lit_ro("home"));
-	wapp_dbl_list_pop_front(Str8, &parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
-	wapp_dbl_list_push_front(Str8, &parts, &tmp);
+  wapp_dbl_list_push_front(Str8, &parts, &wapp_str8_node_from_str8(tmp));
 
   wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
 
@@ -42,8 +42,8 @@ TestFuncResult test_cpath_join_path(void) {
   result = result && wapp_str8_equal(&out, &expected);
 
   wapp_str8_format(&tmp, "home%c", WAPP_PATH_SEP);
-	wapp_dbl_list_pop_front(Str8, &parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
-	wapp_dbl_list_push_front(Str8, &parts, &wapp_str8_lit("home"));
+  wapp_dbl_list_push_front(Str8, &parts, &wapp_str8_node_from_cstr("home"));
 
   wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
 
@@ -53,24 +53,24 @@ TestFuncResult test_cpath_join_path(void) {
   wapp_dbl_list_empty(Str8, &parts);
 
   wapp_str8_format(&tmp, "%chome", WAPP_PATH_SEP);
-	wapp_dbl_list_push_back(Str8, &parts, &tmp);
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_str8(tmp));
-	wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_lit(""));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr(""));
 
   wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
 
   wapp_cpath_join_path(&out, &parts);
   result = result && wapp_str8_equal(&out, &expected);
 
-	wapp_dbl_list_pop_front(Str8, &parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
-	wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_lit(""));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr(""));
 
   wapp_str8_format(&expected, "%s", "");
 
   wapp_cpath_join_path(&out, &parts);
   result = result && wapp_str8_equal(&out, &expected);
 
-	wapp_dbl_list_pop_back(Str8, &parts);
+  wapp_dbl_list_pop_back(Str8, Str8Node, &parts);
-	wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_lit("home"));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("home"));
 
   wapp_str8_copy_cstr_capped(&expected, "home");
 

tests/cpath/test_cpath.cc

@@ -16,23 +16,24 @@ TestFuncResult test_cpath_join_path(void) {
   wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
   wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
 
-	Str8List parts = wapp_dbl_list(Str8);
+  Str8List parts = wapp_dbl_list(Str8, Str8List);
 
-	wapp_dbl_list_push_back(Str8, &parts, &tmp);
+  Str8Node tmp_node = wapp_str8_node_from_str8(tmp);
+  wapp_dbl_list_push_back(Str8, &parts, &tmp_node);
 
-	Str8 home = wapp_str8_lit("home");
+  Str8Node home_node = wapp_str8_node_from_cstr("home");
-	wapp_dbl_list_push_back(Str8, &parts, &home);
+  wapp_dbl_list_push_back(Str8, &parts, &home_node);
 
-	Str8 user = wapp_str8_lit("abdelrahman");
+  Str8Node user_node = wapp_str8_node_from_cstr("abdelrahman");
-	wapp_dbl_list_push_back(Str8, &parts, &user);
+  wapp_dbl_list_push_back(Str8, &parts, &user_node);
 
-	Str8 docs = wapp_str8_lit("Documents");
+  Str8Node docs_node = wapp_str8_node_from_cstr("Documents");
-	wapp_dbl_list_push_back(Str8, &parts, &docs);
+  wapp_dbl_list_push_back(Str8, &parts, &docs_node);
 
   wapp_cpath_join_path(&out, &parts);
   result = wapp_str8_equal(&out, &expected);
 
-	wapp_dbl_list_pop_front(Str8, &parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
 
   wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
 
@@ -41,9 +42,10 @@ TestFuncResult test_cpath_join_path(void) {
 
   Str8RO str = wapp_str8_lit_ro("home");
   wapp_str8_concat_capped(&tmp, &str);
-	wapp_dbl_list_pop_front(Str8, &parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
 
-	wapp_dbl_list_push_front(Str8, &parts, &tmp);
+  Str8Node tmp_node_2 = wapp_str8_node_from_str8(tmp);
+  wapp_dbl_list_push_front(Str8, &parts, &tmp_node_2);
 
   wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
 
@@ -51,10 +53,10 @@ TestFuncResult test_cpath_join_path(void) {
   result = result && wapp_str8_equal(&out, &expected);
 
   wapp_str8_format(&tmp, "home%c", WAPP_PATH_SEP);
-	wapp_dbl_list_pop_front(Str8, &parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
 
-	Str8 home_2 = wapp_str8_lit("home");
+  Str8Node home_node_2 = wapp_str8_node_from_cstr("home");
-	wapp_dbl_list_push_front(Str8, &parts, &home_2);
+  wapp_dbl_list_push_front(Str8, &parts, &home_node_2);
 
   wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
 
@@ -65,30 +67,31 @@ TestFuncResult test_cpath_join_path(void) {
 
   wapp_str8_format(&tmp, "%chome", WAPP_PATH_SEP);
 
-	wapp_dbl_list_push_back(Str8, &parts, &tmp);
+  Str8Node tmp_node_3 = wapp_str8_node_from_str8(tmp);
+  wapp_dbl_list_push_back(Str8, &parts, &tmp_node_3);
 
-	Str8 empty = wapp_str8_lit("");
+  Str8Node empty_node = wapp_str8_node_from_cstr("");
-	wapp_dbl_list_push_back(Str8, &parts, &empty);
+  wapp_dbl_list_push_back(Str8, &parts, &empty_node);
 
   wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
 
   wapp_cpath_join_path(&out, &parts);
   result = result && wapp_str8_equal(&out, &expected);
 
-	wapp_dbl_list_pop_front(Str8, &parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
 
-	Str8 empty_2 = wapp_str8_lit("");
+  Str8Node empty_node_2 = wapp_str8_node_from_cstr("");
-	wapp_dbl_list_push_back(Str8, &parts, &empty_2);
+  wapp_dbl_list_push_back(Str8, &parts, &empty_node_2);
 
   wapp_str8_format(&expected, "%s", "");
 
   wapp_cpath_join_path(&out, &parts);
   result = result && wapp_str8_equal(&out, &expected);
 
-	wapp_dbl_list_pop_back(Str8, &parts);
+  wapp_dbl_list_pop_back(Str8, Str8Node, &parts);
 
-	Str8 home_3 = wapp_str8_lit("home");
+  Str8Node home_node_3 = wapp_str8_node_from_cstr("home");
-	wapp_dbl_list_push_back(Str8, &parts, &home_3);
+  wapp_dbl_list_push_back(Str8, &parts, &home_node_3);
 
   wapp_str8_copy_cstr_capped(&expected, "home");
 

tests/file/test_file.c

@@ -1,118 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "test_file.h"
-
-#define DST_CAPACITY 5
-wapp_intern Allocator arena           = {0};
-wapp_intern Str8RO test_filename      = wapp_str8_lit_ro_initialiser_list("wapptest.bin");
-wapp_intern Str8RO new_filename       = wapp_str8_lit_ro_initialiser_list("wapptest2.bin");
-wapp_intern WFile *test_fp            = NULL;
-wapp_intern I32Array src_array1       = wapp_array(i32,  0,  1,  2,  3,  4);
-wapp_intern I32Array src_array2       = wapp_array(i32,  5,  6,  7,  8,  9);
-wapp_intern I32Array src_array3       = wapp_array(i32, 10, 11, 12, 13, 14);
-wapp_intern I32Array dst_array        = wapp_array_with_capacity(i32, DST_CAPACITY, false);
-wapp_intern i32 dst_buf[DST_CAPACITY] = {0};
-
-TestFuncResult test_wapp_file_open(void) {
-	arena   = wapp_mem_arena_allocator_init(KiB(16));
-	test_fp = wapp_file_open(&arena, &test_filename, WAPP_ACCESS_WRITE_EX);
-	return wapp_tester_result(test_fp != NULL);
-}
-
-TestFuncResult test_wapp_file_get_current_position(void) {
-	i64 pos = wapp_file_get_current_position(test_fp);
-	return wapp_tester_result(pos == 0);
-}
-
-TestFuncResult test_wapp_file_seek(void) {
-	wapp_file_write_array((GenericArray)src_array1, test_fp, wapp_array_count(src_array1));
-
-	i64 seek_result = wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
-	b8 result       = seek_result == (i64)(wapp_array_count(src_array1) * wapp_array_item_size(src_array1));
-
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_wapp_file_get_length(void) {
-	i64 length = wapp_file_get_length(test_fp);
-	return wapp_tester_result(length == (i64)(wapp_array_count(src_array1) * wapp_array_item_size(src_array1)));
-}
-
-TestFuncResult test_wapp_file_read(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
-
-	u64 byte_count = DST_CAPACITY * sizeof(i32);
-	u64 count      = wapp_file_read((void *)dst_buf, test_fp, byte_count);
-	b8 result      = count == byte_count;
-
-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		result = result && (dst_buf[index] == *wapp_array_get(i32, src_array1, index));
-		++index;
-		running = index < DST_CAPACITY;
-	}
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_wapp_file_write(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
-
-	u64 expected_count = wapp_array_count(src_array2) * wapp_array_item_size(src_array2);
-	i64 count = wapp_file_write((void *)src_array2, test_fp, expected_count);
-
-	return wapp_tester_result(count >= 0 && (u64)count == expected_count);
-}
-
-TestFuncResult test_wapp_file_read_array(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
-
-	u64 count = wapp_file_read_array((GenericArray)dst_array, test_fp, wapp_array_count(src_array1));
-	b8 result = count == wapp_array_count(src_array1) &&
-	            wapp_array_count(dst_array) == wapp_array_count(src_array1);
-
-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		result = result && (*wapp_array_get(i32, dst_array, index) == *wapp_array_get(i32, src_array1, index));
-		++index;
-		running = index < wapp_array_count(dst_array);
-	}
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_wapp_file_write_array(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
-
-	i64 count = wapp_file_write_array((GenericArray)src_array3, test_fp, wapp_array_count(src_array3));
-
-	return wapp_tester_result(count >= 0 && (u64)count == wapp_array_count(src_array3));
-}
-
-TestFuncResult test_wapp_file_flush(void) {
-	i32 flush_result = wapp_file_flush(test_fp);
-	return wapp_tester_result(flush_result == 0);
-}
-
-TestFuncResult test_wapp_file_close(void) {
-	i32 close_result = wapp_file_close(test_fp);
-	return wapp_tester_result(close_result == 0);
-}
-
-TestFuncResult test_wapp_file_rename(void) {
-	i32 rename_result = wapp_file_rename(&test_filename, &new_filename);
-	return wapp_tester_result(rename_result == 0);
-}
-
-TestFuncResult test_wapp_file_remove(void) {
-	i32 remove_result = wapp_file_remove(&new_filename);
-	return wapp_tester_result(remove_result == 0);
-}

tests/file/test_file.cc

@@ -1,122 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "test_file.h"
-
-#define DST_CAPACITY 5
-wapp_intern Allocator arena           = {};
-wapp_intern Str8RO test_filename      = wapp_str8_lit_ro_initialiser_list("wapptest.bin");
-wapp_intern Str8RO new_filename       = wapp_str8_lit_ro_initialiser_list("wapptest2.bin");
-wapp_intern WFile *test_fp            = NULL;
-wapp_intern i32 dst_buf[DST_CAPACITY] = {0};
-wapp_intern I32Array src_array1;
-wapp_intern I32Array src_array2;
-wapp_intern I32Array src_array3;
-wapp_intern I32Array dst_array ;
-
-TestFuncResult test_wapp_file_open(void) {
-	arena      = wapp_mem_arena_allocator_init(KiB(16));
-	src_array1 = wapp_array(i32,  0,  1,  2,  3,  4);
-	src_array2 = wapp_array(i32,  5,  6,  7,  8,  9);
-	src_array3 = wapp_array(i32, 10, 11, 12, 13, 14);
-	dst_array  = wapp_array_with_capacity(i32, DST_CAPACITY, false);
-	test_fp    = wapp_file_open(&arena, &test_filename, WAPP_ACCESS_WRITE_EX);
-	return wapp_tester_result(test_fp != NULL);
-}
-
-TestFuncResult test_wapp_file_get_current_position(void) {
-	i64 pos = wapp_file_get_current_position(test_fp);
-	return wapp_tester_result(pos == 0);
-}
-
-TestFuncResult test_wapp_file_seek(void) {
-	wapp_file_write_array((GenericArray)src_array1, test_fp, wapp_array_count(src_array1));
-
-	i64 seek_result = wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
-	b8 result       = seek_result == (i64)(wapp_array_count(src_array1) * wapp_array_item_size(src_array1));
-
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_wapp_file_get_length(void) {
-	i64 length = wapp_file_get_length(test_fp);
-	return wapp_tester_result(length == (i64)(wapp_array_count(src_array1) * wapp_array_item_size(src_array1)));
-}
-
-TestFuncResult test_wapp_file_read(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
-
-	u64 byte_count = DST_CAPACITY * sizeof(i32);
-	u64 count      = wapp_file_read((void *)dst_buf, test_fp, byte_count);
-	b8 result      = count == byte_count;
-
-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		result = result && (dst_buf[index] == *wapp_array_get(i32, src_array1, index));
-		++index;
-		running = index < DST_CAPACITY;
-	}
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_wapp_file_write(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
-
-	u64 expected_count = wapp_array_count(src_array2) * wapp_array_item_size(src_array2);
-	i64 count = wapp_file_write((void *)src_array2, test_fp, expected_count);
-
-	return wapp_tester_result(count >= 0 && (u64)count == expected_count);
-}
-
-TestFuncResult test_wapp_file_read_array(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
-
-	u64 count = wapp_file_read_array((GenericArray)dst_array, test_fp, wapp_array_count(src_array1));
-	b8 result = count == wapp_array_count(src_array1) &&
-	            wapp_array_count(dst_array) == wapp_array_count(src_array1);
-
-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		result = result && (*wapp_array_get(i32, dst_array, index) == *wapp_array_get(i32, src_array1, index));
-		++index;
-		running = index < wapp_array_count(dst_array);
-	}
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_wapp_file_write_array(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
-
-	i64 count = wapp_file_write_array((GenericArray)src_array3, test_fp, wapp_array_count(src_array3));
-
-	return wapp_tester_result(count >= 0 && (u64)count == wapp_array_count(src_array3));
-}
-
-TestFuncResult test_wapp_file_flush(void) {
-	i32 flush_result = wapp_file_flush(test_fp);
-	return wapp_tester_result(flush_result == 0);
-}
-
-TestFuncResult test_wapp_file_close(void) {
-	i32 close_result = wapp_file_close(test_fp);
-	return wapp_tester_result(close_result == 0);
-}
-
-TestFuncResult test_wapp_file_rename(void) {
-	i32 rename_result = wapp_file_rename(&test_filename, &new_filename);
-	return wapp_tester_result(rename_result == 0);
-}
-
-TestFuncResult test_wapp_file_remove(void) {
-	i32 remove_result = wapp_file_remove(&new_filename);
-	return wapp_tester_result(remove_result == 0);
-}

tests/file/test_file.h

@@ -1,21 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef TEST_FILE_H
-#define TEST_FILE_H
-
-#include "wapp.h"
-
-TestFuncResult test_wapp_file_open(void);
-TestFuncResult test_wapp_file_get_current_position(void);
-TestFuncResult test_wapp_file_seek(void);
-TestFuncResult test_wapp_file_get_length(void);
-TestFuncResult test_wapp_file_read(void);
-TestFuncResult test_wapp_file_write(void);
-TestFuncResult test_wapp_file_read_array(void);
-TestFuncResult test_wapp_file_write_array(void);
-TestFuncResult test_wapp_file_flush(void);
-TestFuncResult test_wapp_file_close(void);
-TestFuncResult test_wapp_file_rename(void);
-TestFuncResult test_wapp_file_remove(void);
-
-#endif // !TEST_FILE_H

tests/queue/test_queue.c

@@ -1,98 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "wapp.h"
-#include "test_queue.h"
-
-#define CAPACITY 8
-
-TestFuncResult test_queue_push(void) {
-	I32Queue queue = wapp_queue(i32, CAPACITY);
-
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 item = (i32)i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	b8 result = true;
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 *value = ((i32 *)(queue.items)) + i;
-		result = result && value != NULL && *value == (i32)i;
-	}
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_queue_push_alloc(void) {
-	Allocator arena = wapp_mem_arena_allocator_init(MiB(64));
-	I32Queue queue  = wapp_queue(i32, CAPACITY);
-
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 item = (i32)i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	b8 result = true;
-	i32 item  = 8;
-	u64 new_capacity = CAPACITY * 2;
-	I32Queue *new_queue = wapp_queue_push_alloc(i32, &arena, &queue, &item);
-	if (new_queue && new_queue != &queue) {
-		queue = *new_queue;
-	}
-	u64 capacity = wapp_queue_capacity(&queue);
-	result = result && capacity == new_capacity;
-
-	for (u64 i = 0; i < 2; ++i) {
-		wapp_queue_pop(i32, &queue);
-	}
-
-	u64 remaining = wapp_queue_capacity(&queue) - queue.count;
-	for (u64 i = 0; i < remaining; ++i) {
-		item = remaining + i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	++item;
-	new_queue = wapp_queue_push_alloc(i32, &arena, &queue, &item);
-	if (new_queue && new_queue != &queue) {
-		queue = *new_queue;
-	}
-
-	result = result && wapp_queue_capacity(&queue) == new_capacity * 2;
-
-	i32 *arr = (i32 *)queue.items;
-	for (u64 i = 0; i < queue.count; ++i) {
-		// NOTE (Abdelrahman): First queue value is currently 2
-		result = result && arr[i] == (i32)(2 + i);
-	}
-
-	wapp_mem_arena_allocator_destroy(&arena);
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_queue_pop(void) {
-	I32Queue queue = wapp_queue(i32, CAPACITY);
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 item = (i32)i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	b8 result      = true;
-	u64 half_count = queue.count / 2;
-	for (u64 i = 0; i < half_count; ++i) {
-		i32 *value = wapp_queue_pop(i32, &queue);
-		result = result && value != NULL && *value == (i32)i;
-	}
-
-	for (u64 i = 0; i < half_count; ++i) {
-		i32 item = (i32)i + CAPACITY;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 *value = wapp_queue_pop(i32, &queue);
-		result = result && value != NULL && *value == (i32)half_count + (i32)i;
-	}
-
-	return wapp_tester_result(result);
-}

tests/queue/test_queue.cc

@@ -1,96 +0,0 @@
-#include "wapp.h"
-#include "test_queue.h"
-
-#define CAPACITY 8
-
-TestFuncResult test_queue_push(void) {
-	I32Queue queue = wapp_queue(i32, CAPACITY);
-
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 item = (i32)i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	b8 result = true;
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 *value = ((i32 *)(queue.items)) + i;
-		result = result && value != NULL && *value == (i32)i;
-	}
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_queue_push_alloc(void) {
-	Allocator arena = wapp_mem_arena_allocator_init(MiB(64));
-	I32Queue queue  = wapp_queue(i32, CAPACITY);
-
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 item = (i32)i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	b8 result = true;
-	i32 item  = 8;
-	u64 new_capacity = CAPACITY * 2;
-	I32Queue *new_queue = wapp_queue_push_alloc(i32, &arena, &queue, &item);
-	if (new_queue && new_queue != &queue) {
-		queue = *new_queue;
-	}
-	u64 capacity = wapp_queue_capacity(&queue);
-	result = result && capacity == new_capacity;
-
-	for (u64 i = 0; i < 2; ++i) {
-		wapp_queue_pop(i32, &queue);
-	}
-
-	u64 remaining = wapp_queue_capacity(&queue) - queue.count;
-	for (u64 i = 0; i < remaining; ++i) {
-		item = remaining + i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	++item;
-	new_queue = wapp_queue_push_alloc(i32, &arena, &queue, &item);
-	if (new_queue && new_queue != &queue) {
-		queue = *new_queue;
-	}
-
-	result = result && wapp_queue_capacity(&queue) == new_capacity * 2;
-
-	i32 *arr = (i32 *)queue.items;
-	for (u64 i = 0; i < queue.count; ++i) {
-		// NOTE (Abdelrahman): First queue value is currently 2
-		result = result && arr[i] == (i32)(2 + i);
-	}
-
-	wapp_mem_arena_allocator_destroy(&arena);
-
-	return wapp_tester_result(result);
-}
-
-TestFuncResult test_queue_pop(void) {
-	I32Queue queue = wapp_queue(i32, CAPACITY);
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 item = (i32)i;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	b8 result      = true;
-	u64 half_count = queue.count / 2;
-	for (u64 i = 0; i < half_count; ++i) {
-		i32 *value = wapp_queue_pop(i32, &queue);
-		result = result && value != NULL && *value == (i32)i;
-	}
-
-	for (u64 i = 0; i < half_count; ++i) {
-		i32 item = (i32)i + CAPACITY;
-		wapp_queue_push(i32, &queue, &item);
-	}
-
-	for (u64 i = 0; i < CAPACITY; ++i) {
-		i32 *value = wapp_queue_pop(i32, &queue);
-		result = result && value != NULL && *value == (i32)half_count + (i32)i;
-	}
-
-	return wapp_tester_result(result);
-}

tests/queue/test_queue.h

@@ -1,12 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef TEST_QUEUE_H
-#define TEST_QUEUE_H
-
-#include "wapp.h"
-
-TestFuncResult test_queue_push(void);
-TestFuncResult test_queue_push_alloc(void);
-TestFuncResult test_queue_pop(void);
-
-#endif // !TEST_QUEUE_H

tests/shell_commander/test_shell_commander.c

@@ -5,9 +5,9 @@
 #include <string.h>
 
 TestFuncResult test_commander_cmd_success(void) {
-	Str8List cmd = wapp_dbl_list(Str8);
+  Str8List cmd = wapp_dbl_list(Str8, Str8List);
-	wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_lit("echo"));
+  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("echo"));
-	wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_lit("hello world"));
+  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("hello world"));
 
   CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, NULL, &cmd);
   b8 succeeded    = result.exited && result.exit_code == EXIT_SUCCESS &&
@@ -17,8 +17,8 @@ TestFuncResult test_commander_cmd_success(void) {
 }
 
 TestFuncResult test_commander_cmd_failure(void) {
-	Str8List cmd = wapp_dbl_list(Str8);
+  Str8List cmd = wapp_dbl_list(Str8, Str8List);
-	wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_lit("grep"));
+  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("grep"));
 
   CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, NULL, &cmd);
   b8 failed       = result.exited && result.exit_code != EXIT_SUCCESS &&
@@ -33,9 +33,9 @@ TestFuncResult test_commander_cmd_out_buf_success(void) {
   char msg[]        = "hello world";
   wapp_str8_copy_cstr_capped(&expected, msg);
 
-	Str8List cmd = wapp_dbl_list(Str8);
+  Str8List cmd = wapp_dbl_list(Str8, Str8List);
-	wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_lit("echo"));
+  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("echo"));
-	wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_lit(msg));
+  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr(msg));
 
   CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd);
   b8 succeeded    = result.exited && result.exit_code == EXIT_SUCCESS &&
@@ -50,9 +50,9 @@ TestFuncResult test_commander_cmd_out_buf_failure(void) {
   char msg[]       = "hello world";
   wapp_str8_copy_cstr_capped(&expected, msg);
 
-	Str8List cmd = wapp_dbl_list(Str8);
+  Str8List cmd = wapp_dbl_list(Str8, Str8List);
-	wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_lit("echo"));
+  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("echo"));
-	wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_lit(msg));
+  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr(msg));
 
   CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd);
   b8 failed       = !result.exited && result.exit_code != EXIT_SUCCESS &&

tests/shell_commander/test_shell_commander.cc

@@ -5,9 +5,9 @@
 #include <string.h>
 
 TestFuncResult test_commander_cmd_success(void) {
-	Str8List cmd  = wapp_dbl_list(Str8);
+  Str8List cmd  = wapp_dbl_list(Str8, Str8List);
-	Str8 echo  = wapp_str8_lit("echo");
+  Str8Node echo = wapp_str8_node_from_cstr("echo");
-	Str8 msg  = wapp_str8_lit("hello world");
+  Str8Node msg  = wapp_str8_node_from_cstr("hello world");
   wapp_dbl_list_push_back(Str8, &cmd, &echo);
   wapp_dbl_list_push_back(Str8, &cmd, &msg);
 
@@ -19,8 +19,8 @@ TestFuncResult test_commander_cmd_success(void) {
 }
 
 TestFuncResult test_commander_cmd_failure(void) {
-	Str8List cmd  = wapp_dbl_list(Str8);
+  Str8List cmd  = wapp_dbl_list(Str8, Str8List);
-	Str8 grep  = wapp_str8_lit("grep");
+  Str8Node grep = wapp_str8_node_from_cstr("grep");
   wapp_dbl_list_push_back(Str8, &cmd, &grep);
 
   CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, nullptr, &cmd);
@@ -36,9 +36,9 @@ TestFuncResult test_commander_cmd_out_buf_success(void) {
   char msg[]        = "hello world";
   wapp_str8_copy_cstr_capped(&expected, msg);
 
-	Str8List cmd  = wapp_dbl_list(Str8);
+  Str8List cmd  = wapp_dbl_list(Str8, Str8List);
-	Str8 echo  = wapp_str8_lit("echo");
+  Str8Node echo = wapp_str8_node_from_cstr("echo");
-	Str8 arg  = wapp_str8_lit(msg);
+  Str8Node arg  = wapp_str8_node_from_cstr(msg);
   wapp_dbl_list_push_back(Str8, &cmd, &echo);
   wapp_dbl_list_push_back(Str8, &cmd, &arg);
 
@@ -55,9 +55,9 @@ TestFuncResult test_commander_cmd_out_buf_failure(void) {
   char msg[]       = "hello world";
   wapp_str8_copy_cstr_capped(&expected, msg);
 
-	Str8List cmd  = wapp_dbl_list(Str8);
+  Str8List cmd  = wapp_dbl_list(Str8, Str8List);
-	Str8 echo  = wapp_str8_lit("echo");
+  Str8Node echo = wapp_str8_node_from_cstr("echo");
-	Str8 arg  = wapp_str8_lit(msg);
+  Str8Node arg  = wapp_str8_node_from_cstr(msg);
   wapp_dbl_list_push_back(Str8, &cmd, &echo);
   wapp_dbl_list_push_back(Str8, &cmd, &arg);
 

tests/str8/test_str8.c

@@ -443,8 +443,8 @@ TestFuncResult test_str8_split(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running1) {
-		Str8 *node = wapp_dbl_list_get(Str8, list1, index1);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list1, index1);
-		result = result && wapp_str8_equal(node, &(splits1[index1]));
+    result = result && wapp_str8_equal(node->item, &(splits1[index1]));
 
     ++index1;
     running1 = index1 < count1;
@@ -453,8 +453,8 @@ TestFuncResult test_str8_split(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running2) {
-		Str8 *node = wapp_dbl_list_get(Str8, list2, index2);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list2, index2);
-		result = result && wapp_str8_equal(node, &(splits2[index2]));
+    result = result && wapp_str8_equal(node->item, &(splits2[index2]));
 
     ++index2;
     running2 = index2 < count2;
@@ -488,8 +488,8 @@ TestFuncResult test_str8_split_with_max(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running) {
-		Str8 *node = wapp_dbl_list_get(Str8, list, index);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list, index);
-		result = result && wapp_str8_equal(node, &(splits[index]));
+    result = result && wapp_str8_equal(node->item, &(splits[index]));
 
     ++index;
     running = index < count;
@@ -535,8 +535,8 @@ TestFuncResult test_str8_rsplit(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running1) {
-		Str8 *node = wapp_dbl_list_get(Str8, list1, index1);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list1, index1);
-		result = result && wapp_str8_equal(node, &(splits1[index1]));
+    result = result && wapp_str8_equal(node->item, &(splits1[index1]));
 
     ++index1;
     running1 = index1 < count1;
@@ -545,8 +545,8 @@ TestFuncResult test_str8_rsplit(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running2) {
-		Str8 *node = wapp_dbl_list_get(Str8, list2, index2);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list2, index2);
-		result = result && wapp_str8_equal(node, &(splits2[index2]));
+    result = result && wapp_str8_equal(node->item, &(splits2[index2]));
 
     ++index2;
     running2 = index2 < count2;
@@ -580,8 +580,8 @@ TestFuncResult test_str8_rsplit_with_max(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running) {
-		Str8 *node = wapp_dbl_list_get(Str8, list, index);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list, index);
-		result = result && wapp_str8_equal(node, &(splits[index]));
+    result = result && wapp_str8_equal(node->item, &(splits[index]));
 
     ++index;
     running = index < count;
@@ -616,10 +616,10 @@ TestFuncResult test_str8_from_bytes(void) {
   b8 result;
 
   Str8 str      = wapp_str8_buf(1024);
-	U8Array bytes = wapp_array(u8, 'W', 'A', 'P', 'P');
+  U8Array bytes = wapp_array(u8, U8Array, 'W', 'A', 'P', 'P');
-	wapp_str8_from_bytes(&str, bytes);
+  wapp_str8_from_bytes(&str, &bytes);
 
-	result = str.size == wapp_array_count(bytes) * wapp_array_item_size(bytes);
+  result = str.size == bytes.count * bytes.item_size;
   result = result && wapp_str8_equal(&str, &wapp_str8_lit_ro("WAPP"));
 
   return wapp_tester_result(result);

tests/str8/test_str8.cc

@@ -443,8 +443,8 @@ TestFuncResult test_str8_split(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running1) {
-		Str8 *node = wapp_dbl_list_get(Str8, list1, index1);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list1, index1);
-		result = result && wapp_str8_equal(node, &(splits1[index1]));
+    result = result && wapp_str8_equal(node->item, &(splits1[index1]));
 
     ++index1;
     running1 = index1 < count1;
@@ -453,8 +453,8 @@ TestFuncResult test_str8_split(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running2) {
-		Str8 *node = wapp_dbl_list_get(Str8, list2, index2);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list2, index2);
-		result = result && wapp_str8_equal(node, &(splits2[index2]));
+    result = result && wapp_str8_equal(node->item, &(splits2[index2]));
 
     ++index2;
     running2 = index2 < count2;
@@ -488,8 +488,8 @@ TestFuncResult test_str8_split_with_max(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running) {
-		Str8 *node = wapp_dbl_list_get(Str8, list, index);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list, index);
-		result = result && wapp_str8_equal(node, &(splits[index]));
+    result = result && wapp_str8_equal(node->item, &(splits[index]));
 
     ++index;
     running = index < count;
@@ -535,8 +535,8 @@ TestFuncResult test_str8_rsplit(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running1) {
-		Str8 *node = wapp_dbl_list_get(Str8, list1, index1);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list1, index1);
-		result = result && wapp_str8_equal(node, &(splits1[index1]));
+    result = result && wapp_str8_equal(node->item, &(splits1[index1]));
 
     ++index1;
     running1 = index1 < count1;
@@ -545,8 +545,8 @@ TestFuncResult test_str8_rsplit(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running2) {
-		Str8 *node = wapp_dbl_list_get(Str8, list2, index2);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list2, index2);
-		result = result && wapp_str8_equal(node, &(splits2[index2]));
+    result = result && wapp_str8_equal(node->item, &(splits2[index2]));
 
     ++index2;
     running2 = index2 < count2;
@@ -580,8 +580,8 @@ TestFuncResult test_str8_rsplit_with_max(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running) {
-		Str8 *node = wapp_dbl_list_get(Str8, list, index);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list, index);
-		result = result && wapp_str8_equal(node, &(splits[index]));
+    result = result && wapp_str8_equal(node->item, &(splits[index]));
 
     ++index;
     running = index < count;
@@ -617,10 +617,10 @@ TestFuncResult test_str8_from_bytes(void) {
 
   Str8 str      = wapp_str8_buf(1024);
   Str8 expected = wapp_str8_lit_ro("WAPP");
-	U8Array bytes = wapp_array(u8, 'W', 'A', 'P', 'P');
+  U8Array bytes = wapp_array(u8, U8Array, 'W', 'A', 'P', 'P');
-	wapp_str8_from_bytes(&str, bytes);
+  wapp_str8_from_bytes(&str, &bytes);
 
-	result = str.size == wapp_array_count(bytes) * wapp_array_item_size(bytes);
+  result = str.size == bytes.count * bytes.item_size;
   result = result && wapp_str8_equal(&str, &expected);
 
   return wapp_tester_result(result);

tests/str8/test_str8_list.c

@@ -10,28 +10,33 @@ TestFuncResult test_str8_list_get(void) {
   Str8 s4 = wapp_str8_lit("4");
   Str8 s5 = wapp_str8_lit("5");
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);
 
-	wapp_dbl_list_push_back(Str8, &list, &s1);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n5);
 
-	Str8 *node = wapp_dbl_list_get(Str8, &list, 0);
+  Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, &list, 0);
-	result = node == &s1 && wapp_str8_equal(node, &s1);
+  result = node->item == &s1 && wapp_str8_equal(node->item, &s1);
 
-	node   = wapp_dbl_list_get(Str8, &list, 1);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 1);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2);
+  result = result && node->item == &s2 && wapp_str8_equal(node->item, &s2);
 
-	node   = wapp_dbl_list_get(Str8, &list, 2);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 2);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3);
+  result = result && node->item == &s3 && wapp_str8_equal(node->item, &s3);
 
-	node   = wapp_dbl_list_get(Str8, &list, 3);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 3);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4);
+  result = result && node->item == &s4 && wapp_str8_equal(node->item, &s4);
 
-	node   = wapp_dbl_list_get(Str8, &list, 4);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 4);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5);
+  result = result && node->item == &s5 && wapp_str8_equal(node->item, &s5);
 
   return wapp_tester_result(result);
 }
@@ -43,16 +48,19 @@ TestFuncResult test_str8_list_push_front(void) {
   Str8 s2 = wapp_str8_lit("2");
   Str8 s3 = wapp_str8_lit("3");
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
 
-	wapp_dbl_list_push_front(Str8, &list, &s1);
+  wapp_dbl_list_push_front(Str8, &list, &n1);
-	result = list.first == list.last && list.first->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  result = list.first == list.last && list.first == &n1 && list.first->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
 
-	wapp_dbl_list_push_front(Str8, &list, &s2);
+  wapp_dbl_list_push_front(Str8, &list, &n2);
-	result = result && list.first->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  result = result && list.first == &n2 && list.first->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
 
-	wapp_dbl_list_push_front(Str8, &list, &s3);
+  wapp_dbl_list_push_front(Str8, &list, &n3);
-	result = result && list.first->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  result = result && list.first == &n3 && list.first->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
 
   return wapp_tester_result(result);
 }
@@ -64,16 +72,19 @@ TestFuncResult test_str8_list_push_back(void) {
   Str8 s2 = wapp_str8_lit("2");
   Str8 s3 = wapp_str8_lit("3");
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
 
-	wapp_dbl_list_push_back(Str8, &list, &s1);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
-	result = list.first == list.last && list.last->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  result = list.first == list.last && list.last == &n1 && list.last->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
 
-	wapp_dbl_list_push_back(Str8, &list, &s2);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
-	result = result && list.last->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  result = result && list.last == &n2 && list.last->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
 
-	wapp_dbl_list_push_back(Str8, &list, &s3);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
-	result = result && list.last->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  result = result && list.last == &n3 && list.last->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
 
   return wapp_tester_result(result);
 }
@@ -89,21 +100,28 @@ TestFuncResult test_str8_list_insert(void) {
   Str8 s6 = wapp_str8_lit("6");
   Str8 s7 = wapp_str8_lit("7");
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);
+  Str8Node n6   = wapp_str8_node_from_str8(s6);
+  Str8Node n7   = wapp_str8_node_from_str8(s7);
 
-	wapp_dbl_list_push_back(Str8, &list, &s1);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n5);
 
-	Str8 *node;
+  Str8Node *node;
-	wapp_dbl_list_insert(Str8, &list, &s6, 2);
+  wapp_dbl_list_insert(Str8, &list, &n6, 2);
-	node    = wapp_dbl_list_get(Str8, &list, 2);
+  node   = wapp_dbl_list_get(Str8, Str8Node, &list, 2);
-	result  = node != NULL && node == &s6 && wapp_str8_list_total_size(&list) == 6 && list.node_count == 6;
+  result = node != NULL && node->item == &s6 && wapp_str8_list_total_size(&list) == 6 && list.node_count == 6;
-	wapp_dbl_list_insert(Str8, &list, &s7, 5);
+  wapp_dbl_list_insert(Str8, &list, &n7, 5);
-	node    = wapp_dbl_list_get(Str8, &list, 5);
+  node   = wapp_dbl_list_get(Str8, Str8Node, &list, 5);
-	result  = result && node != NULL && node == &s7 && wapp_str8_list_total_size(&list) == 7 && list.node_count == 7;
+  result = result && node != NULL && node->item == &s7 && wapp_str8_list_total_size(&list) == 7 && list.node_count == 7;
 
   return wapp_tester_result(result);
 }
@@ -117,28 +135,33 @@ TestFuncResult test_str8_list_pop_front(void) {
   Str8 s4 = wapp_str8_lit("4");
   Str8 s5 = wapp_str8_lit("5");
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);
 
-	wapp_dbl_list_push_back(Str8, &list, &s1);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n5);
 
-	Str8 *node = wapp_dbl_list_pop_front(Str8, &list);
+  Str8Node *node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-	result = node == &s1 && wapp_str8_equal(node, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
+  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
 
-	node   = wapp_dbl_list_pop_front(Str8, &list);
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
 
-	node   = wapp_dbl_list_pop_front(Str8, &list);
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
 
-	node   = wapp_dbl_list_pop_front(Str8, &list);
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
 
-	node   = wapp_dbl_list_pop_front(Str8, &list);
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
+  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
 
   return wapp_tester_result(result);
 }
@@ -152,28 +175,33 @@ TestFuncResult test_str8_list_pop_back(void) {
   Str8 s4 = wapp_str8_lit("4");
   Str8 s5 = wapp_str8_lit("5");
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);
 
-	wapp_dbl_list_push_front(Str8, &list, &s1);
+  wapp_dbl_list_push_front(Str8, &list, &n1);
-	wapp_dbl_list_push_front(Str8, &list, &s2);
+  wapp_dbl_list_push_front(Str8, &list, &n2);
-	wapp_dbl_list_push_front(Str8, &list, &s3);
+  wapp_dbl_list_push_front(Str8, &list, &n3);
-	wapp_dbl_list_push_front(Str8, &list, &s4);
+  wapp_dbl_list_push_front(Str8, &list, &n4);
-	wapp_dbl_list_push_front(Str8, &list, &s5);
+  wapp_dbl_list_push_front(Str8, &list, &n5);
 
-	Str8 *node = wapp_dbl_list_pop_back(Str8, &list);
+  Str8Node *node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-	result = node == &s1 && wapp_str8_equal(node, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
+  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
 
-	node   = wapp_dbl_list_pop_back(Str8, &list);
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
 
-	node   = wapp_dbl_list_pop_back(Str8, &list);
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
 
-	node   = wapp_dbl_list_pop_back(Str8, &list);
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
 
-	node   = wapp_dbl_list_pop_back(Str8, &list);
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
+  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
 
   return wapp_tester_result(result);
 }
@@ -187,28 +215,33 @@ TestFuncResult test_str8_list_remove(void) {
   Str8 s4 = wapp_str8_lit("4");
   Str8 s5 = wapp_str8_lit("5");
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);
 
-	wapp_dbl_list_push_back(Str8, &list, &s1);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n5);
 
-	Str8 *node = wapp_dbl_list_remove(Str8, &list, 0);
+  Str8Node *node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-	result = node == &s1 && wapp_str8_equal(node, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
+  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
 
-	node   = wapp_dbl_list_remove(Str8, &list, 0);
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
 
-	node   = wapp_dbl_list_remove(Str8, &list, 0);
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
 
-	node   = wapp_dbl_list_remove(Str8, &list, 0);
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
 
-	node   = wapp_dbl_list_remove(Str8, &list, 0);
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
+  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
 
   return wapp_tester_result(result);
 }
@@ -216,11 +249,11 @@ TestFuncResult test_str8_list_remove(void) {
 TestFuncResult test_str8_list_empty(void) {
   b8 result;
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
-	wapp_dbl_list_push_back(Str8, &list, &wapp_str8_lit("Hello"));
+  wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("Hello"));
-	wapp_dbl_list_push_back(Str8, &list, &wapp_str8_lit("from"));
+  wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("from"));
-	wapp_dbl_list_push_back(Str8, &list, &wapp_str8_lit("wizapp"));
+  wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("wizapp"));
-	wapp_dbl_list_push_back(Str8, &list, &wapp_str8_lit("stdlib"));
+  wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("stdlib"));
 
   wapp_dbl_list_empty(Str8, &list);
 

tests/str8/test_str8_list.cc

@@ -10,28 +10,33 @@ TestFuncResult test_str8_list_get(void) {
   Str8 s4 = wapp_str8_lit("4");
   Str8 s5 = wapp_str8_lit("5");
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);
 
-	wapp_dbl_list_push_back(Str8, &list, &s1);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n5);
 
-	Str8 *node = wapp_dbl_list_get(Str8, &list, 0);
+  Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, &list, 0);
-	result = node == &s1 && wapp_str8_equal(node, &s1);
+  result = node->item == &s1 && wapp_str8_equal(node->item, &s1);
 
-	node   = wapp_dbl_list_get(Str8, &list, 1);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 1);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2);
+  result = result && node->item == &s2 && wapp_str8_equal(node->item, &s2);
 
-	node   = wapp_dbl_list_get(Str8, &list, 2);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 2);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3);
+  result = result && node->item == &s3 && wapp_str8_equal(node->item, &s3);
 
-	node   = wapp_dbl_list_get(Str8, &list, 3);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 3);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4);
+  result = result && node->item == &s4 && wapp_str8_equal(node->item, &s4);
 
-	node   = wapp_dbl_list_get(Str8, &list, 4);
+  node = wapp_dbl_list_get(Str8, Str8Node, &list, 4);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5);
+  result = result && node->item == &s5 && wapp_str8_equal(node->item, &s5);
 
   return wapp_tester_result(result);
 }
@@ -43,16 +48,19 @@ TestFuncResult test_str8_list_push_front(void) {
   Str8 s2 = wapp_str8_lit("2");
   Str8 s3 = wapp_str8_lit("3");
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
 
-	wapp_dbl_list_push_front(Str8, &list, &s1);
+  wapp_dbl_list_push_front(Str8, &list, &n1);
-	result = list.first == list.last && list.first->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  result = list.first == list.last && list.first == &n1 && list.first->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
 
-	wapp_dbl_list_push_front(Str8, &list, &s2);
+  wapp_dbl_list_push_front(Str8, &list, &n2);
-	result = result && list.first->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  result = result && list.first == &n2 && list.first->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
 
-	wapp_dbl_list_push_front(Str8, &list, &s3);
+  wapp_dbl_list_push_front(Str8, &list, &n3);
-	result = result && list.first->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  result = result && list.first == &n3 && list.first->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
 
   return wapp_tester_result(result);
 }
@@ -64,16 +72,19 @@ TestFuncResult test_str8_list_push_back(void) {
   Str8 s2 = wapp_str8_lit("2");
   Str8 s3 = wapp_str8_lit("3");
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
 
-	wapp_dbl_list_push_back(Str8, &list, &s1);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
-	result = list.first == list.last && list.last->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  result = list.first == list.last && list.last == &n1 && list.last->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
 
-	wapp_dbl_list_push_back(Str8, &list, &s2);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
-	result = result && list.last->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  result = result && list.last == &n2 && list.last->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
 
-	wapp_dbl_list_push_back(Str8, &list, &s3);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
-	result = result && list.last->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  result = result && list.last == &n3 && list.last->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
 
   return wapp_tester_result(result);
 }
@@ -89,21 +100,28 @@ TestFuncResult test_str8_list_insert(void) {
   Str8 s6 = wapp_str8_lit("6");
   Str8 s7 = wapp_str8_lit("7");
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);
+  Str8Node n6   = wapp_str8_node_from_str8(s6);
+  Str8Node n7   = wapp_str8_node_from_str8(s7);
 
-	wapp_dbl_list_push_back(Str8, &list, &s1);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n5);
 
-	Str8 *node;
+  Str8Node *node;
-	wapp_dbl_list_insert(Str8, &list, &s6, 2);
+  wapp_dbl_list_insert(Str8, &list, &n6, 2);
-	node   = wapp_dbl_list_get(Str8, &list, 2);
+  node   = wapp_dbl_list_get(Str8, Str8Node, &list, 2);
-	result = node != NULL && node == &s6 && wapp_str8_list_total_size(&list) == 6 && list.node_count == 6;
+  result = node != NULL && node->item == &s6 && wapp_str8_list_total_size(&list) == 6 && list.node_count == 6;
-	wapp_dbl_list_insert(Str8, &list, &s7, 5);
+  wapp_dbl_list_insert(Str8, &list, &n7, 5);
-	node   = wapp_dbl_list_get(Str8, &list, 5);
+  node   = wapp_dbl_list_get(Str8, Str8Node, &list, 5);
-	result = result && node != NULL && node == &s7 && wapp_str8_list_total_size(&list) == 7 && list.node_count == 7;
+  result = result && node != NULL && node->item == &s7 && wapp_str8_list_total_size(&list) == 7 && list.node_count == 7;
 
   return wapp_tester_result(result);
 }
@@ -117,28 +135,33 @@ TestFuncResult test_str8_list_pop_front(void) {
   Str8 s4 = wapp_str8_lit("4");
   Str8 s5 = wapp_str8_lit("5");
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);
 
-	wapp_dbl_list_push_back(Str8, &list, &s1);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n5);
 
-	Str8 *node = wapp_dbl_list_pop_front(Str8, &list);
+  Str8Node *node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-	result = node == &s1 && wapp_str8_equal(node, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
+  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
 
-	node   = wapp_dbl_list_pop_front(Str8, &list);
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
 
-	node   = wapp_dbl_list_pop_front(Str8, &list);
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
 
-	node   = wapp_dbl_list_pop_front(Str8, &list);
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
 
-	node   = wapp_dbl_list_pop_front(Str8, &list);
+  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
+  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
 
   return wapp_tester_result(result);
 }
@@ -152,28 +175,33 @@ TestFuncResult test_str8_list_pop_back(void) {
   Str8 s4 = wapp_str8_lit("4");
   Str8 s5 = wapp_str8_lit("5");
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);
 
-	wapp_dbl_list_push_front(Str8, &list, &s1);
+  wapp_dbl_list_push_front(Str8, &list, &n1);
-	wapp_dbl_list_push_front(Str8, &list, &s2);
+  wapp_dbl_list_push_front(Str8, &list, &n2);
-	wapp_dbl_list_push_front(Str8, &list, &s3);
+  wapp_dbl_list_push_front(Str8, &list, &n3);
-	wapp_dbl_list_push_front(Str8, &list, &s4);
+  wapp_dbl_list_push_front(Str8, &list, &n4);
-	wapp_dbl_list_push_front(Str8, &list, &s5);
+  wapp_dbl_list_push_front(Str8, &list, &n5);
 
-	Str8 *node = wapp_dbl_list_pop_back(Str8, &list);
+  Str8Node *node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-	result = node == &s1 && wapp_str8_equal(node, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
+  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
 
-	node   = wapp_dbl_list_pop_back(Str8, &list);
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
 
-	node   = wapp_dbl_list_pop_back(Str8, &list);
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
 
-	node   = wapp_dbl_list_pop_back(Str8, &list);
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
 
-	node   = wapp_dbl_list_pop_back(Str8, &list);
+  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
+  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
 
   return wapp_tester_result(result);
 }
@@ -187,28 +215,33 @@ TestFuncResult test_str8_list_remove(void) {
   Str8 s4 = wapp_str8_lit("4");
   Str8 s5 = wapp_str8_lit("5");
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
+  Str8Node n1   = wapp_str8_node_from_str8(s1);
+  Str8Node n2   = wapp_str8_node_from_str8(s2);
+  Str8Node n3   = wapp_str8_node_from_str8(s3);
+  Str8Node n4   = wapp_str8_node_from_str8(s4);
+  Str8Node n5   = wapp_str8_node_from_str8(s5);
 
-	wapp_dbl_list_push_back(Str8, &list, &s1);
+  wapp_dbl_list_push_back(Str8, &list, &n1);
-	wapp_dbl_list_push_back(Str8, &list, &s2);
+  wapp_dbl_list_push_back(Str8, &list, &n2);
-	wapp_dbl_list_push_back(Str8, &list, &s3);
+  wapp_dbl_list_push_back(Str8, &list, &n3);
-	wapp_dbl_list_push_back(Str8, &list, &s4);
+  wapp_dbl_list_push_back(Str8, &list, &n4);
-	wapp_dbl_list_push_back(Str8, &list, &s5);
+  wapp_dbl_list_push_back(Str8, &list, &n5);
 
-	Str8 *node = wapp_dbl_list_remove(Str8, &list, 0);
+  Str8Node *node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-	result = node == &s1 && wapp_str8_equal(node, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
+  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
 
-	node   = wapp_dbl_list_remove(Str8, &list, 0);
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-	result = result && node == &s2 && wapp_str8_equal(node, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
+  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
 
-	node   = wapp_dbl_list_remove(Str8, &list, 0);
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-	result = result && node == &s3 && wapp_str8_equal(node, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
+  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
 
-	node   = wapp_dbl_list_remove(Str8, &list, 0);
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-	result = result && node == &s4 && wapp_str8_equal(node, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
+  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
 
-	node   = wapp_dbl_list_remove(Str8, &list, 0);
+  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-	result = result && node == &s5 && wapp_str8_equal(node, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
+  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
 
   return wapp_tester_result(result);
 }
@@ -216,18 +249,18 @@ TestFuncResult test_str8_list_remove(void) {
 TestFuncResult test_str8_list_empty(void) {
   b8 result;
 
-	Str8List list = wapp_dbl_list(Str8);
+  Str8List list = wapp_dbl_list(Str8, Str8List);
 
-	Str8 hello = wapp_str8_lit("Hello");
+  Str8Node hello = wapp_str8_node_from_cstr("Hello");
   wapp_dbl_list_push_back(Str8, &list, &hello);
 
-	Str8 from = wapp_str8_lit("from");
+  Str8Node from = wapp_str8_node_from_cstr("from");
   wapp_dbl_list_push_back(Str8, &list, &from);
 
-	Str8 wizapp = wapp_str8_lit("wizapp");
+  Str8Node wizapp = wapp_str8_node_from_cstr("wizapp");
   wapp_dbl_list_push_back(Str8, &list, &wizapp);
 
-	Str8 stdlib = wapp_str8_lit("stdlib");
+  Str8Node stdlib = wapp_str8_node_from_cstr("stdlib");
   wapp_dbl_list_push_back(Str8, &list, &stdlib);
 
   wapp_dbl_list_empty(Str8, &list);

tests/wapptest.c

@@ -4,9 +4,7 @@
 #include "test_arena.h"
 #include "test_str8_array.h"
 #include "test_i32_array.h"
-#include "test_queue.h"
 #include "test_cpath.h"
-#include "test_file.h"
 #include "test_shell_commander.h"
 #include "wapp.h"
 #include <stdlib.h>
@@ -14,22 +12,14 @@
 int main(void) {
   wapp_tester_run_tests(
       test_arena_allocator,
-		test_arena_allocator_with_buffer,
+      test_arena_init,
-		test_arena_allocator_temp_begin,
-		test_arena_allocator_temp_end,
-		test_arena_init_buffer,
-		test_arena_init_allocated,
       test_arena_init_succeeds_when_reserving_very_large_size,
-		test_arena_alloc_with_buffer,
       test_arena_alloc_succeeds_when_within_capacity,
       test_arena_alloc_fails_when_over_capacity,
       test_arena_realloc_bigger_size,
       test_arena_realloc_smaller_size,
-		test_arena_temp_begin,
-		test_arena_temp_end,
       test_arena_clear,
-		test_arena_destroy_buffer,
+      test_arena_destroy,
-		test_arena_destroy_allocated,
       test_str8_array,
       test_i32_array,
       test_i32_array_with_capacity,
@@ -44,9 +34,6 @@ int main(void) {
       test_i32_array_copy_alloc,
       test_i32_array_pop,
       test_i32_array_clear,
-		test_queue_push,
-		test_queue_push_alloc,
-		test_queue_pop,
       test_str8_lit,
       test_str8_lit_ro,
       test_str8_buf,
@@ -83,18 +70,6 @@ int main(void) {
       test_cpath_join_path,
       test_cpath_dirname,
       test_cpath_dirup,
-		test_wapp_file_open,
-		test_wapp_file_get_current_position,
-		test_wapp_file_seek,
-		test_wapp_file_get_length,
-		test_wapp_file_read,
-		test_wapp_file_write,
-		test_wapp_file_read_array,
-		test_wapp_file_write_array,
-		test_wapp_file_flush,
-		test_wapp_file_close,
-		test_wapp_file_rename,
-		test_wapp_file_remove,
       test_commander_cmd_success,
       test_commander_cmd_failure,
       test_commander_cmd_out_buf_success,

tests/wapptest.cc

@@ -4,9 +4,7 @@
 #include "test_arena.h"
 #include "test_str8_array.h"
 #include "test_i32_array.h"
-#include "test_queue.h"
 #include "test_cpath.h"
-#include "test_file.h"
 #include "test_shell_commander.h"
 #include "wapp.h"
 #include <stdlib.h>
@@ -14,22 +12,14 @@
 int main(void) {
   wapp_tester_run_tests(
       test_arena_allocator,
-		test_arena_allocator_with_buffer,
+      test_arena_init,
-		test_arena_allocator_temp_begin,
-		test_arena_allocator_temp_end,
-		test_arena_init_buffer,
-		test_arena_init_allocated,
       test_arena_init_succeeds_when_reserving_very_large_size,
-		test_arena_alloc_with_buffer,
       test_arena_alloc_succeeds_when_within_capacity,
       test_arena_alloc_fails_when_over_capacity,
       test_arena_realloc_bigger_size,
       test_arena_realloc_smaller_size,
-		test_arena_temp_begin,
-		test_arena_temp_end,
       test_arena_clear,
-		test_arena_destroy_buffer,
+      test_arena_destroy,
-		test_arena_destroy_allocated,
       test_str8_array,
       test_i32_array,
       test_i32_array_with_capacity,
@@ -37,16 +27,13 @@ int main(void) {
       test_i32_array_set,
       test_i32_array_append_capped,
       test_i32_array_extend_capped,
+      test_i32_array_clear,
+      test_i32_array_pop,
       test_i32_array_copy_capped,
       test_i32_array_alloc_capacity,
       test_i32_array_append_alloc,
       test_i32_array_extend_alloc,
       test_i32_array_copy_alloc,
-		test_i32_array_pop,
-		test_i32_array_clear,
-		test_queue_push,
-		test_queue_push_alloc,
-		test_queue_pop,
       test_str8_lit,
       test_str8_lit_ro,
       test_str8_buf,
@@ -83,18 +70,6 @@ int main(void) {
       test_cpath_join_path,
       test_cpath_dirname,
       test_cpath_dirup,
-		test_wapp_file_open,
-		test_wapp_file_get_current_position,
-		test_wapp_file_seek,
-		test_wapp_file_get_length,
-		test_wapp_file_read,
-		test_wapp_file_write,
-		test_wapp_file_read_array,
-		test_wapp_file_write_array,
-		test_wapp_file_flush,
-		test_wapp_file_close,
-		test_wapp_file_rename,
-		test_wapp_file_remove,
       test_commander_cmd_success,
       test_commander_cmd_failure,
       test_commander_cmd_out_buf_success,