Prefix static macros

Co-authored-by: Abdelrahman Said <said.abdelrahman@flawlessai.com>
Reviewed-on: #5
Co-authored-by: Abdelrahman <said.abdelrahman89@gmail.com>
Co-committed-by: Abdelrahman <said.abdelrahman89@gmail.com>

.gitignore

@@ -1,5 +1,6 @@
 .cache
 .vscode
+.venv
 test
 test.*
 *.dSYM
@@ -8,6 +9,6 @@ test.*
 *.obj
 compile_commands.json
 libwapp-build
-libwapp.so
+dist
 *.vs
 __pycache__

Makefile

@@ -1,22 +1,42 @@
-CC           = clang
-BUILD_TYPE   = debug
-CFLAGS       = -Wall -Wextra -Werror -pedantic -std=gnu11 -Isrc
-LIBFLAGS     = -fPIC -shared
-KERNEL       = $(shell uname -s)
-MACHINE      = $(shell uname -m)
-PLATFORM     = $(KERNEL)_$(MACHINE)
-TEST_INCLUDE = -Isrc $(shell find tests -type d | xargs -I{} echo -n "-I{} ")
-TEST_SRC     = src/wapp.c $(shell find tests -type f -name "*.c" | xargs -I{} echo -n "{} ")
-BUILD_DIR    = libwapp-build/$(PLATFORM)-$(BUILD_TYPE)
-LIB_OUT      = $(BUILD_DIR)/libwapp.so
-TEST_OUT     = $(BUILD_DIR)/wapptest
+.PHONY: help full prng testing uuid core primitives all clean builddir build-test run-test codegen install build-lib ccodegen
 
-ifeq ($(BUILD_TYPE),debug)
-	CFLAGS += -g -fsanitize=address,undefined
-else ifeq ($(BUILD_TYPE),release)
-	CFLAGS += -O3
+# External variables
+CC             = clang
+CXX            = clang++
+AR             = ar
+BUILD_TYPE     = Debug
+BUILD_DIR      = libwapp-build/$(PLATFORM)-$(BUILD_TYPE)
+INSTALL_PREFIX = dist
+
+# Internal variables
+override CFLAGS              = -Wall -Wextra -Werror -pedantic -Isrc
+override LIBFLAGS            = -fPIC
+override CSTD               := -std=gnu11
+override CXXSTD             := -std=gnu++11
+override KERNEL             := $(shell uname -s)
+override MACHINE            := $(shell uname -m)
+override PLATFORM           := $(KERNEL)_$(MACHINE)
+override TEST_INCLUDE       := -Isrc $(shell find tests -type d | xargs -I{} echo -n "-I{} ")
+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_NAME           := wapp
+override OBJ_OUT            := $(BUILD_DIR)/$(LIB_NAME).o
+override LIB_OUT            := $(BUILD_DIR)/lib$(LIB_NAME).a
+override TEST_C_OUT         := $(BUILD_DIR)/wapptest
+override TEST_CXX_OUT       := $(BUILD_DIR)/wapptestcc
+override INCLUDE_INSTALL    := $(INSTALL_PREFIX)/include/$(LIB_NAME)
+override LIB_INSTALL        := $(INSTALL_PREFIX)/lib
+override HEADER_INSTALL_CMD := scripts/header_install.sh
+
+ifeq ($(BUILD_TYPE),Debug)
+	override CFLAGS += -g -fsanitize=address,undefined -DWAPP_DEBUG_ASSERT
+else ifeq ($(BUILD_TYPE),RelWithDebInfo)
+	override CFLAGS += -g -O2 -fsanitize=address,undefined -DWAPP_DEBUG_ASSERT
+else ifeq ($(BUILD_TYPE),Release)
+	override CFLAGS += -O3
 else
-	$(error Invalid BUILD type '$(BUILD_TYPE)'. Use 'debug' or 'release')
+	$(error Invalid BUILD type '$(BUILD_TYPE)'. Use 'Debug', 'RelWithDebInfo' or 'Release')
 endif
 
 ifeq ($(CC),gcc)
@@ -24,9 +44,51 @@ ifeq ($(CC),gcc)
   export ASAN_OPTIONS=verify_asan_link_order=0
 endif
 
-.PHONY: all clean builddir build-test run-test codegen build-lib full prng testing uuid core primitives
+all: clean builddir codegen run-c-test full run-cc-test
 
-all: clean builddir codegen run-test full
+help:
+	@echo "Available build variables:"
+	@echo "  CC                C compiler to use (Default: clang)."
+	@echo "  CXX               C++ compiler to use (Default: clang++)."
+	@echo "  AR                Archiving utility to use for building static libraries (Default: ar)."
+	@echo "  BUILD_TYPE        Build type. Choose from \`Debug\`, \`RelWithDebInfo\` or \`Release\` (Default: Debug)."
+	@echo "  BUILD_DIR         Directory where build files will be written."
+	@echo "  INSTALL_PREFIX    Prefix where library and include files will be installed."
+	@echo
+	@echo "Available targets:"
+	@echo "  make              Build, install and test the full wapp library."
+	@echo "  make full         Build and install the full wapp library."
+	@echo "  make core         Build and install only the \`core\` component of the wapp library with all its dependencies."
+	@echo "  make prng         Build and install only the \`prng\` component of the wapp library with all its dependencies."
+	@echo "  make uuid         Build and install only the \`uuid\` component of the wapp library with all its dependencies."
+	@echo "  make testing      Build and install only the \`testing\` component of the wapp library with all its dependencies."
+	@echo "  make primitives   Build and install only the \`primitives\` component of the wapp library with all its dependencies."
+	@echo "  make clean        Clean build directory."
+	@echo "  make help         Print this help message and exit."
+
+full: LIB_SRC = src/wapp.c
+full: INCLUDES = common core primitives prng testing uuid
+full: install
+
+prng: LIB_SRC = src/prng/wapp_prng.c
+prng: INCLUDES = common prng
+prng: install
+
+testing: LIB_SRC = src/testing/wapp_testing.c
+testing: INCLUDES = common core testing
+testing: install
+
+uuid: LIB_SRC = src/uuid/wapp_uuid.c
+uuid: INCLUDES = common primitives prng
+uuid: install
+
+core: LIB_SRC = src/core/wapp_core.c
+core: INCLUDES = common core primitives
+core: install
+
+primitives: LIB_SRC = src/primitives/wapp_primitives.c
+primitives: INCLUDES = common primitives
+primitives: install
 
 clean:
 	@rm -rf $(BUILD_DIR)
@@ -34,33 +96,35 @@ clean:
 builddir:
 	@mkdir -p $(BUILD_DIR)
 
-build-test:
-	$(CC) $(CFLAGS) $(TEST_INCLUDE) $(TEST_SRC) -o $(TEST_OUT)
+build-c-test:
+	$(CC) $(CSTD) $(CFLAGS) $(TEST_INCLUDE) $(TEST_C_SRC) -o $(TEST_C_OUT)
 
-run-test: build-test
-	@$(TEST_OUT)
-	@rm $(TEST_OUT)
+run-c-test: build-c-test
+	@echo -e "\n\033[34;1mRUNNING C TESTS\033[0m"
+	@$(TEST_C_OUT)
+	@rm $(TEST_C_OUT)
+
+build-cc-test:
+	$(CXX) $(CXXSTD) $(CFLAGS) $(TEST_INCLUDE) $(TEST_CXX_SRC) $(LIB_OUT) -o $(TEST_CXX_OUT)
+
+run-cc-test: build-cc-test
+	@echo -e "\n\033[34;1mRUNNING C++ TESTS\033[0m"
+	@export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(BUILD_DIR) && $(TEST_CXX_OUT)
+	@rm $(TEST_CXX_OUT)
 
 codegen:
 	python3 -m codegen
 
-build-lib:
-	$(CC) $(CFLAGS) $(LIBFLAGS) $(LIB_SRC) -o $(LIB_OUT)
+install: build-lib
+	@mkdir -p $(LIB_INSTALL)
+	@cp -v $(LIB_OUT) $(LIB_INSTALL)
+	@mkdir -p $(INCLUDE_INSTALL)
+	@bash $(HEADER_INSTALL_CMD) $(LIB_SRC) $(INCLUDE_INSTALL) $(INCLUDES)
 
-full: LIB_SRC = src/wapp.c
-full: build-lib
+build-lib: builddir
+	$(CC) -c $(CSTD) $(CFLAGS) $(LIBFLAGS) $(LIB_SRC) -o $(OBJ_OUT)
+	$(AR) r $(LIB_OUT) $(OBJ_OUT)
+	@rm $(OBJ_OUT)
 
-prng: LIB_SRC = src/prng/wapp_prng.c
-prng: build-lib
-
-testing: LIB_SRC = src/testing/wapp_testing.c
-testing: build-lib
-
-uuid: LIB_SRC = src/uuid/wapp_uuid.c
-uuid: build-lib
-
-core: LIB_SRC = src/core/wapp_core.c
-core: build-lib
-
-primitives: LIB_SRC = src/core/wapp_primitives.c
-primitives: build-lib
+ccodegen:
+	$(CC) $(CSTD) $(CFLAGS) $(LIBFLAGS) -Isrc/core src/core/wapp_core.c ccodegen/*.c -o ccgen

build

@@ -1,13 +1,45 @@
 #!/bin/bash
 
-BUILD_TYPE="debug"
+# Colors
+RED="\033[0;31m"
+BOLD="\033[1m"
+NC="\033[0m" # No Color
+
+BUILD_TYPE="Debug"
+ACCEPTED_BUILD_TYPES=("Debug" "RelWithDebInfo" "Release")
+KERNEL="$(uname -s)"
 ARGS=""
 
+join_array_elements() {
+  local IFS=","
+  echo "$*"
+}
+
+contains() {
+  local item="$1"; shift
+  local e
+  for e; do
+    [[ "$e" == "$item" ]] && return 0
+  done
+  return 1
+}
+
+print_usage() {
+  echo -e "Usage: build [-b build_type] ..."
+  echo -e "  Options:"
+  echo -e "    -b, --build-type    Choose from $(join_array_elements ${ACCEPTED_BUILD_TYPES[*]}) (Default: Debug)."
+  echo -e "    -h, --help          Print this message and exit"
+}
+
 while [[ $# > 0 ]];do
   case $1 in
-    --release)
-      BUILD_TYPE="release"
-      shift
+    -b|--build-type)
+      BUILD_TYPE="$2"
+      shift 2
+      ;;
+    -h|--help)
+      print_usage
+      exit 0
       ;;
     *|-*|--*)
       rest=("$@")
@@ -17,4 +49,21 @@ while [[ $# > 0 ]];do
   esac
 done
 
-bear -- make BUILD_TYPE=$BUILD_TYPE $ARGS
+if ! contains ${BUILD_TYPE} "${ACCEPTED_BUILD_TYPES[@]}"; then
+  echo -e "${RED}${BOLD}Unknown build type: ${BUILD_TYPE}${NC}\n"
+  print_usage
+  exit 1
+fi
+
+if [[ $KERNEL == "Darwin" ]]; then
+  if [[ ! -d .venv ]]; then
+    python3 -m venv .venv
+  fi
+
+  source .venv/bin/activate
+  pip install scan-build
+  intercept-build make CC=intercept-cc CXX=intercept-c++ BUILD_TYPE=$BUILD_TYPE $ARGS
+  deactivate
+else
+  bear -- make BUILD_TYPE=$BUILD_TYPE $ARGS
+fi

ccodegen/datatypes.c

@@ -0,0 +1,522 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "datatypes.h"
+#include "dbl_list.h"
+#include "type_enums.h"
+#include "wapp_core.h"
+
+#define ERR_MSG "Not enough capacity in dst buffer"
+#define CFILE_DISCLAIMER "/**\n" \
+  " * THIS FILE IS AUTOMATICALLY GENERATED. ANY MODIFICATIONS TO IT WILL BE OVERWRITTEN.\n" \
+  " */\n\n"
+
+void cobject_to_string(Str8 *dst, const CObject *object) {
+  wapp_debug_assert(dst != NULL && object != NULL, "`allocator`, `dst` and `object` should not be NULL");
+
+  switch (object->kind) {
+    case COBJECT_CTYPE:
+      ctype_to_string(dst, object->object.c_type);
+      break;
+    case COBJECT_CQUALIFIER:
+      cqualifier_to_string(dst, object->object.c_qualifier);
+      break;
+    case COBJECT_CPOINTERTYPE:
+      cpointertype_to_string(dst, object->object.c_pointertype);
+      break;
+    case COBJECT_CPOINTER:
+      cpointer_to_string(dst, &(object->object.c_pointer));
+      break;
+    case COBJECT_CENUMVAL:
+      cenumval_to_string(dst, &(object->object.c_enumval));
+      break;
+    case COBJECT_CENUM:
+      cenum_to_string(dst, &(object->object.c_enum));
+      break;
+    case COBJECT_CMACRO:
+      cmacro_to_string(dst, &(object->object.c_macro));
+      break;
+    case COBJECT_CSTRUCT:
+      cstruct_to_string(dst, &(object->object.c_struct));
+      break;
+    case COBJECT_CUSERTYPE:
+      cusertype_to_string(dst, &(object->object.c_usertype));
+      break;
+    case COBJECT_CDATATYPE:
+      cdatatype_to_string(dst, &(object->object.c_datatype));
+      break;
+    case COBJECT_CARG:
+      carg_to_string(dst, &(object->object.c_arg));
+      break;
+    case COBJECT_CFUNC:
+      cfunc_to_string(dst, &(object->object.c_func));
+      break;
+    case COBJECT_CINCULDE:
+      cinclude_to_string(dst, &(object->object.c_include));
+      break;
+    case COBJECT_CHEADER:
+      cheader_to_string(dst, &(object->object.c_header));
+      break;
+    case COBJECT_CSOURCE:
+      csource_to_string(dst, &(object->object.c_source));
+      break;
+    default:
+      break;
+  }
+}
+
+void ctype_to_string(Str8 *dst, CType ctype) {
+  wapp_runtime_assert(ctypes[ctype].size <= dst->capacity, ERR_MSG);
+  wapp_str8_copy_str8_capped(dst, &ctypes[ctype]);
+}
+
+void cqualifier_to_string(Str8 *dst, CQualifier cqualifier) {
+  wapp_runtime_assert(cqualifiers[cqualifier].size <= dst->capacity, ERR_MSG);
+  wapp_str8_copy_str8_capped(dst, &cqualifiers[cqualifier]);
+}
+
+void cpointertype_to_string(Str8 *dst, CPointerType cpointertype) {
+  wapp_runtime_assert(cpointertypes[cpointertype].size <= dst->capacity, ERR_MSG);
+  wapp_str8_copy_str8_capped(dst, &cpointertypes[cpointertype]);
+}
+
+void cpointer_to_string(Str8 *dst, const CPointer *cpointer) {
+  wapp_debug_assert(dst != NULL && cpointer != NULL, "`dst` and `cpointer` should not be NULL");
+
+  u64 total_size = cpointertypes[cpointer->type].size + cqualifiers[cpointer->qualifier].size;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst,
+                   WAPP_STR8_SPEC WAPP_STR8_SPEC,
+                   wapp_str8_varg(cpointertypes[cpointer->type]),
+                   wapp_str8_varg(cqualifiers[cpointer->qualifier]));
+}
+
+void cenumval_to_string(Str8 *dst, const CEnumVal *cenumval) {
+  wapp_debug_assert(dst != NULL && cenumval != NULL, "`dst` and `cenumval` should not be NULL");
+
+  Str8 tmp     = wapp_str8_buf(CCGEN_BUF_TINY);
+  u64 tmp_size = 0;
+  if (cenumval->value != NULL) {
+    wapp_str8_format(&tmp, " = %d", *(cenumval->value));
+    tmp_size = tmp.size;
+  }
+
+  u64 total_size = cenumval->name.size + tmp_size;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst,
+                   WAPP_STR8_SPEC WAPP_STR8_SPEC,
+                   wapp_str8_varg(cenumval->name),
+                   wapp_str8_varg(tmp));
+}
+
+void cenum_to_string(Str8 *dst, const CEnum *cenum) {
+  wapp_debug_assert(dst != NULL && cenum != NULL, "`dst` and `cenum` should not be NULL");
+
+  Str8 header = wapp_str8_buf(CCGEN_BUF_LARGE);
+  Str8 values = wapp_str8_buf(CCGEN_BUF_MAX);
+  Str8 footer = wapp_str8_buf(CCGEN_BUF_LARGE);
+  Str8 tmp    = wapp_str8_buf(CCGEN_BUF_LARGE);
+
+  if (cenum->add_typedef) {
+    wapp_str8_copy_cstr_capped(&header, "typedef enum {\n");
+    wapp_str8_format(&footer, "} " WAPP_STR8_SPEC ";\n", wapp_str8_varg(cenum->name));
+  } else {
+    wapp_str8_format(&header, "enum " WAPP_STR8_SPEC " {\n", wapp_str8_varg(cenum->name));
+    wapp_str8_copy_cstr_capped(&footer, "};\n");
+  }
+
+  for (u64 i = 0; i < cenum->values.node_count; ++i) {
+    cenumval_to_string(&tmp, wapp_cenumval_list_get(&(cenum->values), i)->item);
+    // Add 4 for extra characters
+    wapp_runtime_assert(tmp.size + 4 <= values.capacity - values.size, ERR_MSG);
+    wapp_str8_concat_capped(&values, &wapp_str8_lit_ro("  "));
+    wapp_str8_concat_capped(&values, &tmp);
+    wapp_str8_concat_capped(&values, &wapp_str8_lit_ro(",\n"));
+  }
+
+  u64 total_size = header.size + values.size + footer.size;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst,
+                   WAPP_STR8_SPEC WAPP_STR8_SPEC WAPP_STR8_SPEC,
+                   wapp_str8_varg(header),
+                   wapp_str8_varg(values),
+                   wapp_str8_varg(footer));
+}
+
+void cmacro_to_string(Str8 *dst, const CMacro *cmacro) {
+  wapp_debug_assert(dst != NULL && cmacro != NULL, "`dst` and `cmacro` should not be NULL");
+
+  Str8 def       = wapp_str8_lit("#define ");
+  u64 total_size = def.size + cmacro->name.size + cmacro->value.size + 1; // Add 1 for newline
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst,
+                   WAPP_STR8_SPEC WAPP_STR8_SPEC " " WAPP_STR8_SPEC "\n",
+                   wapp_str8_varg(def),
+                   wapp_str8_varg(cmacro->name),
+                   wapp_str8_varg(cmacro->value));
+}
+
+void cstruct_to_string(Str8 *dst, const CStruct *cstruct) {
+  wapp_debug_assert(dst != NULL && cstruct != NULL, "`dst` and `cstruct` should not be NULL");
+
+  Str8 declaration = wapp_str8_buf(CCGEN_BUF_LARGE);
+  Str8 definition  = wapp_str8_buf(CCGEN_BUF_MAX);
+
+  declare_cstruct(&declaration, cstruct);
+  define_cstruct(&definition, cstruct);
+
+  u64 total_size = declaration.size + definition.size;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst, WAPP_STR8_SPEC WAPP_STR8_SPEC,
+                   wapp_str8_varg(declaration), wapp_str8_varg(definition));
+}
+
+void declare_cstruct(Str8 *dst, const CStruct *cstruct) {
+  wapp_debug_assert(dst != NULL && cstruct != NULL, "`dst` and `cstruct` should not be NULL");
+
+  Str8 tmp = wapp_str8_buf(CCGEN_BUF_MAX);
+  wapp_str8_format(&tmp,
+                   "typedef struct " WAPP_STR8_SPEC " " WAPP_STR8_SPEC ";\n",
+                   wapp_str8_varg(cstruct->name),
+                   wapp_str8_varg(cstruct->typedef_name.size > 0 ? cstruct->typedef_name : cstruct->name));
+
+  wapp_runtime_assert(tmp.size <= dst->capacity, ERR_MSG);
+  wapp_str8_copy_str8_capped(dst, &tmp);
+}
+
+void define_cstruct(Str8 *dst, const CStruct *cstruct) {
+  wapp_debug_assert(dst != NULL && cstruct != NULL, "`dst` and `cstruct` should not be NULL");
+
+  Str8 definition = wapp_str8_buf(CCGEN_BUF_LARGE);
+  Str8 args       = wapp_str8_buf(CCGEN_BUF_MAX);
+  Str8 footer     = wapp_str8_lit_ro("};\n");
+  Str8 tmp        = wapp_str8_buf(CCGEN_BUF_MEDIUM);
+
+  wapp_str8_format(&definition, "struct " WAPP_STR8_SPEC " {\n", wapp_str8_varg(cstruct->name));
+
+  for (u64 i = 0; i < cstruct->args.node_count; ++i) {
+    carg_to_string(&tmp, wapp_carg_list_get(&(cstruct->args), i)->item);
+    // Add 4 for extra characters
+    wapp_runtime_assert(tmp.size + 4 <= args.capacity - args.size, ERR_MSG);
+    wapp_str8_concat_capped(&args, &wapp_str8_lit_ro("  "));
+    wapp_str8_concat_capped(&args, &tmp);
+    wapp_str8_concat_capped(&args, &wapp_str8_lit_ro(";\n"));
+  }
+
+  u64 total_size = definition.size + args.size + footer.size;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst,
+                   WAPP_STR8_SPEC WAPP_STR8_SPEC WAPP_STR8_SPEC,
+                   wapp_str8_varg(definition),
+                   wapp_str8_varg(args),
+                   wapp_str8_varg(footer));
+}
+
+void cusertype_to_string(Str8 *dst, const CUserType *cusertype) {
+  wapp_debug_assert(dst != NULL && cusertype != NULL, "`dst` and `cusertype` should not be NULL");
+
+  switch (cusertype->kind) {
+    case CUSERTYPE_CENUM:
+      cenum_to_string(dst, &(cusertype->type.c_enum));
+      break;
+    case CUSERTYPE_CSTRUCT:
+      cstruct_to_string(dst, &(cusertype->type.c_struct));
+      break;
+    default:
+      break;
+  }
+}
+
+void cdatatype_to_string(Str8 *dst, const CDataType *cdatatype) {
+  wapp_debug_assert(dst != NULL && cdatatype != NULL, "`dst` and `cdatatype` should not be NULL");
+
+  switch (cdatatype->kind) {
+    case CDATATYPE_CTYPE:
+      ctype_to_string(dst, cdatatype->type.c_type);
+      break;
+    case CDATATYPE_CUSERTYPE:
+      cusertype_to_string(dst, &(cdatatype->type.c_usertype));
+      break;
+    case CDATATYPE_STR:
+      wapp_runtime_assert(cdatatype->type.str.size <= dst->capacity, ERR_MSG);
+      wapp_str8_copy_str8_capped(dst, &(cdatatype->type.str));
+      break;
+    default:
+      break;
+  }
+}
+
+void carg_to_string(Str8 *dst, const CArg *carg) {
+  wapp_debug_assert(dst != NULL && carg != NULL, "`dst` and `carg` should not be NULL");
+
+  Str8 qualifier = wapp_str8_buf(CCGEN_BUF_MEDIUM);
+  Str8 type      = wapp_str8_buf(CCGEN_BUF_LARGE);
+  Str8 pointer   = wapp_str8_buf(CCGEN_BUF_MEDIUM);
+  Str8 array     = wapp_str8_buf(CCGEN_BUF_MEDIUM);
+
+  cqualifier_to_string(&qualifier, carg->qualifier);
+  cdatatype_to_string(&type, &(carg->type));
+  wapp_str8_concat_capped(&type, &wapp_str8_lit_ro(" "));
+  cpointer_to_string(&pointer, &(carg->pointer));
+  if (carg->is_array) { wapp_str8_copy_cstr_capped(&array, "[]"); }
+
+  u64 total_size = qualifier.size + type.size + pointer.size + array.size + carg->name.size;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst, WAPP_STR8_SPEC WAPP_STR8_SPEC WAPP_STR8_SPEC WAPP_STR8_SPEC WAPP_STR8_SPEC,
+                   wapp_str8_varg(qualifier), wapp_str8_varg(type), wapp_str8_varg(pointer),
+                   wapp_str8_varg(carg->name), wapp_str8_varg(array));
+}
+
+void cfunc_to_string(Str8 *dst, const CFunc *cfunc) {
+  wapp_debug_assert(dst != NULL && cfunc != NULL, "`dst` and `cfunc` should not be NULL");
+
+  Str8 qualifiers = wapp_str8_buf(CCGEN_BUF_LARGE);
+  Str8 args       = wapp_str8_buf(CCGEN_BUF_LARGE);
+  Str8 ret_type   = wapp_str8_buf(CCGEN_BUF_SMALL);
+  Str8 pointer    = wapp_str8_buf(CCGEN_BUF_SMALL);
+  Str8 tmp        = wapp_str8_buf(CCGEN_BUF_MEDIUM);
+  CQualifier *qf  = NULL;
+  CArg *arg       = NULL;
+
+  for (u64 i = 0; i < cfunc->qualifiers.node_count; ++i) {
+    qf = wapp_cqualifier_list_get(&(cfunc->qualifiers), i)->item;
+    if (*qf == CQUALIFIER_NONE) { continue; }
+
+    cqualifier_to_string(&tmp, *qf);
+
+    wapp_runtime_assert(tmp.size + 1 <= qualifiers.capacity - qualifiers.size, ERR_MSG);
+    if (qualifiers.size > 0) { wapp_str8_concat_capped(&qualifiers, &wapp_str8_lit_ro(" ")); }
+
+    wapp_str8_concat_capped(&qualifiers, &tmp);
+  }
+
+  for (u64 i = 0; i < cfunc->args.node_count; ++i) {
+    arg = wapp_carg_list_get(&(cfunc->args), i)->item;
+    carg_to_string(&tmp, arg);
+
+    wapp_runtime_assert(tmp.size + 2 <= args.capacity - args.size, ERR_MSG);
+    wapp_str8_concat_capped(&args, &tmp);
+    if (i + 1 < cfunc->args.node_count) { wapp_str8_concat_capped(&args, &wapp_str8_lit_ro(", ")); }
+  }
+
+  cdatatype_to_string(&ret_type, &(cfunc->ret_type));
+  cpointer_to_string(&pointer, &(cfunc->pointer));
+
+  u64 total_size = cfunc->name.size + qualifiers.size + args.size + ret_type.size + pointer.size + 4;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst,
+                   WAPP_STR8_SPEC WAPP_STR8_SPEC " " WAPP_STR8_SPEC WAPP_STR8_SPEC "(" WAPP_STR8_SPEC ")",
+                   wapp_str8_varg(qualifiers),
+                   wapp_str8_varg(ret_type),
+                   wapp_str8_varg(pointer),
+                   wapp_str8_varg(cfunc->name),
+                   wapp_str8_varg(args));
+}
+
+void declare_cfunc(Str8 *dst, const CFunc *cfunc) {
+  wapp_debug_assert(dst != NULL && cfunc != NULL, "`dst` and `cfunc` should not be NULL");
+
+  Str8 tmp = wapp_str8_buf(CCGEN_BUF_MAX);
+  cfunc_to_string(&tmp, cfunc);
+
+  wapp_runtime_assert(tmp.size + 2 <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst, WAPP_STR8_SPEC ";\n", wapp_str8_varg(tmp));
+}
+
+void define_cfunc(Str8 *dst, const CFunc *cfunc) {
+  wapp_debug_assert(dst != NULL && cfunc != NULL, "`dst` and `cfunc` should not be NULL");
+
+  Str8 tmp = wapp_str8_buf(CCGEN_BUF_MAX);
+  cfunc_to_string(&tmp, cfunc);
+
+  wapp_runtime_assert(tmp.size + cfunc->body.size + 8 <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst, WAPP_STR8_SPEC " {\n" WAPP_STR8_SPEC "\n}\n\n",
+                   wapp_str8_varg(tmp), wapp_str8_varg(cfunc->body));
+}
+
+void cinclude_to_string(Str8 *dst, const CInclude *cinclude) {
+  wapp_debug_assert(dst != NULL && cinclude != NULL, "`dst` and `cinclude` should not be NULL");
+
+  Str8 header_str = wapp_str8_buf(CCGEN_BUF_LARGE);
+  if (!cheaderinclude_to_string(&header_str, &(cinclude->header))) { return; }
+
+  Str8 inc = wapp_str8_lit("#include ");
+  Str8 open_symbol = wapp_str8_buf(CCGEN_BUF_MIN);
+  Str8 close_symbol = wapp_str8_buf(CCGEN_BUF_MIN);
+
+  if (cinclude->is_local) {
+    wapp_str8_concat_capped(&open_symbol, &wapp_str8_lit_ro("\""));
+    wapp_str8_concat_capped(&close_symbol, &wapp_str8_lit_ro("\""));
+    if (cinclude->same_dir) { wapp_str8_concat_capped(&open_symbol, &wapp_str8_lit_ro("./")); }
+  } else {
+    wapp_str8_concat_capped(&open_symbol, &wapp_str8_lit_ro("<"));
+    wapp_str8_concat_capped(&close_symbol, &wapp_str8_lit_ro(">"));
+  }
+
+  u64 total_size = header_str.size + inc.size + open_symbol.size + close_symbol.size;
+  wapp_runtime_assert(total_size <= dst->capacity, ERR_MSG);
+  wapp_str8_format(dst,
+                   WAPP_STR8_SPEC WAPP_STR8_SPEC WAPP_STR8_SPEC WAPP_STR8_SPEC "\n",
+                   wapp_str8_varg(inc),
+                   wapp_str8_varg(open_symbol),
+                   wapp_str8_varg(header_str),
+                   wapp_str8_varg(close_symbol));
+}
+
+void cheader_to_string(Str8 *dst, const CHeader *cheader) {
+  wapp_debug_assert(dst != NULL && cheader != NULL, "`dst` and `cheader` should not be NULL");
+
+  Allocator arena = wapp_mem_arena_allocator_init(MB(64));
+  Str8 *output = wapp_str8_alloc_buf(&arena, KB(32));
+  wapp_runtime_assert(output != NULL, "Failed to allocate buffer");
+
+  Str8 header_guard_name = wapp_str8_buf(CCGEN_BUF_SMALL);
+  Str8 tmp = wapp_str8_buf(CCGEN_BUF_MAX);
+
+  // ADD HEADER GUARD AND START C LINKAGE
+  wapp_str8_to_upper(&header_guard_name, &(cheader->name));
+  wapp_str8_concat_capped(&header_guard_name, &wapp_str8_lit_ro("_H"));
+  wapp_str8_format(&tmp, "#ifndef " WAPP_STR8_SPEC "\n#define " WAPP_STR8_SPEC "\n\n"
+                   "#ifdef WAPP_PLATFORM_CPP\nBEGIN_C_LINKAGE\n#endif // !WAPP_PLATFORM_CPP\n\n",
+                   wapp_str8_varg(header_guard_name), wapp_str8_varg(header_guard_name));
+  wapp_str8_alloc_concat(&arena, output, &tmp);
+
+  for (u64 i = 0; i < cheader->includes.node_count; ++i) {
+    cinclude_to_string(&tmp, wapp_cinclude_list_get(&(cheader->includes), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+  if (cheader->includes.node_count > 0) { wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("\n")); }
+
+  for (u64 i = 0; i < cheader->macros.node_count; ++i) {
+    cmacro_to_string(&tmp, wapp_cmacro_list_get(&(cheader->macros), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+  if (cheader->macros.node_count > 0) { wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("\n")); }
+
+  if (cheader->cpp_macros.node_count > 0) {
+    wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("#ifdef WAPP_PLATFORM_CPP\n"));
+
+    for (u64 i = 0; i < cheader->cpp_macros.node_count; ++i) {
+      cmacro_to_string(&tmp, wapp_cmacro_list_get(&(cheader->cpp_macros), i)->item);
+      wapp_str8_alloc_concat(&arena, output, &tmp);
+    }
+
+    wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("#else\n"));
+
+    for (u64 i = 0; i < cheader->c_macros.node_count; ++i) {
+      cmacro_to_string(&tmp, wapp_cmacro_list_get(&(cheader->c_macros), i)->item);
+      wapp_str8_alloc_concat(&arena, output, &tmp);
+    }
+
+    wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("#endif // !WAPP_PLATFORM_CPP\n\n"));
+  }
+
+  for (u64 i = 0; i < cheader->decl_types.node_count; ++i) {
+    declare_cstruct(&tmp, wapp_cstruct_list_get(&(cheader->decl_types), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+  if (cheader->decl_types.node_count > 0) { wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("\n")); }
+
+  for (u64 i = 0; i < cheader->types.node_count; ++i) {
+    cusertype_to_string(&tmp, wapp_cusertype_list_get(&(cheader->types), i)->item);
+    wapp_str8_concat_capped(&tmp, &wapp_str8_lit_ro("\n"));
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+
+  for (u64 i = 0; i < cheader->funcs.node_count; ++i) {
+    declare_cfunc(&tmp, wapp_cfunc_list_get(&(cheader->funcs), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+
+  // END C LINKAGE AND CLOSE HEADER GUARD
+  wapp_str8_format(&tmp, "\n#ifdef WAPP_PLATFORM_CPP\nEND_C_LINKAGE\n#endif // !WAPP_PLATFORM_CPP\n\n"
+                   "#endif // !" WAPP_STR8_SPEC "\n", wapp_str8_varg(header_guard_name));
+  wapp_str8_alloc_concat(&arena, output, &tmp);
+
+  wapp_runtime_assert(output->size <= dst->capacity, ERR_MSG);
+  wapp_str8_copy_str8_capped(dst, output);
+
+  wapp_mem_arena_allocator_destroy(&arena);
+}
+
+void csource_to_string(Str8 *dst, const CSource *csource) {
+  wapp_debug_assert(dst != NULL && csource != NULL, "`dst` and `csource` should not be NULL");
+
+  Allocator arena = wapp_mem_arena_allocator_init(MB(64));
+  Str8 *output = wapp_str8_alloc_buf(&arena, KB(32));
+  Str8 *internal_funcs_def = wapp_str8_alloc_buf(&arena, KB(16));
+  wapp_runtime_assert(output != NULL && internal_funcs_def != NULL, "Failed to allocate buffer");
+
+  Str8 tmp = wapp_str8_buf(CCGEN_BUF_MAX);
+
+  for (u64 i = 0; i < csource->includes.node_count; ++i) {
+    cinclude_to_string(&tmp, wapp_cinclude_list_get(&(csource->includes), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+  if (csource->includes.node_count > 0) { wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("\n")); }
+
+  for (u64 i = 0; i < csource->macros.node_count; ++i) {
+    cmacro_to_string(&tmp, wapp_cmacro_list_get(&(csource->macros), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+  if (csource->macros.node_count > 0) { wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("\n")); }
+
+  for (u64 i = 0; i < csource->decl_types.node_count; ++i) {
+    declare_cstruct(&tmp, wapp_cstruct_list_get(&(csource->decl_types), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+  if (csource->decl_types.node_count > 0) { wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("\n")); }
+
+  for (u64 i = 0; i < csource->types.node_count; ++i) {
+    cusertype_to_string(&tmp, wapp_cusertype_list_get(&(csource->types), i)->item);
+    wapp_str8_concat_capped(&tmp, &wapp_str8_lit_ro("\n"));
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+
+  Str8RO _wapp_intern = wapp_str8_lit_ro("wapp_intern ");
+  for (u64 i = 0; i < csource->internal_funcs.node_count; ++i) {
+    declare_cfunc(&tmp, wapp_cfunc_list_get(&(csource->internal_funcs), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &_internal);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+
+    define_cfunc(&tmp, wapp_cfunc_list_get(&(csource->internal_funcs), i)->item);
+    wapp_str8_alloc_concat(&arena, internal_funcs_def, &_internal);
+    wapp_str8_alloc_concat(&arena, internal_funcs_def, &tmp);
+  }
+  if (csource->internal_funcs.node_count > 0) { wapp_str8_alloc_concat(&arena, output, &wapp_str8_lit_ro("\n")); }
+
+  for (u64 i = 0; i < csource->funcs.node_count; ++i) {
+    define_cfunc(&tmp, wapp_cfunc_list_get(&(csource->funcs), i)->item);
+    wapp_str8_alloc_concat(&arena, output, &tmp);
+  }
+
+  wapp_runtime_assert(output->size + internal_funcs_def->size <= dst->capacity, ERR_MSG);
+  wapp_str8_copy_str8_capped(dst, output);
+  wapp_str8_concat_capped(dst, internal_funcs_def);
+
+  wapp_mem_arena_allocator_destroy(&arena);
+}
+
+b32 cheaderinclude_to_string(Str8 *dst, const CHeaderInclude *cheaderinclude) {
+  wapp_debug_assert(dst != NULL && cheaderinclude != NULL, "`dst` and `cheaderinclude` should not be NULL");
+
+  switch (cheaderinclude->kind) {
+    case C_HEADER_INCLUDE_STR:
+      wapp_runtime_assert(cheaderinclude->header.name.size <= dst->capacity, ERR_MSG);
+      wapp_str8_format(dst, WAPP_STR8_SPEC, wapp_str8_varg(cheaderinclude->header.name));
+      return true;
+    case C_HEADER_INCLUDE_HEADER:
+      // Take extension into account
+      wapp_runtime_assert(cheaderinclude->header.header.name.size + 2 <= dst->capacity, ERR_MSG);
+      wapp_str8_format(
+        dst,
+        WAPP_STR8_SPEC ".%s",
+        wapp_str8_varg(cheaderinclude->header.header.name),
+        cheaderinclude->header.header.extension == CFILE_EXT_H ? "h" : "c"
+      );
+      return true;
+    default:
+      return false;
+  }
+
+  return false;
+}

ccodegen/datatypes.h

@@ -0,0 +1,280 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef DATATYPES_H
+#define DATATYPES_H
+
+#include "wapp_core.h"
+#include "dbl_list.h"
+#include "type_enums.h"
+
+#ifndef CCGEN_BUF_MIN
+#define CCGEN_BUF_MIN 16
+#endif // !CCGEN_BUF_MIN
+
+#ifndef CCGEN_BUF_TINY
+#define CCGEN_BUF_TINY 32
+#endif // !CCGEN_BUF_TINY
+
+#ifndef CCGEN_BUF_SMALL
+#define CCGEN_BUF_SMALL 512
+#endif // !CCGEN_BUF_SMALL
+
+#ifndef CCGEN_BUF_MEDIUM
+#define CCGEN_BUF_MEDIUM 1024
+#endif // !CCGEN_BUF_MEDIUM
+
+#ifndef CCGEN_BUF_LARGE
+#define CCGEN_BUF_LARGE 4096
+#endif // !CCGEN_BUF_LARGE
+
+#ifndef CCGEN_BUF_MAX
+#define CCGEN_BUF_MAX 8192
+#endif // !CCGEN_BUF_MAX
+
+#define CENUM(NAME, VALUES, TYPEDEF) ((CEnum){ .name = (NAME), .values = (VALUES), .add_typedef = (TYPEDEF) })
+#define CSTRUCT(NAME, ARGS, TYPEDEF_NAME_PTR) ((CStruct){ .name = (NAME), .args = (ARGS), .typedef_name = (TYPEDEF_NAME_PTR) })
+
+#define CUSERTYPE_ENUM(ENUM) ((CUserType){ .kind = CUSERTYPE_CENUM, .type.c_enum = ENUM })
+#define CUSERTYPE_STRUCT(STRUCT) ((CUserType){ .kind = CUSERTYPE_CSTRUCT, .type.c_struct = STRUCT })
+
+#define CDATATYPE_CTYPE(VALUE) ((CDataType){ .kind = CDATATYPE_CTYPE, .type.c_type = (VALUE) })
+#define CDATATYPE_USERTYPE(USERTYPE) ((CDataType){ .kind = CDATATYPE_CUSERTYPE, .type.c_usertype = (USERTYPE) })
+#define CDATATYPE_STR(STR) ((CDataType){ .kind = CDATATYPE_STR, .type.str = (STR) })
+
+#define CHEADERINCLUDE_STR(NAME) ((CHeaderInclude){ .kind = C_HEADER_INCLUDE_STR, .header.name = (NAME) })
+#define CHEADERINCLUDE_CHEADER(CHEADER) ((CHeaderInclude){ .kind = C_HEADER_INCLUDE_HEADER, .header.header = (CHEADER) })
+
+#define COBJECT_TYPE(VALUE)                                                    \
+  ((CObject){ .kind = COBJECT_CTYPE, .object.c_type = (VALUE) })
+#define COBJECT_QUALIFIER(VALUE)                                               \
+  ((CObject){ .kind = COBJECT_CQUALIFIER, .object.c_qualifier = (VALUE) })
+#define COBJECT_POINTERTYPE(VALUE)                                             \
+  ((CObject){ .kind = COBJECT_CPOINTERTYPE, .object.c_pointertype = (VALUE) })
+#define COBJECT_POINTER(CPOINTER)                                              \
+  ((CObject){ .kind = COBJECT_CPOINTER, .object.c_pointer = (CPOINTER) })
+#define COBJECT_ENUMVAL(CENUMVAL)                                              \
+  ((CObject){ .kind = COBJECT_CENUMVAL, .object.c_enumval = (CENUMVAL) })
+#define COBJECT_ENUM(ENUM)                                                     \
+  ((CObject){ .kind = COBJECT_CENUM, .object.c_enum = (ENUM) })
+#define COBJECT_MACRO(CMACRO)                                                  \
+  ((CObject){ .kind = COBJECT_CMACRO, .object.c_macro = (CMACRO) })
+#define COBJECT_STRUCT(STRUCT)                                                 \
+  ((CObject){ .kind = COBJECT_CSTRUCT, .object.c_struct = STRUCT })
+#define COBJECT_USERTYPE(USERTYPE)                                             \
+  ((CObject){ .kind = COBJECT_CUSERTYPE, .object.c_usertype = (USERTYPE) })
+#define COBJECT_DATATYPE(DATATYPE)                                             \
+  ((CObject){ .kind = COBJECT_CDATATYPE, .object.c_datatype = (DATATYPE) })
+#define COBJECT_ARG(CARG)                                                      \
+  ((CObject){ .kind = COBJECT_CARG, .object.c_arg = (CARG) })
+#define COBJECT_FUNC(CFUNC)                                                    \
+  ((CObject){ .kind = COBJECT_CFUNC, .object.c_func = (CFUNC) })
+#define COBJECT_INCULDE(CINCLUDE)                                              \
+  ((CObject){ .kind = COBJECT_CINCULDE, .object.c_include = (CINCLUDE) })
+#define COBJECT_HEADER(CHEADER)                                                \
+  ((CObject){ .kind = COBJECT_CHEADER, .object.c_header = (CHEADER) })
+#define COBJECT_SOURCE(CSOURCE)                                                \
+  ((CObject){ .kind = COBJECT_CSOURCE, .object.c_source = (CSOURCE) })
+
+typedef enum {
+  CUSERTYPE_CENUM,
+  CUSERTYPE_CSTRUCT,
+
+  COUNT_CUSERTYPEKIND,
+} CUserTypeKind;
+
+typedef enum {
+  CDATATYPE_CTYPE,
+  CDATATYPE_CUSERTYPE,
+  CDATATYPE_STR,
+
+  COUNT_CDATATYPEKIND,
+} CDataTypeKind;
+
+typedef enum {
+  CFILE_EXT_H,
+  CFILE_EXT_C,
+
+  COUNT_CFILE_EXT,
+} CFileExtension;
+
+typedef enum {
+  C_HEADER_INCLUDE_STR,
+  C_HEADER_INCLUDE_HEADER,
+
+  COUNT_CHEADERINCLUDEKIND,
+} CHeaderIncludeKind;
+
+typedef enum {
+  COBJECT_CTYPE,
+  COBJECT_CQUALIFIER,
+  COBJECT_CPOINTERTYPE,
+  COBJECT_CPOINTER,
+  COBJECT_CENUMVAL,
+  COBJECT_CENUM,
+  COBJECT_CMACRO,
+  COBJECT_CSTRUCT,
+  COBJECT_CUSERTYPE,
+  COBJECT_CDATATYPE,
+  COBJECT_CARG,
+  COBJECT_CFUNC,
+  COBJECT_CINCULDE,
+  COBJECT_CHEADER,
+  COBJECT_CSOURCE,
+
+  COUNT_COBJECTKIND,
+} CObjectKind;
+
+typedef struct cpointer        CPointer;
+typedef struct cenumval        CEnumVal;
+typedef struct cenum           CEnum;
+typedef struct cmacro          CMacro;
+typedef struct cstruct         CStruct;
+typedef struct cusertype       CUserType;
+typedef struct cdatatype       CDataType;
+typedef struct carg            CArg;
+typedef struct cfunc           CFunc;
+typedef struct cheader_include CHeaderInclude;
+typedef struct cinclude        CInclude;
+typedef struct cheader         CHeader;
+typedef struct csource         CSource;
+typedef struct cobject         CObject;
+
+struct cpointer {
+  CPointerType type;
+  CQualifier qualifier;
+};
+
+struct cenumval {
+  Str8 name;
+  i32 *value;
+};
+
+struct cenum {
+  Str8 name;
+  CEnumValList values;
+  b32 add_typedef;
+};
+
+struct cmacro {
+  Str8 name;
+  Str8 value;
+};
+
+struct cstruct {
+  Str8 name;
+  CArgList args;
+  Str8 typedef_name;
+};
+
+struct cusertype {
+  CUserTypeKind kind;
+  union {
+    CEnum c_enum;
+    CStruct c_struct;
+  } type;
+};
+
+struct cdatatype {
+  CDataTypeKind kind;
+  union {
+    CType c_type;
+    CUserType c_usertype;
+    Str8 str;
+  } type;
+};
+
+struct carg {
+  Str8 name;
+  CDataType type;
+  CPointer pointer;
+  CQualifier qualifier;
+  b32 is_array;
+};
+
+struct cfunc {
+  Str8 name;
+  CDataType ret_type;
+  CArgList args;
+  Str8 body;
+  CPointer pointer;
+  CQualifierList qualifiers;
+};
+
+#define CFILE_ARGS          \
+  Str8 name;                \
+  CFileExtension extension; \
+  CIncludeList includes;    \
+  CUserTypeList types;      \
+  CFuncList funcs;          \
+  CStructList decl_types;   \
+  CMacroList macros;        \
+  CMacroList c_macros;      \
+  CMacroList cpp_macros     \
+
+struct cheader {
+  CFILE_ARGS;
+};
+
+struct csource {
+  CFILE_ARGS;
+  CFuncList internal_funcs;
+};
+
+struct cheader_include {
+  CHeaderIncludeKind kind;
+  union {
+    Str8 name;
+    CHeader header;
+  } header;
+};
+
+struct cinclude {
+  CHeaderInclude header;
+  b32 is_local;
+  b32 same_dir;
+};
+
+struct cobject {
+  CObjectKind kind;
+  union {
+    CType c_type;
+    CQualifier c_qualifier;
+    CPointerType c_pointertype;
+    CPointer c_pointer;
+    CEnumVal c_enumval;
+    CEnum c_enum;
+    CMacro c_macro;
+    CStruct c_struct;
+    CUserType c_usertype;
+    CDataType c_datatype;
+    CArg c_arg;
+    CFunc c_func;
+    CInclude c_include;
+    CHeader c_header;
+    CSource c_source;
+  } object;
+};
+
+void cobject_to_string(Str8 *dst, const CObject *object);
+void ctype_to_string(Str8 *dst, CType ctype);
+void cqualifier_to_string(Str8 *dst, CQualifier cqualifier);
+void cpointertype_to_string(Str8 *dst, CPointerType cpointertype);
+void cpointer_to_string(Str8 *dst, const CPointer *cpointer);
+void cenumval_to_string(Str8 *dst, const CEnumVal *cenumval);
+void cenum_to_string(Str8 *dst, const CEnum *cenum);
+void cmacro_to_string(Str8 *dst, const CMacro *cmacro);
+void cstruct_to_string(Str8 *dst, const CStruct *cstruct);
+void declare_cstruct(Str8 *dst, const CStruct *cstruct);
+void define_cstruct(Str8 *dst, const CStruct *cstruct);
+void cusertype_to_string(Str8 *dst, const CUserType *cusertype);
+void cdatatype_to_string(Str8 *dst, const CDataType *cdatatype);
+void carg_to_string(Str8 *dst, const CArg *carg);
+void cfunc_to_string(Str8 *dst, const CFunc *cfunc);
+void declare_cfunc(Str8 *dst, const CFunc *cfunc);
+void define_cfunc(Str8 *dst, const CFunc *cfunc);
+void cinclude_to_string(Str8 *dst, const CInclude *cinclude);
+void cheader_to_string(Str8 *dst, const CHeader *cheader);
+void csource_to_string(Str8 *dst, const CSource *csource);
+b32 cheaderinclude_to_string(Str8 *dst, const CHeaderInclude *cheaderinclude);
+
+#endif // !DATATYPES_H

ccodegen/dbl_list.h

@@ -0,0 +1,222 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef CCGEN_DBL_LIST_H
+#define CCGEN_DBL_LIST_H
+
+#include "wapp_core.h"
+#include "type_enums.h"
+
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#ifdef WAPP_PLATFORM_CPP
+#define wapp_cenumval_list_node(ITEM_PTR) CEnumValNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_carg_list_node(ITEM_PTR) CArgNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_cqualifier_list_node(ITEM_PTR) CQualifierNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_cinclude_list_node(ITEM_PTR) CIncludeNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_cusertype_list_node(ITEM_PTR) CUserTypeNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_cfunc_list_node(ITEM_PTR) CFuncNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_cstruct_list_node(ITEM_PTR) CStructNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_cmacro_list_node(ITEM_PTR) CMacroNode{ITEM_PTR, nullptr, nullptr}
+#else
+#define wapp_cenumval_list_node(ITEM_PTR) ((CEnumValNode){.item = ITEM_PTR})
+#define wapp_carg_list_node(ITEM_PTR) ((CArgNode){.item = ITEM_PTR})
+#define wapp_cqualifier_list_node(ITEM_PTR) ((CQualifierNode){.item = ITEM_PTR})
+#define wapp_cinclude_list_node(ITEM_PTR) ((CIncludeNode){.item = ITEM_PTR})
+#define wapp_cusertype_list_node(ITEM_PTR) ((CUserTypeNode){.item = ITEM_PTR})
+#define wapp_cfunc_list_node(ITEM_PTR) ((CFuncNode){.item = ITEM_PTR})
+#define wapp_cstruct_list_node(ITEM_PTR) ((CStructNode){.item = ITEM_PTR})
+#define wapp_cmacro_list_node(ITEM_PTR) ((CMacroNode){.item = ITEM_PTR})
+#endif // !WAPP_PLATFORM_CPP
+
+typedef struct cenumval CEnumVal;
+typedef struct carg CArg;
+typedef struct cinclude CInclude;
+typedef struct cusertype CUserType;
+typedef struct cfunc CFunc;
+typedef struct cstruct CStruct;
+typedef struct cmacro CMacro;
+
+typedef struct CEnumValNode CEnumValNode;
+struct CEnumValNode {
+  CEnumVal *item;
+  CEnumValNode *prev;
+  CEnumValNode *next;
+};
+
+typedef struct CEnumValList CEnumValList;
+struct CEnumValList {
+  CEnumValNode *first;
+  CEnumValNode *last;
+  u64 node_count;
+};
+
+typedef struct CArgNode CArgNode;
+struct CArgNode {
+  CArg *item;
+  CArgNode *prev;
+  CArgNode *next;
+};
+
+typedef struct CArgList CArgList;
+struct CArgList {
+  CArgNode *first;
+  CArgNode *last;
+  u64 node_count;
+};
+
+typedef struct CQualifierNode CQualifierNode;
+struct CQualifierNode {
+  CQualifier *item;
+  CQualifierNode *prev;
+  CQualifierNode *next;
+};
+
+typedef struct CQualifierList CQualifierList;
+struct CQualifierList {
+  CQualifierNode *first;
+  CQualifierNode *last;
+  u64 node_count;
+};
+
+typedef struct CIncludeNode CIncludeNode;
+struct CIncludeNode {
+  CInclude *item;
+  CIncludeNode *prev;
+  CIncludeNode *next;
+};
+
+typedef struct CIncludeList CIncludeList;
+struct CIncludeList {
+  CIncludeNode *first;
+  CIncludeNode *last;
+  u64 node_count;
+};
+
+typedef struct CUserTypeNode CUserTypeNode;
+struct CUserTypeNode {
+  CUserType *item;
+  CUserTypeNode *prev;
+  CUserTypeNode *next;
+};
+
+typedef struct CUserTypeList CUserTypeList;
+struct CUserTypeList {
+  CUserTypeNode *first;
+  CUserTypeNode *last;
+  u64 node_count;
+};
+
+typedef struct CFuncNode CFuncNode;
+struct CFuncNode {
+  CFunc *item;
+  CFuncNode *prev;
+  CFuncNode *next;
+};
+
+typedef struct CFuncList CFuncList;
+struct CFuncList {
+  CFuncNode *first;
+  CFuncNode *last;
+  u64 node_count;
+};
+
+typedef struct CStructNode CStructNode;
+struct CStructNode {
+  CStruct *item;
+  CStructNode *prev;
+  CStructNode *next;
+};
+
+typedef struct CStructList CStructList;
+struct CStructList {
+  CStructNode *first;
+  CStructNode *last;
+  u64 node_count;
+};
+
+typedef struct CMacroNode CMacroNode;
+struct CMacroNode {
+  CMacro *item;
+  CMacroNode *prev;
+  CMacroNode *next;
+};
+
+typedef struct CMacroList CMacroList;
+struct CMacroList {
+  CMacroNode *first;
+  CMacroNode *last;
+  u64 node_count;
+};
+
+CEnumValNode *wapp_cenumval_list_get(const CEnumValList *list, u64 index);
+void wapp_cenumval_list_push_front(CEnumValList *list, CEnumValNode *node);
+void wapp_cenumval_list_push_back(CEnumValList *list, CEnumValNode *node);
+void wapp_cenumval_list_insert(CEnumValList *list, CEnumValNode *node, u64 index);
+CEnumValNode *wapp_cenumval_list_pop_front(CEnumValList *list);
+CEnumValNode *wapp_cenumval_list_pop_back(CEnumValList *list);
+CEnumValNode *wapp_cenumval_list_remove(CEnumValList *list, u64 index);
+void wapp_cenumval_list_empty(CEnumValList *list);
+CArgNode *wapp_carg_list_get(const CArgList *list, u64 index);
+void wapp_carg_list_push_front(CArgList *list, CArgNode *node);
+void wapp_carg_list_push_back(CArgList *list, CArgNode *node);
+void wapp_carg_list_insert(CArgList *list, CArgNode *node, u64 index);
+CArgNode *wapp_carg_list_pop_front(CArgList *list);
+CArgNode *wapp_carg_list_pop_back(CArgList *list);
+CArgNode *wapp_carg_list_remove(CArgList *list, u64 index);
+void wapp_carg_list_empty(CArgList *list);
+CQualifierNode *wapp_cqualifier_list_get(const CQualifierList *list, u64 index);
+void wapp_cqualifier_list_push_front(CQualifierList *list, CQualifierNode *node);
+void wapp_cqualifier_list_push_back(CQualifierList *list, CQualifierNode *node);
+void wapp_cqualifier_list_insert(CQualifierList *list, CQualifierNode *node, u64 index);
+CQualifierNode *wapp_cqualifier_list_pop_front(CQualifierList *list);
+CQualifierNode *wapp_cqualifier_list_pop_back(CQualifierList *list);
+CQualifierNode *wapp_cqualifier_list_remove(CQualifierList *list, u64 index);
+void wapp_cqualifier_list_empty(CQualifierList *list);
+CIncludeNode *wapp_cinclude_list_get(const CIncludeList *list, u64 index);
+void wapp_cinclude_list_push_front(CIncludeList *list, CIncludeNode *node);
+void wapp_cinclude_list_push_back(CIncludeList *list, CIncludeNode *node);
+void wapp_cinclude_list_insert(CIncludeList *list, CIncludeNode *node, u64 index);
+CIncludeNode *wapp_cinclude_list_pop_front(CIncludeList *list);
+CIncludeNode *wapp_cinclude_list_pop_back(CIncludeList *list);
+CIncludeNode *wapp_cinclude_list_remove(CIncludeList *list, u64 index);
+void wapp_cinclude_list_empty(CIncludeList *list);
+CUserTypeNode *wapp_cusertype_list_get(const CUserTypeList *list, u64 index);
+void wapp_cusertype_list_push_front(CUserTypeList *list, CUserTypeNode *node);
+void wapp_cusertype_list_push_back(CUserTypeList *list, CUserTypeNode *node);
+void wapp_cusertype_list_insert(CUserTypeList *list, CUserTypeNode *node, u64 index);
+CUserTypeNode *wapp_cusertype_list_pop_front(CUserTypeList *list);
+CUserTypeNode *wapp_cusertype_list_pop_back(CUserTypeList *list);
+CUserTypeNode *wapp_cusertype_list_remove(CUserTypeList *list, u64 index);
+void wapp_cusertype_list_empty(CUserTypeList *list);
+CFuncNode *wapp_cfunc_list_get(const CFuncList *list, u64 index);
+void wapp_cfunc_list_push_front(CFuncList *list, CFuncNode *node);
+void wapp_cfunc_list_push_back(CFuncList *list, CFuncNode *node);
+void wapp_cfunc_list_insert(CFuncList *list, CFuncNode *node, u64 index);
+CFuncNode *wapp_cfunc_list_pop_front(CFuncList *list);
+CFuncNode *wapp_cfunc_list_pop_back(CFuncList *list);
+CFuncNode *wapp_cfunc_list_remove(CFuncList *list, u64 index);
+void wapp_cfunc_list_empty(CFuncList *list);
+CStructNode *wapp_cstruct_list_get(const CStructList *list, u64 index);
+void wapp_cstruct_list_push_front(CStructList *list, CStructNode *node);
+void wapp_cstruct_list_push_back(CStructList *list, CStructNode *node);
+void wapp_cstruct_list_insert(CStructList *list, CStructNode *node, u64 index);
+CStructNode *wapp_cstruct_list_pop_front(CStructList *list);
+CStructNode *wapp_cstruct_list_pop_back(CStructList *list);
+CStructNode *wapp_cstruct_list_remove(CStructList *list, u64 index);
+void wapp_cstruct_list_empty(CStructList *list);
+CMacroNode *wapp_cmacro_list_get(const CMacroList *list, u64 index);
+void wapp_cmacro_list_push_front(CMacroList *list, CMacroNode *node);
+void wapp_cmacro_list_push_back(CMacroList *list, CMacroNode *node);
+void wapp_cmacro_list_insert(CMacroList *list, CMacroNode *node, u64 index);
+CMacroNode *wapp_cmacro_list_pop_front(CMacroList *list);
+CMacroNode *wapp_cmacro_list_pop_back(CMacroList *list);
+CMacroNode *wapp_cmacro_list_remove(CMacroList *list, u64 index);
+void wapp_cmacro_list_empty(CMacroList *list);
+
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#endif // !DBL_LIST_H

ccodegen/main.c

@@ -0,0 +1,10 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "datatypes.h"
+#include "type_enums.h"
+#include "wapp_core.h"
+#include <stdio.h>
+
+int main(void) {
+  return 0;
+}

ccodegen/type_enums.h

@@ -0,0 +1,84 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef TYPE_ENUMS_H
+#define TYPE_ENUMS_H
+
+#include "wapp_core.h"
+
+typedef enum {
+  CTYPE_VOID,
+  CTYPE_B32,
+  CTYPE_CHAR,
+  CTYPE_C8,
+  CTYPE_C16,
+  CTYPE_C32,
+  CTYPE_I8,
+  CTYPE_I16,
+  CTYPE_I32,
+  CTYPE_I64,
+  CTYPE_U8,
+  CTYPE_U16,
+  CTYPE_U32,
+  CTYPE_U64,
+  CTYPE_F32,
+  CTYPE_F64,
+  CTYPE_F128,
+  CTYPE_IPTR,
+  CTYPE_UPTR,
+
+  COUNT_CTYPE,
+} CType;
+wapp_intern Str8RO ctypes[COUNT_CTYPE] = {
+  [CTYPE_VOID] = wapp_str8_lit_ro("void"),
+  [CTYPE_B32]  = wapp_str8_lit_ro("b32"),
+  [CTYPE_CHAR] = wapp_str8_lit_ro("char"),
+  [CTYPE_C8]   = wapp_str8_lit_ro("c8"),
+  [CTYPE_C16]  = wapp_str8_lit_ro("c16"),
+  [CTYPE_C32]  = wapp_str8_lit_ro("c32"),
+  [CTYPE_I8]   = wapp_str8_lit_ro("i8"),
+  [CTYPE_I16]  = wapp_str8_lit_ro("i16"),
+  [CTYPE_I32]  = wapp_str8_lit_ro("i32"),
+  [CTYPE_I64]  = wapp_str8_lit_ro("i64"),
+  [CTYPE_U8]   = wapp_str8_lit_ro("u8"),
+  [CTYPE_U16]  = wapp_str8_lit_ro("u16"),
+  [CTYPE_U32]  = wapp_str8_lit_ro("u32"),
+  [CTYPE_U64]  = wapp_str8_lit_ro("u64"),
+  [CTYPE_F32]  = wapp_str8_lit_ro("f32"),
+  [CTYPE_F64]  = wapp_str8_lit_ro("f64"),
+  [CTYPE_F128] = wapp_str8_lit_ro("f128"),
+  [CTYPE_IPTR] = wapp_str8_lit_ro("iptr"),
+  [CTYPE_UPTR] = wapp_str8_lit_ro("uptr"),
+};
+
+typedef enum {
+  CQUALIFIER_NONE,
+  CQUALIFIER_CONST,
+  CQUALIFIER_EXTERNAL,
+  CQUALIFIER_INTERNAL,
+  CQUALIFIER_PERSISTENT,
+
+  COUNT_CQUALIFIER,
+} CQualifier;
+wapp_intern Str8RO cqualifiers[COUNT_CQUALIFIER] = {
+  [CQUALIFIER_NONE]       = wapp_str8_lit_ro(""),
+  [CQUALIFIER_CONST]      = wapp_str8_lit_ro("const "),
+  [CQUALIFIER_EXTERNAL]   = wapp_str8_lit_ro("wapp_extern "),
+  [CQUALIFIER_INTERNAL]   = wapp_str8_lit_ro("wapp_intern "),
+  [CQUALIFIER_PERSISTENT] = wapp_str8_lit_ro("wapp_persist "),
+};
+
+
+typedef enum {
+  CPOINTERTYPE_NONE,
+  CPOINTERTYPE_SINGLE,
+  CPOINTERTYPE_DOUBLE,
+
+  COUNT_CPOINTERTYPE,
+} CPointerType;
+wapp_intern Str8RO cpointertypes[COUNT_CPOINTERTYPE] = {
+  [CPOINTERTYPE_NONE]   = wapp_str8_lit_ro(""),
+  [CPOINTERTYPE_SINGLE] = wapp_str8_lit_ro("*"),
+  [CPOINTERTYPE_DOUBLE] = wapp_str8_lit_ro("**"),
+};
+
+#endif // !TYPE_ENUMS_H

codegen/__main__.py

@@ -1,23 +1,60 @@
+import json
 from typing import Dict
-from codegen.datatypes import CDataType
+from pathlib import Path
+from codegen.datatypes import CDataType, CStruct
+from codegen.constants import WAPP_REPO_ROOT, DBL_LIST_DATA, ARRAY_DATA
 from codegen.dbl_list.make_dbl_list import DblListData, make_dbl_list
 from codegen.array.make_array import ArrayData, make_array
 
 
-def main():
-    gen_dbl_list()
-    gen_array()
+def main(types_file: Path | None):
+    dbl_list_datatypes: Dict[CDataType, DblListData] = {}
+    array_datatypes: Dict[CDataType, ArrayData] = {}
 
+    if types_file is not None:
+        with types_file.open("r") as infile:
+            datatypes = json.load(infile)
+            dbl_list_data = datatypes.get(DBL_LIST_DATA)
+            array_data = datatypes.get(ARRAY_DATA)
 
-def gen_dbl_list():
-    datatypes: Dict[CDataType, DblListData] = {}
-    make_dbl_list(datatypes)
+            if dbl_list_data is not None and isinstance(dbl_list_data, dict):
+                dbl_list_datatypes = {k: DblListData.from_dict(v) for k, v in dbl_list_data.items()}
 
+            if array_data is not None and isinstance(array_data, dict):
+                array_datatypes = {k: ArrayData.from_dict(v) for k, v in array_data.items()}
 
-def gen_array():
-    datatypes: Dict[CDataType, ArrayData] = {}
-    make_array(datatypes)
+    make_dbl_list(dbl_list_datatypes)
+    make_array(array_datatypes)
+
+    # Save example types file
+    custom_struct = CStruct(name="custom_type", cargs=[], typedef_name="CustomType")
+    example = {
+        DBL_LIST_DATA: {
+            "CustomType": DblListData(
+                node_typename="CustomTypeNode",
+                list_typename="CustomTypeList",
+                hdr_decl_types=[custom_struct],
+            ).to_dict()
+        },
+        ARRAY_DATA: {
+            "CustomType": ArrayData(
+                array_typename="CustomTypeArray",
+                hdr_decl_types=[custom_struct],
+            ).to_dict()
+        },
+    }
+
+    example_file = WAPP_REPO_ROOT / "codegen_custom_data_example.json"
+    with example_file.open("w") as outfile:
+        json.dump(example, outfile, indent=2)
 
 
 if __name__ == "__main__":
-    main()
+    from argparse import ArgumentParser
+
+    parser = ArgumentParser()
+    parser.add_argument("-f", "--types-file", type=Path, help="JSON file containing custom types for codegen")
+
+    args = parser.parse_args()
+
+    main(args.types_file)

codegen/array/make_array.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 from dataclasses import dataclass, field
-from typing import List, Dict
+from typing import List, Dict, Any, Type
 from codegen.constants import WAPP_SRC_ROOT
 from codegen.utils import load_func_body_from_file, convert_to_relative
 from codegen.datatypes import (
@@ -16,16 +16,24 @@ from codegen.datatypes import (
     CPointerType,
     CQualifier,
     CInclude,
+    SerialisableDataclass,
     get_datatype_string,
 )
 
 
 @dataclass
-class ArrayData:
+class ArrayData(SerialisableDataclass):
     array_typename: str
     hdr_decl_types: List[CStruct] = field(default_factory=list)
     src_decl_types: List[CStruct] = field(default_factory=list)
 
+    @classmethod
+    def from_dict(cls: Type["ArrayData"], d: Dict[str, Any]) -> "ArrayData":
+        data = ArrayData(**d)
+        data.hdr_decl_types = [CStruct.from_dict(v) for v in data.hdr_decl_types if isinstance(v, dict)]
+        data.src_decl_types = [CStruct.from_dict(v) for v in data.src_decl_types if isinstance(v, dict)]
+        return data
+
 
 def make_array(user_datatypes: Dict[CDataType, ArrayData] = {}):
     def __format_func_body(
@@ -46,7 +54,6 @@ def make_array(user_datatypes: Dict[CDataType, ArrayData] = {}):
     out_dir.mkdir(parents=True, exist_ok=True)
 
     common_includes: List[CInclude] = [
-        CInclude(header="stdbool.h"),
         CInclude(
             header=str(convert_to_relative(WAPP_SRC_ROOT / "primitives" / "mem_allocator" / "mem_allocator.h", out_dir)).replace("\\", "/"),
             local=True,
@@ -60,6 +67,8 @@ def make_array(user_datatypes: Dict[CDataType, ArrayData] = {}):
     common_decl_types: List[CStruct] = []
 
     datatypes: dict[CDataType, ArrayData] = {
+        CType.VOID: ArrayData(array_typename="GenericArray"),
+        "void *": ArrayData(array_typename="VoidPArray"),
         "Str8": ArrayData(
             array_typename="Str8Array",
             hdr_decl_types=[
@@ -70,18 +79,10 @@ def make_array(user_datatypes: Dict[CDataType, ArrayData] = {}):
 
     for _type in CType:
         if _type == CType.VOID:
-            datatypes["void *"] = ArrayData(
-                array_typename="VoidPArray",
-            )
-            continue
-        elif _type == CType.BOOL:
-            datatypes[_type.value] = ArrayData(
-                array_typename="BoolArray",
-            )
             continue
 
         type_title = _type.value.title()
-        datatypes[_type.value] = ArrayData(
+        datatypes[_type] = ArrayData(
             array_typename=f"{type_title}Array",
         )
 
@@ -102,8 +103,11 @@ def make_array(user_datatypes: Dict[CDataType, ArrayData] = {}):
         decl_types=[*common_decl_types],
         includes=[
             CInclude(header, local=True, same_dir=True),
+            CInclude(
+                header=str(convert_to_relative(WAPP_SRC_ROOT / "common" / "assert" / "assert.h", out_dir)).replace("\\", "/"),
+                local=True
+            ),
             CInclude(header="stddef.h"),
-            CInclude(header="assert.h"),
         ],
         internal_funcs=[],
         funcs=header.funcs
@@ -132,7 +136,7 @@ def make_array(user_datatypes: Dict[CDataType, ArrayData] = {}):
             ],
         )
 
-        if isinstance(_type, str) and _type == "void *":
+        if isinstance(_type, CType) and _type == CType.VOID:
             alloc_capacity_func = CFunc(
                 name=f"_array_alloc_capacity",
                 ret_type=array,
@@ -151,238 +155,276 @@ def make_array(user_datatypes: Dict[CDataType, ArrayData] = {}):
                 pointer=CPointer(CPointerType.SINGLE),
             )
             generic_funcs.append(alloc_capacity_func)
-        
-        stack_array_macro = CMacro(
-            name=f"wapp_{type_string_lower}_array(...)",
-            value=__format_func_body(
-                filename=snippets_dir / "stack_array",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
+        else:
+            stack_array_cmacro = CMacro(
+                name=f"wapp_{type_string_lower}_array(...)",
+                value=__format_func_body(
+                    filename=snippets_dir / "stack_array",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+            )
+            stack_array_cppmacro = CMacro(
+                name=f"wapp_{type_string_lower}_array(...)",
+                value=__format_func_body(
+                    filename=snippets_dir / "stack_array_cpp",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+            )
 
-        stack_capacity_array_macro = CMacro(
-            name=f"wapp_{type_string_lower}_array_with_capacity(CAPACITY)",
-            value=__format_func_body(
-                filename=snippets_dir / "stack_capacity_array",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
+            stack_capacity_array_cmacro = CMacro(
+                name=f"wapp_{type_string_lower}_array_with_capacity(CAPACITY)",
+                value=__format_func_body(
+                    filename=snippets_dir / "stack_capacity_array",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+            )
+            stack_capacity_array_cppmacro = CMacro(
+                name=f"wapp_{type_string_lower}_array_with_capacity(CAPACITY)",
+                value=__format_func_body(
+                    filename=snippets_dir / "stack_capacity_array_cpp",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+            )
 
-        alloc_capacity_array_macro = CMacro(
-            name=f"wapp_{type_string_lower}_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY)",
-            value=__format_func_body(
-                filename=snippets_dir / "alloc_capacity_macro",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
+            alloc_capacity_array_macro = CMacro(
+                name=f"wapp_{type_string_lower}_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY)",
+                value=__format_func_body(
+                    filename=snippets_dir / "alloc_capacity_macro",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+            )
 
-        array_pop_macro = CMacro(
-            name=f"wapp_{type_string_lower}_array_pop(ARRAY_PTR)",
-            value=__format_func_body(
-                filename=snippets_dir / "array_pop_macro",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
+            array_pop_cmacro = CMacro(
+                name=f"wapp_{type_string_lower}_array_pop(ARRAY_PTR)",
+                value=__format_func_body(
+                    filename=snippets_dir / "array_pop_macro",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+            )
+            array_pop_cppmacro = CMacro(
+                name=f"wapp_{type_string_lower}_array_pop(ARRAY_PTR)",
+                value=__format_func_body(
+                    filename=snippets_dir / "array_pop_macro_cpp",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+            )
 
-        get_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_get",
-            ret_type=type_string,
-            args=[
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-                CArg(name="index", _type=CType.U64),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "array_get",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-            pointer=CPointer(CPointerType.SINGLE),
-        )
+            get_func = CFunc(
+                name=f"wapp_{type_string_lower}_array_get",
+                ret_type=type_string,
+                args=[
+                    CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
+                    CArg(name="index", _type=CType.U64),
+                ],
+                body=__format_func_body(
+                    filename=snippets_dir / "array_get",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+                pointer=CPointer(CPointerType.SINGLE),
+            )
 
-        set_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_set",
-            ret_type=CType.VOID,
-            args=[
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-                CArg(name="index", _type=CType.U64),
-                CArg(name="item", _type=type_string, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "array_set",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
+            set_func = CFunc(
+                name=f"wapp_{type_string_lower}_array_set",
+                ret_type=CType.VOID,
+                args=[
+                    CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
+                    CArg(name="index", _type=CType.U64),
+                    CArg(name="item", _type=type_string, pointer=CPointer(CPointerType.SINGLE)),
+                ],
+                body=__format_func_body(
+                    filename=snippets_dir / "array_set",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+            )
 
-        append_capped_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_append_capped",
-            ret_type=CType.VOID,
-            args=[
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-                CArg(name="item", _type=type_string, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "append_capped",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
+            append_capped_func = CFunc(
+                name=f"wapp_{type_string_lower}_array_append_capped",
+                ret_type=CType.VOID,
+                args=[
+                    CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
+                    CArg(name="item", _type=type_string, pointer=CPointer(CPointerType.SINGLE)),
+                ],
+                body=__format_func_body(
+                    filename=snippets_dir / "append_capped",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+            )
 
-        extend_capped_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_extend_capped",
-            ret_type=CType.VOID,
-            args=[
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-                CArg(name="other", _type=array, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "extend_capped",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
+            extend_capped_func = CFunc(
+                name=f"wapp_{type_string_lower}_array_extend_capped",
+                ret_type=CType.VOID,
+                args=[
+                    CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
+                    CArg(name="other", _type=array, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
+                ],
+                body=__format_func_body(
+                    filename=snippets_dir / "extend_capped",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+            )
 
-        clear_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_clear",
-            ret_type=CType.VOID,
-            args=[
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "clear",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
+            clear_func = CFunc(
+                name=f"wapp_{type_string_lower}_array_clear",
+                ret_type=CType.VOID,
+                args=[
+                    CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
+                ],
+                body=__format_func_body(
+                    filename=snippets_dir / "clear",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+            )
 
-        copy_capped_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_copy_capped",
-            ret_type=CType.VOID,
-            args=[
-                CArg(name="src", _type=array, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-                CArg(name="dst", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "copy_capped",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
+            copy_capped_func = CFunc(
+                name=f"wapp_{type_string_lower}_array_copy_capped",
+                ret_type=CType.VOID,
+                args=[
+                    CArg(name="src", _type=array, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
+                    CArg(name="dst", _type=array, pointer=CPointer(CPointerType.SINGLE)),
+                ],
+                body=__format_func_body(
+                    filename=snippets_dir / "copy_capped",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+            )
 
-        append_alloc_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_append_alloc",
-            ret_type=array,
-            args=[
-                CArg(name="allocator", _type="Allocator", pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-                CArg(name="item", _type=type_string, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "append_alloc",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-            pointer=CPointer(CPointerType.SINGLE),
-        )
+            append_alloc_func = CFunc(
+                name=f"wapp_{type_string_lower}_array_append_alloc",
+                ret_type=array,
+                args=[
+                    CArg(name="allocator", _type="Allocator", pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
+                    CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
+                    CArg(name="item", _type=type_string, pointer=CPointer(CPointerType.SINGLE)),
+                ],
+                body=__format_func_body(
+                    filename=snippets_dir / "append_alloc",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+                pointer=CPointer(CPointerType.SINGLE),
+            )
 
-        extend_alloc_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_extend_alloc",
-            ret_type=array,
-            args=[
-                CArg(name="allocator", _type="Allocator", pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-                CArg(name="other", _type=array, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "extend_alloc",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-            pointer=CPointer(CPointerType.SINGLE),
-        )
+            extend_alloc_func = CFunc(
+                name=f"wapp_{type_string_lower}_array_extend_alloc",
+                ret_type=array,
+                args=[
+                    CArg(name="allocator", _type="Allocator", pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
+                    CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
+                    CArg(name="other", _type=array, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
+                ],
+                body=__format_func_body(
+                    filename=snippets_dir / "extend_alloc",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+                pointer=CPointer(CPointerType.SINGLE),
+            )
 
-        copy_alloc_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_copy_alloc",
-            ret_type=array,
-            args=[
-                CArg(name="allocator", _type="Allocator", pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-                CArg(name="src", _type=array, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-                CArg(name="dst", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "copy_alloc",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-            pointer=CPointer(CPointerType.SINGLE),
-        )
+            copy_alloc_func = CFunc(
+                name=f"wapp_{type_string_lower}_array_copy_alloc",
+                ret_type=array,
+                args=[
+                    CArg(name="allocator", _type="Allocator", pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
+                    CArg(name="src", _type=array, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
+                    CArg(name="dst", _type=array, pointer=CPointer(CPointerType.SINGLE)),
+                ],
+                body=__format_func_body(
+                    filename=snippets_dir / "copy_alloc",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+                pointer=CPointer(CPointerType.SINGLE),
+            )
 
-        pop_func = CFunc(
-            name=f"_{type_string_lower}_array_pop",
-            ret_type=type_string,
-            args=[
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "array_pop",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-            pointer=CPointer(CPointerType.SINGLE),
-        )
+            pop_func = CFunc(
+                name=f"_{type_string_lower}_array_pop",
+                ret_type=type_string,
+                args=[
+                    CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
+                ],
+                body=__format_func_body(
+                    filename=snippets_dir / "array_pop",
+                    type_string=type_string,
+                    type_string_upper=type_string_upper,
+                    type_string_lower=type_string_lower,
+                    array_typename=array_data.array_typename,
+                ),
+                pointer=CPointer(CPointerType.SINGLE),
+            )
+
+            header.macros.extend([
+                alloc_capacity_array_macro,
+            ])
+            header.c_macros.extend([
+                stack_array_cmacro,
+                stack_capacity_array_cmacro,
+                array_pop_cmacro,
+            ])
+            header.cpp_macros.extend([
+                stack_array_cppmacro,
+                stack_capacity_array_cppmacro,
+                array_pop_cppmacro,
+            ])
+            header.funcs.extend([
+                get_func,
+                set_func,
+                append_capped_func,
+                extend_capped_func,
+                clear_func,
+                copy_capped_func,
+                append_alloc_func,
+                extend_alloc_func,
+                copy_alloc_func,
+                pop_func,
+            ])
 
         header.decl_types.extend(array_data.hdr_decl_types)
-        header.macros.extend([
-            stack_array_macro,
-            stack_capacity_array_macro,
-            alloc_capacity_array_macro,
-            array_pop_macro,
-        ])
         header.types.extend([array])
-        header.funcs.extend([
-            get_func,
-            set_func,
-            append_capped_func,
-            extend_capped_func,
-            clear_func,
-            copy_capped_func,
-            append_alloc_func,
-            extend_alloc_func,
-            copy_alloc_func,
-            pop_func,
-        ])
 
         source.decl_types.extend(array_data.src_decl_types)
         source.funcs = header.funcs

codegen/array/snippets/alloc_capacity

@@ -1,4 +1,4 @@
-  assert(allocator != NULL);
+  wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
 
   u64 allocation_size = sizeof({ArrayType}) + item_size * capacity;
   {ArrayType} *array  = wapp_mem_allocator_alloc(allocator, allocation_size);

codegen/array/snippets/append_alloc

@@ -1,4 +1,4 @@
-  assert(allocator != NULL && array != NULL);
+  wapp_debug_assert(allocator != NULL && array != NULL, "`allocator` and `array` should not be NULL");
 
   {ArrayType} *output = array;
 

codegen/array/snippets/append_capped

@@ -1,4 +1,5 @@
-  assert(array != NULL && array->count < array->capacity);
+  wapp_debug_assert(array != NULL, "`array` should not be NULL");
+  wapp_runtime_assert(array->count < array->capacity, "`array` is full");
 
   u64 index = (array->count)++;
   wapp_{Tlower}_array_set(array, index, item);

codegen/array/snippets/array_get

@@ -1,4 +1,5 @@
-  assert(array != NULL && index < array->count);
+  wapp_debug_assert(array != NULL, "`array` should not be NULL");
+  wapp_runtime_assert(index < array->count, "`index` is out of bounds");
 
   u8 *ptr = (u8 *)(array->items) + (array->item_size * index);
   return ({T} *)ptr;

codegen/array/snippets/array_pop_macro_cpp

@@ -0,0 +1,4 @@
+(ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_{Tlower}_array_pop(ARRAY_PTR) : \
+  {T}{{}} \
+)

codegen/array/snippets/clear

@@ -1,2 +1,2 @@
-  assert(array != NULL);
+  wapp_debug_assert(array != NULL, "`array` should not be NULL");
   array->count = 0;

codegen/array/snippets/copy_alloc

@@ -1,4 +1,4 @@
-  assert(allocator != NULL && src != NULL && dst != NULL);
+  wapp_debug_assert(allocator != NULL && src != NULL && dst != NULL, "`allocator`, `src` and `dst` should not be NULL");
 
   {ArrayType} *output = dst;
 

codegen/array/snippets/copy_capped

@@ -1,4 +1,4 @@
-  assert(src != NULL && dst != NULL);
+  wapp_debug_assert(src != NULL && dst != NULL, "`src` and `dst` should not be NULL");
 
   wapp_{Tlower}_array_clear(dst);
 
@@ -8,7 +8,7 @@
   // MSVC Spectre mitigation warnings
   u64 to_copy    = src->count < dst->capacity ? src->count : dst->capacity;
   u64 item_index = 0;
-  bool running   = true;
+  b32 running    = true;
   while (running) {{
     item = wapp_{Tlower}_array_get(src, item_index);
     ++item_index;

codegen/array/snippets/extend_alloc

@@ -1,4 +1,4 @@
-  assert(allocator != NULL && array != NULL && other != NULL);
+  wapp_debug_assert(allocator != NULL && array != NULL && other != NULL, "`allocator`, `array` and `other` should not be NULL");
 
   {ArrayType} *output = array;
 

codegen/array/snippets/extend_capped

@@ -1,7 +1,7 @@
-  assert(array != NULL && other != NULL);
+  wapp_debug_assert(array != NULL && other != NULL, "`array` and `other` should not be NULL");
 
   u64 remaining_capacity = array->capacity - array->count;
-  assert(other->count < remaining_capacity);
+  wapp_runtime_assert(other->count < remaining_capacity, "`array` does not have enough capacity");
 
   {T} *item;
 
@@ -9,7 +9,7 @@
   // MSVC Spectre mitigation warnings
   u64 items_to_add = other->count;
   u64 item_index   = 0;
-  bool running     = true;
+  b32 running      = true;
   while (running) {{
     item = wapp_{Tlower}_array_get(other, item_index);
     ++item_index;

codegen/array/snippets/stack_array_cpp

@@ -0,0 +1,9 @@
+([&]() {{ \
+  wapp_persist {T} buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count({T}, __VA_ARGS__) * 2)] = {{__VA_ARGS__}}; \
+  return {ArrayType}{{ \
+    buf, \
+    wapp_misc_utils_va_args_count({T}, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count({T}, __VA_ARGS__) * 2), \
+    sizeof({T}) \
+  }}; \
+}}())

codegen/array/snippets/stack_capacity_array_cpp

@@ -0,0 +1,4 @@
+([&]() {{ \
+  wapp_persist {T} buf[CAPACITY] = {{}}; \
+  return {ArrayType}{{buf, 0, CAPACITY, sizeof({T})}}; \
+}}())

codegen/constants.py

@@ -1,5 +1,10 @@
 from pathlib import Path
 
-
+# Paths
 PACKAGE_DIR = Path(__file__).parent.resolve()
-WAPP_SRC_ROOT = PACKAGE_DIR.parent / "src"
+WAPP_REPO_ROOT = PACKAGE_DIR.parent
+WAPP_SRC_ROOT = WAPP_REPO_ROOT / "src"
+
+# Dictionary Keys
+DBL_LIST_DATA = "dbl_list_data"
+ARRAY_DATA = "array_data"

codegen/datatypes.py

@@ -1,15 +1,73 @@
 from enum import Enum
 from pathlib import Path
-from typing import Optional, Union, List
-from dataclasses import dataclass, field
+from typing import Optional, Union, List, Dict, Type, Any, TypeVar, cast
+from dataclasses import dataclass, asdict, field, fields
 
 from codegen.constants import WAPP_SRC_ROOT
 from codegen.utils import convert_to_relative
 
+E = TypeVar("E", bound="Enum")
+S = TypeVar("S", bound="SerialisableDataclass")
+F = TypeVar("F", bound="CFile")
+
+@dataclass
+class SerialisableDataclass:
+    def to_dict(self) -> Dict[str, Any]:
+        d = asdict(self)
+        for f in fields(self):
+            member = getattr(self, f.name)
+
+            if isinstance(member, list):
+                d[f.name] = [self.__serialise_member(i) for i in member]
+            else:
+                d[f.name] = self.__serialise_member(member)
+
+        return d
+
+    def __serialise_member(self, member: Any) -> Any:
+        if isinstance(member, Enum):
+            return member.value
+        elif isinstance(member, SerialisableDataclass):
+            return member.to_dict()
+
+        return member
+
+    @staticmethod
+    def to_enum_value(value: Any, _type: Type[E]) -> "E":
+        if isinstance(value, _type):
+            return value
+
+        return _type(value)
+
+    @staticmethod
+    def to_c_usertype(value: dict[str, Any]) -> "CUserType":
+        try:
+            output = CStruct.from_dict(value)
+        except TypeError:
+            output = CEnum.from_dict(value)
+
+        return output
+
+    @staticmethod
+    def to_cdatatype(value: Any) -> "CDataType":
+        if isinstance(value, dict):
+            output = SerialisableDataclass.to_c_usertype(value)
+        else:
+            try:
+                output = CType(value)
+            except ValueError:
+                output = value
+
+        return output
+
+    @classmethod
+    def from_dict(cls: Type[S], d: Dict[str, Any]) -> "S":
+        return cls(**d)
+
 
 class CType(Enum):
     VOID = "void"
-    BOOL = "bool"
+    BOOL = "b32"
     CHAR = "char"
     C8   = "c8"
     C16  = "c16"
@@ -35,9 +93,9 @@ class CType(Enum):
 class CQualifier(Enum):
     NONE       = ""
     CONST      = "const "
-    EXTERNAL   = "external "
-    INTERNAL   = "internal "
-    PERSISTENT = "persistent "
+    EXTERNAL   = "wapp_extern "
+    INTERNAL   = "wapp_intern "
+    PERSISTENT = "wapp_persist "
 
     def __str__(self) -> str:
         return self.value
@@ -53,16 +111,23 @@ class CPointerType(Enum):
 
 
 @dataclass
-class CPointer:
+class CPointer(SerialisableDataclass):
     _type: CPointerType = CPointerType.NONE
     qualifier: CQualifier = CQualifier.NONE
 
     def __str__(self) -> str:
         return str(self._type) + str(self.qualifier)
 
+    @classmethod
+    def from_dict(cls: Type["CPointer"], d: Dict[str, Any]) -> "CPointer":
+        ptr = CPointer(**d)
+        ptr._type = CPointer.to_enum_value(ptr._type, CPointerType)
+        ptr.qualifier = CPointer.to_enum_value(ptr.qualifier, CQualifier)
+        return ptr
+
 
 @dataclass
-class CEnumVal:
+class CEnumVal(SerialisableDataclass):
     name: str
     value: Optional[int] = None
 
@@ -71,7 +136,7 @@ class CEnumVal:
 
 
 @dataclass
-class CEnum:
+class CEnum(SerialisableDataclass):
     name: str
     values: List[CEnumVal]
     typedef: bool = False
@@ -90,9 +155,15 @@ class CEnum:
 
         return header + values + footer
 
+    @classmethod
+    def from_dict(cls: Type["CEnum"], d: Dict[str, Any]) -> "CEnum":
+        e = CEnum(**d)
+        e.values = [CEnumVal.from_dict(v) for v in e.values if isinstance(v, dict)]
+        return e
+
 
 @dataclass
-class CMacro:
+class CMacro(SerialisableDataclass):
     name: str
     value: str
 
@@ -101,7 +172,7 @@ class CMacro:
 
 
 @dataclass
-class CStruct:
+class CStruct(SerialisableDataclass):
     name: str
     cargs: List["CArg"]
     typedef_name: Optional[str] = None
@@ -122,13 +193,19 @@ class CStruct:
 
         return definition + args + footer;
 
+    @classmethod
+    def from_dict(cls: Type["CStruct"], d: Dict[str, Any]) -> "CStruct":
+        s = CStruct(**d)
+        s.cargs = [CArg.from_dict(v) for v in s.cargs if isinstance(v, dict)]
+        return s
+
 
 CUserType = Union[CStruct, CEnum]
 CDataType = Union[CType, CUserType, str]
 
 
 @dataclass
-class CArg:
+class CArg(SerialisableDataclass):
     name: str
     _type: CDataType
     array: bool = False
@@ -143,9 +220,21 @@ class CArg:
 
         return qualifier + _type + pointer + self.name + array
 
+    @classmethod
+    def from_dict(cls: Type["CArg"], d: Dict[str, Any]) -> "CArg":
+        arg = CArg(**d)
+        arg._type = CArg.to_cdatatype(arg._type)
+
+        if isinstance(arg.pointer, dict):
+            arg.pointer = CPointer.from_dict(arg.pointer)
+
+        arg.qualifier = CArg.to_enum_value(arg.qualifier, CQualifier)
+
+        return arg
+
 
 @dataclass
-class CFunc:
+class CFunc(SerialisableDataclass):
     name: str
     ret_type: CDataType
     args: List[CArg]
@@ -176,9 +265,21 @@ class CFunc:
     def define(self) -> str:
         return f"{str(self)} {{\n{self.body}\n}}\n\n"
 
+    @classmethod
+    def from_dict(cls: Type["CFunc"], d: Dict[str, Any]) -> "CFunc":
+        f = CFunc(**d)
+        f.ret_type = CFunc.to_cdatatype(f.ret_type)
+        f.args = [CArg.from_dict(v) for v in f.args if isinstance(v, dict)]
+        f.qualifiers = [CFunc.to_enum_value(v, CQualifier) for v in f.qualifiers]
+
+        if isinstance(f.pointer, dict):
+            f.pointer = CPointer.from_dict(f.pointer)
+
+        return f
+
 
 @dataclass
-class CInclude:
+class CInclude(SerialisableDataclass):
     header: Union[str, "CHeader"]
     local: bool = False
     same_dir: bool = False
@@ -201,9 +302,18 @@ class CInclude:
         
         return f"#include {open_symbol}{name}{close_symbol}\n"
 
+    @classmethod
+    def from_dict(cls: Type["CInclude"], d: Dict[str, Any]) -> "CInclude":
+        inc = CInclude(**d)
+
+        if isinstance(inc.header, dict):
+            inc.header = CHeader.from_dict(inc.header)
+
+        return inc
+
 
 @dataclass
-class CFile:
+class CFile(SerialisableDataclass):
     name: str
     extension: str
     includes: List[CInclude] = field(default_factory=list)
@@ -211,6 +321,8 @@ class CFile:
     funcs: List[CFunc] = field(default_factory=list)
     decl_types: List[CStruct] = field(default_factory=list)
     macros: List[CMacro] = field(default_factory=list)
+    c_macros: List[CMacro] = field(default_factory=list)
+    cpp_macros: List[CMacro] = field(default_factory=list)
 
     def save(self, output_dir: Path):
         self.includes.extend(
@@ -232,11 +344,27 @@ class CFile:
     def __str__(self) -> str:
         return """\
 /**
- * THIS FILE IS AUTOMATICALLY GENERATED. ANY MODIFICATIONS TO IT WILL BE OVERWRITTEN
+ * THIS FILE IS AUTOMATICALLY GENERATED. ANY MODIFICATIONS TO IT WILL BE OVERWRITTEN.
  */
 
 """
 
+    @classmethod
+    def from_dict(cls: Type["CFile"], d: Dict[str, Any]) -> "CFile":
+        f = CFile(**d)
+        f.deserialise_c_file_data()
+
+        return f
+
+    def deserialise_c_file_data(self) -> None:
+        self.includes = [CInclude.from_dict(v) for v in self.includes if isinstance(v, dict)]
+        self.types = [CFile.to_c_usertype(v) for v in self.types if isinstance(v, dict)]
+        self.funcs = [CFunc.from_dict(v) for v in self.funcs if isinstance(v, dict)]
+        self.decl_types = [CStruct.from_dict(v) for v in self.decl_types if isinstance(v, dict)]
+        self.macros = [CMacro.from_dict(v) for v in self.macros if isinstance(v, dict)]
+        self.c_macros = [CMacro.from_dict(v) for v in self.c_macros if isinstance(v, dict)]
+        self.cpp_macros = [CMacro.from_dict(v) for v in self.cpp_macros if isinstance(v, dict)]
+
 
 @dataclass
 class CHeader(CFile):
@@ -246,7 +374,10 @@ class CHeader(CFile):
         name_upper = self.name.upper()
         header_guard_name = f"{name_upper}_H"
         header_guard_open = f"#ifndef {header_guard_name}\n#define {header_guard_name}\n\n"
-        header_guard_close = f"\n#endif // !{header_guard_name}\n"
+        header_guard_close = f"#endif // !{header_guard_name}\n"
+
+        c_linkage_open = "#ifdef WAPP_PLATFORM_CPP\nBEGIN_C_LINKAGE\n#endif // !WAPP_PLATFORM_CPP\n\n"
+        c_linkage_close = "\n#ifdef WAPP_PLATFORM_CPP\nEND_C_LINKAGE\n#endif // !WAPP_PLATFORM_CPP\n\n"
 
         includes = _get_includes_string(self.includes)
 
@@ -256,6 +387,15 @@ class CHeader(CFile):
         if len(macros) > 0:
             macros += "\n"
 
+        if len(self.cpp_macros) > 0:
+            macros += "#ifdef WAPP_PLATFORM_CPP\n"
+            for macro in self.cpp_macros:
+                macros += str(macro)
+            macros += "#else\n"
+            for macro in self.c_macros:
+                macros += str(macro)
+            macros += "#endif // !WAPP_PLATFORM_CPP\n\n"
+
         forward_declarations = ""
         for _type in self.decl_types:
             forward_declarations += _type.declare()
@@ -274,13 +414,19 @@ class CHeader(CFile):
             super().__str__() +
             header_guard_open +
             includes +
+            c_linkage_open +
             macros +
             forward_declarations +
             types +
             funcs +
+            c_linkage_close +
             header_guard_close
         )
 
+    @classmethod
+    def from_dict(cls: Type["CHeader"], d: Dict[str, Any]) -> "CHeader":
+        return cast("CHeader", super().from_dict(d))
+
 
 @dataclass
 class CSource(CFile):
@@ -330,6 +476,13 @@ class CSource(CFile):
             internal_funcs_def
         )
 
+    @classmethod
+    def from_dict(cls: Type["CSource"], d: Dict[str, Any]) -> "CSource":
+        s = CSource(**d)
+        s.deserialise_c_file_data()
+        s.internal_funcs = [CFunc.from_dict(v) for v in s.funcs if isinstance(v, dict)]
+        return s
+
 
 def get_datatype_string(_type: CDataType) -> str:
     if isinstance(_type, CType):

codegen/dbl_list/make_dbl_list.py

@@ -1,8 +1,8 @@
 from pathlib import Path
 from dataclasses import dataclass, field
-from typing import List, Dict
+from typing import List, Dict, Any, Type
 from codegen.constants import WAPP_SRC_ROOT
-from codegen.utils import load_func_body_from_file
+from codegen.utils import load_func_body_from_file, convert_to_relative
 from codegen.datatypes import (
     CDataType,
     CMacro,
@@ -16,17 +16,25 @@ from codegen.datatypes import (
     CPointerType,
     CQualifier,
     CInclude,
+    SerialisableDataclass,
     get_datatype_string,
 )
 
 
 @dataclass
-class DblListData:
+class DblListData(SerialisableDataclass):
     node_typename: str
     list_typename: str
     hdr_decl_types: List[CStruct] = field(default_factory=list)
     src_decl_types: List[CStruct] = field(default_factory=list)
 
+    @classmethod
+    def from_dict(cls: Type["DblListData"], d: Dict[str, Any]) -> "DblListData":
+        data = DblListData(**d)
+        data.hdr_decl_types = [CStruct.from_dict(v) for v in data.hdr_decl_types if isinstance(v, dict)]
+        data.src_decl_types = [CStruct.from_dict(v) for v in data.src_decl_types if isinstance(v, dict)]
+        return data
+
 
 def make_dbl_list(user_datatypes: Dict[CDataType, DblListData] = {}):
     def __format_func_body(
@@ -48,13 +56,11 @@ def make_dbl_list(user_datatypes: Dict[CDataType, DblListData] = {}):
     out_dir = WAPP_SRC_ROOT / "primitives" / "dbl_list"
     out_dir.mkdir(parents=True, exist_ok=True)
 
-    common_includes: List[CInclude] = [
-        CInclude(header="stdbool.h")
-    ]
-
     common_decl_types: List[CStruct] = []
 
     datatypes: dict[CDataType, DblListData] = {
+        CType.VOID: DblListData(node_typename="GenericNode", list_typename="GenericList"),
+        "void *": DblListData(node_typename="VoidPNode", list_typename="VoidPList"),
         "Str8": DblListData(
             node_typename="Str8Node",
             list_typename="Str8List",
@@ -66,14 +72,10 @@ def make_dbl_list(user_datatypes: Dict[CDataType, DblListData] = {}):
 
     for _type in CType:
         if _type == CType.VOID:
-            datatypes["void *"] = DblListData(
-                node_typename="VoidPNode",
-                list_typename="VoidPList",
-            )
             continue
 
         type_title = _type.value.title()
-        datatypes[_type.value] = DblListData(
+        datatypes[_type] = DblListData(
             node_typename=f"{type_title}Node",
             list_typename=f"{type_title}List",
         )
@@ -95,17 +97,16 @@ def make_dbl_list(user_datatypes: Dict[CDataType, DblListData] = {}):
         decl_types=[*common_decl_types],
         includes=[
             CInclude(header, local=True, same_dir=True),
+            CInclude(
+                header=str(convert_to_relative(WAPP_SRC_ROOT / "common" / "assert" / "assert.h", out_dir)).replace("\\", "/"),
+                local=True
+            ),
             CInclude(header="stddef.h"),
-            CInclude(header="assert.h"),
         ],
         internal_funcs=[],
         funcs=header.funcs
     )
 
-    if len(common_includes) > 0:
-        header.includes.extend(common_includes)
-        source.includes.extend(common_includes)
-
     for _type, dbl_list_data in datatypes.items():
         type_string = get_datatype_string(_type)
         clean_type_string = type_string.replace(" ", "").replace("*", "_ptr")
@@ -132,7 +133,14 @@ def make_dbl_list(user_datatypes: Dict[CDataType, DblListData] = {}):
             ],
         )
 
-        node_macro = CMacro(
+        header.types.extend([node, dl_list])
+        header.decl_types.extend(dbl_list_data.hdr_decl_types)
+        source.decl_types.extend(dbl_list_data.src_decl_types)
+        if isinstance(_type, CType) and _type == CType.VOID:
+            # Don't define any functions for the generic node and list
+            continue
+
+        node_cmacro = CMacro(
             name=f"wapp_{type_string_lower}_list_node(ITEM_PTR)",
             value=__format_func_body(
                 filename=snippets_dir / "list_node",
@@ -144,6 +152,18 @@ def make_dbl_list(user_datatypes: Dict[CDataType, DblListData] = {}):
             ),
         )
 
+        node_cppmacro = CMacro(
+            name=f"wapp_{type_string_lower}_list_node(ITEM_PTR)",
+            value=__format_func_body(
+                filename=snippets_dir / "list_node_cpp",
+                type_string=type_string,
+                type_string_upper=type_string_upper,
+                type_string_lower=type_string_lower,
+                node_typename=dbl_list_data.node_typename,
+                list_typename=dbl_list_data.list_typename
+            ),
+        )
+
         get_func = CFunc(
             name=f"wapp_{type_string_lower}_list_get",
             ret_type=node,
@@ -299,9 +319,8 @@ def make_dbl_list(user_datatypes: Dict[CDataType, DblListData] = {}):
             qualifiers=[CQualifier.INTERNAL],
         )
 
-        header.decl_types.extend(dbl_list_data.hdr_decl_types)
-        header.macros.append(node_macro)
-        header.types.extend([node, dl_list])
+        header.c_macros.append(node_cmacro)
+        header.cpp_macros.append(node_cppmacro)
         header.funcs.extend([
             get_func,
             push_front_func,
@@ -313,7 +332,6 @@ def make_dbl_list(user_datatypes: Dict[CDataType, DblListData] = {}):
             empty_func,
         ])
 
-        source.decl_types.extend(dbl_list_data.src_decl_types)
         source.internal_funcs.append(node_to_list_func)
         source.funcs = header.funcs
 

codegen/dbl_list/snippets/list_empty

@@ -1,4 +1,4 @@
-  assert(list != NULL);
+  wapp_debug_assert(list != NULL, "`list` should not be NULL");
 
   u64 count = list->node_count;
   for (u64 i = 0; i < count; ++i) {{

codegen/dbl_list/snippets/list_get

@@ -1,4 +1,4 @@
-  assert(index < list->node_count);
+  wapp_runtime_assert(index < list->node_count, "`index` is out of bounds");
 
   {NodeType} *output  = NULL;
   {NodeType} *current = list->first;

codegen/dbl_list/snippets/list_insert

@@ -1,4 +1,4 @@
-  assert(list != NULL && node != NULL && (node->item) != NULL);
+  wapp_debug_assert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
 
   if (index == 0) {{
     wapp_{Tlower}_list_push_front(list, node);

codegen/dbl_list/snippets/list_node_cpp

@@ -0,0 +1 @@
+{NodeType}{{ITEM_PTR, nullptr, nullptr}}

codegen/dbl_list/snippets/list_pop_back

@@ -1,4 +1,4 @@
-  assert(list != NULL);
+  wapp_debug_assert(list != NULL, "`list` should not be NULL");
 
   {NodeType} *output = NULL;
 

codegen/dbl_list/snippets/list_pop_front

@@ -1,4 +1,4 @@
-  assert(list != NULL);
+  wapp_debug_assert(list != NULL, "`list` should not be NULL");
 
   {NodeType} *output = NULL;
 

codegen/dbl_list/snippets/list_push_back

@@ -1,4 +1,4 @@
-  assert(list != NULL && node != NULL && (node->item) != NULL);
+  wapp_debug_assert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
 
   {ListType} node_list = {Tlower}_node_to_list(node);
 

codegen/dbl_list/snippets/list_push_front

@@ -1,4 +1,4 @@
-  assert(list != NULL && node != NULL && (node->item) != NULL);
+  wapp_debug_assert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
 
   {ListType} node_list = {Tlower}_node_to_list(node);
 

codegen/dbl_list/snippets/list_remove

@@ -1,4 +1,4 @@
-  assert(list != NULL);
+  wapp_debug_assert(list != NULL, "`list` should not be NULL");
 
   {NodeType} *output = NULL;
 

codegen_custom_data_example.json

@@ -0,0 +1,29 @@
+{
+  "dbl_list_data": {
+    "CustomType": {
+      "node_typename": "CustomTypeNode",
+      "list_typename": "CustomTypeList",
+      "hdr_decl_types": [
+        {
+          "name": "custom_type",
+          "cargs": [],
+          "typedef_name": "CustomType"
+        }
+      ],
+      "src_decl_types": []
+    }
+  },
+  "array_data": {
+    "CustomType": {
+      "array_typename": "CustomTypeArray",
+      "hdr_decl_types": [
+        {
+          "name": "custom_type",
+          "cargs": [],
+          "typedef_name": "CustomType"
+        }
+      ],
+      "src_decl_types": []
+    }
+  }
+}

scripts/header_install.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+SCRIPT_DIR="$(dirname $0)"
+LIB_SRC="$1"
+INSTALL_PREFIX="$2"
+shift 2
+INCLUDES="$@"
+
+mkdir -p "$INSTALL_PREFIX"
+
+BASE_INCLUDE_DIR="$(dirname "$LIB_SRC")"
+find $BASE_INCLUDE_DIR -maxdepth 1 -type f -name "*.h" -exec cp -v {} "$INSTALL_PREFIX" \;
+
+cd "$SCRIPT_DIR/../src"
+for INCLUDE in $INCLUDES; do
+  for f in $(find "$INCLUDE" -type f -name "*.h"); do
+    DST="$INSTALL_PREFIX/$(dirname $f)"
+    mkdir -p "$DST"
+    cp -v "$f" "$DST"
+  done
+done

src/common/aliases/aliases.h

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef ALIASES_H
 #define ALIASES_H
 
@@ -26,6 +28,20 @@
 #define u32 uint32_t
 #define u64 uint64_t
 
+#define b32 uint32_t
+
+#ifndef WAPP_PLATFORM_CPP
+
+#ifndef false
+#define false (b32)0
+#endif // !false
+
+#ifndef true
+#define true (b32)1
+#endif // !true
+
+#endif // !WAPP_PLATFORM_CPP
+
 #define i8 int8_t
 #define i16 int16_t
 #define i32 int32_t
@@ -38,8 +54,14 @@
 #define uptr uintptr_t
 #define iptr intptr_t
 
-#define external extern
-#define internal static
-#define persistent static
+#define wapp_extern extern
+#define wapp_intern static
+#define wapp_persist static
+
+#ifdef WAPP_PLATFORM_CPP
+#define wapp_class_mem static
+#define BEGIN_C_LINKAGE extern "C" {
+#define END_C_LINKAGE }
+#endif // WAPP_PLATFORM_CPP
 
 #endif // !ALIASES_H

src/common/assert/assert.h

@@ -0,0 +1,41 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef WAPP_ASSERT_H
+#define WAPP_ASSERT_H
+
+#include "../aliases/aliases.h"
+#include "../platform/platform.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#define wapp_static_assert(EXPR, MSG) extern char ASSERTION_FAILED[EXPR ? 1 : -1]
+#define wapp_runtime_assert(EXPR, MSG) __wapp_runtime_assert(EXPR, MSG)
+
+#ifdef WAPP_DEBUG_ASSERT
+  #define wapp_debug_assert(EXPR, MSG) wapp_runtime_assert(EXPR, MSG)
+#else
+  #define wapp_debug_assert(EXPR, MSG)
+#endif
+
+#define __wapp_runtime_assert(EXPR, MSG) do {                                         \
+  if (!(EXPR)) {                                                                      \
+    fprintf(                                                                          \
+      stderr,                                                                         \
+      "%s:%d (In function `%s`): Assertion failed (%" PRIu32 ")\nDiagnostic: %s\n\n", \
+      __FILE__, __LINE__, __func__,                                                   \
+      EXPR, MSG                                                                       \
+    );                                                                                \
+    abort();                                                                          \
+  }                                                                                   \
+} while(false)
+
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#endif // !WAPP_ASSERT_H

src/common/misc/misc_utils.h

@@ -1,8 +1,14 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef MISC_UTILS_H
 #define MISC_UTILS_H
 
 #include "../aliases/aliases.h"
 
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #define KB(SIZE) (SIZE * 1024ull)
 #define MB(SIZE) (KB(SIZE) * 1024)
 #define GB(SIZE) (MB(SIZE) * 1024)
@@ -32,6 +38,19 @@
   ) + 1 \
 )
 
+#ifdef WAPP_PLATFORM_CPP
+#define wapp_misc_utils_va_args_count(T, ...) va_args_count<T>(__VA_ARGS__)
+#else
 #define wapp_misc_utils_va_args_count(T, ...) (sizeof((T[]){__VA_ARGS__})/sizeof(T))
+#endif // !WAPP_PLATFORM_CPP
+
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+
+template <typename T, typename... Args>
+constexpr u64 va_args_count(Args&&...) {
+    return sizeof...(Args);
+}
+#endif // !WAPP_PLATFORM_CPP
 
 #endif // !MISC_UTILS_H

src/common/platform/platform.h

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef PLATFORM_H
 #define PLATFORM_H
 
@@ -59,7 +61,30 @@
 #endif
 
 #ifdef __cplusplus
-  #error "WAPP is a C only library"
+  #define WAPP_PLATFORM_CPP
+  #define WAPP_PLATFORM_CPP_VERSION __cplusplus
+  #define WAPP_PLATFORM_CPP98_VERSION 199711L
+  #define WAPP_PLATFORM_CPP11_VERSION 201103L
+  #define WAPP_PLATFORM_CPP14_VERSION 201402L
+  #define WAPP_PLATFORM_CPP17_VERSION 201703L
+  #define WAPP_PLATFORM_CPP20_VERSION 202002L
+  #define WAPP_PLATFORM_CPP23_VERSION 202302L
+
+  #if WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP98_VERSION
+    #define WAPP_PLATFORM_CPP98
+  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP11_VERSION
+    #define WAPP_PLATFORM_CPP11
+  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP14_VERSION
+    #define WAPP_PLATFORM_CPP14
+  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP17_VERSION
+    #define WAPP_PLATFORM_CPP17
+  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP20_VERSION
+    #define WAPP_PLATFORM_CPP20
+  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP23_VERSION
+    #define WAPP_PLATFORM_CPP23
+  #else
+    #error "Unrecognised C++ version"
+  #endif
 #else
   #define WAPP_PLATFORM_C
 

src/common/wapp_common.h

@@ -1,7 +1,10 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef WAPP_COMMON_H
 #define WAPP_COMMON_H
 
 #include "aliases/aliases.h"
+#include "assert/assert.h"
 #include "misc/misc_utils.h"
 #include "platform/platform.h"
 

src/core/file/file.c

@@ -0,0 +1,103 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "file.h"
+#include "../os/cpath/cpath.h"
+#include "../../common/assert/assert.h"
+#include "../../common/aliases/aliases.h"
+#include "../../primitives/array/array.h"
+#include "../../primitives/strings/str8/str8.h"
+#include <stdio.h>
+
+File *wapp_file_open(Str8RO *filepath, FileAccessMode mode) {
+  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.");
+
+  memset(tmp, 0, WAPP_PATH_MAX);
+  memcpy(tmp, filepath->buf, filepath->size);
+
+  return fopen((const char *)tmp, modes[mode]);
+}
+
+u64 wapp_file_get_current_position(File *file) {
+  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
+  return (u64)ftell(file);
+}
+
+i32 wapp_file_seek(File *file, u64 offset, FileSeekOrigin origin) {
+  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
+  return fseek(file, offset, origin);
+}
+
+u64 wapp_file_get_length(File *file) {
+  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
+
+  u64 current = wapp_file_get_current_position(file);
+
+  wapp_file_seek(file, 0, WAPP_SEEK_END);
+
+  u64 output = ftell(file);
+
+  // Restore position
+  wapp_file_seek(file, current, WAPP_SEEK_START);
+
+  return output;
+}
+
+u64 wapp_file_read(GenericArray *dst, File *file, u64 item_count) {
+  wapp_debug_assert(dst != NULL && dst->items != NULL && file != NULL,
+                    "`dst`, `dst->items` and `file` should not be NULL.");
+
+  u64 file_length       = wapp_file_get_length(file);
+  u64 dst_byte_capacity = dst->item_size * dst->capacity;
+  u64 req_byte_count    = item_count * dst->item_size;
+  u64 copy_byte_count   = 0;
+
+  if (req_byte_count <= file_length && req_byte_count <= dst_byte_capacity) {
+    copy_byte_count = req_byte_count;
+  } else {
+    copy_byte_count = file_length <= dst_byte_capacity ? file_length : dst_byte_capacity;
+  }
+
+  dst->count = fread(dst->items, sizeof(u8), copy_byte_count, file) / dst->item_size;
+
+  return dst->count;
+}
+
+u64 wapp_file_write(const GenericArray *src, File *file, u64 item_count) {
+  wapp_debug_assert(src != NULL && src->items != NULL && file != NULL,
+                    "`src`, `src->items` and `file` should not be NULL.");
+
+  u64 src_byte_count = src->count * src->item_size;
+  u64 req_byte_count = item_count * src->item_size;
+  u64 to_copy        = req_byte_count <= src_byte_count ? req_byte_count : src_byte_count;
+
+  return fwrite(src->items, sizeof(u8), to_copy, file);
+}
+
+i32 wapp_file_flush(File *file) {
+  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
+  return fflush(file);
+}
+
+i32 wapp_file_close(File *file) {
+  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
+  return fclose(file);
+}

src/core/file/file.h

@@ -0,0 +1,72 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef FILE_H
+#define FILE_H
+
+#include "../../common/aliases/aliases.h"
+#include "../../primitives/array/array.h"
+#include "../../primitives/strings/str8/str8.h"
+#include <stdio.h>
+
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#ifdef WAPP_PLATFORM_CPP
+#define wapp_file_item_to_array(ITEM) (GenericArray{&(ITEM), 1, 1, sizeof(ITEM)})
+#define wapp_file_array_to_item(TYPE, ARRAY) (sizeof(TYPE) == (ARRAY).item_size && (ARRAY).count == 1 ? \
+                                              *((TYPE *)((ARRAY).items)) :                              \
+                                              TYPE{})
+#else
+#define wapp_file_item_to_array(ITEM) ((GenericArray){.items     = &(ITEM),       \
+                                                      .count     = 1,             \
+                                                      .capacity  = 1,             \
+                                                      .item_size = sizeof(ITEM)})
+#define wapp_file_array_to_item(TYPE, ARRAY) (sizeof(TYPE) == (ARRAY).item_size && (ARRAY).count == 1 ? \
+                                              *((TYPE *)((ARRAY).items)) :                              \
+                                              (TYPE){0})
+#endif // !WAPP_PLATFORM_CPP
+
+typedef FILE File;
+
+typedef enum {
+  WAPP_FA_MODE_R,      // Equivalent to r
+  WAPP_FA_MODE_W,      // Equivalent to w
+  WAPP_FA_MODE_A,      // Equivalent to a
+  WAPP_FA_MODE_R_EX,   // Equivalent to r+
+  WAPP_FA_MODE_W_EX,   // Equivalent to w+
+  WAPP_FA_MODE_A_EX,   // Equivalent to a+
+  WAPP_FA_MODE_RB,     // Equivalent to rb
+  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   = SEEK_SET,
+  WAPP_SEEK_CURRENT = SEEK_CUR,
+  WAPP_SEEK_END     = SEEK_END,
+} FileSeekOrigin;
+
+File *wapp_file_open(Str8RO *filename, FileAccessMode mode);
+u64   wapp_file_get_current_position(File *file);
+i32   wapp_file_seek(File *file, u64 offset, FileSeekOrigin origin);
+u64   wapp_file_get_length(File *file);
+u64   wapp_file_read(GenericArray *dst, File *file, u64 item_count);
+u64   wapp_file_write(const GenericArray *src, File *file, u64 item_count);
+i32   wapp_file_flush(File *file);
+i32   wapp_file_close(File *file);
+
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#endif // !FILE_H

src/core/mem/arena/mem_arena.c

@@ -1,12 +1,13 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "mem_arena.h"
 #include "../utils/mem_utils.h"
 #include "../../../common/aliases/aliases.h"
+#include "../../../common/assert/assert.h"
 #include "../../../common/misc/misc_utils.h"
 #include "../../os/mem/mem_os.h"
-#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #ifndef DEFAULT_ALIGNMENT
 // Why 2 * sizeof(void *) instead of sizeof(void *)
@@ -20,14 +21,14 @@ struct arena {
   u8 *buf;
   u8 *offset;
   u64 capacity;
-  bool committed;
+  b32 committed;
 
 #ifdef WAPP_PLATFORM_WINDOWS
-  wapp_misc_utils_padding_size(sizeof(u8 *) * 2 + sizeof(u64) + sizeof(bool));
+  wapp_misc_utils_padding_size(sizeof(u8 *) * 2 + sizeof(u64) + sizeof(b32));
 #endif // ifdef WAPP_PLATFORM_WINDOWS
 };
 
-bool wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, bool zero_buffer) {
+b32 wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b32 zero_buffer) {
   if (!arena || *arena || base_capacity == 0) {
     return false;
   }
@@ -64,7 +65,7 @@ void *wapp_mem_arena_alloc(Arena *arena, u64 size) {
 }
 
 void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) {
-  assert(arena != NULL);
+  wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
 
   u8 *alloc_start = arena->offset;
 
@@ -123,14 +124,14 @@ void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64
 }
 
 void wapp_mem_arena_clear(Arena *arena) {
-  assert(arena != NULL);
+  wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
 
   memset(arena->buf, 0, arena->offset - arena->buf);
   arena->offset = arena->buf;
 }
 
 void wapp_mem_arena_destroy(Arena **arena) {
-  assert(arena != NULL && (*arena) != NULL);
+  wapp_debug_assert(arena != NULL && (*arena) != NULL, "`arena` double pointer is not valid");
 
   Arena *arena_ptr = *arena;
   if (arena_ptr->buf) {

src/core/mem/arena/mem_arena.h

@@ -1,10 +1,15 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef MEM_ARENA_H
 #define MEM_ARENA_H
 
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/platform/platform.h"
 #include "../../os/mem/mem_os.h"
-#include <stdbool.h>
+
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
 
 typedef struct arena Arena;
 
@@ -22,7 +27,7 @@ typedef struct arena Arena;
  * control over how the Arena is initialised. Wrapper macros are provided for
  * easier use.
  */
-bool wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, bool zero_buffer);
+b32  wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b32 zero_buffer);
 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);
@@ -30,4 +35,8 @@ void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64
 void wapp_mem_arena_clear(Arena *arena);
 void wapp_mem_arena_destroy(Arena **arena);
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !MEM_ARENA_H

src/core/mem/arena/mem_arena_allocator.c

@@ -1,18 +1,20 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "mem_arena_allocator.h"
 #include "mem_arena.h"
 #include "../../../common/aliases/aliases.h"
 #include "../../os/mem/mem_os.h"
 
-internal inline void *mem_arena_alloc(u64 size, void *alloc_obj);
-internal inline void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj);
-internal inline void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
-internal inline void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
+wapp_intern inline 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 inline 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,
                                                 void *alloc_obj);
 
 
-Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, bool zero_buffer) {
+Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, b32 zero_buffer) {
   Allocator allocator = {0};
-  bool initialised = wapp_mem_arena_init_custom((Arena **)(&allocator.obj), base_capacity, flags, zero_buffer);
+  b32 initialised = wapp_mem_arena_init_custom((Arena **)(&allocator.obj), base_capacity, flags, zero_buffer);
   if (!initialised) {
     return allocator;
   }
@@ -35,22 +37,22 @@ void wapp_mem_arena_allocator_destroy(Allocator *allocator) {
 }
 
 
-internal inline 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);
 }
 
-internal inline 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);
 }
 
-internal inline 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);
 }
 
-internal inline 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/core/mem/arena/mem_arena_allocator.h

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef MEM_ARENA_ALLOCATOR_H
 #define MEM_ARENA_ALLOCATOR_H
 
@@ -5,7 +7,10 @@
 #include "../../../common/platform/platform.h"
 #include "../../../primitives/mem_allocator/mem_allocator.h"
 #include "../../os/mem/mem_os.h"
-#include <stdbool.h>
+
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
 
 #define wapp_mem_arena_allocator_init(base_capacity)                           \
   (wapp_mem_arena_allocator_init_custom(base_capacity, WAPP_MEM_ALLOC_RESERVE, false))
@@ -27,8 +32,12 @@
  * The `wapp_mem_arena_allocator_init_custom` provides the most control over how
  * the Arena is initialised. Wrapper macros are provided for easier use.
  */
-Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, bool zero_buffer);
+Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, b32 zero_buffer);
 void wapp_mem_arena_allocator_clear(Allocator *allocator);
 void wapp_mem_arena_allocator_destroy(Allocator *allocator);
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !MEM_ARENA_ALLOCATOR_H

src/core/mem/utils/mem_utils.c

@@ -1,14 +1,15 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "mem_utils.h"
 #include "../../../common/aliases/aliases.h"
-#include <stdbool.h>
+#include "../../../common/assert/assert.h"
 #include <stddef.h>
-#include <assert.h>
 
-internal bool is_power_of_two(u64 num) { return (num & (num - 1)) == 0; }
+wapp_intern b32 is_power_of_two(u64 num) { return (num & (num - 1)) == 0; }
 
 void *wapp_mem_util_align_forward(void *ptr, u64 alignment) {
-  assert(ptr != NULL);
-  assert(is_power_of_two(alignment));
+  wapp_debug_assert(ptr != NULL, "`ptr` should not be NULL");
+  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/core/mem/utils/mem_utils.h

@@ -1,9 +1,19 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef MEM_UTILS_H
 #define MEM_UTILS_H
 
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/platform/platform.h"
 
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 void *wapp_mem_util_align_forward(void *ptr, u64 alignment);
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !MEM_UTILS_H

src/core/os/cpath/cpath.c

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "cpath.h"
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/misc/misc_utils.h"
@@ -6,7 +8,6 @@
 #include "../../../primitives/mem_allocator/mem_allocator.h"
 #include "../../../primitives/strings/str8/str8.h"
 #include <stdarg.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -20,7 +21,7 @@ u32 wapp_cpath_join_path(Str8 *dst, const Str8List *parts) {
   }
 
   Str8 separator = wapp_str8_buf(4);
-  wapp_str8_push_back(&separator, PATH_SEP);
+  wapp_str8_push_back(&separator, WAPP_PATH_SEP);
 
   u64 required_capacity = parts->node_count * separator.size + wapp_str8_list_total_size(parts);
   if (dst->capacity < required_capacity) {
@@ -35,7 +36,7 @@ u32 wapp_cpath_join_path(Str8 *dst, const Str8List *parts) {
   // MSVC Spectre mitigation warnings
   const Str8Node *node = first_node;
   u64 node_index       = 1;
-  bool running         = node_index < parts->node_count;
+  b32 running          = node_index < parts->node_count;
   while (running && node->next) {
     node = node->next;
     if (node->item->size == 0) {
@@ -43,9 +44,9 @@ u32 wapp_cpath_join_path(Str8 *dst, const Str8List *parts) {
     }
 
     if (dst->size > 0) {
-      char dst_last = wapp_str8_get(dst, dst->size - 1);
-      char node_start = wapp_str8_get(node->item, 0);
-      bool add_path_sep = dst_last != PATH_SEP && node_start != PATH_SEP;
+      char dst_last    = wapp_str8_get(dst, dst->size - 1);
+      char node_start  = wapp_str8_get(node->item, 0);
+      b32 add_path_sep = dst_last != WAPP_PATH_SEP && node_start != WAPP_PATH_SEP;
 
       if (add_path_sep) {
         wapp_str8_concat_capped(dst, &separator);
@@ -67,9 +68,9 @@ Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels) {
     goto RETURN_DIRUP;
   }
 
-  bool absolute  = wapp_str8_get(path, 0) == PATH_SEP;
+  b32 absolute   = wapp_str8_get(path, 0) == WAPP_PATH_SEP;
   Str8 separator = wapp_str8_buf(4);
-  wapp_str8_push_back(&separator, PATH_SEP);
+  wapp_str8_push_back(&separator, WAPP_PATH_SEP);
 
   if (path->size == 0) {
     output = wapp_str8_alloc_buf(allocator, 16);
@@ -77,7 +78,7 @@ Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels) {
       goto RETURN_DIRUP;
     }
 
-    wapp_str8_push_back(output, absolute ? PATH_SEP : '.');
+    wapp_str8_push_back(output, absolute ? WAPP_PATH_SEP : '.');
     goto RETURN_DIRUP;
   }
 
@@ -102,7 +103,7 @@ Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels) {
       goto LIST_CLEANUP_DIRUP;
     }
 
-    wapp_str8_push_back(output, absolute ? PATH_SEP : '.');
+    wapp_str8_push_back(output, absolute ? WAPP_PATH_SEP : '.');
   } else {
     for (u64 i = 0; i < levels; ++i) {
       wapp_str8_list_pop_back(parts);
@@ -116,7 +117,7 @@ Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels) {
     output = wapp_str8_alloc_buf(allocator, alloc_size);
     if (output) {
       if (absolute) {
-        wapp_str8_push_back(output, PATH_SEP);
+        wapp_str8_push_back(output, WAPP_PATH_SEP);
       }
 
       Str8 *joined = wapp_str8_join(&tmp_arena, parts, &separator);

src/core/os/cpath/cpath.h

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef CPATH_H
 #define CPATH_H
 
@@ -6,10 +8,18 @@
 #include "../../../primitives/mem_allocator/mem_allocator.h"
 #include "../../../primitives/strings/str8/str8.h"
 
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #ifdef WAPP_PLATFORM_POSIX
-#define PATH_SEP '/'
+#include <limits.h>
+#define WAPP_PATH_SEP '/'
+#define WAPP_PATH_MAX PATH_MAX
 #elif defined(WAPP_PLATFORM_WINDOWS)
-#define PATH_SEP '\\'
+#include <windows.h>
+#define WAPP_PATH_SEP '\\'
+#define WAPP_PATH_MAX MAX_PATH
 #else
 #error "Unrecognised platform"
 #endif
@@ -27,4 +37,8 @@ enum {
 u32  wapp_cpath_join_path(Str8 *dst, const Str8List *parts);
 Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels);
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !CPATH_H

src/core/os/mem/mem_os.c

@@ -1,9 +1,10 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "mem_os.h"
 #include "mem_os_ops.h"
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/platform/platform.h"
 #include <assert.h>
-#include <stdbool.h>
 #include <string.h>
 
 #if defined(WAPP_PLATFORM_WINDOWS)

src/core/os/mem/mem_os.h

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef MEM_OS_H
 #define MEM_OS_H
 
@@ -6,6 +8,10 @@
 
 #include "mem_os_ops.h"
 
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #if defined(WAPP_PLATFORM_WINDOWS)
 #include "win/mem_os_win.h"
 #elif defined(WAPP_PLATFORM_POSIX)
@@ -17,7 +23,11 @@
 void *wapp_mem_util_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
 void wapp_mem_util_free(void *ptr, u64 size);
 
-external void *mem_util_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
-external void mem_util_free(void *ptr, u64 size);
+wapp_extern void *mem_util_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
+wapp_extern void mem_util_free(void *ptr, u64 size);
+
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
 
 #endif // !MEM_OS_H

src/core/os/mem/mem_os_ops.h

@@ -1,8 +1,14 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef MEM_OS_OPS_H
 #define MEM_OS_OPS_H
 
 #include "../../../common/platform/platform.h"
 
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 typedef enum mem_access {
   WAPP_MEM_ACCESS_NONE,
   WAPP_MEM_ACCESS_READ_ONLY,
@@ -17,4 +23,8 @@ typedef enum mem_init_type {
   WAPP_MEM_INIT_INITIALISED,
 } MemInitType;
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !MEM_OS_OPS_H

src/core/os/mem/posix/mem_os_posix.c

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "../../../../common/aliases/aliases.h"
 #include "../../../../common/platform/platform.h"
 
@@ -7,7 +9,7 @@
 #include "../mem_os_ops.h"
 #include <sys/mman.h>
 
-internal const i32 access_types[] = {
+wapp_intern const i32 access_types[] = {
     [WAPP_MEM_ACCESS_NONE]            = PROT_NONE,
     [WAPP_MEM_ACCESS_READ_ONLY]       = PROT_READ,
     [WAPP_MEM_ACCESS_EXEC_ONLY]       = PROT_EXEC,

src/core/os/mem/posix/mem_os_posix.h

@@ -1,8 +1,14 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef MEM_OS_POSIX_H
 #define MEM_OS_POSIX_H
 
 #include "../../../../common/platform/platform.h"
 
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #ifdef WAPP_PLATFORM_POSIX
 
 #include <sys/mman.h>
@@ -22,4 +28,8 @@ typedef enum mem_alloc_flags {
 
 #endif // !WAPP_PLATFORM_POSIX
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !MEM_OS_POSIX_H

src/core/os/mem/win/mem_os_win.c

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "../../../../common/aliases/aliases.h"
 #include "../../../../common/platform/platform.h"
 
@@ -10,7 +12,7 @@
 #include <Windows.h>
 #include <memoryapi.h>
 
-internal const i32 access_types[] = {
+wapp_intern const i32 access_types[] = {
     [WAPP_MEM_ACCESS_NONE]            = PAGE_NOACCESS,
     [WAPP_MEM_ACCESS_READ_ONLY]       = PAGE_READONLY,
     [WAPP_MEM_ACCESS_EXEC_ONLY]       = PAGE_EXECUTE,

src/core/os/mem/win/mem_os_win.h

@@ -1,8 +1,14 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef MEM_OS_WIN_H
 #define MEM_OS_WIN_H
 
 #include "../../../../common/platform/platform.h"
 
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #ifdef WAPP_PLATFORM_WINDOWS
 
 #define WIN32_LEAN_AND_MEAN
@@ -16,4 +22,8 @@ typedef enum mem_alloc_flags {
 
 #endif // !WAPP_PLATFORM_WINDOWS
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !MEM_OS_WIN_H

src/core/os/shell/commander/commander.c

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "commander.h"
 #include "commander_output.h"
 #include "../utils/shell_utils.h"
@@ -8,7 +10,6 @@
 #include "../../../../primitives/mem_allocator/mem_allocator.h"
 #include "../../../../primitives/strings/str8/str8.h"
 #include <stdarg.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -16,8 +17,8 @@
 #define CMD_BUF_LEN 8192
 #define OUT_BUF_LEN 4096
 
-internal inline CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf);
-internal inline CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf);
+wapp_intern inline CMDResult execute_command(Str8RO *cmd, 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) {
@@ -42,7 +43,7 @@ CMDResult wapp_shell_commander_execute(CMDOutHandling out_handling, Str8 *out_bu
   return output;
 }
 
-internal inline 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);
 
@@ -82,7 +83,7 @@ EXECUTE_COMMAND_CLOSE:
   return output;
 }
 
-internal inline 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/core/os/shell/commander/commander.h

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef COMMANDER_H
 #define COMMANDER_H
 
@@ -5,14 +7,21 @@
 #include "../../../../common/aliases/aliases.h"
 #include "../../../../common/platform/platform.h"
 #include "../../../../primitives/strings/str8/str8.h"
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #define CMD_NO_EXIT(ERR) ((CMDResult){.exited = false, .exit_code = EXIT_FAILURE, .error = ERR})
 
 CMDResult wapp_shell_commander_execute(CMDOutHandling out_handling, Str8 *out_buf, const Str8List *cmd);
 
-external CMDError get_output_status(FILE *fp, i32 *status_out);
+wapp_extern CMDError get_output_status(FILE *fp, i32 *status_out);
+
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
 
 #endif // !COMMANDER_H

src/core/os/shell/commander/commander_output.h

@@ -1,9 +1,14 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef COMMANDER_OUTPUT_H
 #define COMMANDER_OUTPUT_H
 
 #include "../../../../common/aliases/aliases.h"
 #include "../../../../common/platform/platform.h"
-#include <stdbool.h>
+
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
 
 typedef enum {
   SHELL_OUTPUT_DISCARD,
@@ -24,12 +29,16 @@ typedef struct commander_result CMDResult;
 struct commander_result {
   i32 exit_code;
   CMDError error;
-  bool exited;
+  b32 exited;
 
 #ifdef WAPP_PLATFORM_WINDOWS
   #include "../../../../common/misc/misc_utils.h"
-  wapp_misc_utils_padding_size(sizeof(bool) + sizeof(i32) + sizeof(CMDError));
+  wapp_misc_utils_padding_size(sizeof(b32) + sizeof(i32) + sizeof(CMDError));
 #endif // !WAPP_PLATFORM_WINDOWS
 };
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !COMMANDER_OUTPUT_H

src/core/os/shell/commander/posix/commander_posix.c

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "../../../../../common/aliases/aliases.h"
 #include "../../../../../common/platform/platform.h"
 

src/core/os/shell/commander/win/commander_win.c

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "../../../../../common/aliases/aliases.h"
 #include "../../../../../common/platform/platform.h"
 

src/core/os/shell/termcolour/posix/termcolour_posix.c

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "../../../../../common/aliases/aliases.h"
 #include "../../../../../common/platform/platform.h"
 #include "../../../../../primitives/strings/str8/str8.h"
@@ -7,7 +9,7 @@
 #include "../terminal_colours.h"
 #include <stdio.h>
 
-internal Str8RO colours[COUNT_TERM_COLOUR] = {
+wapp_intern Str8RO colours[COUNT_TERM_COLOUR] = {
     [WAPP_TERM_COLOUR_FG_BLACK]      = wapp_str8_lit_ro_initialiser_list("\033[30m"),
     [WAPP_TERM_COLOUR_FG_RED]        = wapp_str8_lit_ro_initialiser_list("\033[31m"),
     [WAPP_TERM_COLOUR_FG_GREEN]      = wapp_str8_lit_ro_initialiser_list("\033[32m"),

src/core/os/shell/termcolour/termcolour.c

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "termcolour.h"
 #include "terminal_colours.h"
 #include "../../../../primitives/strings/str8/str8.h"

src/core/os/shell/termcolour/termcolour.h

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef TERM_COLOUR_H
 #define TERM_COLOUR_H
 
@@ -6,9 +8,17 @@
 #include "../../../../common/platform/platform.h"
 #include "../../../../primitives/strings/str8/str8.h"
 
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 void wapp_shell_termcolour_print_text(Str8RO *text, TerminalColour colour);
 void wapp_shell_termcolour_clear_colour(void);
 
-external void print_coloured_text(Str8RO *text, TerminalColour colour);
+wapp_extern void print_coloured_text(Str8RO *text, TerminalColour colour);
+
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
 
 #endif // !TERM_COLOUR_H

src/core/os/shell/termcolour/terminal_colours.h

@@ -1,8 +1,15 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef TERMINAL_COLOURS_H
 #define TERMINAL_COLOURS_H
 
+#include "../../../../common/aliases/aliases.h"
 #include "../../../../common/platform/platform.h"
 
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 typedef enum {
   WAPP_TERM_COLOUR_FG_BLACK,
   WAPP_TERM_COLOUR_FG_RED,
@@ -25,4 +32,8 @@ typedef enum {
   COUNT_TERM_COLOUR,
 } TerminalColour;
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !TERMINAL_COLOURS_H

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

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "../../../../../common/aliases/aliases.h"
 #include "../../../../../common/platform/platform.h"
 #include "../../../../../primitives/strings/str8/str8.h"
@@ -20,9 +22,9 @@ struct termcolour_data {
   wapp_misc_utils_padding_size(sizeof(HANDLE) + sizeof(WORD) + sizeof(WORD));
 };
 
-internal void init_data(TermcolourData *data);
+wapp_intern void init_data(TermcolourData *data);
 
-internal WORD colours[COUNT_TERM_COLOUR] = {
+wapp_intern WORD colours[COUNT_TERM_COLOUR] = {
     [WAPP_TERM_COLOUR_FG_BLACK]      = 0,
     [WAPP_TERM_COLOUR_FG_RED]        = FOREGROUND_RED,
     [WAPP_TERM_COLOUR_FG_GREEN]      = FOREGROUND_GREEN,
@@ -42,7 +44,7 @@ internal WORD colours[COUNT_TERM_COLOUR] = {
 };
 
 void print_coloured_text(Str8RO *text, TerminalColour colour) {
-  persistent TermcolourData data = {0};
+  wapp_persist TermcolourData data = {0};
   if (data.handle == 0) {
     init_data(&data);
   }
@@ -57,7 +59,7 @@ void print_coloured_text(Str8RO *text, TerminalColour colour) {
   printf(WAPP_STR8_SPEC, wapp_str8_varg((*text)));
 }
 
-internal void init_data(TermcolourData *data) {
+wapp_intern void init_data(TermcolourData *data) {
   // create handle
   data->handle = GetStdHandle(STD_OUTPUT_HANDLE);
 

src/core/os/shell/utils/shell_utils.h

@@ -1,9 +1,16 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef SHELL_UTILS_H
 #define SHELL_UTILS_H
 
+#include "../../../../common/aliases/aliases.h"
 #include "../../../../common/platform/platform.h"
 #include <stdio.h>
 
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #ifdef WAPP_PLATFORM_WINDOWS
   #define wapp_shell_utils_popen  _popen
   #define wapp_shell_utils_pclose _pclose
@@ -12,4 +19,8 @@
   #define wapp_shell_utils_pclose pclose
 #endif /* ifdef WAPP_PLATFORM_WINDOWS */
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !SHELL_UTILS_H

src/core/wapp_core.c

@@ -1,7 +1,10 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef WAPP_CORE_C
 #define WAPP_CORE_C
 
 #include "wapp_core.h"
+#include "file/file.c"
 #include "os/shell/termcolour/posix/termcolour_posix.c"
 #include "os/shell/termcolour/win/termcolour_win.c"
 #include "os/shell/termcolour/termcolour.c"

src/core/wapp_core.h

@@ -1,6 +1,9 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef WAPP_CORE_H
 #define WAPP_CORE_H
 
+#include "file/file.h"
 #include "os/shell/termcolour/termcolour.h"
 #include "os/shell/termcolour/terminal_colours.h"
 #include "os/shell/commander/commander.h"

src/primitives/array/array.h

@@ -1,5 +1,5 @@
 /**
- * THIS FILE IS AUTOMATICALLY GENERATED. ANY MODIFICATIONS TO IT WILL BE OVERWRITTEN
+ * THIS FILE IS AUTOMATICALLY GENERATED. ANY MODIFICATIONS TO IT WILL BE OVERWRITTEN.
  */
 
 #ifndef ARRAY_H
@@ -9,20 +9,374 @@
 #include "../../common/misc/misc_utils.h"
 #include "../../common/aliases/aliases.h"
 #include "../../common/platform/platform.h"
-#include <stdbool.h>
 
-#define wapp_str8_array(...) ((Str8Array){ \
-  .items = (Str8[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(Str8, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(Str8, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(Str8, __VA_ARGS__) * 2), \
-  .item_size = sizeof(Str8) \
-})
-#define wapp_str8_array_with_capacity(CAPACITY) ((Str8Array){.items = (Str8[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(Str8)})
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#define wapp_void_ptr_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((VoidPArray *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(void *)))
 #define wapp_str8_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((Str8Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(Str8)))
+#define wapp_b32_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((B32Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(b32)))
+#define wapp_char_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((CharArray *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(char)))
+#define wapp_c8_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((C8Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(c8)))
+#define wapp_c16_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((C16Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(c16)))
+#define wapp_c32_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((C32Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(c32)))
+#define wapp_i8_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((I8Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(i8)))
+#define wapp_i16_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((I16Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(i16)))
+#define wapp_i32_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((I32Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(i32)))
+#define wapp_i64_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((I64Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(i64)))
+#define wapp_u8_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((U8Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(u8)))
+#define wapp_u16_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((U16Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(u16)))
+#define wapp_u32_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((U32Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(u32)))
+#define wapp_u64_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((U64Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(u64)))
+#define wapp_f32_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((F32Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(f32)))
+#define wapp_f64_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((F64Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(f64)))
+#define wapp_f128_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((F128Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(f128)))
+#define wapp_iptr_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((IptrArray *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(iptr)))
+#define wapp_uptr_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((UptrArray *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(uptr)))
+
+#ifdef WAPP_PLATFORM_CPP
+#define wapp_void_ptr_array(...) ([&]() { \
+  wapp_persist void * buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(void *, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return VoidPArray{ \
+    buf, \
+    wapp_misc_utils_va_args_count(void *, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(void *, __VA_ARGS__) * 2), \
+    sizeof(void *) \
+  }; \
+}())
+#define wapp_void_ptr_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist void * buf[CAPACITY] = {}; \
+  return VoidPArray{buf, 0, CAPACITY, sizeof(void *)}; \
+}())
+#define wapp_void_ptr_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_void_ptr_array_pop(ARRAY_PTR) : \
+  void *{} \
+)
+#define wapp_str8_array(...) ([&]() { \
+  wapp_persist Str8 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(Str8, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return Str8Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(Str8, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(Str8, __VA_ARGS__) * 2), \
+    sizeof(Str8) \
+  }; \
+}())
+#define wapp_str8_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist Str8 buf[CAPACITY] = {}; \
+  return Str8Array{buf, 0, CAPACITY, sizeof(Str8)}; \
+}())
 #define wapp_str8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_str8_array_pop(ARRAY_PTR) : \
-  (Str8){0} \
+  Str8{} \
 )
+#define wapp_b32_array(...) ([&]() { \
+  wapp_persist b32 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(b32, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return B32Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(b32, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(b32, __VA_ARGS__) * 2), \
+    sizeof(b32) \
+  }; \
+}())
+#define wapp_b32_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist b32 buf[CAPACITY] = {}; \
+  return B32Array{buf, 0, CAPACITY, sizeof(b32)}; \
+}())
+#define wapp_b32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_b32_array_pop(ARRAY_PTR) : \
+  b32{} \
+)
+#define wapp_char_array(...) ([&]() { \
+  wapp_persist char buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(char, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return CharArray{ \
+    buf, \
+    wapp_misc_utils_va_args_count(char, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(char, __VA_ARGS__) * 2), \
+    sizeof(char) \
+  }; \
+}())
+#define wapp_char_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist char buf[CAPACITY] = {}; \
+  return CharArray{buf, 0, CAPACITY, sizeof(char)}; \
+}())
+#define wapp_char_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_char_array_pop(ARRAY_PTR) : \
+  char{} \
+)
+#define wapp_c8_array(...) ([&]() { \
+  wapp_persist c8 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c8, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return C8Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(c8, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c8, __VA_ARGS__) * 2), \
+    sizeof(c8) \
+  }; \
+}())
+#define wapp_c8_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist c8 buf[CAPACITY] = {}; \
+  return C8Array{buf, 0, CAPACITY, sizeof(c8)}; \
+}())
+#define wapp_c8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_c8_array_pop(ARRAY_PTR) : \
+  c8{} \
+)
+#define wapp_c16_array(...) ([&]() { \
+  wapp_persist c16 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c16, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return C16Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(c16, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c16, __VA_ARGS__) * 2), \
+    sizeof(c16) \
+  }; \
+}())
+#define wapp_c16_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist c16 buf[CAPACITY] = {}; \
+  return C16Array{buf, 0, CAPACITY, sizeof(c16)}; \
+}())
+#define wapp_c16_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_c16_array_pop(ARRAY_PTR) : \
+  c16{} \
+)
+#define wapp_c32_array(...) ([&]() { \
+  wapp_persist c32 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c32, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return C32Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(c32, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c32, __VA_ARGS__) * 2), \
+    sizeof(c32) \
+  }; \
+}())
+#define wapp_c32_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist c32 buf[CAPACITY] = {}; \
+  return C32Array{buf, 0, CAPACITY, sizeof(c32)}; \
+}())
+#define wapp_c32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_c32_array_pop(ARRAY_PTR) : \
+  c32{} \
+)
+#define wapp_i8_array(...) ([&]() { \
+  wapp_persist i8 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i8, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return I8Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(i8, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i8, __VA_ARGS__) * 2), \
+    sizeof(i8) \
+  }; \
+}())
+#define wapp_i8_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist i8 buf[CAPACITY] = {}; \
+  return I8Array{buf, 0, CAPACITY, sizeof(i8)}; \
+}())
+#define wapp_i8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_i8_array_pop(ARRAY_PTR) : \
+  i8{} \
+)
+#define wapp_i16_array(...) ([&]() { \
+  wapp_persist i16 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i16, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return I16Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(i16, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i16, __VA_ARGS__) * 2), \
+    sizeof(i16) \
+  }; \
+}())
+#define wapp_i16_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist i16 buf[CAPACITY] = {}; \
+  return I16Array{buf, 0, CAPACITY, sizeof(i16)}; \
+}())
+#define wapp_i16_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_i16_array_pop(ARRAY_PTR) : \
+  i16{} \
+)
+#define wapp_i32_array(...) ([&]() { \
+  wapp_persist i32 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i32, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return I32Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(i32, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i32, __VA_ARGS__) * 2), \
+    sizeof(i32) \
+  }; \
+}())
+#define wapp_i32_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist i32 buf[CAPACITY] = {}; \
+  return I32Array{buf, 0, CAPACITY, sizeof(i32)}; \
+}())
+#define wapp_i32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_i32_array_pop(ARRAY_PTR) : \
+  i32{} \
+)
+#define wapp_i64_array(...) ([&]() { \
+  wapp_persist i64 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i64, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return I64Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(i64, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i64, __VA_ARGS__) * 2), \
+    sizeof(i64) \
+  }; \
+}())
+#define wapp_i64_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist i64 buf[CAPACITY] = {}; \
+  return I64Array{buf, 0, CAPACITY, sizeof(i64)}; \
+}())
+#define wapp_i64_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_i64_array_pop(ARRAY_PTR) : \
+  i64{} \
+)
+#define wapp_u8_array(...) ([&]() { \
+  wapp_persist u8 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u8, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return U8Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(u8, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u8, __VA_ARGS__) * 2), \
+    sizeof(u8) \
+  }; \
+}())
+#define wapp_u8_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist u8 buf[CAPACITY] = {}; \
+  return U8Array{buf, 0, CAPACITY, sizeof(u8)}; \
+}())
+#define wapp_u8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_u8_array_pop(ARRAY_PTR) : \
+  u8{} \
+)
+#define wapp_u16_array(...) ([&]() { \
+  wapp_persist u16 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u16, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return U16Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(u16, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u16, __VA_ARGS__) * 2), \
+    sizeof(u16) \
+  }; \
+}())
+#define wapp_u16_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist u16 buf[CAPACITY] = {}; \
+  return U16Array{buf, 0, CAPACITY, sizeof(u16)}; \
+}())
+#define wapp_u16_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_u16_array_pop(ARRAY_PTR) : \
+  u16{} \
+)
+#define wapp_u32_array(...) ([&]() { \
+  wapp_persist u32 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u32, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return U32Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(u32, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u32, __VA_ARGS__) * 2), \
+    sizeof(u32) \
+  }; \
+}())
+#define wapp_u32_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist u32 buf[CAPACITY] = {}; \
+  return U32Array{buf, 0, CAPACITY, sizeof(u32)}; \
+}())
+#define wapp_u32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_u32_array_pop(ARRAY_PTR) : \
+  u32{} \
+)
+#define wapp_u64_array(...) ([&]() { \
+  wapp_persist u64 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u64, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return U64Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(u64, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u64, __VA_ARGS__) * 2), \
+    sizeof(u64) \
+  }; \
+}())
+#define wapp_u64_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist u64 buf[CAPACITY] = {}; \
+  return U64Array{buf, 0, CAPACITY, sizeof(u64)}; \
+}())
+#define wapp_u64_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_u64_array_pop(ARRAY_PTR) : \
+  u64{} \
+)
+#define wapp_f32_array(...) ([&]() { \
+  wapp_persist f32 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f32, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return F32Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(f32, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f32, __VA_ARGS__) * 2), \
+    sizeof(f32) \
+  }; \
+}())
+#define wapp_f32_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist f32 buf[CAPACITY] = {}; \
+  return F32Array{buf, 0, CAPACITY, sizeof(f32)}; \
+}())
+#define wapp_f32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_f32_array_pop(ARRAY_PTR) : \
+  f32{} \
+)
+#define wapp_f64_array(...) ([&]() { \
+  wapp_persist f64 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f64, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return F64Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(f64, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f64, __VA_ARGS__) * 2), \
+    sizeof(f64) \
+  }; \
+}())
+#define wapp_f64_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist f64 buf[CAPACITY] = {}; \
+  return F64Array{buf, 0, CAPACITY, sizeof(f64)}; \
+}())
+#define wapp_f64_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_f64_array_pop(ARRAY_PTR) : \
+  f64{} \
+)
+#define wapp_f128_array(...) ([&]() { \
+  wapp_persist f128 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f128, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return F128Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(f128, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f128, __VA_ARGS__) * 2), \
+    sizeof(f128) \
+  }; \
+}())
+#define wapp_f128_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist f128 buf[CAPACITY] = {}; \
+  return F128Array{buf, 0, CAPACITY, sizeof(f128)}; \
+}())
+#define wapp_f128_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_f128_array_pop(ARRAY_PTR) : \
+  f128{} \
+)
+#define wapp_iptr_array(...) ([&]() { \
+  wapp_persist iptr buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(iptr, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return IptrArray{ \
+    buf, \
+    wapp_misc_utils_va_args_count(iptr, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(iptr, __VA_ARGS__) * 2), \
+    sizeof(iptr) \
+  }; \
+}())
+#define wapp_iptr_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist iptr buf[CAPACITY] = {}; \
+  return IptrArray{buf, 0, CAPACITY, sizeof(iptr)}; \
+}())
+#define wapp_iptr_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_iptr_array_pop(ARRAY_PTR) : \
+  iptr{} \
+)
+#define wapp_uptr_array(...) ([&]() { \
+  wapp_persist uptr buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(uptr, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return UptrArray{ \
+    buf, \
+    wapp_misc_utils_va_args_count(uptr, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(uptr, __VA_ARGS__) * 2), \
+    sizeof(uptr) \
+  }; \
+}())
+#define wapp_uptr_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist uptr buf[CAPACITY] = {}; \
+  return UptrArray{buf, 0, CAPACITY, sizeof(uptr)}; \
+}())
+#define wapp_uptr_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_uptr_array_pop(ARRAY_PTR) : \
+  uptr{} \
+)
+#else
 #define wapp_void_ptr_array(...) ((VoidPArray){ \
   .items = (void *[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(void *, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
   .count = wapp_misc_utils_va_args_count(void *, __VA_ARGS__), \
@@ -30,22 +384,31 @@
   .item_size = sizeof(void *) \
 })
 #define wapp_void_ptr_array_with_capacity(CAPACITY) ((VoidPArray){.items = (void *[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(void *)})
-#define wapp_void_ptr_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((VoidPArray *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(void *)))
 #define wapp_void_ptr_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_void_ptr_array_pop(ARRAY_PTR) : \
   (void *){0} \
 )
-#define wapp_bool_array(...) ((BoolArray){ \
-  .items = (bool[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(bool, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(bool, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(bool, __VA_ARGS__) * 2), \
-  .item_size = sizeof(bool) \
+#define wapp_str8_array(...) ((Str8Array){ \
+  .items = (Str8[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(Str8, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
+  .count = wapp_misc_utils_va_args_count(Str8, __VA_ARGS__), \
+  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(Str8, __VA_ARGS__) * 2), \
+  .item_size = sizeof(Str8) \
 })
-#define wapp_bool_array_with_capacity(CAPACITY) ((BoolArray){.items = (bool[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(bool)})
-#define wapp_bool_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((BoolArray *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(bool)))
-#define wapp_bool_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_bool_array_pop(ARRAY_PTR) : \
-  (bool){0} \
+#define wapp_str8_array_with_capacity(CAPACITY) ((Str8Array){.items = (Str8[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(Str8)})
+#define wapp_str8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_str8_array_pop(ARRAY_PTR) : \
+  (Str8){0} \
+)
+#define wapp_b32_array(...) ((B32Array){ \
+  .items = (b32[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(b32, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
+  .count = wapp_misc_utils_va_args_count(b32, __VA_ARGS__), \
+  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(b32, __VA_ARGS__) * 2), \
+  .item_size = sizeof(b32) \
+})
+#define wapp_b32_array_with_capacity(CAPACITY) ((B32Array){.items = (b32[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(b32)})
+#define wapp_b32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_b32_array_pop(ARRAY_PTR) : \
+  (b32){0} \
 )
 #define wapp_char_array(...) ((CharArray){ \
   .items = (char[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(char, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
@@ -54,7 +417,6 @@
   .item_size = sizeof(char) \
 })
 #define wapp_char_array_with_capacity(CAPACITY) ((CharArray){.items = (char[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(char)})
-#define wapp_char_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((CharArray *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(char)))
 #define wapp_char_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_char_array_pop(ARRAY_PTR) : \
   (char){0} \
@@ -66,7 +428,6 @@
   .item_size = sizeof(c8) \
 })
 #define wapp_c8_array_with_capacity(CAPACITY) ((C8Array){.items = (c8[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(c8)})
-#define wapp_c8_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((C8Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(c8)))
 #define wapp_c8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_c8_array_pop(ARRAY_PTR) : \
   (c8){0} \
@@ -78,7 +439,6 @@
   .item_size = sizeof(c16) \
 })
 #define wapp_c16_array_with_capacity(CAPACITY) ((C16Array){.items = (c16[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(c16)})
-#define wapp_c16_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((C16Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(c16)))
 #define wapp_c16_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_c16_array_pop(ARRAY_PTR) : \
   (c16){0} \
@@ -90,7 +450,6 @@
   .item_size = sizeof(c32) \
 })
 #define wapp_c32_array_with_capacity(CAPACITY) ((C32Array){.items = (c32[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(c32)})
-#define wapp_c32_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((C32Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(c32)))
 #define wapp_c32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_c32_array_pop(ARRAY_PTR) : \
   (c32){0} \
@@ -102,7 +461,6 @@
   .item_size = sizeof(i8) \
 })
 #define wapp_i8_array_with_capacity(CAPACITY) ((I8Array){.items = (i8[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(i8)})
-#define wapp_i8_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((I8Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(i8)))
 #define wapp_i8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_i8_array_pop(ARRAY_PTR) : \
   (i8){0} \
@@ -114,7 +472,6 @@
   .item_size = sizeof(i16) \
 })
 #define wapp_i16_array_with_capacity(CAPACITY) ((I16Array){.items = (i16[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(i16)})
-#define wapp_i16_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((I16Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(i16)))
 #define wapp_i16_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_i16_array_pop(ARRAY_PTR) : \
   (i16){0} \
@@ -126,7 +483,6 @@
   .item_size = sizeof(i32) \
 })
 #define wapp_i32_array_with_capacity(CAPACITY) ((I32Array){.items = (i32[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(i32)})
-#define wapp_i32_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((I32Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(i32)))
 #define wapp_i32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_i32_array_pop(ARRAY_PTR) : \
   (i32){0} \
@@ -138,7 +494,6 @@
   .item_size = sizeof(i64) \
 })
 #define wapp_i64_array_with_capacity(CAPACITY) ((I64Array){.items = (i64[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(i64)})
-#define wapp_i64_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((I64Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(i64)))
 #define wapp_i64_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_i64_array_pop(ARRAY_PTR) : \
   (i64){0} \
@@ -150,7 +505,6 @@
   .item_size = sizeof(u8) \
 })
 #define wapp_u8_array_with_capacity(CAPACITY) ((U8Array){.items = (u8[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(u8)})
-#define wapp_u8_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((U8Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(u8)))
 #define wapp_u8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_u8_array_pop(ARRAY_PTR) : \
   (u8){0} \
@@ -162,7 +516,6 @@
   .item_size = sizeof(u16) \
 })
 #define wapp_u16_array_with_capacity(CAPACITY) ((U16Array){.items = (u16[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(u16)})
-#define wapp_u16_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((U16Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(u16)))
 #define wapp_u16_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_u16_array_pop(ARRAY_PTR) : \
   (u16){0} \
@@ -174,7 +527,6 @@
   .item_size = sizeof(u32) \
 })
 #define wapp_u32_array_with_capacity(CAPACITY) ((U32Array){.items = (u32[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(u32)})
-#define wapp_u32_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((U32Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(u32)))
 #define wapp_u32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_u32_array_pop(ARRAY_PTR) : \
   (u32){0} \
@@ -186,7 +538,6 @@
   .item_size = sizeof(u64) \
 })
 #define wapp_u64_array_with_capacity(CAPACITY) ((U64Array){.items = (u64[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(u64)})
-#define wapp_u64_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((U64Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(u64)))
 #define wapp_u64_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_u64_array_pop(ARRAY_PTR) : \
   (u64){0} \
@@ -198,7 +549,6 @@
   .item_size = sizeof(f32) \
 })
 #define wapp_f32_array_with_capacity(CAPACITY) ((F32Array){.items = (f32[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(f32)})
-#define wapp_f32_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((F32Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(f32)))
 #define wapp_f32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_f32_array_pop(ARRAY_PTR) : \
   (f32){0} \
@@ -210,7 +560,6 @@
   .item_size = sizeof(f64) \
 })
 #define wapp_f64_array_with_capacity(CAPACITY) ((F64Array){.items = (f64[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(f64)})
-#define wapp_f64_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((F64Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(f64)))
 #define wapp_f64_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_f64_array_pop(ARRAY_PTR) : \
   (f64){0} \
@@ -222,7 +571,6 @@
   .item_size = sizeof(f128) \
 })
 #define wapp_f128_array_with_capacity(CAPACITY) ((F128Array){.items = (f128[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(f128)})
-#define wapp_f128_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((F128Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(f128)))
 #define wapp_f128_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_f128_array_pop(ARRAY_PTR) : \
   (f128){0} \
@@ -234,7 +582,6 @@
   .item_size = sizeof(iptr) \
 })
 #define wapp_iptr_array_with_capacity(CAPACITY) ((IptrArray){.items = (iptr[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(iptr)})
-#define wapp_iptr_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((IptrArray *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(iptr)))
 #define wapp_iptr_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_iptr_array_pop(ARRAY_PTR) : \
   (iptr){0} \
@@ -246,17 +593,17 @@
   .item_size = sizeof(uptr) \
 })
 #define wapp_uptr_array_with_capacity(CAPACITY) ((UptrArray){.items = (uptr[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(uptr)})
-#define wapp_uptr_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((UptrArray *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(uptr)))
 #define wapp_uptr_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
   *_uptr_array_pop(ARRAY_PTR) : \
   (uptr){0} \
 )
+#endif // !WAPP_PLATFORM_CPP
 
 typedef struct str8 Str8;
 
-typedef struct Str8Array Str8Array;
-struct Str8Array {
-  Str8 *items;
+typedef struct GenericArray GenericArray;
+struct GenericArray {
+  void *items;
   u64 count;
   u64 capacity;
   u64 item_size;
@@ -270,9 +617,17 @@ struct VoidPArray {
   u64 item_size;
 };
 
-typedef struct BoolArray BoolArray;
-struct BoolArray {
-  bool *items;
+typedef struct Str8Array Str8Array;
+struct Str8Array {
+  Str8 *items;
+  u64 count;
+  u64 capacity;
+  u64 item_size;
+};
+
+typedef struct B32Array B32Array;
+struct B32Array {
+  b32 *items;
   u64 count;
   u64 capacity;
   u64 item_size;
@@ -414,16 +769,6 @@ struct UptrArray {
   u64 item_size;
 };
 
-Str8 *wapp_str8_array_get(const Str8Array *array, u64 index);
-void wapp_str8_array_set(Str8Array *array, u64 index, Str8 *item);
-void wapp_str8_array_append_capped(Str8Array *array, Str8 *item);
-void wapp_str8_array_extend_capped(Str8Array *array, const Str8Array *other);
-void wapp_str8_array_clear(Str8Array *array);
-void wapp_str8_array_copy_capped(const Str8Array *src, Str8Array *dst);
-Str8Array *wapp_str8_array_append_alloc(const Allocator *allocator, Str8Array *array, Str8 *item);
-Str8Array *wapp_str8_array_extend_alloc(const Allocator *allocator, Str8Array *array, const Str8Array *other);
-Str8Array *wapp_str8_array_copy_alloc(const Allocator *allocator, const Str8Array *src, Str8Array *dst);
-Str8 *_str8_array_pop(Str8Array *array);
 void * *wapp_void_ptr_array_get(const VoidPArray *array, u64 index);
 void wapp_void_ptr_array_set(VoidPArray *array, u64 index, void * *item);
 void wapp_void_ptr_array_append_capped(VoidPArray *array, void * *item);
@@ -434,16 +779,26 @@ VoidPArray *wapp_void_ptr_array_append_alloc(const Allocator *allocator, VoidPAr
 VoidPArray *wapp_void_ptr_array_extend_alloc(const Allocator *allocator, VoidPArray *array, const VoidPArray *other);
 VoidPArray *wapp_void_ptr_array_copy_alloc(const Allocator *allocator, const VoidPArray *src, VoidPArray *dst);
 void * *_void_ptr_array_pop(VoidPArray *array);
-bool *wapp_bool_array_get(const BoolArray *array, u64 index);
-void wapp_bool_array_set(BoolArray *array, u64 index, bool *item);
-void wapp_bool_array_append_capped(BoolArray *array, bool *item);
-void wapp_bool_array_extend_capped(BoolArray *array, const BoolArray *other);
-void wapp_bool_array_clear(BoolArray *array);
-void wapp_bool_array_copy_capped(const BoolArray *src, BoolArray *dst);
-BoolArray *wapp_bool_array_append_alloc(const Allocator *allocator, BoolArray *array, bool *item);
-BoolArray *wapp_bool_array_extend_alloc(const Allocator *allocator, BoolArray *array, const BoolArray *other);
-BoolArray *wapp_bool_array_copy_alloc(const Allocator *allocator, const BoolArray *src, BoolArray *dst);
-bool *_bool_array_pop(BoolArray *array);
+Str8 *wapp_str8_array_get(const Str8Array *array, u64 index);
+void wapp_str8_array_set(Str8Array *array, u64 index, Str8 *item);
+void wapp_str8_array_append_capped(Str8Array *array, Str8 *item);
+void wapp_str8_array_extend_capped(Str8Array *array, const Str8Array *other);
+void wapp_str8_array_clear(Str8Array *array);
+void wapp_str8_array_copy_capped(const Str8Array *src, Str8Array *dst);
+Str8Array *wapp_str8_array_append_alloc(const Allocator *allocator, Str8Array *array, Str8 *item);
+Str8Array *wapp_str8_array_extend_alloc(const Allocator *allocator, Str8Array *array, const Str8Array *other);
+Str8Array *wapp_str8_array_copy_alloc(const Allocator *allocator, const Str8Array *src, Str8Array *dst);
+Str8 *_str8_array_pop(Str8Array *array);
+b32 *wapp_b32_array_get(const B32Array *array, u64 index);
+void wapp_b32_array_set(B32Array *array, u64 index, b32 *item);
+void wapp_b32_array_append_capped(B32Array *array, b32 *item);
+void wapp_b32_array_extend_capped(B32Array *array, const B32Array *other);
+void wapp_b32_array_clear(B32Array *array);
+void wapp_b32_array_copy_capped(const B32Array *src, B32Array *dst);
+B32Array *wapp_b32_array_append_alloc(const Allocator *allocator, B32Array *array, b32 *item);
+B32Array *wapp_b32_array_extend_alloc(const Allocator *allocator, B32Array *array, const B32Array *other);
+B32Array *wapp_b32_array_copy_alloc(const Allocator *allocator, const B32Array *src, B32Array *dst);
+b32 *_b32_array_pop(B32Array *array);
 char *wapp_char_array_get(const CharArray *array, u64 index);
 void wapp_char_array_set(CharArray *array, u64 index, char *item);
 void wapp_char_array_append_capped(CharArray *array, char *item);
@@ -614,6 +969,10 @@ UptrArray *wapp_uptr_array_append_alloc(const Allocator *allocator, UptrArray *a
 UptrArray *wapp_uptr_array_extend_alloc(const Allocator *allocator, UptrArray *array, const UptrArray *other);
 UptrArray *wapp_uptr_array_copy_alloc(const Allocator *allocator, const UptrArray *src, UptrArray *dst);
 uptr *_uptr_array_pop(UptrArray *array);
-VoidPArray *_array_alloc_capacity(const Allocator *allocator, u64 capacity, u64 item_size);
+GenericArray *_array_alloc_capacity(const Allocator *allocator, u64 capacity, u64 item_size);
+
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
 
 #endif // !ARRAY_H

src/primitives/dbl_list/dbl_list.h

@@ -1,5 +1,5 @@
 /**
- * THIS FILE IS AUTOMATICALLY GENERATED. ANY MODIFICATIONS TO IT WILL BE OVERWRITTEN
+ * THIS FILE IS AUTOMATICALLY GENERATED. ANY MODIFICATIONS TO IT WILL BE OVERWRITTEN.
  */
 
 #ifndef DBL_LIST_H
@@ -7,11 +7,36 @@
 
 #include "../../common/aliases/aliases.h"
 #include "../../common/platform/platform.h"
-#include <stdbool.h>
 
-#define wapp_str8_list_node(ITEM_PTR) ((Str8Node){.item = ITEM_PTR})
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#ifdef WAPP_PLATFORM_CPP
+#define wapp_void_ptr_list_node(ITEM_PTR) VoidPNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_str8_list_node(ITEM_PTR) Str8Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_b32_list_node(ITEM_PTR) B32Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_char_list_node(ITEM_PTR) CharNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_c8_list_node(ITEM_PTR) C8Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_c16_list_node(ITEM_PTR) C16Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_c32_list_node(ITEM_PTR) C32Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_i8_list_node(ITEM_PTR) I8Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_i16_list_node(ITEM_PTR) I16Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_i32_list_node(ITEM_PTR) I32Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_i64_list_node(ITEM_PTR) I64Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_u8_list_node(ITEM_PTR) U8Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_u16_list_node(ITEM_PTR) U16Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_u32_list_node(ITEM_PTR) U32Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_u64_list_node(ITEM_PTR) U64Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_f32_list_node(ITEM_PTR) F32Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_f64_list_node(ITEM_PTR) F64Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_f128_list_node(ITEM_PTR) F128Node{ITEM_PTR, nullptr, nullptr}
+#define wapp_iptr_list_node(ITEM_PTR) IptrNode{ITEM_PTR, nullptr, nullptr}
+#define wapp_uptr_list_node(ITEM_PTR) UptrNode{ITEM_PTR, nullptr, nullptr}
+#else
 #define wapp_void_ptr_list_node(ITEM_PTR) ((VoidPNode){.item = ITEM_PTR})
-#define wapp_bool_list_node(ITEM_PTR) ((BoolNode){.item = ITEM_PTR})
+#define wapp_str8_list_node(ITEM_PTR) ((Str8Node){.item = ITEM_PTR})
+#define wapp_b32_list_node(ITEM_PTR) ((B32Node){.item = ITEM_PTR})
 #define wapp_char_list_node(ITEM_PTR) ((CharNode){.item = ITEM_PTR})
 #define wapp_c8_list_node(ITEM_PTR) ((C8Node){.item = ITEM_PTR})
 #define wapp_c16_list_node(ITEM_PTR) ((C16Node){.item = ITEM_PTR})
@@ -29,20 +54,21 @@
 #define wapp_f128_list_node(ITEM_PTR) ((F128Node){.item = ITEM_PTR})
 #define wapp_iptr_list_node(ITEM_PTR) ((IptrNode){.item = ITEM_PTR})
 #define wapp_uptr_list_node(ITEM_PTR) ((UptrNode){.item = ITEM_PTR})
+#endif // !WAPP_PLATFORM_CPP
 
 typedef struct str8 Str8;
 
-typedef struct Str8Node Str8Node;
-struct Str8Node {
-  Str8 *item;
-  Str8Node *prev;
-  Str8Node *next;
+typedef struct GenericNode GenericNode;
+struct GenericNode {
+  void *item;
+  GenericNode *prev;
+  GenericNode *next;
 };
 
-typedef struct Str8List Str8List;
-struct Str8List {
-  Str8Node *first;
-  Str8Node *last;
+typedef struct GenericList GenericList;
+struct GenericList {
+  GenericNode *first;
+  GenericNode *last;
   u64 node_count;
 };
 
@@ -60,17 +86,31 @@ struct VoidPList {
   u64 node_count;
 };
 
-typedef struct BoolNode BoolNode;
-struct BoolNode {
-  bool *item;
-  BoolNode *prev;
-  BoolNode *next;
+typedef struct Str8Node Str8Node;
+struct Str8Node {
+  Str8 *item;
+  Str8Node *prev;
+  Str8Node *next;
 };
 
-typedef struct BoolList BoolList;
-struct BoolList {
-  BoolNode *first;
-  BoolNode *last;
+typedef struct Str8List Str8List;
+struct Str8List {
+  Str8Node *first;
+  Str8Node *last;
+  u64 node_count;
+};
+
+typedef struct B32Node B32Node;
+struct B32Node {
+  b32 *item;
+  B32Node *prev;
+  B32Node *next;
+};
+
+typedef struct B32List B32List;
+struct B32List {
+  B32Node *first;
+  B32Node *last;
   u64 node_count;
 };
 
@@ -312,14 +352,6 @@ struct UptrList {
   u64 node_count;
 };
 
-Str8Node *wapp_str8_list_get(const Str8List *list, u64 index);
-void wapp_str8_list_push_front(Str8List *list, Str8Node *node);
-void wapp_str8_list_push_back(Str8List *list, Str8Node *node);
-void wapp_str8_list_insert(Str8List *list, Str8Node *node, u64 index);
-Str8Node *wapp_str8_list_pop_front(Str8List *list);
-Str8Node *wapp_str8_list_pop_back(Str8List *list);
-Str8Node *wapp_str8_list_remove(Str8List *list, u64 index);
-void wapp_str8_list_empty(Str8List *list);
 VoidPNode *wapp_void_ptr_list_get(const VoidPList *list, u64 index);
 void wapp_void_ptr_list_push_front(VoidPList *list, VoidPNode *node);
 void wapp_void_ptr_list_push_back(VoidPList *list, VoidPNode *node);
@@ -328,14 +360,22 @@ VoidPNode *wapp_void_ptr_list_pop_front(VoidPList *list);
 VoidPNode *wapp_void_ptr_list_pop_back(VoidPList *list);
 VoidPNode *wapp_void_ptr_list_remove(VoidPList *list, u64 index);
 void wapp_void_ptr_list_empty(VoidPList *list);
-BoolNode *wapp_bool_list_get(const BoolList *list, u64 index);
-void wapp_bool_list_push_front(BoolList *list, BoolNode *node);
-void wapp_bool_list_push_back(BoolList *list, BoolNode *node);
-void wapp_bool_list_insert(BoolList *list, BoolNode *node, u64 index);
-BoolNode *wapp_bool_list_pop_front(BoolList *list);
-BoolNode *wapp_bool_list_pop_back(BoolList *list);
-BoolNode *wapp_bool_list_remove(BoolList *list, u64 index);
-void wapp_bool_list_empty(BoolList *list);
+Str8Node *wapp_str8_list_get(const Str8List *list, u64 index);
+void wapp_str8_list_push_front(Str8List *list, Str8Node *node);
+void wapp_str8_list_push_back(Str8List *list, Str8Node *node);
+void wapp_str8_list_insert(Str8List *list, Str8Node *node, u64 index);
+Str8Node *wapp_str8_list_pop_front(Str8List *list);
+Str8Node *wapp_str8_list_pop_back(Str8List *list);
+Str8Node *wapp_str8_list_remove(Str8List *list, u64 index);
+void wapp_str8_list_empty(Str8List *list);
+B32Node *wapp_b32_list_get(const B32List *list, u64 index);
+void wapp_b32_list_push_front(B32List *list, B32Node *node);
+void wapp_b32_list_push_back(B32List *list, B32Node *node);
+void wapp_b32_list_insert(B32List *list, B32Node *node, u64 index);
+B32Node *wapp_b32_list_pop_front(B32List *list);
+B32Node *wapp_b32_list_pop_back(B32List *list);
+B32Node *wapp_b32_list_remove(B32List *list, u64 index);
+void wapp_b32_list_empty(B32List *list);
 CharNode *wapp_char_list_get(const CharList *list, u64 index);
 void wapp_char_list_push_front(CharList *list, CharNode *node);
 void wapp_char_list_push_back(CharList *list, CharNode *node);
@@ -473,4 +513,8 @@ UptrNode *wapp_uptr_list_pop_back(UptrList *list);
 UptrNode *wapp_uptr_list_remove(UptrList *list, u64 index);
 void wapp_uptr_list_empty(UptrList *list);
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !DBL_LIST_H

src/primitives/mem_allocator/mem_allocator.c

@@ -1,26 +1,28 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "mem_allocator.h"
 #include "../../common/aliases/aliases.h"
+#include "../../common/assert/assert.h"
 #include <stdlib.h>
-#include <assert.h>
 
 void *wapp_mem_allocator_alloc(const Allocator *allocator, u64 size) {
-  assert(allocator != NULL && (allocator->alloc) != NULL);
+  wapp_debug_assert(allocator != NULL && (allocator->alloc) != NULL, "`allocator` and `allocator->alloc` should not be NULL");
   return allocator->alloc(size, allocator->obj);
 }
 
 void *wapp_mem_allocator_alloc_aligned(const Allocator *allocator, u64 size, u64 alignment) {
-  assert(allocator != NULL && (allocator->alloc_aligned) != NULL);
+  wapp_debug_assert(allocator != NULL && (allocator->alloc_aligned) != NULL, "`allocator` and `allocator->alloc_aligned` should not be NULL");
   return allocator->alloc_aligned(size, alignment, allocator->obj);
 }
 
 void *wapp_mem_allocator_realloc(const Allocator *allocator, void *ptr, u64 old_size, u64 new_size) {
-  assert(allocator != NULL && (allocator->realloc) != NULL);
+  wapp_debug_assert(allocator != NULL && (allocator->realloc) != NULL, "`allocator` and `allocator->realloc` should not be NULL");
   return allocator->realloc(ptr, old_size, new_size, allocator->obj);
 }
 
 void *wapp_mem_allocator_realloc_aligned(const Allocator *allocator, void *ptr, u64 old_size,
                                          u64 new_size, u64 alignment) {
-  assert(allocator != NULL && (allocator->realloc_aligned) != NULL);
+  wapp_debug_assert(allocator != NULL && (allocator->realloc_aligned) != NULL, "`allocator` and `allocator->realloc_aligned` should not be NULL");
   return allocator->realloc_aligned(ptr, old_size, new_size, alignment, allocator->obj);
 }
 

src/primitives/mem_allocator/mem_allocator.h

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef MEM_ALLOCATOR_H
 #define MEM_ALLOCATOR_H
 
@@ -5,6 +7,10 @@
 #include "../../common/platform/platform.h"
 #include <string.h>
 
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 typedef void *(MemAllocFunc)(u64 size, void *alloc_obj);
 typedef void *(MemAllocAlignedFunc)(u64 size, u64 alignment, void *alloc_obj);
 typedef void *(MemReallocFunc)(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
@@ -21,7 +27,14 @@ struct allocator {
   MemFreeFunc *free;
 };
 
+#ifdef WAPP_PLATFORM_CPP
+#define wapp_mem_allocator_invalid(ALLOCATOR) ([&]() {      \
+  Allocator alloc{};                                        \
+  return memcmp(ALLOCATOR, &alloc, sizeof(Allocator)) == 0; \
+}())
+#else
 #define wapp_mem_allocator_invalid(ALLOCATOR) (memcmp(ALLOCATOR, &((Allocator){0}), sizeof(Allocator)) == 0)
+#endif // !WAPP_PLATFORM_CPP
 
 void *wapp_mem_allocator_alloc(const Allocator *allocator, u64 size);
 void *wapp_mem_allocator_alloc_aligned(const Allocator *allocator, u64 size, u64 alignment);
@@ -30,4 +43,8 @@ void *wapp_mem_allocator_realloc_aligned(const Allocator *allocator, void *ptr,
                                          u64 new_size, u64 alignment);
 void wapp_mem_allocator_free(const Allocator *allocator, void **ptr, u64 size);
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !MEM_ALLOCATOR_H

src/primitives/strings/str8/str8.c

@@ -1,17 +1,19 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "str8.h"
 #include "../../../common/aliases/aliases.h"
+#include "../../../common/assert/assert.h"
 #include "../../mem_allocator/mem_allocator.h"
+#include <ctype.h>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdbool.h>
-#include <assert.h>
 
 #define STR8_BUF_ALLOC_SIZE(CAPACITY) (sizeof(Str8) + sizeof(c8) * CAPACITY)
 
 Str8 *wapp_str8_alloc_buf(const Allocator *allocator, u64 capacity) {
-  assert(allocator != NULL);
+  wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
 
   Str8 *str = wapp_mem_allocator_alloc(allocator, STR8_BUF_ALLOC_SIZE(capacity));
   if (!str) {
@@ -26,8 +28,17 @@ RETURN_STR8:
   return str;
 }
 
+Str8 *wapp_str8_alloc_and_fill_buf(const Allocator *allocator, u64 capacity) {
+  Str8 *out = wapp_str8_alloc_buf(allocator, capacity);
+  if (out) {
+    memset(out->buf, 0, capacity);
+    out->size = capacity;
+  }
+  return out;
+}
+
 Str8 *wapp_str8_alloc_cstr(const Allocator *allocator, const char *str) {
-  assert(allocator != NULL && str != NULL);
+  wapp_debug_assert(allocator != NULL && str != NULL, "`allocator` and `str` should not be NULL");
 
   u64 length = strlen(str);
   Str8 *output     = wapp_str8_alloc_buf(allocator, length * 2);
@@ -43,7 +54,7 @@ RETURN_ALLOC_CSTR:
 }
 
 Str8 *wapp_str8_alloc_str8(const Allocator *allocator, Str8RO *str) {
-  assert(allocator != NULL && str != NULL);
+  wapp_debug_assert(allocator != NULL && str != NULL, "`allocator` and `str` should not be NULL");
 
   Str8 *output = wapp_str8_alloc_buf(allocator, str->capacity);
   if (!output) {
@@ -58,7 +69,7 @@ RETURN_ALLOC_STR8:
 }
 
 Str8 *wapp_str8_alloc_substr(const Allocator *allocator, Str8RO *str, u64 start, u64 end) {
-  assert(allocator != NULL && str != NULL);
+  wapp_debug_assert(allocator != NULL && str != NULL, "`allocator` and `str` should not be NULL");
 
   Str8 *output = NULL;
 
@@ -83,7 +94,7 @@ RETURN_ALLOC_SUBSTR:
 }
 
 void wapp_str8_dealloc_buf(const Allocator *allocator, Str8 **str) {
-  assert(allocator != NULL && str != NULL && (*str) != NULL);
+  wapp_debug_assert(allocator != NULL && str != NULL && (*str) != NULL, "Either `allocator` is NULL or `str` is an invalid double pointer");
   wapp_mem_allocator_free(allocator, (void **)str, STR8_BUF_ALLOC_SIZE((*str)->capacity));
 }
 
@@ -112,7 +123,7 @@ void wapp_str8_push_back(Str8 *str, c8 c) {
   wapp_str8_set(str, index, c);
 }
 
-bool wapp_str8_equal(Str8RO *s1, Str8RO *s2) {
+b32 wapp_str8_equal(Str8RO *s1, Str8RO *s2) {
   if (s1->size != s2->size) {
     return false;
   }
@@ -120,7 +131,7 @@ bool wapp_str8_equal(Str8RO *s1, Str8RO *s2) {
   return wapp_str8_equal_to_count(s1, s2, s1->size);
 }
 
-bool wapp_str8_equal_to_count(Str8RO* s1, Str8RO* s2, u64 count) {
+b32 wapp_str8_equal_to_count(Str8RO* s1, Str8RO* s2, u64 count) {
   if (!s1 || !s2) {
       return false;
   }
@@ -146,13 +157,13 @@ Str8 wapp_str8_slice(Str8RO *str, u64 start, u64 end) {
 }
 
 Str8 *wapp_str8_alloc_concat(const Allocator *allocator, Str8 *dst, Str8RO *src) {
-  assert(allocator != NULL && dst != NULL && src != NULL);
+  wapp_debug_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
 
   Str8 *output  = NULL;
   u64 remaining = dst->capacity - dst->size;
   if (src->size <= remaining) {
     output = dst;
-    goto COPY_STRING_STR8_CONCAT;
+    goto SOURCE_STRING_STR8_CONCAT;
   }
 
   u64 capacity = dst->capacity + src->size;
@@ -164,7 +175,7 @@ Str8 *wapp_str8_alloc_concat(const Allocator *allocator, Str8 *dst, Str8RO *src)
 
   wapp_str8_concat_capped(output, dst);
 
-COPY_STRING_STR8_CONCAT:
+SOURCE_STRING_STR8_CONCAT:
   wapp_str8_concat_capped(output, src);
 
 RETURN_STR8_CONCAT:
@@ -172,7 +183,7 @@ RETURN_STR8_CONCAT:
 }
 
 void wapp_str8_concat_capped(Str8 *dst, Str8RO *src) {
-  assert(dst != NULL && src != NULL);
+  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
 
   u64 remaining = dst->capacity - dst->size;
   u64 to_copy   = remaining < src->size ? remaining : src->size;
@@ -182,7 +193,7 @@ void wapp_str8_concat_capped(Str8 *dst, Str8RO *src) {
 }
 
 void wapp_str8_copy_cstr_capped(Str8 *dst, const char *src) {
-  assert(dst != NULL && src != NULL);
+  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
 
   u64 length  = strlen(src);
   u64 to_copy = length <= dst->capacity ? length : dst->capacity;
@@ -193,7 +204,7 @@ void wapp_str8_copy_cstr_capped(Str8 *dst, const char *src) {
 }
 
 void wapp_str8_copy_str8_capped(Str8 *dst, Str8RO *src) {
-  assert(dst != NULL && src != NULL);
+  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
 
   u64 to_copy = src->size <= dst->capacity ? src->size : dst->capacity;
 
@@ -203,7 +214,7 @@ void wapp_str8_copy_str8_capped(Str8 *dst, Str8RO *src) {
 }
 
 void wapp_str8_copy_to_cstr(char *dst, Str8RO *src, u64 dst_capacity) {
-  assert(dst != NULL && src != NULL);
+  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
 
   u64 to_copy = src->size < dst_capacity ? src->size : dst_capacity - 1;
 
@@ -212,7 +223,7 @@ void wapp_str8_copy_to_cstr(char *dst, Str8RO *src, u64 dst_capacity) {
 }
 
 void wapp_str8_format(Str8 *dst, const char *format, ...) {
-  assert(dst != NULL && format != NULL);
+  wapp_debug_assert(dst != NULL && format != NULL, "`dst` and `format` should not be NULL");
 
   va_list args1;
   va_list args2;
@@ -229,6 +240,36 @@ void wapp_str8_format(Str8 *dst, const char *format, ...) {
   va_end(args2);
 }
 
+void wapp_str8_to_lower(Str8 *dst, Str8RO *src) {
+  wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
+  wapp_debug_assert(dst->capacity >= src->capacity, "`dst` does not have enough capacity");
+
+  dst->size = src->size;
+  for (u64 i = 0; i < src->size; ++i) {
+    wapp_str8_set(dst, i, tolower(wapp_str8_get(src, i)));
+  }
+}
+
+void wapp_str8_to_upper(Str8 *dst, Str8RO *src) {
+  wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
+  wapp_debug_assert(dst->capacity >= src->capacity, "`dst` does not have enough capacity");
+
+  dst->size = src->size;
+  for (u64 i = 0; i < src->size; ++i) {
+    wapp_str8_set(dst, i, toupper(wapp_str8_get(src, i)));
+  }
+}
+
+void wapp_str8_from_bytes(Str8 *dst, const U8Array *src) {
+  u64 size = src->count * src->item_size;
+
+  wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
+  wapp_debug_assert(dst->capacity >= size, "`dst` does not have enough capacity");
+
+  dst->size = size;
+  memcpy(dst->buf, src->items, size);
+}
+
 i64 wapp_str8_find(Str8RO *str, Str8RO substr) {
   if (!str || substr.size > str->size) {
     return -1;
@@ -237,7 +278,7 @@ i64 wapp_str8_find(Str8RO *str, Str8RO substr) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   u64 char_index = 0;
-  bool running   = char_index < str->size;
+  b32 running    = char_index < str->size;
   while (running) {
     const c8 *sub = str->buf + char_index;
     if (memcmp(sub, substr.buf, substr.size) == 0) {
@@ -259,7 +300,7 @@ i64 wapp_str8_rfind(Str8RO *str, Str8RO substr) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   i64 char_index = str->size - substr.size;
-  bool running   = char_index >= 0;
+  b32 running    = char_index >= 0;
   while (running) {
     const c8 *sub = str->buf + char_index;
     if (memcmp(sub, substr.buf, substr.size) == 0) {
@@ -274,7 +315,7 @@ i64 wapp_str8_rfind(Str8RO *str, Str8RO substr) {
 }
 
 Str8List *wapp_str8_split_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits) {
-  assert(allocator != NULL && str != NULL && delimiter != NULL);
+  wapp_debug_assert(allocator != NULL && str != NULL && delimiter != NULL, "`allocator`, `str` and `delimiter` should not be NULL");
 
   Str8List *output = wapp_mem_allocator_alloc(allocator, sizeof(Str8List));
 
@@ -327,7 +368,7 @@ RETURN_STR8_SPLIT:
 }
 
 Str8List *wapp_str8_rsplit_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits) {
-  assert(allocator != NULL && str != NULL && delimiter != NULL);
+  wapp_debug_assert(allocator != NULL && str != NULL && delimiter != NULL, "`allocator`, `str` and `delimiter` should not be NULL");
 
   Str8List *output = wapp_mem_allocator_alloc(allocator, sizeof(Str8List));
 
@@ -377,7 +418,7 @@ RETURN_STR8_SPLIT:
 }
 
 Str8 *wapp_str8_join(const Allocator *allocator, const Str8List *list, Str8RO *delimiter) {
-  assert(allocator != NULL && list != NULL && delimiter != NULL);
+  wapp_debug_assert(allocator != NULL && list != NULL && delimiter != NULL, "`allocator`, `list` and `delimiter` should not be NULL");
 
   u64 capacity = wapp_str8_list_total_size(list) + (delimiter->size * (list->node_count - 1));
   Str8 *output = wapp_str8_alloc_buf(allocator, capacity * 2);
@@ -386,7 +427,7 @@ Str8 *wapp_str8_join(const Allocator *allocator, const Str8List *list, Str8RO *d
   // MSVC Spectre mitigation warnings
   Str8Node *node;
   u64 node_index = 0;
-  bool running   = node_index < list->node_count;
+  b32 running    = node_index < list->node_count;
   while (running) {
     node = wapp_str8_list_get(list, node_index);
     if (!node) {
@@ -397,7 +438,7 @@ Str8 *wapp_str8_join(const Allocator *allocator, const Str8List *list, Str8RO *d
 
     // NOTE (Abdelrahman): Comparison extracted to variable to silence
     // MSVC Spectre mitigation warnings
-    bool not_last = node_index + 1 < list->node_count;
+    b32 not_last = node_index + 1 < list->node_count;
     if (not_last) {
       wapp_str8_concat_capped(output, delimiter);
     }
@@ -419,7 +460,7 @@ u64 wapp_str8_list_total_size(const Str8List *list) {
   Str8Node* node;
   u64 node_index = 0;
   u64 output     = 0;
-  bool running   = node_index < list->node_count;
+  b32 running    = node_index < list->node_count;
   while (running) {
       node = wapp_str8_list_get(list, node_index);
       if (!node) {

src/primitives/strings/str8/str8.h

@@ -1,12 +1,19 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef STR8_H
 #define STR8_H
 
 #include "../../../common/aliases/aliases.h"
+#include "../../../common/assert/assert.h"
 #include "../../../common/platform/platform.h"
+#include "../../../primitives/array/array.h"
 #include "../../../primitives/dbl_list/dbl_list.h"
 #include "../../mem_allocator/mem_allocator.h"
 #include <string.h>
-#include <stdbool.h>
+
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
 
 typedef struct str8 Str8;
 struct str8 {
@@ -26,6 +33,25 @@ typedef const Str8 Str8RO;
 /**
  * Str8 stack buffers
  */
+
+#ifdef WAPP_PLATFORM_CPP
+// Uses a lambda to achieve the same behaviour achieved by the C macro
+#define wapp_str8_buf(CAPACITY) ([&](){ \
+  wapp_persist c8 buf[CAPACITY] = {};     \
+  memset(buf, 0, CAPACITY);             \
+  return Str8{CAPACITY, 0, buf};        \
+}())
+
+// Uses a lambda to achieve the same behaviour achieved by the C macro
+#define wapp_str8_lit(STRING) ([&]() {                            \
+  wapp_persist c8 buf[sizeof(STRING) * 2] = {};                     \
+  memcpy(buf, STRING, sizeof(STRING));                            \
+  return Str8{(sizeof(STRING) - 1) * 2, sizeof(STRING) - 1, buf}; \
+}())
+
+#define wapp_str8_lit_ro(STRING) Str8RO{sizeof(STRING) - 1, sizeof(STRING) - 1, (c8 *)STRING}
+#define wapp_str8_lit_ro_initialiser_list(STRING) {sizeof(STRING) - 1, sizeof(STRING) - 1, (c8 *)STRING}
+#else
 #define wapp_str8_buf(CAPACITY) ((Str8){.capacity = CAPACITY, .size = 0, .buf = (c8[CAPACITY]){0}})
 
 // Utilises the fact that memcpy returns pointer to dest buffer and that getting
@@ -42,11 +68,13 @@ typedef const Str8 Str8RO;
 #define wapp_str8_lit_ro_initialiser_list(STRING) {.capacity = sizeof(STRING) - 1, \
                                                    .size     = sizeof(STRING) - 1, \
                                                    .buf      = (c8 *)STRING}
+#endif // !WAPP_PLATFORM_CPP
 
 /**
  * Str8 allocated buffers
  */
 Str8 *wapp_str8_alloc_buf(const Allocator *allocator, u64 capacity);
+Str8 *wapp_str8_alloc_and_fill_buf(const Allocator *allocator, u64 capacity);
 Str8 *wapp_str8_alloc_cstr(const Allocator *allocator, const char *str);
 Str8 *wapp_str8_alloc_str8(const Allocator *allocator, Str8RO *str);
 Str8 *wapp_str8_alloc_substr(const Allocator *allocator, Str8RO *str, u64 start, u64 end);
@@ -61,14 +89,17 @@ void wapp_str8_dealloc_buf(const Allocator *allocator, Str8 **str);
 c8   wapp_str8_get(Str8RO *str, u64 index);
 void wapp_str8_set(Str8 *str, u64 index, c8 c);
 void wapp_str8_push_back(Str8 *str, c8 c);
-bool wapp_str8_equal(Str8RO *s1, Str8RO *s2);
-bool wapp_str8_equal_to_count(Str8RO* s1, Str8RO* s2, u64 count);
+b32  wapp_str8_equal(Str8RO *s1, Str8RO *s2);
+b32  wapp_str8_equal_to_count(Str8RO* s1, Str8RO* s2, u64 count);
 Str8 wapp_str8_slice(Str8RO *str, u64 start, u64 end);
 void wapp_str8_concat_capped(Str8 *dst, Str8RO *src);
 void wapp_str8_copy_cstr_capped(Str8 *dst, const char *src);
 void wapp_str8_copy_str8_capped(Str8 *dst, Str8RO *src);
 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);
 
 /**
  * Str8 find functions
@@ -88,8 +119,23 @@ Str8     *wapp_str8_join(const Allocator *allocator, const Str8List *list, Str8R
 /**
  * Str8 list utilities
  */
+#ifdef WAPP_PLATFORM_CPP
+#define wapp_str8_node_from_cstr(STRING) wapp_str8_list_node([&]() { \
+  wapp_persist Str8 str = wapp_str8_lit(STRING);                      \
+  return &str;                                                      \
+}())
+#define wapp_str8_node_from_str8(STRING) wapp_str8_list_node([&]() { \
+  wapp_persist Str8 str = STRING;                                     \
+  return &str;                                                      \
+}())
+#else
 #define wapp_str8_node_from_cstr(STRING) wapp_str8_list_node(&wapp_str8_lit(STRING))
 #define wapp_str8_node_from_str8(STRING) wapp_str8_list_node(&(STRING))
+#endif // !WAPP_PLATFORM_CPP
 u64 wapp_str8_list_total_size(const Str8List *list);
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !STR8_H

src/primitives/wapp_primitives.c

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef WAPP_PRIMITIVES_C
 #define WAPP_PRIMITIVES_C
 

src/primitives/wapp_primitives.h

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef WAPP_PRIMITIVES_H
 #define WAPP_PRIMITIVES_H
 

src/prng/wapp_prng.c

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef WAPP_PRNG_C
 #define WAPP_PRNG_C
 

src/prng/wapp_prng.h

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef WAPP_PRNG_H
 #define WAPP_PRNG_H
 

src/prng/xorshift/xorshift.c

@@ -1,8 +1,9 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "xorshift.h"
 #include "../../common/aliases/aliases.h"
+#include "../../common/assert/assert.h"
 #include "../../common/platform/platform.h"
-#include <assert.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <time.h>
 
@@ -11,13 +12,13 @@ struct split_mix_64_state {
   u64 seed;
 };
 
-internal u64 rol64(u64 x, u64 bits);
-internal u64 split_mix_64(SplitMix64State *state);
-internal void seed_os_generator(void);
-internal u64 generate_random_number(void);
+wapp_intern u64 rol64(u64 x, u64 bits);
+wapp_intern u64 split_mix_64(SplitMix64State *state);
+wapp_intern void seed_os_generator(void);
+wapp_intern u64 generate_random_number(void);
 
 XOR256State wapp_prng_xorshift_init_state(void) {
-  persistent bool seeded = false;
+  wapp_persist b32 seeded = false;
   if (!seeded) {
     seeded = true;
     seed_os_generator();
@@ -74,11 +75,11 @@ u64 wapp_prng_xorshift_256p(XOR256State *state) {
   return result;
 }
 
-internal u64 rol64(u64 x, u64 bits) {
+wapp_intern u64 rol64(u64 x, u64 bits) {
   return (x << bits) | (x >> (64 - bits));
 }
 
-internal u64 split_mix_64(SplitMix64State *state) {
+wapp_intern u64 split_mix_64(SplitMix64State *state) {
   state->seed += 0x9E3779B97f4A7C15;
 
   u64 result = state->seed;
@@ -90,27 +91,27 @@ internal u64 split_mix_64(SplitMix64State *state) {
 
 #if defined(WAPP_PLATFORM_C) && WAPP_PLATFORM_C_VERSION >= WAPP_PLATFORM_C11_VERSION
 #ifdef WAPP_PLATFORM_POSIX
-internal void seed_os_generator(void) {
+wapp_intern void seed_os_generator(void) {
     struct timespec ts = {0};
     int result = clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
-    assert(result == 0);
+    wapp_runtime_assert(result == 0, "Invalid seed value");
 
     srand48(ts.tv_nsec);
 }
 
-internal u64 generate_random_number(void) {
+wapp_intern u64 generate_random_number(void) {
   return lrand48();
 }
 #else
-internal void seed_os_generator(void) {
+wapp_intern void seed_os_generator(void) {
     struct timespec ts = {0};
     int result = timespec_get(&ts, TIME_UTC);
-    assert(result != 0);
+    wapp_runtime_assert(result != 0, "Invalid seed value");
 
     srand(ts.tv_nsec);
 }
 
-internal u64 generate_random_number(void) {
+wapp_intern u64 generate_random_number(void) {
   i32 n1 = rand();
   i32 n2 = rand();
 
@@ -118,14 +119,14 @@ internal u64 generate_random_number(void) {
 }
 #endif // !WAPP_PLATFORM_POSIX
 #else
-internal void seed_os_generator(void) {
+wapp_intern void seed_os_generator(void) {
     time_t result = time(NULL);
-    assert(result != (time_t)(-1));
+    wapp_runtime_assert(result != (time_t)(-1), "Invalid seed value");
 
     srand(result);
 }
 
-internal u64 generate_random_number(void) {
+wapp_intern u64 generate_random_number(void) {
   i32 n1 = rand();
   i32 n2 = rand();
 

src/prng/xorshift/xorshift.h

@@ -1,9 +1,15 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef XORSHIFT_H
 #define XORSHIFT_H
 
 #include "../../common/aliases/aliases.h"
 #include "../../common/platform/platform.h"
 
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 typedef struct xor_256_state XOR256State;
 struct xor_256_state {
   u64 x;
@@ -17,4 +23,8 @@ u64 wapp_prng_xorshift_256(XOR256State *state);
 u64 wapp_prng_xorshift_256ss(XOR256State *state);
 u64 wapp_prng_xorshift_256p(XOR256State *state);
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !XORSHIFT_H

src/testing/tester/tester.c

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "tester.h"
 #include "../../common/aliases/aliases.h"
 #include "../../core/os/shell/termcolour/termcolour.h"
@@ -6,7 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-internal void handle_test_result(TestFuncResult result);
+wapp_intern void handle_test_result(TestFuncResult result);
 
 void run_tests(TestFunc *func1, ...) {
   printf("\n");
@@ -30,7 +32,7 @@ void run_tests(TestFunc *func1, ...) {
   printf("\n");
 }
 
-internal void handle_test_result(TestFuncResult result) {
+wapp_intern void handle_test_result(TestFuncResult result) {
   TerminalColour colour;
   Str8 result_text = wapp_str8_buf(64);
 

src/testing/tester/tester.h

@@ -1,21 +1,31 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef TESTER_H
 #define TESTER_H
 
 #include "../../common/misc/misc_utils.h"
 #include "../../common/platform/platform.h"
 #include "../../primitives/strings/str8/str8.h"
-#include <stdbool.h>
 
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#ifdef WAPP_PLATFORM_CPP
+#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 test_func_result TestFuncResult;
 struct test_func_result {
   Str8RO name;
-  bool passed;
+  b32 passed;
 
 #ifdef WAPP_PLATFORM_WINDOWS
-  wapp_misc_utils_padding_size(sizeof(Str8RO) + sizeof(bool));
+  wapp_misc_utils_padding_size(sizeof(Str8RO) + sizeof(b32));
 #endif // WAPP_PLATFORM_WINDOWS
 };
 
@@ -23,4 +33,8 @@ typedef TestFuncResult(TestFunc)(void);
 
 void run_tests(TestFunc *func1, ...);
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !TESTER_H

src/testing/wapp_testing.c

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef WAPP_TESTING_C
 #define WAPP_TESTING_C
 

src/testing/wapp_testing.h

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef WAPP_TESTING_H
 #define WAPP_TESTING_H
 

src/uuid/uuid.c

@@ -1,10 +1,11 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #include "uuid.h"
 #include "../common/aliases/aliases.h"
+#include "../common/assert/assert.h"
 #include "../primitives/strings/str8/str8.h"
 #include "../prng/xorshift/xorshift.h"
-#include <stdbool.h>
 #include <inttypes.h>
-#include <assert.h>
 
 #define UUID_STR_FORMAT ("%.8" PRIx64 "-%.4" PRIx64 "-%.4" PRIx64 "-%.4" PRIx64 "-%.12" PRIx64)
 
@@ -14,11 +15,11 @@ struct uuid4 {
   u64 low;
 };
 
-internal UUID4 generate_uuid4(void);
-internal void  uuid4_to_uuid(const UUID4* uuid4, UUID *uuid);
+wapp_intern UUID4 generate_uuid4(void);
+wapp_intern void  uuid4_to_uuid(const UUID4* uuid4, UUID *uuid);
 
 UUID *wapp_uuid_init_uuid4(UUID *uuid) {
-  assert(uuid != NULL);
+  wapp_debug_assert(uuid != NULL, "`uuid` should not be NULL");
 
   UUID4 uuid4 = generate_uuid4();
   uuid4_to_uuid(&uuid4, uuid);
@@ -26,9 +27,9 @@ UUID *wapp_uuid_init_uuid4(UUID *uuid) {
   return uuid;
 }
 
-internal UUID4 generate_uuid4(void) {
-  persistent XOR256State state = {0};
-  persistent bool initialised = false;
+wapp_intern UUID4 generate_uuid4(void) {
+  wapp_persist XOR256State state = {0};
+  wapp_persist b32 initialised = false;
 
   if (!initialised) {
     initialised = true;
@@ -46,7 +47,7 @@ internal UUID4 generate_uuid4(void) {
   return uuid;
 }
 
-internal void uuid4_to_uuid(const UUID4* uuid4, UUID *uuid) {
+wapp_intern void uuid4_to_uuid(const UUID4* uuid4, UUID *uuid) {
   u64 grp1 = uuid4->high >> 32;
   u64 grp2 = (uuid4->high << 32) >> 48;
   u64 grp3 = (uuid4->high << 48) >> 48;

src/uuid/uuid.h

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef UUID_H
 #define UUID_H
 
@@ -5,6 +7,10 @@
 #include "../common/platform/platform.h"
 #include "../primitives/strings/str8/str8.h"
 
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #define UUID_BUF_LENGTH 48
 #define WAPP_UUID_SPEC WAPP_STR8_SPEC
 #define wapp_uuid_varg(UUID) wapp_str8_varg((UUID).uuid)
@@ -24,4 +30,8 @@ struct uuid {
 // Fails when passed a NULL pointer.
 UUID *wapp_uuid_init_uuid4(UUID *uuid);
 
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
 #endif // !UUID_H

src/uuid/wapp_uuid.c

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef WAPP_UUID_C
 #define WAPP_UUID_C
 

src/uuid/wapp_uuid.h

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef WAPP_UUID_H
 #define WAPP_UUID_H
 

src/wapp.c

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef WAPP_C
 #define WAPP_C
 

src/wapp.h

@@ -1,3 +1,5 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
 #ifndef WAPP_H
 #define WAPP_H
 

tests/allocator/test_allocator.c

@@ -1,11 +1,10 @@
 #include "test_allocator.h"
 #include "wapp.h"
-#include <stdbool.h>
 #include <stdlib.h>
 
 TestFuncResult test_arena_allocator(void) {
   Allocator allocator = wapp_mem_arena_allocator_init(4096);
-  bool result         = allocator.obj != NULL && allocator.alloc != NULL &&
+  b32 result          = allocator.obj != NULL && allocator.alloc != NULL &&
                         allocator.alloc_aligned != NULL &&
                         allocator.realloc != NULL && allocator.realloc_aligned != NULL &&
                         allocator.free == NULL;

tests/allocator/test_allocator.cc

@@ -0,0 +1,17 @@
+#include "test_allocator.h"
+#include "wapp.h"
+#include <stdlib.h>
+
+TestFuncResult test_arena_allocator(void) {
+  Allocator allocator = wapp_mem_arena_allocator_init(4096);
+  b32 result          = allocator.obj != nullptr && allocator.alloc != nullptr &&
+                        allocator.alloc_aligned != nullptr &&
+                        allocator.realloc != nullptr && allocator.realloc_aligned != nullptr &&
+                        allocator.free == nullptr;
+  void *ptr           = wapp_mem_allocator_alloc(&allocator, 20);
+  result              = result && (ptr != nullptr);
+
+  wapp_mem_arena_allocator_destroy(&allocator);
+
+  return wapp_tester_result(result);
+}

tests/arena/test_arena.c

@@ -1,16 +1,15 @@
 #include "test_arena.h"
 #include "wapp.h"
-#include <stdbool.h>
 #include <stdlib.h>
 
 #define ARENA_CAPACITY KB(16)
 
-internal Arena *arena = NULL;
-internal i32 count    = 20;
-internal i32 *array   = NULL;
+wapp_intern Arena *arena = NULL;
+wapp_intern i32 count    = 20;
+wapp_intern i32 *array   = NULL;
 
 TestFuncResult test_arena_init(void) {
-  bool result = wapp_mem_arena_init(&arena, ARENA_CAPACITY);
+  b32 result = wapp_mem_arena_init(&arena, ARENA_CAPACITY);
 
   return wapp_tester_result(result);
 }
@@ -18,7 +17,7 @@ TestFuncResult test_arena_init(void) {
 TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {
   Arena *large_arena = NULL;
   u64 capacity       = GB(512);
-  bool result        = wapp_mem_arena_init(&large_arena, capacity);
+  b32 result         = wapp_mem_arena_init(&large_arena, capacity);
   if (result) {
     wapp_mem_arena_destroy(&large_arena);
   }
@@ -28,7 +27,7 @@ TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {
 
 TestFuncResult test_arena_alloc_succeeds_when_within_capacity(void) {
   array       = wapp_mem_arena_alloc(arena, count * sizeof(i32));
-  bool result = array != NULL;
+  b32 result  = array != NULL;
 
   for (i32 i = 0; i < count; ++i) {
     array[i] = i * 10;
@@ -39,7 +38,7 @@ TestFuncResult test_arena_alloc_succeeds_when_within_capacity(void) {
 
 TestFuncResult test_arena_alloc_fails_when_over_capacity(void) {
   u8 *bytes   = wapp_mem_arena_alloc(arena, ARENA_CAPACITY * 2);
-  bool result = bytes == NULL;
+  b32 result  = bytes == NULL;
 
   return wapp_tester_result(result);
 }
@@ -92,7 +91,7 @@ TestFuncResult test_arena_realloc_smaller_size(void) {
 
 TestFuncResult test_arena_clear(void) {
   wapp_mem_arena_clear(arena);
-  bool result = true;
+  b32 result = true;
 
   for (i32 i = 0; i < count; ++i) {
     if (array[i] != 0) {
@@ -106,7 +105,7 @@ TestFuncResult test_arena_clear(void) {
 
 TestFuncResult test_arena_destroy(void) {
   wapp_mem_arena_destroy(&arena);
-  bool result = arena == NULL;
+  b32 result = arena == NULL;
 
   return wapp_tester_result(result);
 }

tests/arena/test_arena.cc

@@ -0,0 +1,111 @@
+#include "test_arena.h"
+#include "wapp.h"
+#include <stdlib.h>
+
+#define ARENA_CAPACITY KB(16)
+
+wapp_intern Arena *arena = nullptr;
+wapp_intern i32 count    = 20;
+wapp_intern i32 *array   = nullptr;
+
+TestFuncResult test_arena_init(void) {
+  b32 result = wapp_mem_arena_init(&arena, ARENA_CAPACITY);
+
+  return wapp_tester_result(result);
+}
+
+TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {
+  Arena *large_arena = nullptr;
+  u64 capacity       = GB(512);
+  b32 result         = wapp_mem_arena_init(&large_arena, capacity);
+  if (result) {
+    wapp_mem_arena_destroy(&large_arena);
+  }
+
+  return wapp_tester_result(result);
+}
+
+TestFuncResult test_arena_alloc_succeeds_when_within_capacity(void) {
+  array       = (i32 *)wapp_mem_arena_alloc(arena, count * sizeof(i32));
+  b32 result  = array != nullptr;
+
+  for (i32 i = 0; i < count; ++i) {
+    array[i] = i * 10;
+  }
+
+  return wapp_tester_result(result);
+}
+
+TestFuncResult test_arena_alloc_fails_when_over_capacity(void) {
+  u8 *bytes   = (u8 *)wapp_mem_arena_alloc(arena, ARENA_CAPACITY * 2);
+  b32 result  = bytes == nullptr;
+
+  return wapp_tester_result(result);
+}
+
+TestFuncResult test_arena_realloc_bigger_size(void) {
+  u64 old_count = 10;
+  u64 new_count = 20;
+  i32 *bytes    = (i32 *)wapp_mem_arena_alloc(arena, old_count * sizeof(i32));
+
+  for (u64 i = 0; i < old_count; ++i) {
+    bytes[i] = (i32)i;
+  }
+
+  i32 *new_bytes = (i32 *)wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
+  if (!new_bytes) {
+    return wapp_tester_result(false);
+  }
+
+  for (u64 i = 0; i < new_count; ++i) {
+    if (i < old_count && new_bytes[i] != bytes[i]) {
+      return wapp_tester_result(false);
+    }
+  }
+
+  return wapp_tester_result(true);
+}
+
+TestFuncResult test_arena_realloc_smaller_size(void) {
+  u64 old_count = 10;
+  u64 new_count = 5;
+  i32 *bytes    = (i32 *)wapp_mem_arena_alloc(arena, old_count * sizeof(i32));
+
+  for (u64 i = 0; i < old_count; ++i) {
+    bytes[i] = (i32)i;
+  }
+
+  i32 *new_bytes = (i32 *)wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
+  if (!new_bytes) {
+    return wapp_tester_result(false);
+  }
+
+  for (u64 i = 0; i < new_count; ++i) {
+    if (i < new_count && new_bytes[i] != bytes[i]) {
+      return wapp_tester_result(false);
+    }
+  }
+
+  return wapp_tester_result(true);
+}
+
+TestFuncResult test_arena_clear(void) {
+  wapp_mem_arena_clear(arena);
+  b32 result = true;
+
+  for (i32 i = 0; i < count; ++i) {
+    if (array[i] != 0) {
+      result = false;
+      break;
+    }
+  }
+
+  return wapp_tester_result(result);
+}
+
+TestFuncResult test_arena_destroy(void) {
+  wapp_mem_arena_destroy(&arena);
+  b32 result = arena == nullptr;
+
+  return wapp_tester_result(result);
+}