Expand data size utilities

Reviewed-on: #8
Co-authored-by: Abdelrahman <said.abdelrahman89@gmail.com>
Co-committed-by: Abdelrahman <said.abdelrahman89@gmail.com>

Makefile

@@ -1,4 +1,4 @@
-.PHONY: help full prng testing uuid core primitives all clean builddir build-test run-test codegen install build-lib ccodegen
+.PHONY: help full base os prng testing uuid all clean builddir build-test run-test install build-lib
 
 # External variables
 CC             = clang
@@ -7,7 +7,7 @@ AR             = ar
 BUILD_TYPE     = Debug
 BUILD_DIR      = libwapp-build/$(PLATFORM)-$(BUILD_TYPE)
 INSTALL_PREFIX = dist
-CODEGEN_INPUT  = ""
+RUNTIME_ASSERT = true
 
 # Internal variables
 override CFLAGS              = -Wall -Wextra -Werror -pedantic -Isrc
@@ -26,8 +26,9 @@ 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 ABS_INSTALL_PREFIX := $(shell mkdir -p $(INSTALL_PREFIX) && realpath $(INSTALL_PREFIX))
-override LIB_INSTALL        := $(INSTALL_PREFIX)/lib
+override INCLUDE_INSTALL    := $(ABS_INSTALL_PREFIX)/include/$(LIB_NAME)
+override LIB_INSTALL        := $(ABS_INSTALL_PREFIX)/lib
 override HEADER_INSTALL_CMD := scripts/header_install.sh
 
 ifeq ($(origin BUILD_FLAGS), undefined)
@@ -42,93 +43,135 @@ else
 endif
 endif
 
+# Disable runtime asserts
+ifeq ($(RUNTIME_ASSERT), false)
+	override BUILD_FLAGS += WAPP_NO_RUNTIME_ASSERT
+endif
+
 ifeq ($(CC),gcc)
   # Used to disable the "ASan runtime does not come first in initial library list" error when compiling with gcc
   export ASAN_OPTIONS=verify_asan_link_order=0
 endif
 
-all: clean builddir codegen run-c-test full run-cc-test
+# Escape sequences
+BOLD              = \033[1m
+BLACK             = \033[30m
+BG_BLACK          = \033[40m
+RED               = \033[31m
+BG_RED            = \033[41m
+GREEN             = \033[32m
+BG_GREEN          = \033[42m
+YELLOW            = \033[33m
+BG_YELLOW         = \033[43m
+BLUE              = \033[34m
+BG_BLUE           = \033[44m
+MAGENTA           = \033[35m
+BG_MAGENTA        = \033[45m
+CYAN              = \033[36m
+BG_CYAN           = \033[46m
+WHITE             = \033[37m
+BG_WHITE          = \033[47m
+GRAY              = \033[90m
+BG_GRAY           = \033[100m
+BRIGHT_RED        = \033[91m
+BG_BRIGHT_RED     = \033[101m
+BRIGHT_GREEN      = \033[92m
+BG_BRIGHT_GREEN   = \033[102m
+BRIGHT_YELLOW     = \033[93m
+BG_BRIGHT_YELLOW  = \033[103m
+BRIGHT_BLUE       = \033[94m
+BG_BRIGHT_BLUE    = \033[104m
+BRIGHT_MAGENTA    = \033[95m
+BG_BRIGHT_MAGENTA = \033[105m
+BRIGHT_CYAN       = \033[96m
+BG_BRIGHT_CYAN    = \033[106m
+BRIGHT_WHITE      = \033[97m
+BG_BRIGHT_WHITE   = \033[107m
+RESET             = \033[0m
+
+ECHO_E = echo -e
+ifeq ($(KERNEL), Darwin)
+	ECHO_E = echo
+endif
+
+all: clean builddir run-c-test full run-cc-test
 
 help:
-	@echo "Available build variables:"
+	@$(ECHO_E) "$(BOLD)$(BLUE)Available build variables:$(RESET)"
-	@echo "  CC                C compiler to use (Default: clang)."
+	@$(ECHO_E) "  $(GREEN)CC$(RESET)                C compiler to use $(YELLOW)(Default: clang)$(RESET)."
-	@echo "  CXX               C++ compiler to use (Default: clang++)."
+	@$(ECHO_E) "  $(GREEN)CXX$(RESET)               C++ compiler to use $(YELLOW)(Default: clang++)$(RESET)."
-	@echo "  AR                Archiving utility to use for building static libraries (Default: ar)."
+	@$(ECHO_E) "  $(GREEN)AR$(RESET)                Archiving utility to use for building static libraries $(YELLOW)(Default: ar)$(RESET)."
-	@echo "  BUILD_TYPE        Build type. Choose from \`Debug\`, \`RelWithDebInfo\` or \`Release\` (Default: Debug)."
+	@$(ECHO_E) "  $(GREEN)BUILD_TYPE$(RESET)        Build type $(MAGENTA)[Debug | RelWithDebInfo | Release] $(YELLOW)(Default: Debug)$(RESET)."
-	@echo "  BUILD_DIR         Directory where build files will be written."
+	@$(ECHO_E) "  $(GREEN)BUILD_DIR$(RESET)         Directory where build files will be written."
-	@echo "  INSTALL_PREFIX    Prefix where library and include files will be installed."
+	@$(ECHO_E) "  $(GREEN)INSTALL_PREFIX$(RESET)    Prefix where library and include files will be installed."
-	@echo "  CODEGEN_INPUT     Input file for code generation (See codegen_custom_data_example.json for an example)."
+	@$(ECHO_E) "  $(GREEN)RUNTIME_ASSERT$(RESET)    Whether runtime asserts are enabled $(MAGENTA)[true | false] $(YELLOW)(Default: true)$(RESET)."
-	@echo
+	@$(ECHO_E) "  $(GREEN)$(RESET)                  $(BOLD)$(BG_RED)DISCLAIMER:$(RESET) Using this flag is not recommended as it disables safety checks"
-	@echo "Available targets:"
+	@$(ECHO_E) "  $(GREEN)$(RESET)                  potentially leading to Undefined Behaviour."
-	@echo "  make              Build, install and test the full wapp library."
+	@$(ECHO_E)
-	@echo "  make full         Build and install the full wapp library."
+	@$(ECHO_E) "$(BOLD)$(BLUE)Available targets:$(RESET)"
-	@echo "  make core         Build and install only the \`core\` component of the wapp library with all its dependencies."
+	@$(ECHO_E) "  $(GREEN)make$(RESET)              Build, install and test the full wapp library."
-	@echo "  make prng         Build and install only the \`prng\` component of the wapp library with all its dependencies."
+	@$(ECHO_E) "  $(GREEN)make full$(RESET)         Build and install the full wapp library."
-	@echo "  make uuid         Build and install only the \`uuid\` component of the wapp library with all its dependencies."
+	@$(ECHO_E) "  $(GREEN)make base$(RESET)         Build and install only the $(CYAN)base$(RESET) 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_E) "  $(GREEN)make os$(RESET)           Build and install only the $(CYAN)os$(RESET) 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_E) "  $(GREEN)make prng$(RESET)         Build and install only the $(CYAN)prng$(RESET) component of the wapp library with all its dependencies."
-	@echo "  make clean        Clean build directory."
+	@$(ECHO_E) "  $(GREEN)make uuid$(RESET)         Build and install only the $(CYAN)uuid$(RESET) component of the wapp library with all its dependencies."
-	@echo "  make help         Print this help message and exit."
+	@$(ECHO_E) "  $(GREEN)make testing$(RESET)      Build and install only the $(CYAN)testing$(RESET) component of the wapp library with all its dependencies."
+	@$(ECHO_E) "  $(GREEN)make clean$(RESET)        Clean the build directory."
+	@$(ECHO_E) "  $(GREEN)make help$(RESET)         Print this help message and exit."
 
 full: LIB_SRC = src/wapp.c
-full: INCLUDES = common core primitives prng testing uuid
+full: INCLUDES = common os base prng testing uuid
 full: install
 
+base: LIB_SRC = src/base/wapp_base.c
+base: INCLUDES = common base
+base: install
+
+os: LIB_SRC = src/os/wapp_os.c
+os: INCLUDES = common os base
+os: 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: INCLUDES = common os testing
 testing: install
 
 uuid: LIB_SRC = src/uuid/wapp_uuid.c
-uuid: INCLUDES = common primitives prng
+uuid: INCLUDES = common base 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)
+	@rm -rf "$(BUILD_DIR)"
 
 builddir:
-	@mkdir -p $(BUILD_DIR)
+	@mkdir -p "$(BUILD_DIR)"
 
 build-c-test:
-	$(CC) $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(TEST_INCLUDE) $(TEST_C_SRC) -o $(TEST_C_OUT)
+	$(CC) $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(TEST_INCLUDE) $(TEST_C_SRC) -o "$(TEST_C_OUT)"
 
 run-c-test: build-c-test
 	@echo -e "\n\033[34;1mRUNNING C TESTS\033[0m"
-	@$(TEST_C_OUT)
+	@"$(TEST_C_OUT)"
-	@rm $(TEST_C_OUT)
+	@rm "$(TEST_C_OUT)"
 
 build-cc-test:
-	$(CXX) $(CXXSTD) $(CFLAGS) $(BUILD_FLAGS) $(TEST_INCLUDE) $(TEST_CXX_SRC) $(LIB_OUT) -o $(TEST_CXX_OUT)
+	$(CXX) $(CXXSTD) $(CFLAGS) $(BUILD_FLAGS) $(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)
+	@export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:"$(BUILD_DIR)" && "$(TEST_CXX_OUT)"
-	@rm $(TEST_CXX_OUT)
+	@rm "$(TEST_CXX_OUT)"
 
-codegen:
+install: build-lib
-	python3 -m codegen -f $(CODEGEN_INPUT)
+	@mkdir -p "$(LIB_INSTALL)"
-
+	@cp -v "$(LIB_OUT)" "$(LIB_INSTALL)"
-install: codegen build-lib
+	@mkdir -p "$(INCLUDE_INSTALL)"
-	@mkdir -p $(LIB_INSTALL)
+	@bash $(HEADER_INSTALL_CMD) $(LIB_SRC) "$(INCLUDE_INSTALL)" $(INCLUDES)
-	@cp -v $(LIB_OUT) $(LIB_INSTALL)
-	@mkdir -p $(INCLUDE_INSTALL)
-	@bash $(HEADER_INSTALL_CMD) $(LIB_SRC) $(INCLUDE_INSTALL) $(INCLUDES)
 
 build-lib: builddir
-	$(CC) -c $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(LIBFLAGS) $(LIB_SRC) -o $(OBJ_OUT)
+	$(CC) -c $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(LIBFLAGS) $(LIB_SRC) -o "$(OBJ_OUT)"
-	$(AR) r $(LIB_OUT) $(OBJ_OUT)
+	$(AR) r "$(LIB_OUT)" "$(OBJ_OUT)"
-	@rm $(OBJ_OUT)
+	@rm "$(OBJ_OUT)"
-
-ccodegen:
-	$(CC) $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(LIBFLAGS) -Isrc/core src/core/wapp_core.c ccodegen/*.c -o ccgen

README.md

@@ -1,3 +1,3 @@
 # Wizard Apprentice Standard Library
 
-A collection of useful C utilities for my projects
+A group of utilities for C/C++ projects

build

@@ -55,15 +55,4 @@ if ! contains ${BUILD_TYPE} "${ACCEPTED_BUILD_TYPES[@]}"; then
   exit 1
 fi
 
-if [[ $KERNEL == "Darwin" ]]; then
+bear -- make BUILD_TYPE=$BUILD_TYPE $ARGS
-  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

build.c

@@ -1,125 +0,0 @@
-#include "aliases.h"
-#include "platform.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-#define COMMAND_BUFFER_SIZE 8192
-
-typedef enum {
-  BUILD_TYPE_DEBUG,
-  BUILD_TYPE_RELEASE,
-} BuildType;
-
-#ifdef RELEASE
-wapp_intern BuildType build_type = BUILD_TYPE_RELEASE;
-#else
-wapp_intern BuildType build_type = BUILD_TYPE_DEBUG;
-#endif /* ifdef RELEASE */
-
-wapp_intern int run_command(const char *cmd);
-
-wapp_intern const char *test_include_directories = "-I./tests/ "
-                                                "-I./tests/arena/";
-wapp_intern const char *test_source_files = "./tests/arena/test_arena.c "
-                                         "./tests/wapptest.c";
-
-wapp_intern const char *lib_include_directories = "-I./src/ "
-                                               "-I./src/aliases/ "
-                                               "-I./src/cpath/ "
-                                               "-I./src/mem/ "
-                                               "-I./src/mem/arena/ "
-                                               "-I./src/mem/util/ "
-                                               "-I./src/misc/ "
-                                               "-I./src/platform/ "
-                                               "-I./src/strings/ "
-                                               "-I./src/strings/dstr/ "
-                                               "-I./src/strings/basic_strings/ "
-                                               "-I./src/termcolour/ "
-                                               "-I./src/tester/";
-wapp_intern const char *lib_source_files = "./src/cpath/cpath.c "
-                                        "./src/mem/arena/mem_arena.c "
-                                        "./src/mem/util/mem_utils.c "
-                                        "./src/strings/dstr/dstr.c "
-                                        "./src/termcolour/termcolour.c "
-                                        "./src/tester/tester.c";
-
-#ifdef WAPP_PLATFORM_POSIX
-
-int main(void) {
-  const char *compiler = "clang";
-  const char *cflags = "-Wall -Werror -pedantic";
-  const char *libflags = "-fPIC -shared";
-  const char *build_flags = "";
-
-  const char *test_out_name = "wapptest";
-  const char *lib_out_name = "wapp.so";
-
-  switch (build_type) {
-  case BUILD_TYPE_DEBUG:
-    build_flags = "-g -fsanitize=address -fsanitize=undefined";
-    break;
-  case BUILD_TYPE_RELEASE:
-    build_flags = "-O3";
-    break;
-  }
-
-  char cmd[COMMAND_BUFFER_SIZE] = {0};
-  snprintf(cmd, COMMAND_BUFFER_SIZE - 1, "%s %s %s %s %s %s %s -o %s", compiler,
-           cflags, build_flags, lib_include_directories,
-           test_include_directories, lib_source_files, test_source_files,
-           test_out_name);
-
-  int status = run_command(cmd);
-  if (status != EXIT_SUCCESS) {
-    fprintf(stderr, "Failed to build tests\n");
-    return EXIT_FAILURE;
-  }
-
-  printf("Running tests\n");
-
-  snprintf(cmd, COMMAND_BUFFER_SIZE - 1, "./%s", test_out_name);
-  status = run_command(cmd);
-  if (status != EXIT_SUCCESS) {
-    fprintf(stderr, "Tests failed\n");
-    return EXIT_FAILURE;
-  }
-
-  snprintf(cmd, COMMAND_BUFFER_SIZE - 1, "%s %s %s %s %s %s -o %s", compiler,
-           cflags, build_flags, libflags, lib_include_directories,
-           lib_source_files, lib_out_name);
-  status = run_command(cmd);
-  if (status != EXIT_SUCCESS) {
-    fprintf(stderr, "Failed to build library\n");
-    return EXIT_FAILURE;
-  }
-
-  return EXIT_SUCCESS;
-}
-
-#elif defined(WAPP_PLATFORM_WINDOWS)
-#error "Windows build unimplemented"
-#else
-#error "Unrecognised platform"
-#endif /* ifdef WAPP_PLATFORM_POSIX */
-
-wapp_intern int run_command(const char *cmd) {
-  printf("%s\n", cmd);
-
-  FILE *fp = popen(cmd, "r");
-  if (!fp) {
-    fprintf(stderr, "Failed to run tests\n");
-    return EXIT_FAILURE;
-  }
-
-  char out[4096];
-  while (fgets(out, 4095, fp)) {
-    printf("%s", out);
-  }
-
-  int st = pclose(fp);
-  if (!WIFEXITED(st)) {
-    return EXIT_FAILURE;
-  }
-
-  return WEXITSTATUS(st);
-}

build.ps1

@@ -3,9 +3,12 @@ Param(
 )
 
 $Compiler = "cl.exe"
+$Linker = "lib.exe"
 
-$GeneralFlags = "/Wall /WX /wd4996 /wd4464 /wd5105 /std:c11"
+$GeneralFlags = "/Wall /WX /wd4996 /wd4464 /wd5105 /EHs"
-$LibraryFlags = "/LD"
+$CStd = "/std:c11"
+$CppStd = "/std:c++14"
+$LibraryFlags = "/c"
 
 $Kernel = (Get-ChildItem Env:OS).Value
 $Machine = (Get-ChildItem Env:PROCESSOR_ARCHITECTURE).Value
@@ -15,14 +18,15 @@ $IncludeDirs = "/I src"
 $SrcFiles = "src/wapp.c"
 
 $TestIncludeDirs = Get-ChildItem -Path tests -Recurse -Directory -ErrorAction SilentlyContinue -Force | %{$("/I " + '"' + $_.FullName + '"')}
-$TestSrcFiles = Get-ChildItem -Path tests -Recurse -Filter *.c -ErrorAction SilentlyContinue -Force | %{$('"' + $_.FullName + '"')}
+$TestCSrcFiles = Get-ChildItem -Path tests -Recurse -Filter *.c -ErrorAction SilentlyContinue -Force | %{$('"' + $_.FullName + '"')}
+$TestCppSrcFiles = Get-ChildItem -Path tests -Recurse -Filter *.cc -ErrorAction SilentlyContinue -Force | %{$('"' + $_.FullName + '"')}
 
 If ($Release -eq $True) {
   $GeneralFlags += " /O2 /Og"
-  $BuildType = "release"
+  $BuildType = "Release"
 } Else {
   $GeneralFlags += " /Zi /Od /fsanitize=address"
-  $BuildType = "debug"
+  $BuildType = "Debug"
 }
 
 $BuildDir = "./libwapp-build/${Platform}-${BuildType}"
@@ -30,12 +34,15 @@ $ObjDir = "$BuildDir/objects"
 $OutDir = "$BuildDir/output"
 $TestsDir = "$BuildDir/tests"
 
-$OutBasename = "libwapp"
+$LibOutput = "$OutDir/libwapp.lib"
 $Objects = "/Fo:$ObjDir/"
-$Outputs = "/Fd:$OutDir/$OutBasename /Fe:$OutDir/$OutBasename"
+$LibOutputFlags = "/OUT:$LibOutput"
 
-$TestOutBasename = "wapptest"
+$TestCOutputBasename = "wapptest"
-$TestOutputs = "/Fo:$TestsDir/ /Fe:$TestsDir/$TestOutBasename"
+$TestCOutputFlags = "/Fo:$TestsDir/ /Fe:$TestsDir/$TestCOutputBasename"
+
+$TestCppOutputBasename = "wapptestcc"
+$TestCppOutputFlags = "/Fo:$TestsDir/ /Fe:$TestsDir/$TestCppOutputBasename"
 
 If (Test-Path $BuildDir) {
   Remove-Item $BuildDir -Recurse -Force
@@ -48,18 +55,23 @@ mkdir -p $TestsDir > $null
 # Run code generation
 Invoke-Expression "python -m codegen"
 
-# Build and run tests
+# Build and run C tests
-Invoke-Expression "$Compiler $GeneralFlags $IncludeDirs $TestIncludeDirs $SrcFiles $TestSrcFiles $TestOutputs" -ErrorAction Stop
+Invoke-Expression "$Compiler $GeneralFlags $CStd $IncludeDirs $TestIncludeDirs $SrcFiles $TestCSrcFiles $TestCOutputFlags" -ErrorAction Stop
+Invoke-Expression "$TestsDir/$TestCOutputBasename.exe"
 
-Invoke-Expression "$TestsDir/$TestOutBasename.exe"
 $Status = $LASTEXITCODE
-
-Remove-Item $TestsDir -Recurse -Force
-
 If ($Status -ne 0) {
+  Remove-Item $TestsDir -Recurse -Force
   Write-Error "Tests failed"
   Exit 1
 }
 
 # Build library
-Invoke-Expression "$Compiler $GeneralFlags $LibraryFlags $SrcFiles $Objects $Outputs"
+Invoke-Expression "$Compiler $GeneralFlags $CStd $LibraryFlags $SrcFiles $Objects"
+Invoke-Expression "$Linker $ObjDir/*.obj $LibOutputFlags"
+
+# Build and run C++ tests
+Invoke-Expression "$Compiler $GeneralFlags $CppStd $IncludeDirs $TestIncludeDirs $LibOutput $TestCppSrcFiles $TestCppOutputFlags" -ErrorAction Stop
+Invoke-Expression "$TestsDir/$TestCppOutputBasename.exe"
+
+Remove-Item $TestsDir -Recurse -Force

ccodegen/datatypes.c

@@ -1,522 +0,0 @@
-// 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);
-}
-
-b8 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

@@ -1,280 +0,0 @@
-// 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;
-  b8 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;
-  b8 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;
-  b8 is_local;
-  b8 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);
-b8 cheaderinclude_to_string(Str8 *dst, const CHeaderInclude *cheaderinclude);
-
-#endif // !DATATYPES_H

ccodegen/dbl_list.h

@@ -1,222 +0,0 @@
-// 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

@@ -1,10 +0,0 @@
-// 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

@@ -1,84 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef TYPE_ENUMS_H
-#define TYPE_ENUMS_H
-
-#include "wapp_core.h"
-
-typedef enum {
-  CTYPE_VOID,
-  CTYPE_B8,
-  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_B8]   = wapp_str8_lit_ro("b8"),
-  [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,47 +0,0 @@
-import json
-from typing import Dict
-from pathlib import Path
-from codegen.datatypes import CDataType, CStruct
-from codegen.constants import WAPP_REPO_ROOT, DBL_LIST_DATA
-from codegen.dbl_list.make_dbl_list import DblListData, make_dbl_list
-
-
-def main(types_file: Path | None):
-    dbl_list_datatypes: Dict[CDataType, DblListData] = {}
-
-    if types_file is not None and types_file.is_file() and "json" in types_file.suffix.lower():
-        with types_file.open("r") as infile:
-            datatypes = json.load(infile)
-            dbl_list_data = datatypes.get(DBL_LIST_DATA)
-
-            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()}
-
-    make_dbl_list(dbl_list_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()
-        },
-    }
-
-    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__":
-    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/constants.py

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

codegen/datatypes.py

@@ -1,503 +0,0 @@
-from enum import Enum
-from pathlib import Path
-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 = "b8"
-    CHAR = "char"
-    C8   = "c8"
-    C16  = "c16"
-    C32  = "c32"
-    I8   = "i8"
-    I16  = "i16"
-    I32  = "i32"
-    I64  = "i64"
-    U8   = "u8"
-    U16  = "u16"
-    U32  = "u32"
-    U64  = "u64"
-    F32  = "f32"
-    F64  = "f64"
-    F128 = "f128"
-    IPTR = "iptr"
-    UPTR = "uptr"
-
-    def __str__(self) -> str:
-        return self.value
-
-
-class CQualifier(Enum):
-    NONE       = ""
-    CONST      = "const "
-    EXTERNAL   = "wapp_extern "
-    INTERNAL   = "wapp_intern "
-    PERSISTENT = "wapp_persist "
-
-    def __str__(self) -> str:
-        return self.value
-
-
-class CPointerType(Enum):
-    NONE   = ""
-    SINGLE = "*"
-    DOUBLE = "**"
-
-    def __str__(self) -> str:
-        return self.value
-
-
-@dataclass
-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(SerialisableDataclass):
-    name: str
-    value: Optional[int] = None
-
-    def __str__(self) -> str:
-        return self.name + "" if self.value is None else f" = {self.value}"
-
-
-@dataclass
-class CEnum(SerialisableDataclass):
-    name: str
-    values: List[CEnumVal]
-    typedef: bool = False
-
-    def __str__(self) -> str:
-        if self.typedef:
-            header = "typedef enum {\n"
-            footer = f"}} {self.name};\n"
-        else:
-            header = f"enum {self.name} {{\n"
-            footer = "};\n"
-
-        values = ""
-        for value in self.values:
-            values += f"  {str(value)},\n"
-
-        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(SerialisableDataclass):
-    name: str
-    value: str
-
-    def __str__(self) -> str:
-        return f"#define {self.name} {self.value}\n"
-
-
-@dataclass
-class CStruct(SerialisableDataclass):
-    name: str
-    cargs: List["CArg"]
-    typedef_name: Optional[str] = None
-
-    def __str__(self) -> str:
-        return self.declare() + self.define()
-
-    def declare(self) -> str:
-        declaration = f"typedef struct {self.name} {self.typedef_name if self.typedef_name is not None else self.name};\n"
-        return declaration
-
-    def define(self):
-        definition = f"struct {self.name} {{\n"
-        args = ""
-        for arg in self.cargs:
-            args += f"  {str(arg)};\n"
-        footer = "};\n"
-
-        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(SerialisableDataclass):
-    name: str
-    _type: CDataType
-    array: bool = False
-    pointer: CPointer = field(default_factory=CPointer)
-    qualifier: CQualifier = CQualifier.NONE
-
-    def __str__(self) -> str:
-        qualifier = str(self.qualifier)
-        _type = get_datatype_string(self._type) + " "
-        pointer = str(self.pointer)
-        array = "[]" if self.array else ""
-
-        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(SerialisableDataclass):
-    name: str
-    ret_type: CDataType
-    args: List[CArg]
-    body: str
-    pointer: CPointer = field(default_factory=CPointer)
-    qualifiers: List[CQualifier] = field(default_factory=list)
-
-    def __str__(self) -> str:
-        qualifiers = ""
-        for qualifier in self.qualifiers:
-            if qualifier == CQualifier.NONE:
-                continue
-            if len(qualifiers) > 0:
-                qualifiers += " "
-            qualifiers += f"{str(qualifier)}"
-
-        args = ""
-        for i, arg in enumerate(self.args):
-            args += f"{str(arg)}"
-            if i + 1 < len(self.args):
-                args += ", "
-
-        return qualifiers + get_datatype_string(self.ret_type) + " " + str(self.pointer) + self.name + f"({args})"
-
-    def declare(self) -> str:
-        return f"{str(self)};\n"
-
-    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(SerialisableDataclass):
-    header: Union[str, "CHeader"]
-    local: bool = False
-    same_dir: bool = False
-
-    def __str__(self) -> str:
-        if isinstance(self.header, CHeader):
-            name = f"{self.header.name}.{self.header.extension}"
-        else:
-            name = self.header
-
-        if self.local:
-            open_symbol = '"'
-            close_symbol = '"'
-
-            if self.same_dir:
-                name = f"./{name}"
-        else:
-            open_symbol = '<'
-            close_symbol = '>'
-        
-        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(SerialisableDataclass):
-    name: str
-    extension: str
-    includes: List[CInclude] = field(default_factory=list)
-    types: List[CUserType] = field(default_factory=list)
-    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(
-            [
-                CInclude(
-                    header=str(convert_to_relative(WAPP_SRC_ROOT / "common" / "aliases" / "aliases.h", output_dir)).replace("\\", "/"),
-                    local=True,
-                ),
-                CInclude(
-                    header=str(convert_to_relative(WAPP_SRC_ROOT / "common" / "platform" / "platform.h", output_dir)).replace("\\", "/"),
-                    local=True,
-                )
-            ]
-        )
-        output_file = output_dir / f"{self.name}.{self.extension}"
-        with open(output_file, "w+") as outfile:
-            outfile.write(str(self))
-
-    def __str__(self) -> str:
-        return """\
-/**
- * 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):
-    extension: str = "h"
-
-    def __str__(self) -> str:
-        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"#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)
-
-        macros = ""
-        for macro in self.macros:
-            macros += str(macro)
-        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()
-        if len(forward_declarations) > 0:
-            forward_declarations += "\n"
-
-        types = ""
-        for _type in self.types:
-            types += str(_type) + "\n"
-
-        funcs = ""
-        for func in self.funcs:
-            funcs += func.declare()
-
-        return (
-            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):
-    extension: str = "c"
-    internal_funcs: List[CFunc] = field(default_factory=list)
-
-    def __str__(self) -> str:
-        includes = _get_includes_string(self.includes)
-
-        macros = ""
-        for macro in self.macros:
-            macros += str(macro)
-        if len(macros) > 0:
-            macros += "\n"
-
-        forward_declarations = ""
-        for _type in self.decl_types:
-            forward_declarations += _type.declare()
-        if len(forward_declarations) > 0:
-            forward_declarations += "\n"
-
-        types = ""
-        for _type in self.types:
-            types += str(_type) + "\n"
-
-        internal_funcs_decl = ""
-        internal_funcs_def = ""
-        for func in self.internal_funcs:
-            internal_funcs_decl += func.declare()
-            internal_funcs_def += func.define()
-
-        if len(internal_funcs_decl) > 0:
-            internal_funcs_decl += "\n"
-
-        funcs = ""
-        for func in self.funcs:
-            funcs += func.define()
-
-        return (
-            super().__str__() +
-            includes +
-            macros +
-            forward_declarations +
-            types +
-            internal_funcs_decl +
-            funcs +
-            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):
-        return str(_type)
-    elif isinstance(_type, CStruct) or isinstance(_type, CEnum):
-        return _type.name
-    elif isinstance(_type, str):
-        return _type
-
-
-def _get_includes_string(includes: List[CInclude]) -> str:
-    output = ""
-    for include in sorted(includes, key=lambda inc: inc.local, reverse=True):
-        output += str(include)
-    if len(output) > 0:
-        output += "\n"
-
-    return output

codegen/dbl_list/make_dbl_list.py

@@ -1,339 +0,0 @@
-from pathlib import Path
-from dataclasses import dataclass, field
-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 (
-    CDataType,
-    CMacro,
-    CStruct,
-    CFunc,
-    CHeader,
-    CSource,
-    CArg,
-    CType,
-    CPointer,
-    CPointerType,
-    CQualifier,
-    CInclude,
-    SerialisableDataclass,
-    get_datatype_string,
-)
-
-
-@dataclass
-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(
-        filename: Path,
-        type_string: str,
-        type_string_upper: str,
-        type_string_lower: str,
-        node_typename: str,
-        list_typename: str
-    ):
-        return load_func_body_from_file(filename).format(
-            T=type_string,
-            NodeType=node_typename,
-            ListType=list_typename,
-            Tupper=type_string_upper,
-            Tlower=type_string_lower,
-        )
-
-    out_dir = WAPP_SRC_ROOT / "primitives" / "dbl_list"
-    out_dir.mkdir(parents=True, exist_ok=True)
-
-    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",
-            hdr_decl_types=[
-                CStruct(name="str8", cargs=[], typedef_name="Str8"),
-            ],
-        ),
-    }
-
-    for _type in CType:
-        if _type == CType.VOID:
-            continue
-
-        type_title = _type.value.title()
-        datatypes[_type] = DblListData(
-            node_typename=f"{type_title}Node",
-            list_typename=f"{type_title}List",
-        )
-
-    datatypes.update(user_datatypes)
-
-    snippets_dir = Path(__file__).parent / "snippets"
-
-    header = CHeader(
-        name="dbl_list",
-        decl_types=[*common_decl_types],
-        includes=[],
-        types=[],
-        funcs=[]
-    )
-
-    source = CSource(
-        name=header.name,
-        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"),
-        ],
-        internal_funcs=[],
-        funcs=header.funcs
-    )
-
-    for _type, dbl_list_data in datatypes.items():
-        type_string = get_datatype_string(_type)
-        clean_type_string = type_string.replace(" ", "").replace("*", "_ptr")
-        type_string_upper = clean_type_string.upper()
-        type_string_lower = clean_type_string.lower()
-
-        node = CStruct(
-            name=dbl_list_data.node_typename,
-            cargs=[
-                CArg(name="item", _type=type_string, pointer=CPointer(_type=CPointerType.SINGLE)),
-            ],
-        )
-        node.cargs.extend([
-            CArg(name="prev", _type=node, pointer=CPointer(_type=CPointerType.SINGLE)),
-            CArg(name="next", _type=node, pointer=CPointer(_type=CPointerType.SINGLE)),
-        ])
-        
-        dl_list = CStruct(
-            name=dbl_list_data.list_typename,
-            cargs=[
-                CArg(name="first", _type=node, pointer=CPointer(_type=CPointerType.SINGLE)),
-                CArg(name="last", _type=node, pointer=CPointer(_type=CPointerType.SINGLE)),
-                CArg(name="node_count", _type=CType.U64),
-            ],
-        )
-
-        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",
-                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
-            ),
-        )
-
-        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,
-            args=[
-                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-                CArg(name="index", _type=CType.U64),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "list_get",
-                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
-            ),
-            pointer=CPointer(CPointerType.SINGLE),
-        )
-
-        push_front_func = CFunc(
-            name=f"wapp_{type_string_lower}_list_push_front",
-            ret_type=CType.VOID,
-            args=[
-                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE)),
-                CArg(name="node", _type=node, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "list_push_front",
-                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
-            ),
-        )
-
-        push_back_func = CFunc(
-            name=f"wapp_{type_string_lower}_list_push_back",
-            ret_type=CType.VOID,
-            args=[
-                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE)),
-                CArg(name="node", _type=node, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "list_push_back",
-                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
-            ),
-        )
-
-        insert_func = CFunc(
-            name=f"wapp_{type_string_lower}_list_insert",
-            ret_type=CType.VOID,
-            args=[
-                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE)),
-                CArg(name="node", _type=node, pointer=CPointer(CPointerType.SINGLE)),
-                CArg(name="index", _type=CType.U64),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "list_insert",
-                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
-            ),
-        )
-
-        pop_front_func = CFunc(
-            name=f"wapp_{type_string_lower}_list_pop_front",
-            ret_type=node,
-            args=[
-                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "list_pop_front",
-                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
-            ),
-            pointer=CPointer(CPointerType.SINGLE),
-        )
-
-        pop_back_func = CFunc(
-            name=f"wapp_{type_string_lower}_list_pop_back",
-            ret_type=node,
-            args=[
-                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "list_pop_back",
-                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
-            ),
-            pointer=CPointer(CPointerType.SINGLE),
-        )
-
-        remove_func = CFunc(
-            name=f"wapp_{type_string_lower}_list_remove",
-            ret_type=node,
-            args=[
-                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE)),
-                CArg(name="index", _type=CType.U64),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "list_remove",
-                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
-            ),
-            pointer=CPointer(CPointerType.SINGLE),
-        )
-
-        empty_func = CFunc(
-            name=f"wapp_{type_string_lower}_list_empty",
-            ret_type=CType.VOID,
-            args=[
-                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "list_empty",
-                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
-            ),
-        )
-
-        node_to_list_func = CFunc(
-            name=f"{type_string_lower}_node_to_list",
-            ret_type=dl_list,
-            args=[
-                CArg(name="node", _type=node, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "node_to_list",
-                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
-            ),
-            qualifiers=[CQualifier.INTERNAL],
-        )
-
-        header.c_macros.append(node_cmacro)
-        header.cpp_macros.append(node_cppmacro)
-        header.funcs.extend([
-            get_func,
-            push_front_func,
-            push_back_func,
-            insert_func,
-            pop_front_func,
-            pop_back_func,
-            remove_func,
-            empty_func,
-        ])
-
-        source.internal_funcs.append(node_to_list_func)
-        source.funcs = header.funcs
-
-    header.save(out_dir)
-    source.save(out_dir)

codegen/dbl_list/snippets/list_empty

@@ -1,6 +0,0 @@
-  wapp_debug_assert(list != NULL, "`list` should not be NULL");
-
-  u64 count = list->node_count;
-  for (u64 i = 0; i < count; ++i) {{
-    wapp_{Tlower}_list_pop_back(list);
-  }}

codegen/dbl_list/snippets/list_get

@@ -1,11 +0,0 @@
-  wapp_runtime_assert(index < list->node_count, "`index` is out of bounds");
-
-  {NodeType} *output  = NULL;
-  {NodeType} *current = list->first;
-  for (u64 i = 1; i <= index; ++i) {{
-    current = current->next;
-  }}
-
-  output = current;
-
-  return output;

codegen/dbl_list/snippets/list_insert

@@ -1,26 +0,0 @@
-  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);
-    return;
-  }} else if (index == list->node_count) {{
-    wapp_{Tlower}_list_push_back(list, node);
-    return;
-  }}
-
-  {NodeType} *dst_node = wapp_{Tlower}_list_get(list, index);
-  if (!dst_node) {{
-    return;
-  }}
-
-  {ListType} node_list = {Tlower}_node_to_list(node);
-
-  list->node_count += node_list.node_count;
-
-  {NodeType} *prev = dst_node->prev;
-
-  dst_node->prev = node_list.last;
-  prev->next     = node_list.first;
-
-  node_list.first->prev = prev;
-  node_list.last->next  = dst_node;

codegen/dbl_list/snippets/list_node

@@ -1 +0,0 @@
-(({NodeType}){{.item = ITEM_PTR}})

codegen/dbl_list/snippets/list_node_cpp

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

codegen/dbl_list/snippets/list_pop_back

@@ -1,22 +0,0 @@
-  wapp_debug_assert(list != NULL, "`list` should not be NULL");
-
-  {NodeType} *output = NULL;
-
-  if (list->node_count == 0) {{
-    goto RETURN_{Tupper}_LIST_POP_BACK;
-  }}
-
-  output = list->last;
-
-  if (list->node_count == 1) {{
-    *list = ({ListType}){{0}};
-    goto RETURN_{Tupper}_LIST_POP_BACK;
-  }}
-
-  --(list->node_count);
-  list->last = output->prev;
-
-  output->prev = output->next = NULL;
-
-RETURN_{Tupper}_LIST_POP_BACK:
-  return output;

codegen/dbl_list/snippets/list_pop_front

@@ -1,22 +0,0 @@
-  wapp_debug_assert(list != NULL, "`list` should not be NULL");
-
-  {NodeType} *output = NULL;
-
-  if (list->node_count == 0) {{
-    goto RETURN_{Tupper}_LIST_POP_FRONT;
-  }}
-
-  output = list->first;
-
-  if (list->node_count == 1) {{
-    *list = ({ListType}){{0}};
-    goto RETURN_{Tupper}_LIST_POP_FRONT;
-  }}
-
-  --(list->node_count);
-  list->first = output->next;
-
-  output->prev = output->next = NULL;
-
-RETURN_{Tupper}_LIST_POP_FRONT:
-  return output;

codegen/dbl_list/snippets/list_push_back

@@ -1,18 +0,0 @@
-  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);
-
-  if (list->node_count == 0) {{
-    *list = node_list;
-    return;
-  }}
-
-  list->node_count += node_list.node_count;
-
-  {NodeType} *last = list->last;
-  if (last) {{
-    last->next = node_list.first;
-  }}
-
-  list->last            = node_list.last;
-  node_list.first->prev = last;

codegen/dbl_list/snippets/list_push_front

@@ -1,18 +0,0 @@
-  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);
-
-  if (list->node_count == 0) {{
-    *list = node_list;
-    return;
-  }}
-
-  list->node_count += node_list.node_count;
-
-  {NodeType} *first = list->first;
-  if (first) {{
-    first->prev = node_list.last;
-  }}
-
-  list->first          = node_list.first;
-  node_list.last->next = first;

codegen/dbl_list/snippets/list_remove

@@ -1,26 +0,0 @@
-  wapp_debug_assert(list != NULL, "`list` should not be NULL");
-
-  {NodeType} *output = NULL;
-
-  if (index == 0) {{
-    output = wapp_{Tlower}_list_pop_front(list);
-    goto RETURN_{Tupper}_LIST_REMOVE;
-  }} else if (index == list->node_count) {{
-    output = wapp_{Tlower}_list_pop_back(list);
-    goto RETURN_{Tupper}_LIST_REMOVE;
-  }}
-
-  output = wapp_{Tlower}_list_get(list, index);
-  if (!output) {{
-    goto RETURN_{Tupper}_LIST_REMOVE;
-  }}
-
-  output->prev->next = output->next;
-  output->next->prev = output->prev;
-
-  --(list->node_count);
-
-  output->prev = output->next = NULL;
-
-RETURN_{Tupper}_LIST_REMOVE:
-  return output;

codegen/dbl_list/snippets/node_to_list

@@ -1,13 +0,0 @@
-  {ListType} output = {{.first = node, .last = node, .node_count = 1}};
-
-  while (output.first->prev != NULL) {{
-    output.first = output.first->prev;
-    ++(output.node_count);
-  }}
-
-  while (output.last->next != NULL) {{
-    output.last = output.last->next;
-    ++(output.node_count);
-  }}
-
-  return output;

codegen/utils.py

@@ -1,18 +0,0 @@
-import os
-import sys
-from pathlib import Path
-
-
-def load_func_body_from_file(filename: Path) -> str:
-    with open(filename, "r") as infile:
-        return infile.read().rstrip()
-
-
-def convert_to_relative(path: Path, target: Path) -> Path:
-    major = sys.version_info.major
-    minor = sys.version_info.minor
-
-    if major >= 3 and minor >= 12:
-        return path.relative_to(target, walk_up=True)
-    else:
-        return Path(os.path.relpath(str(path), start=str(target)))

codegen_custom_data_example.json

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

src/base/array/array.c

@@ -0,0 +1,173 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "./array.h"
+#include "../../common/assert/assert.h"
+#include "../mem/allocator/mem_allocator.h"
+#include "../../common/misc/misc_utils.h"
+#include "../../common/aliases/aliases.h"
+#include <stddef.h>
+
+#define _offset_pointer(PTR, OFFSET) ((void *)((uptr)(PTR) + (OFFSET)))
+
+wapp_persist inline void _array_validate(const GenericArray *array, u64 item_size);
+
+void *_array_get(GenericArray *array, u64 index, u64 item_size) {
+  wapp_runtime_assert(array != NULL, "`array` should not be NULL");
+  _array_validate(array, item_size);
+  wapp_runtime_assert(index < array->count, "`index` is out of bounds");
+
+  return _offset_pointer(array->items, array->item_size * index);
+}
+
+void _array_set(GenericArray *array, u64 index, void *value, u64 item_size) {
+  void *item = _array_get(array, index, item_size);
+  memcpy(item, value, array->item_size);
+}
+
+void _array_append_capped(GenericArray *array, void *value, u64 item_size) {
+  wapp_runtime_assert(array != NULL, "`array` should not be NULL");
+  _array_validate(array, item_size);
+
+  if (array->count >= array->capacity) { return; }
+
+  u64 index = (array->count)++;
+  _array_set(array, index, value, item_size);
+}
+
+void _array_extend_capped(GenericArray *dst, const GenericArray *src, u64 item_size) {
+  wapp_runtime_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
+  _array_validate(dst, item_size);
+  _array_validate(src, item_size);
+
+  u64 remaining_capacity = dst->capacity - dst->count;
+
+  u64 copy_count = src->count < remaining_capacity ? src->count : remaining_capacity;
+  void *dst_ptr = _offset_pointer(dst->items, dst->count * dst->item_size);
+  memcpy(dst_ptr, src->items, copy_count * src->item_size);
+  dst->count += copy_count;
+}
+
+void _array_copy_capped(GenericArray *dst, const GenericArray *src, u64 item_size) {
+  wapp_runtime_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
+  _array_validate(dst, item_size);
+  _array_validate(src, item_size);
+
+  _array_clear(dst, item_size);
+  u64 copy_count = src->count < dst->capacity ? src->count : dst->capacity;
+  memcpy(dst->items, src->items, copy_count * src->item_size);
+  dst->count = copy_count;
+}
+
+GenericArray *_array_append_alloc(const Allocator *allocator, GenericArray *array, void *value, u64 item_size) {
+  wapp_runtime_assert(allocator != NULL && array != NULL, "`allocator` and `array` should not be NULL");
+  _array_validate(array, item_size);
+
+  GenericArray *output = array;
+
+  if (array->count >= array->capacity) {
+    u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(array->capacity * 2);
+    output           = (GenericArray *)_array_alloc_capacity(allocator, new_capacity, array->item_size);
+    if (!output) {
+      output = array;
+      goto RETURN_ARRAY_APPEND_ALLOC;
+    }
+    _array_copy_capped(output, array, item_size);
+  }
+
+  _array_append_capped(output, value, item_size);
+
+RETURN_ARRAY_APPEND_ALLOC:
+  return output;
+}
+
+GenericArray *_array_extend_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size) {
+  wapp_runtime_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
+  _array_validate(dst, item_size);
+  _array_validate(src, item_size);
+
+  GenericArray *output = dst;
+
+  u64 remaining_capacity = dst->capacity - dst->count;
+  if (src->count >= remaining_capacity) {
+    u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(dst->capacity * 2);
+    output           = (GenericArray *)_array_alloc_capacity(allocator, new_capacity, dst->item_size);
+    if (!output) {
+      output = dst;
+      goto RETURN_ARRAY_EXTEND_ALLOC;
+    }
+    _array_copy_capped(output, dst, item_size);
+  }
+
+  _array_extend_capped(output, src, item_size);
+
+RETURN_ARRAY_EXTEND_ALLOC:
+  return output;
+}
+
+GenericArray *_array_copy_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size) {
+  wapp_runtime_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
+  _array_validate(dst, item_size);
+  _array_validate(src, item_size);
+
+  GenericArray *output = dst;
+
+  if (src->count >= dst->capacity) {
+    u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(dst->capacity * 2);
+    output           = (GenericArray *)_array_alloc_capacity(allocator, new_capacity, src->item_size);
+    if (!output) {
+      output = dst;
+      goto RETURN_ARRAY_COPY_ALLOC;
+    }
+  }
+
+  _array_copy_capped(output, src, item_size);
+
+RETURN_ARRAY_COPY_ALLOC:
+  return output;
+}
+
+void *_array_pop(GenericArray *array, u64 item_size) {
+  wapp_runtime_assert(array != NULL, "`array` should not be NULL");
+  _array_validate(array, item_size);
+
+  if (array->count == 0) { return NULL; }
+
+  u64 index = array->count - 1;
+  void *out = _array_get(array, index, item_size);
+  --(array->count);
+  return out;
+}
+
+void _array_clear(GenericArray *array, u64 item_size) {
+  wapp_runtime_assert(array != NULL, "`array` should not be NULL");
+  _array_validate(array, item_size);
+
+  array->count = 0;
+}
+
+GenericArray *_array_alloc_capacity(const Allocator *allocator, u64 capacity, u64 item_size) {
+  wapp_runtime_assert(allocator != NULL, "`allocator` should not be NULL");
+
+  GenericArray *output = NULL;
+
+  u64 allocation_size = sizeof(GenericArray) + item_size * capacity;
+
+  output = wapp_mem_allocator_alloc(allocator, allocation_size);
+  if (!output) {
+    goto RETURN_ARRAY_ALLOC;
+  }
+
+  output->magic     = WAPP_ARRAY_MAGIC;
+  output->count     = 0;
+  output->capacity  = capacity;
+  output->item_size = item_size;
+  output->items     = (void *)(output + 1);
+
+RETURN_ARRAY_ALLOC:
+  return output;
+}
+
+wapp_persist inline void _array_validate(const GenericArray *array, u64 item_size) {
+  wapp_runtime_assert(WAPP_ARRAY_MAGIC == array->magic, "`array` is not a valid wapp array");
+  wapp_runtime_assert(item_size == array->item_size, "Invalid item type provided");
+}

src/base/array/array.h

@@ -0,0 +1,163 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef ARRAY_H
+#define ARRAY_H
+
+#include "../mem/allocator/mem_allocator.h"
+#include "../../common/misc/misc_utils.h"
+#include "../../common/aliases/aliases.h"
+#include "../../common/platform/platform.h"
+
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#define WAPP_ARRAY_MAGIC (u64)0x57415f415252
+
+#define _calc_array_count(TYPE, ...) wapp_misc_utils_va_args_count(TYPE, __VA_ARGS__)
+#define _calc_array_capacity(TYPE, ...) wapp_misc_utils_u64_round_up_pow2(_calc_array_count(TYPE, __VA_ARGS__) * 2)
+
+#define wapp_array_alloc_capacity(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, CAPACITY)   \
+  ((ARRAY_TYPE *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(ELEM_TYPE)))
+
+#define WAPP_DEF_ARRAY_TYPE(T, NAME) \
+  typedef struct {                   \
+    u64 magic;                       \
+    u64 count;                       \
+    u64 capacity;                    \
+    u64 item_size;                   \
+    T *items;                        \
+  } NAME
+
+#ifdef WAPP_PLATFORM_CPP
+#define wapp_array(ELEM_TYPE, ARRAY_TYPE, ...) ([&]() {                                  \
+  wapp_persist ELEM_TYPE items[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE{}).items)) ?    \
+    _calc_array_capacity(ELEM_TYPE, __VA_ARGS__) : -1                                    \
+  ] = {__VA_ARGS__};                                                                     \
+                                                                                         \
+  return ARRAY_TYPE{                                                                     \
+    WAPP_ARRAY_MAGIC,                                                                    \
+    _calc_array_count(ELEM_TYPE, __VA_ARGS__),                                           \
+    _calc_array_capacity(ELEM_TYPE, __VA_ARGS__),                                        \
+    sizeof(ELEM_TYPE),                                                                   \
+    items,                                                                               \
+  };                                                                                     \
+}())
+#define wapp_array_with_capacity(ELEM_TYPE, ARRAY_TYPE, CAPACITY) ([&]() {               \
+  wapp_persist ELEM_TYPE items[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE{}).items)) ?    \
+    CAPACITY : -1] = {};                                                                 \
+                                                                                         \
+  return ARRAY_TYPE{                                                                     \
+    WAPP_ARRAY_MAGIC,                                                                    \
+    0,                                                                                   \
+    CAPACITY,                                                                            \
+    sizeof(ELEM_TYPE),                                                                   \
+    items,                                                                               \
+  };                                                                                     \
+}())
+#define wapp_array_pop(ELEM_TYPE, ARRAY_PTR) ([&]() {                                    \
+  if (ARRAY_PTR == NULL || (ARRAY_PTR)->count == 0) {                                    \
+    ELEM_TYPE result{};                                                                  \
+    return result;                                                                       \
+  }                                                                                      \
+                                                                                         \
+  return *((ELEM_TYPE *)_array_pop((GenericArray *)ARRAY_PTR, sizeof(ELEM_TYPE)));              \
+}())
+#else
+#define wapp_array(ELEM_TYPE, ARRAY_TYPE, ...)                                      \
+  ((ARRAY_TYPE){                                                                    \
+    .magic     = WAPP_ARRAY_MAGIC,                                                  \
+    .count     = _calc_array_count(ELEM_TYPE, __VA_ARGS__),                         \
+    .capacity  = _calc_array_capacity(ELEM_TYPE, __VA_ARGS__),                      \
+    .item_size = sizeof(ELEM_TYPE),                                                 \
+    .items     = (ELEM_TYPE[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE){0}.items)) ? \
+                            _calc_array_capacity(ELEM_TYPE, __VA_ARGS__) :          \
+                            -1]){__VA_ARGS__}                                       \
+  })
+#define wapp_array_with_capacity(ELEM_TYPE, ARRAY_TYPE, CAPACITY)                   \
+  ((ARRAY_TYPE){                                                                    \
+    .magic     = WAPP_ARRAY_MAGIC,                                                  \
+    .count     = 0,                                                                 \
+    .capacity  = CAPACITY,                                                          \
+    .item_size = sizeof(ELEM_TYPE),                                                 \
+    .items     = (ELEM_TYPE[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE){0}.items)) ? \
+                            CAPACITY : -1]){0}                                      \
+  })
+#define wapp_array_pop(ELEM_TYPE, ARRAY_PTR)                                        \
+  (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ?                                    \
+    *((ELEM_TYPE *)_array_pop((GenericArray *)ARRAY_PTR, sizeof(ELEM_TYPE))) :             \
+    (ELEM_TYPE){0}                                                                  \
+  )
+#endif // !WAPP_PLATFORM_CPP
+
+#define wapp_array_get(ELEM_TYPE, ARRAY_PTR, INDEX)                                                 \
+  ((ELEM_TYPE *)_array_get((GenericArray *)ARRAY_PTR, INDEX, sizeof(ELEM_TYPE)))
+#define wapp_array_set(ELEM_TYPE, ARRAY_PTR, INDEX, VALUE_PTR)                                      \
+  _array_set((GenericArray *)ARRAY_PTR, INDEX, (void *)VALUE_PTR, sizeof(ELEM_TYPE))
+#define wapp_array_append_capped(ELEM_TYPE, ARRAY_PTR, VALUE_PTR)                                   \
+  _array_append_capped((GenericArray *)ARRAY_PTR, (void *)VALUE_PTR, sizeof(ELEM_TYPE))
+#define wapp_array_extend_capped(ELEM_TYPE, DST_ARRAY_PTR, SRC_ARRAY_PTR)                           \
+  _array_extend_capped(                                                                             \
+    (GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)                 \
+  )
+#define wapp_array_copy_capped(ELEM_TYPE, DST_ARRAY_PTR, SRC_ARRAY_PTR)                             \
+  _array_copy_capped(                                                                               \
+    (GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)                 \
+  )
+#define wapp_array_append_alloc(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, ARRAY_PTR, VALUE_PTR)         \
+  (ARRAY_TYPE *)_array_append_alloc(                                                                \
+    ALLOCATOR_PTR, (GenericArray *)ARRAY_PTR, (void *)VALUE_PTR, sizeof(ELEM_TYPE)                  \
+  )
+#define wapp_array_extend_alloc(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, DST_ARRAY_PTR, SRC_ARRAY_PTR) \
+  (ARRAY_TYPE *)_array_extend_alloc(                                                                \
+    ALLOCATOR_PTR, (GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)  \
+  )
+#define wapp_array_copy_alloc(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, DST_ARRAY_PTR, SRC_ARRAY_PTR)   \
+  (ARRAY_TYPE *)_array_copy_alloc(                                                                  \
+    ALLOCATOR_PTR, (GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)  \
+  )
+#define wapp_array_clear(ELEM_TYPE, ARRAY_PTR)                                                      \
+  _array_clear((GenericArray *)ARRAY_PTR, sizeof(ELEM_TYPE))
+
+WAPP_DEF_ARRAY_TYPE(void, GenericArray);
+
+void         *_array_get(GenericArray *array, u64 index, u64 item_size);
+void          _array_set(GenericArray *array, u64 index, void *value, u64 item_size);
+void          _array_append_capped(GenericArray *array, void *value, u64 item_size);
+void          _array_extend_capped(GenericArray *dst, const GenericArray *src, u64 item_size);
+void          _array_copy_capped(GenericArray *dst, const GenericArray *src, u64 item_size);
+GenericArray *_array_append_alloc(const Allocator *allocator, GenericArray *array, void *value, u64 item_size);
+GenericArray *_array_extend_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size);
+GenericArray *_array_copy_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size);
+void         *_array_pop(GenericArray *array, u64 item_size);
+void          _array_clear(GenericArray *array, u64 item_size);
+GenericArray *_array_alloc_capacity(const Allocator *allocator, u64 capacity, u64 item_size);
+
+// Base array types
+typedef struct str8 Str8;
+
+WAPP_DEF_ARRAY_TYPE(void *, VoidPtrArray);
+WAPP_DEF_ARRAY_TYPE(c8    , C8Array);
+WAPP_DEF_ARRAY_TYPE(c16   , C16Array);
+WAPP_DEF_ARRAY_TYPE(c32   , C32Array);
+WAPP_DEF_ARRAY_TYPE(u8    , U8Array);
+WAPP_DEF_ARRAY_TYPE(u16   , U16Array);
+WAPP_DEF_ARRAY_TYPE(u32   , U32Array);
+WAPP_DEF_ARRAY_TYPE(u64   , U64Array);
+WAPP_DEF_ARRAY_TYPE(b8    , B8Array);
+WAPP_DEF_ARRAY_TYPE(i8    , I8Array);
+WAPP_DEF_ARRAY_TYPE(i16   , I16Array);
+WAPP_DEF_ARRAY_TYPE(i32   , I32Array);
+WAPP_DEF_ARRAY_TYPE(i64   , I64Array);
+WAPP_DEF_ARRAY_TYPE(f32   , F32Array);
+WAPP_DEF_ARRAY_TYPE(f64   , F64Array);
+WAPP_DEF_ARRAY_TYPE(f128  , F128Array);
+WAPP_DEF_ARRAY_TYPE(uptr  , UptrArray);
+WAPP_DEF_ARRAY_TYPE(iptr  , IptrArray);
+WAPP_DEF_ARRAY_TYPE(Str8  , Str8Array);
+
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#endif // !ARRAY_H

src/base/dbl_list/dbl_list.c

@@ -0,0 +1,258 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "./dbl_list.h"
+#include "../mem/allocator/mem_allocator.h"
+#include "../../common/assert/assert.h"
+#include "../../common/aliases/aliases.h"
+#include "../../common/platform/platform.h"
+#include <stddef.h>
+
+wapp_intern inline GenericList _node_to_list(GenericNode *node, u64 item_size);
+wapp_intern inline void _dbl_list_validate(const GenericList *list, u64 item_size);
+wapp_intern inline void _dbl_list_node_validate(const GenericList *list, const GenericNode *node, u64 item_size);
+
+GenericList *_dbl_list_alloc(const Allocator *allocator, u64 item_size) {
+  wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
+
+  GenericList *list = wapp_mem_allocator_alloc(allocator, sizeof(GenericList));
+  if (!list) { goto DBL_LIST_ALLOC_RETURN; }
+
+  memset((void *)list, 0, sizeof(GenericList));
+  list->magic     = WAPP_DBL_LIST_MAGIC;
+  list->item_size = item_size;
+
+DBL_LIST_ALLOC_RETURN:
+  return list;
+}
+
+GenericNode *_dbl_list_node_alloc(const Allocator *allocator, u64 item_size) {
+  wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
+
+  GenericNode *node = wapp_mem_allocator_alloc(allocator, sizeof(GenericNode));
+  if (!node) { goto DBL_LIST_NODE_ALLOC_RETURN; }
+
+  memset((void *)node, 0, sizeof(GenericNode));
+  node->magic     = WAPP_DBL_NODE_MAGIC;
+  node->item_size = item_size;
+
+DBL_LIST_NODE_ALLOC_RETURN:
+  return node;
+}
+
+GenericNode *_dbl_list_get(const GenericList *list, u64 index, u64 item_size) {
+  wapp_debug_assert(list != NULL, "`list` should not be NULL");
+  _dbl_list_validate(list, item_size);
+  wapp_runtime_assert(index < list->node_count, "`index` is out of bounds");
+
+  GenericNode *output  = NULL;
+  GenericNode *current = list->first;
+  for (u64 i = 1; i <= index; ++i) {
+    current = current->next;
+  }
+
+  output = current;
+
+  return output;
+}
+
+void _dbl_list_push_front(GenericList *list, GenericNode *node, u64 item_size) {
+  wapp_debug_assert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
+  _dbl_list_validate(list, item_size);
+  _dbl_list_node_validate(list, node, item_size);
+
+  GenericList node_list = _node_to_list(node, item_size);
+
+  if (list->node_count == 0) {
+    *list = node_list;
+    return;
+  }
+
+  list->node_count += node_list.node_count;
+
+  GenericNode *first = list->first;
+  if (first) {
+    first->prev = node_list.last;
+  }
+
+  list->first          = node_list.first;
+  node_list.last->next = first;
+}
+
+void _dbl_list_push_back(GenericList *list, GenericNode *node, u64 item_size) {
+  wapp_debug_assert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
+  _dbl_list_validate(list, item_size);
+  _dbl_list_node_validate(list, node, item_size);
+
+  GenericList node_list = _node_to_list(node, item_size);
+
+  if (list->node_count == 0) {
+    *list = node_list;
+    return;
+  }
+
+  list->node_count += node_list.node_count;
+
+  GenericNode *last = list->last;
+  if (last) {
+    last->next = node_list.first;
+  }
+
+  list->last            = node_list.last;
+  node_list.first->prev = last;
+}
+
+void _dbl_list_insert(GenericList *list, GenericNode *node, u64 index, u64 item_size) {
+  wapp_debug_assert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
+  _dbl_list_validate(list, item_size);
+  _dbl_list_node_validate(list, node, item_size);
+
+  if (index == 0) {
+    _dbl_list_push_front(list, node, item_size);
+    return;
+  } else if (index == list->node_count) {
+    _dbl_list_push_back(list, node, item_size);
+    return;
+  }
+
+  GenericNode *dst_node = _dbl_list_get(list, index, item_size);
+  if (!dst_node) {
+    return;
+  }
+
+  GenericList node_list = _node_to_list(node, item_size);
+
+  list->node_count += node_list.node_count;
+
+  GenericNode *prev = dst_node->prev;
+
+  dst_node->prev = node_list.last;
+  prev->next     = node_list.first;
+
+  node_list.first->prev = prev;
+  node_list.last->next  = dst_node;
+}
+
+GenericNode *_dbl_list_pop_front(GenericList *list, u64 item_size) {
+  wapp_debug_assert(list != NULL, "`list` should not be NULL");
+  _dbl_list_validate(list, item_size);
+
+  GenericNode *output = NULL;
+
+  if (list->node_count == 0) {
+    goto RETURN_I32_LIST_POP_FRONT;
+  }
+
+  output = list->first;
+
+  if (list->node_count == 1) {
+    *list = (GenericList){.magic = WAPP_DBL_LIST_MAGIC, .item_size = item_size};
+    goto RETURN_I32_LIST_POP_FRONT;
+  }
+
+  --(list->node_count);
+  list->first = output->next;
+
+  output->prev = output->next = NULL;
+
+RETURN_I32_LIST_POP_FRONT:
+  return output;
+}
+
+GenericNode *_dbl_list_pop_back(GenericList *list, u64 item_size) {
+  wapp_debug_assert(list != NULL, "`list` should not be NULL");
+  _dbl_list_validate(list, item_size);
+
+  GenericNode *output = NULL;
+
+  if (list->node_count == 0) {
+    goto RETURN_I32_LIST_POP_BACK;
+  }
+
+  output = list->last;
+
+  if (list->node_count == 1) {
+    *list = (GenericList){.magic = WAPP_DBL_LIST_MAGIC, .item_size = item_size};
+    goto RETURN_I32_LIST_POP_BACK;
+  }
+
+  --(list->node_count);
+  list->last = output->prev;
+
+  output->prev = output->next = NULL;
+
+RETURN_I32_LIST_POP_BACK:
+  return output;
+}
+
+GenericNode *_dbl_list_remove(GenericList *list, u64 index, u64 item_size) {
+  wapp_debug_assert(list != NULL, "`list` should not be NULL");
+  _dbl_list_validate(list, item_size);
+
+  GenericNode *output = NULL;
+
+  if (index == 0) {
+    output = _dbl_list_pop_front(list, item_size);
+    goto RETURN_I32_LIST_REMOVE;
+  } else if (index == list->node_count) {
+    output = _dbl_list_pop_back(list, item_size);
+    goto RETURN_I32_LIST_REMOVE;
+  }
+
+  output = _dbl_list_get(list, index, item_size);
+  if (!output) {
+    goto RETURN_I32_LIST_REMOVE;
+  }
+
+  output->prev->next = output->next;
+  output->next->prev = output->prev;
+
+  --(list->node_count);
+
+  output->prev = output->next = NULL;
+
+RETURN_I32_LIST_REMOVE:
+  return output;
+}
+
+void _dbl_list_empty(GenericList *list, u64 item_size) {
+  wapp_debug_assert(list != NULL, "`list` should not be NULL");
+  _dbl_list_validate(list, item_size);
+
+  u64 count = list->node_count;
+  for (u64 i = 0; i < count; ++i) {
+    _dbl_list_pop_back(list, item_size);
+  }
+}
+
+wapp_intern GenericList _node_to_list(GenericNode *node, u64 item_size) {
+  GenericList output = {
+    .magic      = WAPP_DBL_LIST_MAGIC,
+    .first      = node,
+    .last       = node,
+    .node_count = 1,
+    .item_size  = item_size,
+  };
+
+  while (output.first->prev != NULL) {
+    output.first = output.first->prev;
+    ++(output.node_count);
+  }
+
+  while (output.last->next != NULL) {
+    output.last = output.last->next;
+    ++(output.node_count);
+  }
+
+  return output;
+}
+
+wapp_intern void _dbl_list_validate(const GenericList *list, u64 item_size) {
+  wapp_runtime_assert(list->magic == WAPP_DBL_LIST_MAGIC, "`list` isn't a valid wapp list type");
+  wapp_runtime_assert(list->item_size == item_size, "Invalid item provided");
+}
+
+wapp_intern void _dbl_list_node_validate(const GenericList *list, const GenericNode *node, u64 item_size) {
+  wapp_runtime_assert(node->magic == WAPP_DBL_NODE_MAGIC, "`node` isn't a valid wapp node type");
+  wapp_runtime_assert(list->item_size == node->item_size, "Mismatched `list` and `node` types");
+  wapp_runtime_assert(node->item_size == item_size, "Invalid item provided");
+}

src/base/dbl_list/dbl_list.h

@@ -0,0 +1,110 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef DBL_LIST_H
+#define DBL_LIST_H
+
+#include "../mem/allocator/mem_allocator.h"
+#include "../../common/aliases/aliases.h"
+#include "../../common/platform/platform.h"
+
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#define WAPP_DBL_LIST_MAGIC (u64)0x57415f444c5354
+#define WAPP_DBL_NODE_MAGIC (u64)0x57415f444e44
+
+#define WAPP_DEF_DBL_LIST_TYPE(T, NODE_NAME, LIST_NAME) \
+  typedef struct NODE_NAME NODE_NAME;                   \
+  struct NODE_NAME {                                    \
+    u64 magic;                                          \
+    T *item;                                            \
+    NODE_NAME *prev;                                    \
+    NODE_NAME *next;                                    \
+    u64 item_size;                                      \
+  };                                                    \
+                                                        \
+  typedef struct {                                      \
+    u64 magic;                                          \
+    NODE_NAME *first;                                   \
+    NODE_NAME *last;                                    \
+    u64 node_count;                                     \
+    u64 item_size;                                      \
+  } LIST_NAME
+
+#ifdef WAPP_PLATFORM_CPP
+#define wapp_dbl_list(ELEM_TYPE, LIST_TYPE)                                     \
+  LIST_TYPE{WAPP_DBL_LIST_MAGIC, nullptr, nullptr, 0, sizeof(ELEM_TYPE)}
+#define wapp_dbl_list_node(ELEM_TYPE, NODE_TYPE, ELEM_PTR)                      \
+  NODE_TYPE{WAPP_DBL_NODE_MAGIC, ELEM_PTR, nullptr, nullptr, sizeof(ELEM_TYPE)}
+#else
+#define wapp_dbl_list(ELEM_TYPE, LIST_TYPE) (                                                 \
+  (LIST_TYPE){.magic = WAPP_DBL_LIST_MAGIC, .item_size = sizeof(ELEM_TYPE)}                   \
+)
+#define wapp_dbl_list_node(ELEM_TYPE, NODE_TYPE, ELEM_PTR) (                                  \
+  (NODE_TYPE){.magic = WAPP_DBL_NODE_MAGIC, .item = ELEM_PTR, .item_size = sizeof(ELEM_TYPE)} \
+)
+#endif // !WAPP_PLATFORM_CPP
+
+#define wapp_dbl_list_alloc(ELEM_TYPE, LIST_TYPE, ALLOCATOR)                                        \
+  (LIST_TYPE *)_dbl_list_alloc(ALLOCATOR, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_node_alloc(ELEM_TYPE, NODE_TYPE, ALLOCATOR)                                   \
+  (NODE_TYPE *)_dbl_list_node_alloc(ALLOCATOR, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_get(ELEM_TYPE, NODE_TYPE, LIST_PTR, ELEM_INDEX)                               \
+  (NODE_TYPE *)_dbl_list_get((GenericList *)LIST_PTR, ELEM_INDEX, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_push_front(ELEM_TYPE, LIST_PTR, NODE_PTR)                                     \
+  _dbl_list_push_front((GenericList *)LIST_PTR, (GenericNode *)NODE_PTR, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_push_back(ELEM_TYPE, LIST_PTR, NODE_PTR)                                      \
+  _dbl_list_push_back((GenericList *)LIST_PTR, (GenericNode *)NODE_PTR, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_insert(ELEM_TYPE, LIST_PTR, NODE_PTR, ELEM_INDEX)                             \
+  _dbl_list_insert((GenericList *)LIST_PTR, (GenericNode *)NODE_PTR, ELEM_INDEX, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_pop_front(ELEM_TYPE, NODE_TYPE, LIST_PTR)                                     \
+  (NODE_TYPE *)_dbl_list_pop_front((GenericList *)LIST_PTR, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_pop_back(ELEM_TYPE, NODE_TYPE, LIST_PTR)                                      \
+  (NODE_TYPE *)_dbl_list_pop_back((GenericList *)LIST_PTR, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_remove(ELEM_TYPE, NODE_TYPE, LIST_PTR, ELEM_INDEX)                            \
+  (NODE_TYPE *)_dbl_list_remove((GenericList *)LIST_PTR, ELEM_INDEX, sizeof(ELEM_TYPE))
+#define wapp_dbl_list_empty(ELEM_TYPE, LIST_PTR)                                                    \
+  _dbl_list_empty((GenericList *)LIST_PTR, sizeof(ELEM_TYPE))
+
+WAPP_DEF_DBL_LIST_TYPE(void, GenericNode, GenericList);
+
+GenericList *_dbl_list_alloc(const Allocator *allocator, u64 item_size);
+GenericNode *_dbl_list_node_alloc(const Allocator *allocator, u64 item_size);
+GenericNode *_dbl_list_get(const GenericList *list, u64 index, u64 item_size);
+void         _dbl_list_push_front(GenericList *list, GenericNode *node, u64 item_size);
+void         _dbl_list_push_back(GenericList *list, GenericNode *node, u64 item_size);
+void         _dbl_list_insert(GenericList *list, GenericNode *node, u64 index, u64 item_size);
+GenericNode *_dbl_list_pop_front(GenericList *list, u64 item_size);
+GenericNode *_dbl_list_pop_back(GenericList *list, u64 item_size);
+GenericNode *_dbl_list_remove(GenericList *list, u64 index, u64 item_size);
+void         _dbl_list_empty(GenericList *list, u64 item_size);
+
+// Base list types
+typedef struct str8 Str8;
+
+WAPP_DEF_DBL_LIST_TYPE(void *, VoidPtrNode, VoidPtrList);
+WAPP_DEF_DBL_LIST_TYPE(c8    , C8Node     , C8List);
+WAPP_DEF_DBL_LIST_TYPE(c16   , C16Node    , C16List);
+WAPP_DEF_DBL_LIST_TYPE(c32   , C32Node    , C32List);
+WAPP_DEF_DBL_LIST_TYPE(u8    , U8Node     , U8List);
+WAPP_DEF_DBL_LIST_TYPE(u16   , U16Node    , U16List);
+WAPP_DEF_DBL_LIST_TYPE(u32   , U32Node    , U32List);
+WAPP_DEF_DBL_LIST_TYPE(u64   , U64Node    , U64List);
+WAPP_DEF_DBL_LIST_TYPE(b8    , B8Node     , B8List);
+WAPP_DEF_DBL_LIST_TYPE(i8    , I8Node     , I8List);
+WAPP_DEF_DBL_LIST_TYPE(i16   , I16Node    , I16List);
+WAPP_DEF_DBL_LIST_TYPE(i32   , I32Node    , I32List);
+WAPP_DEF_DBL_LIST_TYPE(i64   , I64Node    , I64List);
+WAPP_DEF_DBL_LIST_TYPE(f32   , F32Node    , F32List);
+WAPP_DEF_DBL_LIST_TYPE(f64   , F64Node    , F64List);
+WAPP_DEF_DBL_LIST_TYPE(f128  , F128Node   , F128List);
+WAPP_DEF_DBL_LIST_TYPE(uptr  , UptrNode   , UptrList);
+WAPP_DEF_DBL_LIST_TYPE(iptr  , IptrNode   , IptrList);
+WAPP_DEF_DBL_LIST_TYPE(Str8  , Str8Node   , Str8List);
+
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#endif // !DBL_LIST_H

src/base/mem/allocator/mem_allocator.c

@@ -1,8 +1,8 @@
 // vim:fileencoding=utf-8:foldmethod=marker
 
 #include "mem_allocator.h"
-#include "../../common/aliases/aliases.h"
+#include "../../../common/aliases/aliases.h"
-#include "../../common/assert/assert.h"
+#include "../../../common/assert/assert.h"
 #include <stdlib.h>
 
 void *wapp_mem_allocator_alloc(const Allocator *allocator, u64 size) {

src/base/mem/allocator/mem_allocator.h

@@ -3,8 +3,8 @@
 #ifndef MEM_ALLOCATOR_H
 #define MEM_ALLOCATOR_H
 
-#include "../../common/aliases/aliases.h"
+#include "../../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
+#include "../../../common/platform/platform.h"
 #include <string.h>
 
 #ifdef WAPP_PLATFORM_CPP

src/base/strings/str8/str8.c

@@ -2,9 +2,9 @@
 
 #include "str8.h"
 #include "../../array/array.h"
+#include "../../mem/allocator/mem_allocator.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>
@@ -246,8 +246,15 @@ void wapp_str8_to_lower(Str8 *dst, Str8RO *src) {
   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)));
+  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
+  // MSVC Spectre mitigation warnings
+  u64 index  = 0;
+  b8 running = true;
+  while (running) {
+    wapp_str8_set(dst, index, (u8)tolower(wapp_str8_get(src, index)));
+    ++index;
+    running = index < src->size;
   }
 }
 
@@ -256,20 +263,27 @@ void wapp_str8_to_upper(Str8 *dst, Str8RO *src) {
   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)));
+  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
+  // MSVC Spectre mitigation warnings
+  u64 index  = 0;
+  b8 running = true;
+  while (running) {
+    wapp_str8_set(dst, index, (u8)toupper(wapp_str8_get(src, index)));
+    ++index;
+    running = index < src->size;
   }
 }
 
-void wapp_str8_from_bytes(Str8 *dst, const u8 *src_byte_array) {
+void wapp_str8_from_bytes(Str8 *dst, const U8Array *src) {
-  wapp_debug_assert(src_byte_array != NULL && dst != NULL, "`dst` and `src` should not be NULL");
+  wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
 
-  u64 size = wapp_array_count(u8, src_byte_array) * wapp_array_item_size(u8, src_byte_array);
+  u64 size = src->count * src->item_size;
 
   wapp_debug_assert(dst->capacity >= size, "`dst` does not have enough capacity");
 
   dst->size = size;
-  memcpy(dst->buf, src_byte_array, size);
+  memcpy(dst->buf, src->items, size);
 }
 
 i64 wapp_str8_find(Str8RO *str, Str8RO substr) {
@@ -319,14 +333,14 @@ i64 wapp_str8_rfind(Str8RO *str, Str8RO substr) {
 Str8List *wapp_str8_split_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits) {
   wapp_debug_assert(allocator != NULL && str != NULL && delimiter != NULL, "`allocator`, `str` and `delimiter` should not be NULL");
 
-  Str8List *output = wapp_mem_allocator_alloc(allocator, sizeof(Str8List));
+  Str8List *output = wapp_dbl_list_alloc(Str8, Str8List, allocator);
 
   if (delimiter->size > str->size) {
     Str8 *full     = wapp_str8_alloc_str8(allocator, str);
-    Str8Node *node = wapp_mem_allocator_alloc(allocator, sizeof(Str8Node));
+    Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
     if (node) {
       node->item = full;
-      wapp_str8_list_push_back(output, node);
+      wapp_dbl_list_push_back(Str8, output, node);
     }
 
     goto RETURN_STR8_SPLIT;
@@ -344,10 +358,10 @@ Str8List *wapp_str8_split_with_max(const Allocator *allocator, Str8RO *str, Str8
     }
 
     before_str     = wapp_str8_alloc_substr(allocator, str, start, start + end);
-    Str8Node *node = wapp_mem_allocator_alloc(allocator, sizeof(Str8Node));
+    Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
     if (node && before_str) {
       node->item = before_str;
-      wapp_str8_list_push_back(output, node);
+      wapp_dbl_list_push_back(Str8, output, node);
     }
 
     wapp_mem_allocator_free(allocator, (void **)&rest, sizeof(Str8));
@@ -359,10 +373,10 @@ Str8List *wapp_str8_split_with_max(const Allocator *allocator, Str8RO *str, Str8
 
   // Ensure the last part of the string after the delimiter is added to the list
   rest           = wapp_str8_alloc_substr(allocator, str, start, str->size);
-  Str8Node *node = wapp_mem_allocator_alloc(allocator, sizeof(Str8Node));
+  Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
   if (node && rest) {
     node->item = rest;
-    wapp_str8_list_push_back(output, node);
+    wapp_dbl_list_push_back(Str8, output, node);
   }
 
 RETURN_STR8_SPLIT:
@@ -372,14 +386,14 @@ RETURN_STR8_SPLIT:
 Str8List *wapp_str8_rsplit_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits) {
   wapp_debug_assert(allocator != NULL && str != NULL && delimiter != NULL, "`allocator`, `str` and `delimiter` should not be NULL");
 
-  Str8List *output = wapp_mem_allocator_alloc(allocator, sizeof(Str8List));
+  Str8List *output = wapp_dbl_list_alloc(Str8, Str8List, allocator);
 
   if (delimiter->size > str->size) {
     Str8 *full     = wapp_str8_alloc_str8(allocator, str);
-    Str8Node *node = wapp_mem_allocator_alloc(allocator, sizeof(Str8Node));
+    Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
     if (node && full) {
       node->item = full;
-      wapp_str8_list_push_back(output, node);
+      wapp_dbl_list_push_back(Str8, output, node);
     }
 
     goto RETURN_STR8_SPLIT;
@@ -396,10 +410,10 @@ Str8List *wapp_str8_rsplit_with_max(const Allocator *allocator, Str8RO *str, Str
     }
 
     after_str     = wapp_str8_alloc_substr(allocator, rest, end + delimiter->size, str->size);
-    Str8Node *node = wapp_mem_allocator_alloc(allocator, sizeof(Str8Node));
+    Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
     if (node) {
       node->item = after_str;
-      wapp_str8_list_push_front(output, node);
+      wapp_dbl_list_push_front(Str8, output, node);
     }
 
     wapp_mem_allocator_free(allocator, (void **)&rest, sizeof(Str8));
@@ -409,10 +423,10 @@ Str8List *wapp_str8_rsplit_with_max(const Allocator *allocator, Str8RO *str, Str
   }
 
   rest           = wapp_str8_alloc_substr(allocator, str, 0, rest->size);
-  Str8Node *node = wapp_mem_allocator_alloc(allocator, sizeof(Str8Node));
+  Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
   if (node && rest) {
     node->item = rest;
-    wapp_str8_list_push_front(output, node);
+    wapp_dbl_list_push_front(Str8, output, node);
   }
 
 RETURN_STR8_SPLIT:
@@ -431,7 +445,7 @@ Str8 *wapp_str8_join(const Allocator *allocator, const Str8List *list, Str8RO *d
   u64 node_index = 0;
   b8 running    = node_index < list->node_count;
   while (running) {
-    node = wapp_str8_list_get(list, node_index);
+    node = wapp_dbl_list_get(Str8, Str8Node, list, node_index);
     if (!node) {
         break;
     }
@@ -464,7 +478,7 @@ u64 wapp_str8_list_total_size(const Str8List *list) {
   u64 output     = 0;
   b8 running    = node_index < list->node_count;
   while (running) {
-      node = wapp_str8_list_get(list, node_index);
+      node = wapp_dbl_list_get(Str8, Str8Node, list, node_index);
       if (!node) {
           break;
       }

src/base/strings/str8/str8.h

@@ -6,9 +6,9 @@
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/assert/assert.h"
 #include "../../../common/platform/platform.h"
-#include "../../../primitives/array/array.h"
+#include "../../array/array.h"
-#include "../../../primitives/dbl_list/dbl_list.h"
+#include "../../dbl_list/dbl_list.h"
-#include "../../mem_allocator/mem_allocator.h"
+#include "../../mem/allocator/mem_allocator.h"
 #include <string.h>
 
 #ifdef WAPP_PLATFORM_CPP
@@ -37,14 +37,14 @@ typedef const Str8 Str8RO;
 #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] = {};     \
+  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] = {};                     \
+  wapp_persist c8 buf[sizeof(STRING) * 2] = {};                   \
   memcpy(buf, STRING, sizeof(STRING));                            \
   return Str8{(sizeof(STRING) - 1) * 2, sizeof(STRING) - 1, buf}; \
 }())
@@ -99,7 +99,7 @@ void wapp_str8_copy_to_cstr(char *dst, Str8RO *src, u64 dst_capacity);
 void wapp_str8_format(Str8 *dst, const char *format, ...);
 void wapp_str8_to_lower(Str8 *dst, Str8RO *src);
 void wapp_str8_to_upper(Str8 *dst, Str8RO *src);
-void wapp_str8_from_bytes(Str8 *dst, const u8 *src);
+void wapp_str8_from_bytes(Str8 *dst, const U8Array *src);
 
 /**
  * Str8 find functions
@@ -119,23 +119,31 @@ 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
+
+#include <type_traits>
+
+template <typename T>
+constexpr bool is_lvalue(T&&) {
+  return std::is_lvalue_reference<T>{};
+}
+
+#define wapp_str8_node_from_cstr(STRING) wapp_dbl_list_node(Str8, Str8Node, [&]() { \
+  wapp_persist Str8 str = wapp_str8_lit(STRING);                                    \
+  return &str;                                                                      \
+}())
+#define wapp_str8_node_from_str8(STRING) wapp_dbl_list_node(Str8, Str8Node, [&]() { \
+  if (is_lvalue(STRING)) { return &STRING; }                                        \
+                                                                                    \
+  wapp_persist Str8 str = STRING;                                                   \
+  return &str;                                                                      \
+}())
+#else
+#define wapp_str8_node_from_cstr(STRING) wapp_dbl_list_node(Str8, Str8Node, &wapp_str8_lit(STRING))
+#define wapp_str8_node_from_str8(STRING) wapp_dbl_list_node(Str8, Str8Node, &(STRING))
 #endif // !WAPP_PLATFORM_CPP
 
 #endif // !STR8_H

src/base/wapp_base.c

@@ -0,0 +1,13 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef WAPP_BASE_C
+#define WAPP_BASE_C
+
+#include "wapp_base.h"
+#include "array/array.c"
+#include "dbl_list/dbl_list.c"
+#include "mem/allocator/mem_allocator.c"
+#include "mem/utils/mem_utils.c"
+#include "strings/str8/str8.c"
+
+#endif // !WAPP_BASE_C

src/base/wapp_base.h

@@ -1,12 +1,13 @@
 // vim:fileencoding=utf-8:foldmethod=marker
 
-#ifndef WAPP_PRIMITIVES_H
+#ifndef WAPP_BASE_H
-#define WAPP_PRIMITIVES_H
+#define WAPP_BASE_H
 
 #include "dbl_list/dbl_list.h"
 #include "array/array.h"
-#include "mem_allocator/mem_allocator.h"
+#include "mem/allocator/mem_allocator.h"
+#include "mem/utils/mem_utils.h"
 #include "strings/str8/str8.h"
 #include "../common/wapp_common.h"
 
-#endif // !WAPP_PRIMITIVES_H
+#endif // !WAPP_BASE_H

src/common/aliases/aliases.h

@@ -6,7 +6,7 @@
 #include "../platform/platform.h"
 #include <stdint.h>
 
-#if WAPP_PLATFORM_C_VERSION >= WAPP_PLATFORM_C11_VERSION && !defined(WAPP_PLATFORM_APPLE)
+#if defined(WAPP_PLATFORM_C) && WAPP_PLATFORM_C_VERSION >= WAPP_PLATFORM_C11_VERSION && !defined(WAPP_PLATFORM_APPLE)
   #include <uchar.h>
 
   #if WAPP_PLATFORM_C_VERSION >= WAPP_PLATFORM_C23_VERSION
@@ -21,7 +21,7 @@
   #define c8 uint8_t
   #define c16 uint16_t
   #define c32 uint32_t
-#endif // !WAPP_PLATFORM_C11_VERSION
+#endif // !WAPP_PLATFORM_C
 
 #define u8 uint8_t
 #define u16 uint16_t

src/common/assert/assert.h

@@ -14,7 +14,12 @@ 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)
+
+#ifndef WAPP_NO_RUNTIME_ASSERT
+  #define wapp_runtime_assert(EXPR, MSG) __wapp_runtime_assert(EXPR, MSG)
+#else
+  #define wapp_runtime_assert(EXPR, MSG)
+#endif
 
 #ifdef WAPP_DEBUG_ASSERT
   #define wapp_debug_assert(EXPR, MSG) wapp_runtime_assert(EXPR, MSG)
@@ -22,16 +27,31 @@ BEGIN_C_LINKAGE
   #define wapp_debug_assert(EXPR, MSG)
 #endif
 
-#define __wapp_runtime_assert(EXPR, MSG) do {                                         \
+#ifdef WAPP_PLATFORM_WINDOWS
-  if (!(EXPR)) {                                                                      \
+#define __wapp_runtime_assert(EXPR, MSG) do {                                       \
-    fprintf(                                                                          \
+  __pragma(warning(push))                                                           \
-      stderr,                                                                         \
+  __pragma(warning(disable:4127))                                                   \
-      "%s:%d (In function `%s`): Assertion failed (%" PRIu32 ")\nDiagnostic: %s\n\n", \
+  if (!(EXPR)) {                                                                    \
-      __FILE__, __LINE__, __func__,                                                   \
+  __pragma(warning(pop))                                                            \
-      EXPR, MSG                                                                       \
+    __runtime_assert_failed(EXPR, MSG);                                             \
-    );                                                                                \
+  }                                                                                 \
-    abort();                                                                          \
+} while(false)
-  }                                                                                   \
+#else
+#define __wapp_runtime_assert(EXPR, MSG) do {                                       \
+  if (!(EXPR)) {                                                                    \
+    __runtime_assert_failed(EXPR, MSG);                                             \
+  }                                                                                 \
+} while(false)
+#endif // !WAPP_PLATFORM_WINDOWS
+
+#define __runtime_assert_failed(EXPR, MSG) do {                                     \
+  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

src/common/misc/misc_utils.h

@@ -9,10 +9,19 @@
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP
 
-#define KB(SIZE) (SIZE * 1024ull)
+#define KiB(SIZE) (((u64)SIZE) << 10)
-#define MB(SIZE) (KB(SIZE) * 1024)
+#define MiB(SIZE) (((u64)SIZE) << 20)
-#define GB(SIZE) (MB(SIZE) * 1024)
+#define GiB(SIZE) (((u64)SIZE) << 30)
-#define TB(SIZE) (GB(SIZE) * 1024)
+#define TiB(SIZE) (((u64)SIZE) << 40)
+#define PiB(SIZE) (((u64)SIZE) << 50)
+#define EiB(SIZE) (((u64)SIZE) << 60)
+
+#define KB(SIZE) (((u64)SIZE) * 1000llu)
+#define MB(SIZE) (KB(SIZE)    * 1000llu)
+#define GB(SIZE) (MB(SIZE)    * 1000llu)
+#define TB(SIZE) (GB(SIZE)    * 1000llu)
+#define PB(SIZE) (TB(SIZE)    * 1000llu)
+#define EB(SIZE) (PB(SIZE)    * 1000llu)
 
 #define wapp_misc_utils_padding_size(SIZE) u8 reserved_padding[sizeof(void *) - ((SIZE) % sizeof(void *))]
 
@@ -39,18 +48,13 @@ BEGIN_C_LINKAGE
 )
 
 #ifdef WAPP_PLATFORM_CPP
-#define wapp_misc_utils_va_args_count(T, ...) va_args_count<T>(__VA_ARGS__)
+END_C_LINKAGE
+
+#include <tuple>
+
+#define wapp_misc_utils_va_args_count(T, ...) (std::tuple_size<decltype(std::make_tuple(__VA_ARGS__))>::value)
 #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/core/wapp_core.c

@@ -1,23 +0,0 @@
-// 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"
-#include "os/shell/commander/posix/commander_posix.c"
-#include "os/shell/commander/win/commander_win.c"
-#include "os/shell/commander/commander.c"
-#include "os/cpath/cpath.c"
-#include "os/mem/posix/mem_os_posix.c"
-#include "os/mem/win/mem_os_win.c"
-#include "os/mem/mem_os.c"
-#include "mem/utils/mem_utils.c"
-#include "mem/arena/mem_arena.c"
-#include "mem/arena/mem_arena_allocator.c"
-#include "../primitives/wapp_primitives.c"
-
-#endif // !WAPP_CORE_C

src/core/wapp_core.h

@@ -1,23 +0,0 @@
-// 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"
-#include "os/shell/commander/commander_output.h"
-#include "os/shell/utils/shell_utils.h"
-#include "os/cpath/cpath.h"
-#include "os/mem/posix/mem_os_posix.h"
-#include "os/mem/win/mem_os_win.h"
-#include "os/mem/mem_os_ops.h"
-#include "os/mem/mem_os.h"
-#include "mem/utils/mem_utils.h"
-#include "mem/arena/mem_arena_allocator.h"
-#include "mem/arena/mem_arena.h"
-#include "../common/wapp_common.h"
-#include "../primitives/wapp_primitives.h"
-
-#endif // !WAPP_CORE_H

src/os/allocators/arena/mem_arena.c

@@ -1,11 +1,11 @@
 // vim:fileencoding=utf-8:foldmethod=marker
 
 #include "mem_arena.h"
-#include "../utils/mem_utils.h"
+#include "../../mem/mem_os.h"
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/assert/assert.h"
 #include "../../../common/misc/misc_utils.h"
-#include "../../os/mem/mem_os.h"
+#include "../../../base/mem/utils/mem_utils.h"
 #include <stdlib.h>
 #include <string.h>
 
@@ -15,7 +15,7 @@
 #define DEFAULT_ALIGNMENT (2 * sizeof(void *))
 #endif /* ifndef DEFAULT_ALIGNMENT */
 
-#define ARENA_MINIMUM_CAPACITY KB(16) // Allocate minimum of 4 pages
+#define ARENA_MINIMUM_CAPACITY KiB(16) // Allocate minimum of 4 pages
 
 struct arena {
   u8 *buf;

src/os/allocators/arena/mem_arena.h

@@ -3,9 +3,9 @@
 #ifndef MEM_ARENA_H
 #define MEM_ARENA_H
 
+#include "../../mem/mem_os.h"
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/platform/platform.h"
-#include "../../os/mem/mem_os.h"
 
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE

src/os/allocators/arena/mem_arena_allocator.c

@@ -2,8 +2,8 @@
 
 #include "mem_arena_allocator.h"
 #include "mem_arena.h"
+#include "../../mem/mem_os.h"
 #include "../../../common/aliases/aliases.h"
-#include "../../os/mem/mem_os.h"
 
 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);

src/os/allocators/arena/mem_arena_allocator.h

@@ -3,10 +3,10 @@
 #ifndef MEM_ARENA_ALLOCATOR_H
 #define MEM_ARENA_ALLOCATOR_H
 
+#include "../../mem/mem_os.h"
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/platform/platform.h"
-#include "../../../primitives/mem_allocator/mem_allocator.h"
+#include "../../../base/mem/allocator/mem_allocator.h"
-#include "../../os/mem/mem_os.h"
 
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE

src/os/cpath/cpath.c

@@ -1,12 +1,12 @@
 // vim:fileencoding=utf-8:foldmethod=marker
 
 #include "cpath.h"
-#include "../../../common/aliases/aliases.h"
+#include "../allocators/arena/mem_arena_allocator.h"
-#include "../../../common/misc/misc_utils.h"
+#include "../../common/aliases/aliases.h"
-#include "../../mem/arena/mem_arena_allocator.h"
+#include "../../common/misc/misc_utils.h"
-#include "../../../primitives/dbl_list/dbl_list.h"
+#include "../../base/dbl_list/dbl_list.h"
-#include "../../../primitives/mem_allocator/mem_allocator.h"
+#include "../../base/mem/allocator/mem_allocator.h"
-#include "../../../primitives/strings/str8/str8.h"
+#include "../../base/strings/str8/str8.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
@@ -29,7 +29,7 @@ u32 wapp_cpath_join_path(Str8 *dst, const Str8List *parts) {
   }
 
   // Handle first node
-  const Str8Node *first_node = wapp_str8_list_get(parts, 0);
+  const Str8Node *first_node = wapp_dbl_list_get(Str8, Str8Node, parts, 0);
   wapp_str8_copy_str8_capped(dst, first_node->item);
 
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
@@ -87,7 +87,7 @@ Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels) {
     goto RETURN_DIRUP;
   }
 
-  Allocator tmp_arena = wapp_mem_arena_allocator_init(MB(8));
+  Allocator tmp_arena = wapp_mem_arena_allocator_init(MiB(8));
   if (wapp_mem_allocator_invalid(&tmp_arena)) {
     goto RETURN_DIRUP;
   }
@@ -106,7 +106,7 @@ Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels) {
     wapp_str8_push_back(output, absolute ? WAPP_PATH_SEP : '.');
   } else {
     for (u64 i = 0; i < levels; ++i) {
-      wapp_str8_list_pop_back(parts);
+      wapp_dbl_list_pop_back(Str8, Str8Node, parts);
     }
     
     u64 alignment  = sizeof(void *) * 2;

src/os/cpath/cpath.h

@@ -3,10 +3,10 @@
 #ifndef CPATH_H
 #define CPATH_H
 
-#include "../../../common/aliases/aliases.h"
+#include "../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
+#include "../../common/platform/platform.h"
-#include "../../../primitives/mem_allocator/mem_allocator.h"
+#include "../../base/mem/allocator/mem_allocator.h"
-#include "../../../primitives/strings/str8/str8.h"
+#include "../../base/strings/str8/str8.h"
 
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
@@ -17,6 +17,7 @@ BEGIN_C_LINKAGE
 #define WAPP_PATH_SEP '/'
 #define WAPP_PATH_MAX PATH_MAX
 #elif defined(WAPP_PLATFORM_WINDOWS)
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #define WAPP_PATH_SEP '\\'
 #define WAPP_PATH_MAX MAX_PATH

src/os/file/file.c

@@ -1,11 +1,11 @@
 // vim:fileencoding=utf-8:foldmethod=marker
 
 #include "file.h"
-#include "../os/cpath/cpath.h"
+#include "../cpath/cpath.h"
 #include "../../common/assert/assert.h"
 #include "../../common/aliases/aliases.h"
-#include "../../primitives/array/array.h"
+#include "../../base/array/array.h"
-#include "../../primitives/strings/str8/str8.h"
+#include "../../base/strings/str8/str8.h"
 #include <stdio.h>
 
 File *wapp_file_open(Str8RO *filepath, FileAccessMode mode) {
@@ -43,7 +43,8 @@ u64 wapp_file_get_current_position(File *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);
+  // TODO (Abdelrahman): Revisit conversion to long
+  return fseek(file, (long)offset, origin);
 }
 
 u64 wapp_file_get_length(File *file) {
@@ -61,13 +62,14 @@ u64 wapp_file_get_length(File *file) {
   return output;
 }
 
-u64 wapp_file_read(GenericArray *dst, File *file, u64 item_count) {
+u64 wapp_file_read(GenericArray *dst_buf, File *file, u64 item_count) {
-  wapp_debug_assert(dst != NULL && dst->items != NULL && file != NULL,
+  wapp_debug_assert(dst_buf != NULL && file != NULL,
-                    "`dst`, `dst->items` and `file` should not be NULL.");
+                    "`dst_buf` and `file` should not be NULL.");
 
   u64 file_length       = wapp_file_get_length(file);
-  u64 dst_byte_capacity = dst->header.item_size * dst->header.capacity;
+  u64 item_size         = dst_buf->item_size;
-  u64 req_byte_count    = item_count * dst->header.item_size;
+  u64 dst_byte_capacity = dst_buf->capacity * item_size;
+  u64 req_byte_count    = item_count * item_size;
   u64 copy_byte_count   = 0;
 
   if (req_byte_count <= file_length && req_byte_count <= dst_byte_capacity) {
@@ -76,20 +78,24 @@ u64 wapp_file_read(GenericArray *dst, File *file, u64 item_count) {
     copy_byte_count = file_length <= dst_byte_capacity ? file_length : dst_byte_capacity;
   }
 
-  dst->header.count = fread(dst->items, sizeof(u8), copy_byte_count, file) / dst->header.item_size;
+  u64 count = fread(dst_buf->items, sizeof(u8), copy_byte_count, file);
+  if (ferror(file)) { return 0; }
 
-  return dst->header.count;
+  dst_buf->count = count / item_size;
+
+  return dst_buf->count;
 }
 
-u64 wapp_file_write(const GenericArray *src, File *file, u64 item_count) {
+u64 wapp_file_write(const GenericArray *src_buf, File *file, u64 item_count) {
-  wapp_debug_assert(src != NULL && src->items != NULL && file != NULL,
+  wapp_debug_assert(src_buf != NULL && file != NULL,
-                    "`src`, `src->items` and `file` should not be NULL.");
+                    "`src_buf` and `file` should not be NULL.");
 
-  u64 src_byte_count = src->header.count * src->header.item_size;
+  u64 item_size      = src_buf->item_size;
-  u64 req_byte_count = item_count * src->header.item_size;
+  u64 src_byte_count = src_buf->count * item_size;
+  u64 req_byte_count = item_count * item_size;
   u64 to_copy        = req_byte_count <= src_byte_count ? req_byte_count : src_byte_count;
 
-  return fwrite(src->items, sizeof(u8), to_copy, file);
+  return fwrite(src_buf->items, sizeof(u8), to_copy, file);
 }
 
 i32 wapp_file_flush(File *file) {

src/os/file/file.h

@@ -4,29 +4,13 @@
 #define FILE_H
 
 #include "../../common/aliases/aliases.h"
-#include "../../primitives/array/array.h"
+#include "../../base/strings/str8/str8.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 {
@@ -60,8 +44,8 @@ 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_read(GenericArray *dst_buf, File *file, u64 item_count);
-u64   wapp_file_write(const GenericArray *src, File *file, u64 item_count);
+u64   wapp_file_write(const GenericArray *src_buf, File *file, u64 item_count);
 i32   wapp_file_flush(File *file);
 i32   wapp_file_close(File *file);
 

src/os/mem/mem_os.c

@@ -2,8 +2,8 @@
 
 #include "mem_os.h"
 #include "mem_os_ops.h"
-#include "../../../common/aliases/aliases.h"
+#include "../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
+#include "../../common/platform/platform.h"
 #include <assert.h>
 #include <string.h>
 

src/os/mem/mem_os.h

@@ -3,8 +3,8 @@
 #ifndef MEM_OS_H
 #define MEM_OS_H
 
-#include "../../../common/aliases/aliases.h"
+#include "../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
+#include "../../common/platform/platform.h"
 
 #include "mem_os_ops.h"
 

src/os/mem/mem_os_ops.h

@@ -3,7 +3,7 @@
 #ifndef MEM_OS_OPS_H
 #define MEM_OS_OPS_H
 
-#include "../../../common/platform/platform.h"
+#include "../../common/platform/platform.h"
 
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE

src/os/mem/posix/mem_os_posix.c

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

src/os/mem/posix/mem_os_posix.h

@@ -3,7 +3,7 @@
 #ifndef MEM_OS_POSIX_H
 #define MEM_OS_POSIX_H
 
-#include "../../../../common/platform/platform.h"
+#include "../../../common/platform/platform.h"
 
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE

src/os/mem/win/mem_os_win.c

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

src/os/mem/win/mem_os_win.h

@@ -3,7 +3,7 @@
 #ifndef MEM_OS_WIN_H
 #define MEM_OS_WIN_H
 
-#include "../../../../common/platform/platform.h"
+#include "../../../common/platform/platform.h"
 
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE

src/os/shell/commander/commander.c

@@ -3,12 +3,12 @@
 #include "commander.h"
 #include "commander_output.h"
 #include "../utils/shell_utils.h"
-#include "../../../mem/arena/mem_arena_allocator.h"
+#include "../../allocators/arena/mem_arena_allocator.h"
-#include "../../../../common/aliases/aliases.h"
+#include "../../../common/aliases/aliases.h"
-#include "../../../../common/misc/misc_utils.h"
+#include "../../../common/misc/misc_utils.h"
-#include "../../../../primitives/dbl_list/dbl_list.h"
+#include "../../../base/dbl_list/dbl_list.h"
-#include "../../../../primitives/mem_allocator/mem_allocator.h"
+#include "../../../base/mem/allocator/mem_allocator.h"
-#include "../../../../primitives/strings/str8/str8.h"
+#include "../../../base/strings/str8/str8.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,7 +25,7 @@ CMDResult wapp_shell_commander_execute(CMDOutHandling out_handling, Str8 *out_bu
     return CMD_NO_EXIT(SHELL_ERR_INVALID_ARGS);
   }
 
-  Allocator arena = wapp_mem_arena_allocator_init(KB(500));
+  Allocator arena = wapp_mem_arena_allocator_init(KiB(500));
 
   Str8 *cmd_str = wapp_str8_join(&arena, cmd, &wapp_str8_lit_ro(" "));
   if (!cmd_str) {

src/os/shell/commander/commander.h

@@ -4,9 +4,9 @@
 #define COMMANDER_H
 
 #include "commander_output.h"
-#include "../../../../common/aliases/aliases.h"
+#include "../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
+#include "../../../common/platform/platform.h"
-#include "../../../../primitives/strings/str8/str8.h"
+#include "../../../base/strings/str8/str8.h"
 #include <stdio.h>
 #include <stdlib.h>
 

src/os/shell/commander/commander_output.h

@@ -3,8 +3,8 @@
 #ifndef COMMANDER_OUTPUT_H
 #define COMMANDER_OUTPUT_H
 
-#include "../../../../common/aliases/aliases.h"
+#include "../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
+#include "../../../common/platform/platform.h"
 
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE

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

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

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

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

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

@@ -1,8 +1,8 @@
 // vim:fileencoding=utf-8:foldmethod=marker
 
-#include "../../../../../common/aliases/aliases.h"
+#include "../../../../common/aliases/aliases.h"
-#include "../../../../../common/platform/platform.h"
+#include "../../../../common/platform/platform.h"
-#include "../../../../../primitives/strings/str8/str8.h"
+#include "../../../../base/strings/str8/str8.h"
 
 #ifdef WAPP_PLATFORM_POSIX
 

src/os/shell/termcolour/termcolour.c

@@ -2,7 +2,7 @@
 
 #include "termcolour.h"
 #include "terminal_colours.h"
-#include "../../../../primitives/strings/str8/str8.h"
+#include "../../../base/strings/str8/str8.h"
 
 void wapp_shell_termcolour_print_text(Str8RO *text, TerminalColour colour) {
   if (colour < WAPP_TERM_COLOUR_FG_BLACK || colour > WAPP_TERM_COLOUR_FG_BR_WHITE) {

src/os/shell/termcolour/termcolour.h

@@ -4,9 +4,9 @@
 #define TERM_COLOUR_H
 
 #include "terminal_colours.h"
-#include "../../../../common/aliases/aliases.h"
+#include "../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
+#include "../../../common/platform/platform.h"
-#include "../../../../primitives/strings/str8/str8.h"
+#include "../../../base/strings/str8/str8.h"
 
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE

src/os/shell/termcolour/terminal_colours.h

@@ -3,8 +3,8 @@
 #ifndef TERMINAL_COLOURS_H
 #define TERMINAL_COLOURS_H
 
-#include "../../../../common/aliases/aliases.h"
+#include "../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
+#include "../../../common/platform/platform.h"
 
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE

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

@@ -1,8 +1,8 @@
 // vim:fileencoding=utf-8:foldmethod=marker
 
-#include "../../../../../common/aliases/aliases.h"
+#include "../../../../common/aliases/aliases.h"
-#include "../../../../../common/platform/platform.h"
+#include "../../../../common/platform/platform.h"
-#include "../../../../../primitives/strings/str8/str8.h"
+#include "../../../../base/strings/str8/str8.h"
 
 #ifdef WAPP_PLATFORM_WINDOWS
 

src/os/shell/utils/shell_utils.h

@@ -3,8 +3,8 @@
 #ifndef SHELL_UTILS_H
 #define SHELL_UTILS_H
 
-#include "../../../../common/aliases/aliases.h"
+#include "../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
+#include "../../../common/platform/platform.h"
 #include <stdio.h>
 
 #ifdef WAPP_PLATFORM_CPP

src/os/wapp_os.c

@@ -0,0 +1,22 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef WAPP_OS_C
+#define WAPP_OS_C
+
+#include "wapp_os.h"
+#include "file/file.c"
+#include "shell/termcolour/posix/termcolour_posix.c"
+#include "shell/termcolour/win/termcolour_win.c"
+#include "shell/termcolour/termcolour.c"
+#include "shell/commander/posix/commander_posix.c"
+#include "shell/commander/win/commander_win.c"
+#include "shell/commander/commander.c"
+#include "cpath/cpath.c"
+#include "allocators/arena/mem_arena.c"
+#include "allocators/arena/mem_arena_allocator.c"
+#include "mem/posix/mem_os_posix.c"
+#include "mem/win/mem_os_win.c"
+#include "mem/mem_os.c"
+#include "../base/wapp_base.c"
+
+#endif // !WAPP_OS_C

src/os/wapp_os.h

@@ -0,0 +1,22 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef WAPP_CORE_H
+#define WAPP_CORE_H
+
+#include "file/file.h"
+#include "shell/termcolour/termcolour.h"
+#include "shell/termcolour/terminal_colours.h"
+#include "shell/commander/commander.h"
+#include "shell/commander/commander_output.h"
+#include "shell/utils/shell_utils.h"
+#include "cpath/cpath.h"
+#include "allocators/arena/mem_arena.h"
+#include "allocators/arena/mem_arena_allocator.h"
+#include "mem/posix/mem_os_posix.h"
+#include "mem/win/mem_os_win.h"
+#include "mem/mem_os_ops.h"
+#include "mem/mem_os.h"
+#include "../common/wapp_common.h"
+#include "../base/wapp_base.h"
+
+#endif // !WAPP_CORE_H

src/primitives/array/array.c

@@ -1,226 +0,0 @@
-#include "./array.h"
-#include "../../common/assert/assert.h"
-#include "../mem_allocator/mem_allocator.h"
-#include "../../common/misc/misc_utils.h"
-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
-#include <stddef.h>
-
-#define _array_header(DATA_PTR) (ArrayHeader *)((u8 *)DATA_PTR - sizeof(ArrayHeader))
-
-u64 _array_count(u8 *array, u64 item_size) {
-  wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-  ArrayHeader *arr_header = _array_header(array);
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == arr_header->magic, "`array` is not a valid wapp array");
-  wapp_runtime_assert(item_size == arr_header->item_size, "Invalid item type provided");
-
-  return arr_header->count;
-}
-
-u64 _array_capacity(u8 *array, u64 item_size) {
-  wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-  ArrayHeader *arr_header = _array_header(array);
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == arr_header->magic, "`array` is not a valid wapp array");
-  wapp_runtime_assert(item_size == arr_header->item_size, "Invalid item type provided");
-
-  return arr_header->capacity;
-}
-
-u64 _array_item_size(u8 *array, u64 item_size) {
-  wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-  ArrayHeader *arr_header = _array_header(array);
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == arr_header->magic, "`array` is not a valid wapp array");
-  wapp_runtime_assert(item_size == arr_header->item_size, "Invalid item type provided");
-
-  return arr_header->item_size;
-}
-
-u8 *_array_get(u8 *array, u64 index, u64 item_size) {
-  wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-  ArrayHeader *arr_header = _array_header(array);
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == arr_header->magic, "`array` is not a valid wapp array");
-  wapp_runtime_assert(item_size == arr_header->item_size, "Invalid item type provided");
-  wapp_runtime_assert(index < arr_header->count, "`index` is out of bounds");
-
-  return array + arr_header->item_size * index;
-}
-
-void _array_set(u8 *array, u64 index, u8 *value, u64 item_size) {
-  u8 *item                = _array_get(array, index, item_size);
-  ArrayHeader *arr_header = _array_header(array);
-  memcpy((void *)item, (void *)value, arr_header->item_size);
-}
-
-void _array_append_capped(u8 *array, u8 *value, u64 item_size) {
-  wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-  ArrayHeader *arr_header = _array_header(array);
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == arr_header->magic, "`array` is not a valid wapp array");
-  wapp_runtime_assert(item_size == arr_header->item_size, "Invalid item type provided");
-
-  if (arr_header->count >= arr_header->capacity) { return; }
-
-  u64 index = (arr_header->count)++;
-  _array_set(array, index, value, item_size);
-}
-
-void _array_extend_capped(u8 *array, const u8 *other, u64 item_size) {
-  wapp_debug_assert(array != NULL && other != NULL, "`array` and `other` should not be NULL");
-
-  ArrayHeader *dst_header = _array_header(array);
-  ArrayHeader *src_header = _array_header(other);
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == dst_header->magic, "`array` is not a valid wapp array");
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == src_header->magic, "`other` is not a valid wapp array");
-  wapp_runtime_assert(item_size == dst_header->item_size && item_size == src_header->item_size, "Invalid item type provided");
-
-  u64 remaining_capacity = dst_header->capacity - dst_header->count;
-
-  u64 copy_count = src_header->count < remaining_capacity ? src_header->count : remaining_capacity;
-  u8 *dst_ptr = array + dst_header->count * dst_header->item_size;
-  memcpy((void *)dst_ptr, (const void *)other, copy_count * src_header->item_size);
-  dst_header->count += copy_count;
-}
-
-void _array_copy_capped(u8 *array, const u8 *other, u64 item_size) {
-  wapp_debug_assert(array != NULL && other != NULL, "`array` and `other` should not be NULL");
-
-  ArrayHeader *dst_header = _array_header(array);
-  ArrayHeader *src_header = _array_header(other);
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == dst_header->magic, "`array` is not a valid wapp array");
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == src_header->magic, "`other` is not a valid wapp array");
-  wapp_runtime_assert(item_size == dst_header->item_size && item_size == src_header->item_size, "Invalid item type provided");
-
-  _array_clear(array, item_size);
-  u64 copy_count = src_header->count < dst_header->capacity ? src_header->count : dst_header->capacity;
-  memcpy((void *)array, (const void *)other, copy_count * src_header->item_size);
-  dst_header->count = copy_count;
-}
-
-u8 *_array_append_alloc(const Allocator *allocator, u8 *array, u8 *value, u64 item_size) {
-  wapp_debug_assert(allocator != NULL && array != NULL, "`allocator` and `array` should not be NULL");
-
-  ArrayHeader *arr_header = _array_header(array);
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == arr_header->magic, "`array` is not a valid wapp array");
-  wapp_runtime_assert(item_size == arr_header->item_size, "Invalid item type provided");
-
-  u8 *output = array;
-
-  if (arr_header->count >= arr_header->capacity) {
-    u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(arr_header->capacity * 2);
-    output           = (u8 *)_array_alloc_capacity(allocator, new_capacity, arr_header->item_size);
-    if (!output) {
-      output = array;
-      goto RETURN_ARRAY_APPEND_ALLOC;
-    }
-    _array_copy_capped(output, array, item_size);
-  }
-
-  _array_append_capped(output, value, item_size);
-
-RETURN_ARRAY_APPEND_ALLOC:
-  return output;
-}
-
-u8 *_array_extend_alloc(const Allocator *allocator, u8 *array, const u8 *other, u64 item_size) {
-  wapp_debug_assert(allocator != NULL && array != NULL && other != NULL, "`allocator`, `array` and `other` should not be NULL");
-
-  ArrayHeader *dst_header = _array_header(array);
-  ArrayHeader *src_header = _array_header(other);
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == dst_header->magic, "`array` is not a valid wapp array");
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == src_header->magic, "`other` is not a valid wapp array");
-  wapp_runtime_assert(item_size == dst_header->item_size && item_size == src_header->item_size, "Invalid item type provided");
-
-  u8 *output = array;
-
-  u64 remaining_capacity = dst_header->capacity - dst_header->count;
-  if (src_header->count >= remaining_capacity) {
-    u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(dst_header->capacity * 2);
-    output           = (u8 *)_array_alloc_capacity(allocator, new_capacity, dst_header->item_size);
-    if (!output) {
-      output = array;
-      goto RETURN_ARRAY_EXTEND_ALLOC;
-    }
-    _array_copy_capped(output, array, item_size);
-  }
-
-  _array_extend_capped(output, other, item_size);
-
-RETURN_ARRAY_EXTEND_ALLOC:
-  return output;
-}
-
-u8 *_array_copy_alloc(const Allocator *allocator, u8 *array, const u8 *other, u64 item_size) {
-  wapp_debug_assert(allocator != NULL && array != NULL && other != NULL, "`allocator`, `array` and `other` should not be NULL");
-
-  ArrayHeader *dst_header = _array_header(array);
-  ArrayHeader *src_header = _array_header(other);
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == dst_header->magic, "`array` is not a valid wapp array");
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == src_header->magic, "`other` is not a valid wapp array");
-  wapp_runtime_assert(item_size == dst_header->item_size && item_size == src_header->item_size, "Invalid item type provided");
-
-  u8 *output = array;
-
-  if (src_header->count >= dst_header->capacity) {
-    u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(dst_header->capacity * 2);
-    output           = (u8 *)_array_alloc_capacity(allocator, new_capacity, src_header->item_size);
-    if (!output) {
-      output = array;
-      goto RETURN_ARRAY_COPY_ALLOC;
-    }
-  }
-
-  _array_copy_capped(output, other, item_size);
-
-RETURN_ARRAY_COPY_ALLOC:
-  return output;
-}
-
-u8 *_array_pop(u8 *array, u64 item_size) {
-  wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-  ArrayHeader *arr_header = _array_header(array);
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == arr_header->magic, "`array` is not a valid wapp array");
-  wapp_runtime_assert(item_size == arr_header->item_size, "Invalid item type provided");
-
-  if (arr_header->count == 0) { return NULL; }
-
-  u64 index = arr_header->count - 1;
-  u8 *out   = _array_get(array, index, item_size);
-  --(arr_header->count);
-  return out;
-}
-
-void _array_clear(u8 *array, u64 item_size) {
-  wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-  ArrayHeader *arr_header = _array_header(array);
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == arr_header->magic, "`array` is not a valid wapp array");
-  wapp_runtime_assert(item_size == arr_header->item_size, "Invalid item type provided");
-
-  arr_header->count = 0;
-}
-
-u8 *_array_alloc_capacity(const Allocator *allocator, u64 capacity, u64 item_size) {
-  wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
-
-  u8 *output = NULL;
-
-  u64 allocation_size = sizeof(ArrayHeader) + item_size * capacity;
-  ArrayHeader *header = wapp_mem_allocator_alloc(allocator, allocation_size);
-  if (!header) {
-    goto RETURN_ARRAY_ALLOC;
-  }
-
-  output            = ((u8 *)header) + sizeof(ArrayHeader);
-  header->magic     = WAPP_ARRAY_MAGIC;
-  header->count     = 0;
-  header->capacity  = capacity;
-  header->item_size = item_size;
-
-RETURN_ARRAY_ALLOC:
-  return output;
-}

src/primitives/array/array.h

@@ -1,134 +0,0 @@
-#ifndef ARRAY_H
-#define ARRAY_H
-
-#include "../mem_allocator/mem_allocator.h"
-#include "../../common/misc/misc_utils.h"
-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#define WAPP_ARRAY_MAGIC (u64)0x57415F415252
-
-#define _calc_array_count(TYPE, ...) wapp_misc_utils_va_args_count(TYPE, __VA_ARGS__)
-#define _calc_array_capacity(TYPE, ...) wapp_misc_utils_u64_round_up_pow2(_calc_array_count(TYPE, __VA_ARGS__) * 2)
-
-#define wapp_array_alloc_capacity(TYPE, ALLOCATOR_PTR, CAPACITY) ((TYPE *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(TYPE)))
-
-#ifdef WAPP_PLATFORM_CPP
-#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{} \
-)
-#else
-#define _stack_array(TYPE, SIZE) struct { ArrayHeader header; TYPE items[SIZE]; }
-#define wapp_array(TYPE, ...)                                      \
-  (TYPE *)(                                                        \
-    (_stack_array(TYPE, _calc_array_capacity(TYPE, __VA_ARGS__))){ \
-      .header = {                                                  \
-        .magic     = WAPP_ARRAY_MAGIC,                             \
-        .count     = _calc_array_count(TYPE, __VA_ARGS__),         \
-        .capacity  = _calc_array_capacity(TYPE, __VA_ARGS__),      \
-        .item_size = sizeof(TYPE),                                 \
-      },                                                           \
-      .items  = {__VA_ARGS__},                                     \
-    }.items                                                        \
-  )
-#define wapp_array_with_capacity(TYPE, CAPACITY) \
-  (TYPE *)(                                      \
-    (_stack_array(TYPE, CAPACITY)){              \
-      .header = {                                \
-        .magic     = WAPP_ARRAY_MAGIC,           \
-        .count     = 0,                          \
-        .capacity  = CAPACITY,                   \
-        .item_size = sizeof(TYPE),               \
-      },                                         \
-      .items  = {0},                             \
-    }.items                                      \
-  )
-#define wapp_array_count(TYPE, ARRAY_PTR)                                                            \
-  _array_count((u8 *)ARRAY_PTR, sizeof(TYPE))
-#define wapp_array_capacity(TYPE, ARRAY_PTR)                                                         \
-  _array_capacity((u8 *)ARRAY_PTR, sizeof(TYPE))
-#define wapp_array_item_size(TYPE, ARRAY_PTR)                                                        \
-  _array_item_size((u8 *)ARRAY_PTR, sizeof(TYPE))
-#define wapp_array_get(TYPE, ARRAY_PTR, INDEX)                                                       \
-  (*((TYPE *)_array_get((u8 *)ARRAY_PTR, INDEX, sizeof(TYPE))))
-#define wapp_array_set(TYPE, ARRAY_PTR, INDEX, VALUE_PTR)                                            \
-  _array_set((u8 *)ARRAY_PTR, INDEX, (u8 *)VALUE_PTR, sizeof(TYPE))
-#define wapp_array_append_capped(TYPE, ARRAY_PTR, VALUE_PTR)                                         \
-  _array_append_capped((u8 *)ARRAY_PTR, (u8 *)VALUE_PTR, sizeof(TYPE))
-#define wapp_array_extend_capped(TYPE, DST_ARRAY_PTR, SRC_ARRAY_PTR)                                 \
-  _array_extend_capped((u8 *)DST_ARRAY_PTR, (u8 *)SRC_ARRAY_PTR, sizeof(TYPE))
-#define wapp_array_copy_capped(TYPE, DST_ARRAY_PTR, SRC_ARRAY_PTR)                                   \
-  _array_copy_capped((u8 *)DST_ARRAY_PTR, (u8 *)SRC_ARRAY_PTR, sizeof(TYPE))
-#define wapp_array_append_alloc(TYPE, ALLOCATOR_PTR, ARRAY_PTR, VALUE_PTR)                           \
-  (TYPE *)_array_append_alloc(ALLOCATOR_PTR, (u8 *)ARRAY_PTR, (u8 *)VALUE_PTR, sizeof(TYPE))
-#define wapp_array_extend_alloc(TYPE, ALLOCATOR_PTR, DST_ARRAY_PTR, SRC_ARRAY_PTR)                   \
-  (TYPE *)_array_extend_alloc(ALLOCATOR_PTR, (u8 *)DST_ARRAY_PTR, (u8 *)SRC_ARRAY_PTR, sizeof(TYPE))
-#define wapp_array_copy_alloc(TYPE, ALLOCATOR_PTR, DST_ARRAY_PTR, SRC_ARRAY_PTR)                     \
-  (TYPE *)_array_copy_alloc(ALLOCATOR_PTR, (u8 *)DST_ARRAY_PTR, (u8 *)SRC_ARRAY_PTR, sizeof(TYPE))
-#define wapp_array_pop(TYPE, ARRAY_PTR)                                                              \
-  (ARRAY_PTR != NULL && _array_count((u8 *)ARRAY_PTR, sizeof(TYPE)) > 0 ?                            \
-    *((TYPE *)_array_pop((u8 *)ARRAY_PTR, sizeof(TYPE))) :                                           \
-    (TYPE){0}                                                                                        \
-  )
-#define wapp_array_clear(TYPE, ARRAY_PTR)                                                            \
-  _array_clear((u8 *)ARRAY_PTR, sizeof(TYPE))
-#endif // !WAPP_PLATFORM_CPP
-
-typedef struct header ArrayHeader;
-struct header {
-  u64 magic;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct array Array;
-struct array {
-  ArrayHeader header;
-  u8 *items;
-};
-
-typedef struct GenericArray GenericArray;
-struct GenericArray {
-  ArrayHeader header;
-  void *items;
-};
-
-u64 _array_count(u8 *array, u64 item_size);
-u64 _array_capacity(u8 *array, u64 item_size);
-u64 _array_item_size(u8 *array, u64 item_size);
-u8 *_array_get(u8 *array, u64 index, u64 item_size);
-void _array_set(u8 *array, u64 index, u8 *value, u64 item_size);
-void _array_append_capped(u8 *array, u8 *value, u64 item_size);
-void _array_extend_capped(u8 *array, const u8 *other, u64 item_size);
-void _array_copy_capped(u8 *array, const u8 *other, u64 item_size);
-u8 *_array_append_alloc(const Allocator *allocator, u8 *array, u8 *value, u64 item_size);
-u8 *_array_extend_alloc(const Allocator *allocator, u8 *array, const u8 *other, u64 item_size);
-u8 *_array_copy_alloc(const Allocator *allocator, u8 *array, const u8 *other, u64 item_size);
-u8 *_array_pop(u8 *array, u64 item_size);
-void _array_clear(u8 *array, u64 item_size);
-u8 *_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,520 +0,0 @@
-/**
- * THIS FILE IS AUTOMATICALLY GENERATED. ANY MODIFICATIONS TO IT WILL BE OVERWRITTEN.
- */
-
-#ifndef DBL_LIST_H
-#define DBL_LIST_H
-
-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#ifdef WAPP_PLATFORM_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_b8_list_node(ITEM_PTR) B8Node{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_str8_list_node(ITEM_PTR) ((Str8Node){.item = ITEM_PTR})
-#define wapp_b8_list_node(ITEM_PTR) ((B8Node){.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})
-#define wapp_c32_list_node(ITEM_PTR) ((C32Node){.item = ITEM_PTR})
-#define wapp_i8_list_node(ITEM_PTR) ((I8Node){.item = ITEM_PTR})
-#define wapp_i16_list_node(ITEM_PTR) ((I16Node){.item = ITEM_PTR})
-#define wapp_i32_list_node(ITEM_PTR) ((I32Node){.item = ITEM_PTR})
-#define wapp_i64_list_node(ITEM_PTR) ((I64Node){.item = ITEM_PTR})
-#define wapp_u8_list_node(ITEM_PTR) ((U8Node){.item = ITEM_PTR})
-#define wapp_u16_list_node(ITEM_PTR) ((U16Node){.item = ITEM_PTR})
-#define wapp_u32_list_node(ITEM_PTR) ((U32Node){.item = ITEM_PTR})
-#define wapp_u64_list_node(ITEM_PTR) ((U64Node){.item = ITEM_PTR})
-#define wapp_f32_list_node(ITEM_PTR) ((F32Node){.item = ITEM_PTR})
-#define wapp_f64_list_node(ITEM_PTR) ((F64Node){.item = ITEM_PTR})
-#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 GenericNode GenericNode;
-struct GenericNode {
-  void *item;
-  GenericNode *prev;
-  GenericNode *next;
-};
-
-typedef struct GenericList GenericList;
-struct GenericList {
-  GenericNode *first;
-  GenericNode *last;
-  u64 node_count;
-};
-
-typedef struct VoidPNode VoidPNode;
-struct VoidPNode {
-  void * *item;
-  VoidPNode *prev;
-  VoidPNode *next;
-};
-
-typedef struct VoidPList VoidPList;
-struct VoidPList {
-  VoidPNode *first;
-  VoidPNode *last;
-  u64 node_count;
-};
-
-typedef struct Str8Node Str8Node;
-struct Str8Node {
-  Str8 *item;
-  Str8Node *prev;
-  Str8Node *next;
-};
-
-typedef struct Str8List Str8List;
-struct Str8List {
-  Str8Node *first;
-  Str8Node *last;
-  u64 node_count;
-};
-
-typedef struct B8Node B8Node;
-struct B8Node {
-  b8 *item;
-  B8Node *prev;
-  B8Node *next;
-};
-
-typedef struct B8List B8List;
-struct B8List {
-  B8Node *first;
-  B8Node *last;
-  u64 node_count;
-};
-
-typedef struct CharNode CharNode;
-struct CharNode {
-  char *item;
-  CharNode *prev;
-  CharNode *next;
-};
-
-typedef struct CharList CharList;
-struct CharList {
-  CharNode *first;
-  CharNode *last;
-  u64 node_count;
-};
-
-typedef struct C8Node C8Node;
-struct C8Node {
-  c8 *item;
-  C8Node *prev;
-  C8Node *next;
-};
-
-typedef struct C8List C8List;
-struct C8List {
-  C8Node *first;
-  C8Node *last;
-  u64 node_count;
-};
-
-typedef struct C16Node C16Node;
-struct C16Node {
-  c16 *item;
-  C16Node *prev;
-  C16Node *next;
-};
-
-typedef struct C16List C16List;
-struct C16List {
-  C16Node *first;
-  C16Node *last;
-  u64 node_count;
-};
-
-typedef struct C32Node C32Node;
-struct C32Node {
-  c32 *item;
-  C32Node *prev;
-  C32Node *next;
-};
-
-typedef struct C32List C32List;
-struct C32List {
-  C32Node *first;
-  C32Node *last;
-  u64 node_count;
-};
-
-typedef struct I8Node I8Node;
-struct I8Node {
-  i8 *item;
-  I8Node *prev;
-  I8Node *next;
-};
-
-typedef struct I8List I8List;
-struct I8List {
-  I8Node *first;
-  I8Node *last;
-  u64 node_count;
-};
-
-typedef struct I16Node I16Node;
-struct I16Node {
-  i16 *item;
-  I16Node *prev;
-  I16Node *next;
-};
-
-typedef struct I16List I16List;
-struct I16List {
-  I16Node *first;
-  I16Node *last;
-  u64 node_count;
-};
-
-typedef struct I32Node I32Node;
-struct I32Node {
-  i32 *item;
-  I32Node *prev;
-  I32Node *next;
-};
-
-typedef struct I32List I32List;
-struct I32List {
-  I32Node *first;
-  I32Node *last;
-  u64 node_count;
-};
-
-typedef struct I64Node I64Node;
-struct I64Node {
-  i64 *item;
-  I64Node *prev;
-  I64Node *next;
-};
-
-typedef struct I64List I64List;
-struct I64List {
-  I64Node *first;
-  I64Node *last;
-  u64 node_count;
-};
-
-typedef struct U8Node U8Node;
-struct U8Node {
-  u8 *item;
-  U8Node *prev;
-  U8Node *next;
-};
-
-typedef struct U8List U8List;
-struct U8List {
-  U8Node *first;
-  U8Node *last;
-  u64 node_count;
-};
-
-typedef struct U16Node U16Node;
-struct U16Node {
-  u16 *item;
-  U16Node *prev;
-  U16Node *next;
-};
-
-typedef struct U16List U16List;
-struct U16List {
-  U16Node *first;
-  U16Node *last;
-  u64 node_count;
-};
-
-typedef struct U32Node U32Node;
-struct U32Node {
-  u32 *item;
-  U32Node *prev;
-  U32Node *next;
-};
-
-typedef struct U32List U32List;
-struct U32List {
-  U32Node *first;
-  U32Node *last;
-  u64 node_count;
-};
-
-typedef struct U64Node U64Node;
-struct U64Node {
-  u64 *item;
-  U64Node *prev;
-  U64Node *next;
-};
-
-typedef struct U64List U64List;
-struct U64List {
-  U64Node *first;
-  U64Node *last;
-  u64 node_count;
-};
-
-typedef struct F32Node F32Node;
-struct F32Node {
-  f32 *item;
-  F32Node *prev;
-  F32Node *next;
-};
-
-typedef struct F32List F32List;
-struct F32List {
-  F32Node *first;
-  F32Node *last;
-  u64 node_count;
-};
-
-typedef struct F64Node F64Node;
-struct F64Node {
-  f64 *item;
-  F64Node *prev;
-  F64Node *next;
-};
-
-typedef struct F64List F64List;
-struct F64List {
-  F64Node *first;
-  F64Node *last;
-  u64 node_count;
-};
-
-typedef struct F128Node F128Node;
-struct F128Node {
-  f128 *item;
-  F128Node *prev;
-  F128Node *next;
-};
-
-typedef struct F128List F128List;
-struct F128List {
-  F128Node *first;
-  F128Node *last;
-  u64 node_count;
-};
-
-typedef struct IptrNode IptrNode;
-struct IptrNode {
-  iptr *item;
-  IptrNode *prev;
-  IptrNode *next;
-};
-
-typedef struct IptrList IptrList;
-struct IptrList {
-  IptrNode *first;
-  IptrNode *last;
-  u64 node_count;
-};
-
-typedef struct UptrNode UptrNode;
-struct UptrNode {
-  uptr *item;
-  UptrNode *prev;
-  UptrNode *next;
-};
-
-typedef struct UptrList UptrList;
-struct UptrList {
-  UptrNode *first;
-  UptrNode *last;
-  u64 node_count;
-};
-
-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);
-void wapp_void_ptr_list_insert(VoidPList *list, VoidPNode *node, u64 index);
-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);
-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);
-B8Node *wapp_b8_list_get(const B8List *list, u64 index);
-void wapp_b8_list_push_front(B8List *list, B8Node *node);
-void wapp_b8_list_push_back(B8List *list, B8Node *node);
-void wapp_b8_list_insert(B8List *list, B8Node *node, u64 index);
-B8Node *wapp_b8_list_pop_front(B8List *list);
-B8Node *wapp_b8_list_pop_back(B8List *list);
-B8Node *wapp_b8_list_remove(B8List *list, u64 index);
-void wapp_b8_list_empty(B8List *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);
-void wapp_char_list_insert(CharList *list, CharNode *node, u64 index);
-CharNode *wapp_char_list_pop_front(CharList *list);
-CharNode *wapp_char_list_pop_back(CharList *list);
-CharNode *wapp_char_list_remove(CharList *list, u64 index);
-void wapp_char_list_empty(CharList *list);
-C8Node *wapp_c8_list_get(const C8List *list, u64 index);
-void wapp_c8_list_push_front(C8List *list, C8Node *node);
-void wapp_c8_list_push_back(C8List *list, C8Node *node);
-void wapp_c8_list_insert(C8List *list, C8Node *node, u64 index);
-C8Node *wapp_c8_list_pop_front(C8List *list);
-C8Node *wapp_c8_list_pop_back(C8List *list);
-C8Node *wapp_c8_list_remove(C8List *list, u64 index);
-void wapp_c8_list_empty(C8List *list);
-C16Node *wapp_c16_list_get(const C16List *list, u64 index);
-void wapp_c16_list_push_front(C16List *list, C16Node *node);
-void wapp_c16_list_push_back(C16List *list, C16Node *node);
-void wapp_c16_list_insert(C16List *list, C16Node *node, u64 index);
-C16Node *wapp_c16_list_pop_front(C16List *list);
-C16Node *wapp_c16_list_pop_back(C16List *list);
-C16Node *wapp_c16_list_remove(C16List *list, u64 index);
-void wapp_c16_list_empty(C16List *list);
-C32Node *wapp_c32_list_get(const C32List *list, u64 index);
-void wapp_c32_list_push_front(C32List *list, C32Node *node);
-void wapp_c32_list_push_back(C32List *list, C32Node *node);
-void wapp_c32_list_insert(C32List *list, C32Node *node, u64 index);
-C32Node *wapp_c32_list_pop_front(C32List *list);
-C32Node *wapp_c32_list_pop_back(C32List *list);
-C32Node *wapp_c32_list_remove(C32List *list, u64 index);
-void wapp_c32_list_empty(C32List *list);
-I8Node *wapp_i8_list_get(const I8List *list, u64 index);
-void wapp_i8_list_push_front(I8List *list, I8Node *node);
-void wapp_i8_list_push_back(I8List *list, I8Node *node);
-void wapp_i8_list_insert(I8List *list, I8Node *node, u64 index);
-I8Node *wapp_i8_list_pop_front(I8List *list);
-I8Node *wapp_i8_list_pop_back(I8List *list);
-I8Node *wapp_i8_list_remove(I8List *list, u64 index);
-void wapp_i8_list_empty(I8List *list);
-I16Node *wapp_i16_list_get(const I16List *list, u64 index);
-void wapp_i16_list_push_front(I16List *list, I16Node *node);
-void wapp_i16_list_push_back(I16List *list, I16Node *node);
-void wapp_i16_list_insert(I16List *list, I16Node *node, u64 index);
-I16Node *wapp_i16_list_pop_front(I16List *list);
-I16Node *wapp_i16_list_pop_back(I16List *list);
-I16Node *wapp_i16_list_remove(I16List *list, u64 index);
-void wapp_i16_list_empty(I16List *list);
-I32Node *wapp_i32_list_get(const I32List *list, u64 index);
-void wapp_i32_list_push_front(I32List *list, I32Node *node);
-void wapp_i32_list_push_back(I32List *list, I32Node *node);
-void wapp_i32_list_insert(I32List *list, I32Node *node, u64 index);
-I32Node *wapp_i32_list_pop_front(I32List *list);
-I32Node *wapp_i32_list_pop_back(I32List *list);
-I32Node *wapp_i32_list_remove(I32List *list, u64 index);
-void wapp_i32_list_empty(I32List *list);
-I64Node *wapp_i64_list_get(const I64List *list, u64 index);
-void wapp_i64_list_push_front(I64List *list, I64Node *node);
-void wapp_i64_list_push_back(I64List *list, I64Node *node);
-void wapp_i64_list_insert(I64List *list, I64Node *node, u64 index);
-I64Node *wapp_i64_list_pop_front(I64List *list);
-I64Node *wapp_i64_list_pop_back(I64List *list);
-I64Node *wapp_i64_list_remove(I64List *list, u64 index);
-void wapp_i64_list_empty(I64List *list);
-U8Node *wapp_u8_list_get(const U8List *list, u64 index);
-void wapp_u8_list_push_front(U8List *list, U8Node *node);
-void wapp_u8_list_push_back(U8List *list, U8Node *node);
-void wapp_u8_list_insert(U8List *list, U8Node *node, u64 index);
-U8Node *wapp_u8_list_pop_front(U8List *list);
-U8Node *wapp_u8_list_pop_back(U8List *list);
-U8Node *wapp_u8_list_remove(U8List *list, u64 index);
-void wapp_u8_list_empty(U8List *list);
-U16Node *wapp_u16_list_get(const U16List *list, u64 index);
-void wapp_u16_list_push_front(U16List *list, U16Node *node);
-void wapp_u16_list_push_back(U16List *list, U16Node *node);
-void wapp_u16_list_insert(U16List *list, U16Node *node, u64 index);
-U16Node *wapp_u16_list_pop_front(U16List *list);
-U16Node *wapp_u16_list_pop_back(U16List *list);
-U16Node *wapp_u16_list_remove(U16List *list, u64 index);
-void wapp_u16_list_empty(U16List *list);
-U32Node *wapp_u32_list_get(const U32List *list, u64 index);
-void wapp_u32_list_push_front(U32List *list, U32Node *node);
-void wapp_u32_list_push_back(U32List *list, U32Node *node);
-void wapp_u32_list_insert(U32List *list, U32Node *node, u64 index);
-U32Node *wapp_u32_list_pop_front(U32List *list);
-U32Node *wapp_u32_list_pop_back(U32List *list);
-U32Node *wapp_u32_list_remove(U32List *list, u64 index);
-void wapp_u32_list_empty(U32List *list);
-U64Node *wapp_u64_list_get(const U64List *list, u64 index);
-void wapp_u64_list_push_front(U64List *list, U64Node *node);
-void wapp_u64_list_push_back(U64List *list, U64Node *node);
-void wapp_u64_list_insert(U64List *list, U64Node *node, u64 index);
-U64Node *wapp_u64_list_pop_front(U64List *list);
-U64Node *wapp_u64_list_pop_back(U64List *list);
-U64Node *wapp_u64_list_remove(U64List *list, u64 index);
-void wapp_u64_list_empty(U64List *list);
-F32Node *wapp_f32_list_get(const F32List *list, u64 index);
-void wapp_f32_list_push_front(F32List *list, F32Node *node);
-void wapp_f32_list_push_back(F32List *list, F32Node *node);
-void wapp_f32_list_insert(F32List *list, F32Node *node, u64 index);
-F32Node *wapp_f32_list_pop_front(F32List *list);
-F32Node *wapp_f32_list_pop_back(F32List *list);
-F32Node *wapp_f32_list_remove(F32List *list, u64 index);
-void wapp_f32_list_empty(F32List *list);
-F64Node *wapp_f64_list_get(const F64List *list, u64 index);
-void wapp_f64_list_push_front(F64List *list, F64Node *node);
-void wapp_f64_list_push_back(F64List *list, F64Node *node);
-void wapp_f64_list_insert(F64List *list, F64Node *node, u64 index);
-F64Node *wapp_f64_list_pop_front(F64List *list);
-F64Node *wapp_f64_list_pop_back(F64List *list);
-F64Node *wapp_f64_list_remove(F64List *list, u64 index);
-void wapp_f64_list_empty(F64List *list);
-F128Node *wapp_f128_list_get(const F128List *list, u64 index);
-void wapp_f128_list_push_front(F128List *list, F128Node *node);
-void wapp_f128_list_push_back(F128List *list, F128Node *node);
-void wapp_f128_list_insert(F128List *list, F128Node *node, u64 index);
-F128Node *wapp_f128_list_pop_front(F128List *list);
-F128Node *wapp_f128_list_pop_back(F128List *list);
-F128Node *wapp_f128_list_remove(F128List *list, u64 index);
-void wapp_f128_list_empty(F128List *list);
-IptrNode *wapp_iptr_list_get(const IptrList *list, u64 index);
-void wapp_iptr_list_push_front(IptrList *list, IptrNode *node);
-void wapp_iptr_list_push_back(IptrList *list, IptrNode *node);
-void wapp_iptr_list_insert(IptrList *list, IptrNode *node, u64 index);
-IptrNode *wapp_iptr_list_pop_front(IptrList *list);
-IptrNode *wapp_iptr_list_pop_back(IptrList *list);
-IptrNode *wapp_iptr_list_remove(IptrList *list, u64 index);
-void wapp_iptr_list_empty(IptrList *list);
-UptrNode *wapp_uptr_list_get(const UptrList *list, u64 index);
-void wapp_uptr_list_push_front(UptrList *list, UptrNode *node);
-void wapp_uptr_list_push_back(UptrList *list, UptrNode *node);
-void wapp_uptr_list_insert(UptrList *list, UptrNode *node, u64 index);
-UptrNode *wapp_uptr_list_pop_front(UptrList *list);
-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/wapp_primitives.c

@@ -1,12 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_PRIMITIVES_C
-#define WAPP_PRIMITIVES_C
-
-#include "wapp_primitives.h"
-#include "array/array.c"
-#include "dbl_list/dbl_list.c"
-#include "mem_allocator/mem_allocator.c"
-#include "strings/str8/str8.c"
-
-#endif // !WAPP_PRIMITIVES_C

src/testing/tester/tester.c

@@ -2,8 +2,8 @@
 
 #include "tester.h"
 #include "../../common/aliases/aliases.h"
-#include "../../core/os/shell/termcolour/termcolour.h"
+#include "../../os/shell/termcolour/termcolour.h"
-#include "../../primitives/strings/str8/str8.h"
+#include "../../base/strings/str8/str8.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>

src/testing/tester/tester.h

@@ -5,13 +5,11 @@
 
 #include "../../common/misc/misc_utils.h"
 #include "../../common/platform/platform.h"
-#include "../../primitives/strings/str8/str8.h"
+#include "../../base/strings/str8/str8.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})
@@ -21,7 +19,7 @@ BEGIN_C_LINKAGE
 
 typedef struct test_func_result TestFuncResult;
 struct test_func_result {
-  Str8RO name;
+  Str8 name;
   b8 passed;
 
 #ifdef WAPP_PLATFORM_WINDOWS

src/testing/wapp_testing.c

@@ -5,6 +5,6 @@
 
 #include "wapp_testing.h"
 #include "tester/tester.c"
-#include "../core/wapp_core.c"
+#include "../os/wapp_os.c"
 
 #endif // !WAPP_TESTING_C

src/testing/wapp_testing.h

@@ -5,6 +5,6 @@
 
 #include "tester/tester.h"
 #include "../common/wapp_common.h"
-#include "../core/wapp_core.h"
+#include "../os/wapp_os.h"
 
 #endif // !WAPP_TESTING_H

src/uuid/uuid.c

@@ -3,7 +3,7 @@
 #include "uuid.h"
 #include "../common/aliases/aliases.h"
 #include "../common/assert/assert.h"
-#include "../primitives/strings/str8/str8.h"
+#include "../base/strings/str8/str8.h"
 #include "../prng/xorshift/xorshift.h"
 #include <inttypes.h>
 
@@ -16,9 +16,9 @@ struct uuid4 {
 };
 
 wapp_intern UUID4 generate_uuid4(void);
-wapp_intern void  uuid4_to_uuid(const UUID4* uuid4, UUID *uuid);
+wapp_intern void  uuid4_to_uuid(const UUID4* uuid4, WUUID *uuid);
 
-UUID *wapp_uuid_init_uuid4(UUID *uuid) {
+WUUID *wapp_uuid_init_uuid4(WUUID *uuid) {
   wapp_debug_assert(uuid != NULL, "`uuid` should not be NULL");
 
   UUID4 uuid4 = generate_uuid4();
@@ -47,12 +47,12 @@ wapp_intern UUID4 generate_uuid4(void) {
   return uuid;
 }
 
-wapp_intern void uuid4_to_uuid(const UUID4* uuid4, UUID *uuid) {
+wapp_intern void uuid4_to_uuid(const UUID4* uuid4, WUUID *uuid) {
-  u64 grp1 = uuid4->high >> 32;
+  u64 group1 = uuid4->high >> 32;
-  u64 grp2 = (uuid4->high << 32) >> 48;
+  u64 group2 = (uuid4->high << 32) >> 48;
-  u64 grp3 = (uuid4->high << 48) >> 48;
+  u64 group3 = (uuid4->high << 48) >> 48;
-  u64 grp4 = uuid4->low >> 48;
+  u64 group4 = uuid4->low >> 48;
-  u64 grp5 = (uuid4->low << 16) >> 16;
+  u64 group5 = (uuid4->low << 16) >> 16;
 
-  wapp_str8_format(&(uuid->uuid), UUID_STR_FORMAT, grp1, grp2, grp3, grp4, grp5);
+  wapp_str8_format(&(uuid->uuid), UUID_STR_FORMAT, group1, group2, group3, group4, group5);
 }

src/uuid/uuid.h

@@ -5,7 +5,7 @@
 
 #include "../common/aliases/aliases.h"
 #include "../common/platform/platform.h"
-#include "../primitives/strings/str8/str8.h"
+#include "../base/strings/str8/str8.h"
 
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
@@ -13,10 +13,10 @@ BEGIN_C_LINKAGE
 
 #define UUID_BUF_LENGTH 48
 #define WAPP_UUID_SPEC WAPP_STR8_SPEC
-#define wapp_uuid_varg(UUID) wapp_str8_varg((UUID).uuid)
+#define wapp_uuid_varg(WUUID) wapp_str8_varg((WUUID).uuid)
 
-typedef struct uuid UUID;
+typedef struct wapp_uuid WUUID;
-struct uuid {
+struct wapp_uuid {
   Str8 uuid;
 };
 
@@ -24,11 +24,11 @@ struct uuid {
 
 /* Low level UUID API */
 
-#define wapp_uuid_create() ((UUID){.uuid = wapp_str8_buf(UUID_BUF_LENGTH)})
+#define wapp_uuid_create() ((WUUID){.uuid = wapp_str8_buf(UUID_BUF_LENGTH)})
 
 // Just returns the same pointer that was passed in with the UUID initialised.
 // Fails when passed a NULL pointer.
-UUID *wapp_uuid_init_uuid4(UUID *uuid);
+WUUID *wapp_uuid_init_uuid4(WUUID *uuid);
 
 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE

src/uuid/wapp_uuid.c

@@ -4,7 +4,7 @@
 #define WAPP_UUID_C
 
 #include "uuid.c"
-#include "../primitives/wapp_primitives.c"
+#include "../base/wapp_base.c"
 #include "../prng/wapp_prng.c"
 
 #endif // !WAPP_UUID_C

src/uuid/wapp_uuid.h

@@ -5,7 +5,7 @@
 
 #include "uuid.h"
 #include "../common/wapp_common.h"
-#include "../primitives/wapp_primitives.h"
+#include "../base/wapp_base.h"
 #include "../prng/wapp_prng.h"
 
 #endif // !WAPP_UUID_H

src/wapp.c

@@ -4,8 +4,8 @@
 #define WAPP_C
 
 #include "wapp.h"
-#include "primitives/wapp_primitives.c"
+#include "base/wapp_base.c"
-#include "core/wapp_core.c"
+#include "os/wapp_os.c"
 #include "prng/wapp_prng.c"
 #include "uuid/uuid.c"
 #include "testing/wapp_testing.c"

src/wapp.h

@@ -4,8 +4,8 @@
 #define WAPP_H
 
 #include "common/wapp_common.h"
-#include "primitives/wapp_primitives.h"
+#include "base/wapp_base.h"
-#include "core/wapp_core.h"
+#include "os/wapp_os.h"
 #include "prng/wapp_prng.h"
 #include "uuid/wapp_uuid.h"
 #include "testing/wapp_testing.h"

tests/arena/test_arena.c

@@ -2,7 +2,7 @@
 #include "wapp.h"
 #include <stdlib.h>
 
-#define ARENA_CAPACITY KB(16)
+#define ARENA_CAPACITY KiB(16)
 
 wapp_intern Arena *arena = NULL;
 wapp_intern i32 count    = 20;
@@ -16,7 +16,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);
+  u64 capacity       = GiB(512);
   b8 result         = wapp_mem_arena_init(&large_arena, capacity);
   if (result) {
     wapp_mem_arena_destroy(&large_arena);

tests/arena/test_arena.cc

@@ -2,7 +2,7 @@
 #include "wapp.h"
 #include <stdlib.h>
 
-#define ARENA_CAPACITY KB(16)
+#define ARENA_CAPACITY KiB(16)
 
 wapp_intern Arena *arena = nullptr;
 wapp_intern i32 count    = 20;
@@ -16,7 +16,7 @@ TestFuncResult test_arena_init(void) {
 
 TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {
   Arena *large_arena = nullptr;
-  u64 capacity       = GB(512);
+  u64 capacity       = GiB(512);
   b8 result         = wapp_mem_arena_init(&large_arena, capacity);
   if (result) {
     wapp_mem_arena_destroy(&large_arena);

tests/array/test_i32_array.c

@@ -4,16 +4,16 @@
 TestFuncResult test_i32_array(void) {
   b8 result;
 
-  i32 *array = wapp_array(i32, 1, 2, 3, 4, 5, 6, 7);
+  I32Array array = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7);
-  result = wapp_array_count(i32, array) == 7 && wapp_array_capacity(i32, array) == 16;
+  result = array.count == 7 && array.capacity == 16;
 
-  i32 item;
+  i32 *item;
-  u64 count   = wapp_array_count(i32, array);
+  u64 count   = array.count;
   u64 index   = 0;
   b8 running  = true;
   while (running) {
-      item   = wapp_array_get(i32, array, index);
+      item   = wapp_array_get(i32, &array, index);
-      result = result && item && item == (i32)(index + 1);
+      result = result && item && *item == (i32)(index + 1);
 
       ++index;
       running = index < count;
@@ -25,8 +25,8 @@ TestFuncResult test_i32_array(void) {
 TestFuncResult test_i32_array_with_capacity(void) {
   b8 result;
 
-  i32 *array = wapp_array_with_capacity(i32, 64);
+  I32Array array = wapp_array_with_capacity(i32, I32Array, 64);
-  result = wapp_array_count(i32, array) == 0 && wapp_array_capacity(i32, array) == 64;
+  result = array.count == 0 && array.capacity == 64;
 
   return wapp_tester_result(result);
 }
@@ -34,15 +34,15 @@ TestFuncResult test_i32_array_with_capacity(void) {
 TestFuncResult test_i32_array_get(void) {
   b8 result = true;
 
-  i32 *array = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
 
-  i32 item;
+  i32 *item;
-  u64 count   = wapp_array_count(i32, array);
+  u64 count   = array.count;
   u64 index   = 0;
   b8 running  = true;
   while (running) {
-    item   = wapp_array_get(i32, array, index);
+    item   = wapp_array_get(i32, &array, index);
-    result = result && item == (i32)index;
+    result = result && item && *item == (i32)index;
 
     ++index;
     running = index < count;
@@ -54,17 +54,17 @@ TestFuncResult test_i32_array_get(void) {
 TestFuncResult test_i32_array_set(void) {
   b8 result = true;
 
-  i32 *array = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
 
-  i32 item;
+  i32 *item;
-  u64 count   = wapp_array_count(i32, array);
+  u64 count   = array.count;
   u64 index   = 0;
   b8 running  = true;
   while (running) {
     i32 num = (i32)(index * 2);
-    wapp_array_set(i32, array, index, &num);
+    wapp_array_set(i32, &array, index, &num);
-    item   = wapp_array_get(i32, array, index);
+    item   = wapp_array_get(i32, &array, index);
-    result = result && item == (i32)(index * 2);
+    result = result && item && *item == (i32)(index * 2);
 
     ++index;
     running = index < count;
@@ -76,17 +76,17 @@ TestFuncResult test_i32_array_set(void) {
 TestFuncResult test_i32_array_append_capped(void) {
   b8 result;
 
-  i32 *array = wapp_array_with_capacity(i32, 64);
+  I32Array array = wapp_array_with_capacity(i32, I32Array, 64);
-  wapp_array_append_capped(i32, array, &((i32){10}));
+  wapp_array_append_capped(i32, &array, &((i32){10}));
 
-  result = wapp_array_count(i32, array) == 1;
+  result    = array.count == 1;
-  i32 item = wapp_array_get(i32, array, 0);
+  i32 *item = wapp_array_get(i32, &array, 0);
-  result = result && item == 10;
+  result = result && item && *item == 10;
 
-  array = wapp_array(i32, 1);
+  array = wapp_array(i32, I32Array, 1);
-  wapp_array_append_capped(i32, array, &((i32){10}));
+  wapp_array_append_capped(i32, &array, &((i32){10}));
 
-  result = result && wapp_array_count(i32, array) == 2;
+  result = result && array.count == 2;
 
   return wapp_tester_result(result);
 }
@@ -94,14 +94,14 @@ TestFuncResult test_i32_array_append_capped(void) {
 TestFuncResult test_i32_array_extend_capped(void) {
   b8 result;
 
-  i32 *array1 = wapp_array(i32, 1, 2, 3, 4);
+  I32Array array1 = wapp_array(i32, I32Array, 1, 2, 3, 4);
-  i32 *array2 = wapp_array(i32, 10, 20);
+  I32Array array2 = wapp_array(i32, I32Array, 10, 20);
 
-  result = wapp_array_count(i32, array1) == 4 && wapp_array_count(i32, array2) == 2;
+  result = array1.count == 4 && array2.count == 2;
 
-  wapp_array_extend_capped(i32, array1, array2);
+  wapp_array_extend_capped(i32, &array1, &array2);
 
-  result = result && wapp_array_count(i32, array1) == 6;
+  result = result && array1.count == 6;
 
   return wapp_tester_result(result);
 }
@@ -109,31 +109,31 @@ TestFuncResult test_i32_array_extend_capped(void) {
 TestFuncResult test_i32_array_copy_capped(void) {
   b8 result;
 
-  i32 *src  = wapp_array(i32, 1, 2, 3, 4, 5);
+  I32Array src  = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
-  i32 *dst1 = wapp_array(i32, 1, 2, 3, 4, 5, 6);
+  I32Array dst1 = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
-  i32 *dst2 = wapp_array(i32, 1, 2);
+  I32Array dst2 = wapp_array(i32, I32Array, 1, 2);
 
   u64 expected_count = 5;
-  wapp_array_copy_capped(i32, dst1, src);
+  wapp_array_copy_capped(i32, &dst1, &src);
-  result = wapp_array_count(i32, dst1) == expected_count;
+  result = dst1.count == expected_count;
 
   u64 index    = 0;
   b8 running  = true;
   while (running) {
-    result = result && wapp_array_get(i32, src, index) == wapp_array_get(i32, dst1, index);
+    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst1, index);
 
     ++index;
     running = index < expected_count;
   }
 
   expected_count = 4;
-  wapp_array_copy_capped(i32, dst2, src);
+  wapp_array_copy_capped(i32, &dst2, &src);
-  result = result && wapp_array_count(i32, dst2) == expected_count;
+  result = result && dst2.count == expected_count;
 
   index   = 0;
   running = true;
   while (running) {
-    result = result && wapp_array_get(i32, src, index) == wapp_array_get(i32, dst2, index);
+    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst2, index);
 
     ++index;
     running = index < expected_count;
@@ -145,11 +145,11 @@ TestFuncResult test_i32_array_copy_capped(void) {
 TestFuncResult test_i32_array_alloc_capacity(void) {
   b8 result;
 
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
   u64 capacity        = 32;
-  i32 *array          = wapp_array_alloc_capacity(i32, &allocator, capacity);
+  I32Array *array     = wapp_array_alloc_capacity(i32, I32Array, &allocator, capacity);
 
-  result = array && wapp_array_capacity(i32, array) == capacity;
+  result = array && array->capacity == capacity;
 
   wapp_mem_arena_allocator_destroy(&allocator);
 
@@ -159,24 +159,24 @@ TestFuncResult test_i32_array_alloc_capacity(void) {
 TestFuncResult test_i32_array_append_alloc(void) {
   b8 result;
 
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-  i32 *array1         = wapp_array(i32, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
-  i32 *array2         = wapp_array(i32, 1, 2);
+  I32Array array2     = wapp_array(i32, I32Array, 1, 2);
 
-  i32 *arr_ptr = wapp_array_append_alloc(i32, &allocator, array1, &((i32){10}));
+  I32Array *arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array1, &((i32){10}));
-  result = arr_ptr == array1;
+  result = arr_ptr == &array1;
 
   u64 count    = 4;
   u64 index    = 0;
   b8 running  = true;
   while (running) {
     i32 num = (i32)index;
-    arr_ptr = wapp_array_append_alloc(i32, &allocator, array2, &num);
+    arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array2, &num);
 
     ++index;
     running = index < count;
   }
-  result = result && arr_ptr != array2;
+  result = result && arr_ptr != &array2;
 
   wapp_mem_arena_allocator_destroy(&allocator);
 
@@ -186,16 +186,16 @@ TestFuncResult test_i32_array_append_alloc(void) {
 TestFuncResult test_i32_array_extend_alloc(void) {
   b8 result;
 
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-  i32 *array1         = wapp_array(i32, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
-  i32 *array2         = wapp_array(i32, 1, 2);
+  I32Array array2     = wapp_array(i32, I32Array, 1, 2);
-  i32 *array3         = wapp_array(i32, 1, 2, 3, 4);
+  I32Array array3     = wapp_array(i32, I32Array, 1, 2, 3, 4);
 
-  i32 *arr_ptr = wapp_array_extend_alloc(i32, &allocator, array1, array3);
+  I32Array *arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array1, &array3);
-  result = arr_ptr == array1;
+  result = arr_ptr == &array1;
 
-  arr_ptr = wapp_array_extend_alloc(i32, &allocator, array2, array3);
+  arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array2, &array3);
-  result  = result && arr_ptr != array2;
+  result  = result && arr_ptr != &array2;
 
   wapp_mem_arena_allocator_destroy(&allocator);
 
@@ -205,33 +205,33 @@ TestFuncResult test_i32_array_extend_alloc(void) {
 TestFuncResult test_i32_array_copy_alloc(void) {
   b8 result;
 
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-  i32 *src        = wapp_array(i32, 1, 2, 3, 4, 5);
+  I32Array src        = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
-  i32 *dst1       = wapp_array(i32, 1, 2, 3, 4, 5, 6);
+  I32Array dst1       = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
-  i32 *dst2       = wapp_array(i32, 1, 2);
+  I32Array dst2       = wapp_array(i32, I32Array, 1, 2);
-  i32 *array_ptr  = NULL;
+  I32Array *array_ptr = NULL;
 
   u64 expected_count = 5;
-  array_ptr = wapp_array_copy_alloc(i32, &allocator, dst1, src);
+  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst1, &src);
-  result = wapp_array_count(i32, array_ptr) == expected_count && array_ptr == dst1;
+  result = array_ptr->count == expected_count && array_ptr == &dst1;
 
   u64 index    = 0;
   b8 running  = true;
   while (running) {
-    result = result && wapp_array_get(i32, src, index) == wapp_array_get(i32, array_ptr, index);
+    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index);
 
     ++index;
     running = index < expected_count;
   }
 
   expected_count = 5;
-  array_ptr = wapp_array_copy_alloc(i32, &allocator, dst2, src);
+  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst2, &src);
-  result = result && wapp_array_count(i32, array_ptr) == expected_count && array_ptr != dst2;
+  result = result && array_ptr->count == expected_count && array_ptr != &dst2;
 
   index   = 0;
   running = true;
   while (running) {
-    result = result && wapp_array_get(i32, src, index) == wapp_array_get(i32, array_ptr, index);
+    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index);
 
     ++index;
     running = index < expected_count;
@@ -245,11 +245,11 @@ TestFuncResult test_i32_array_copy_alloc(void) {
 TestFuncResult test_i32_array_pop(void) {
   b8 result;
 
-  i32 *array1 = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array1 = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-  i32 *array2 = wapp_array_with_capacity(i32, 32);
+  I32Array array2 = wapp_array_with_capacity(i32, I32Array, 32);
 
-  i32 item1 = wapp_array_pop(i32, array1);
+  i32 item1 = wapp_array_pop(i32, &array1);
-  i32 item2 = wapp_array_pop(i32, array2);
+  i32 item2 = wapp_array_pop(i32, &array2);
 
   result = item1 == 8 && item2 == 0;
 
@@ -259,12 +259,12 @@ TestFuncResult test_i32_array_pop(void) {
 TestFuncResult test_i32_array_clear(void) {
   b8 result;
 
-  i32 *array = wapp_array(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-  result = wapp_array_count(i32, array) == 9;
+  result = array.count == 9;
 
-  wapp_array_clear(i32, array);
+  wapp_array_clear(i32, &array);
 
-  result = result && wapp_array_count(i32, array) == 0;
+  result = result && array.count == 0;
 
   return wapp_tester_result(result);
 }

tests/array/test_i32_array.cc

@@ -4,7 +4,7 @@
 TestFuncResult test_i32_array(void) {
   b8 result;
 
-  I32Array array = wapp_i32_array(1, 2, 3, 4, 5, 6, 7);
+  I32Array array = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7);
   result = array.count == 7 && array.capacity == 16;
 
   i32 *item;
@@ -12,7 +12,7 @@ TestFuncResult test_i32_array(void) {
   u64 index    = 0;
   b8 running  = true;
   while (running) {
-      item   = wapp_i32_array_get(&array, index);
+      item   = wapp_array_get(i32, &array, index);
       result = result && item && (*item == (i32)(index + 1));
 
       ++index;
@@ -25,7 +25,7 @@ TestFuncResult test_i32_array(void) {
 TestFuncResult test_i32_array_with_capacity(void) {
   b8 result;
 
-  I32Array array = wapp_i32_array_with_capacity(64);
+  I32Array array = wapp_array_with_capacity(i32, I32Array, 64);
   result = array.count == 0 && array.capacity == 64;
 
   return wapp_tester_result(result);
@@ -34,14 +34,14 @@ TestFuncResult test_i32_array_with_capacity(void) {
 TestFuncResult test_i32_array_get(void) {
   b8 result = true;
 
-  I32Array array = wapp_i32_array(0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
 
   i32 *item;
   u64 count    = array.count;
   u64 index    = 0;
   b8 running  = true;
   while (running) {
-    item   = wapp_i32_array_get(&array, index);
+    item   = wapp_array_get(i32, &array, index);
     result = result && item && (*item == (i32)index);
 
     ++index;
@@ -54,7 +54,7 @@ TestFuncResult test_i32_array_get(void) {
 TestFuncResult test_i32_array_set(void) {
   b8 result = true;
 
-  I32Array array = wapp_i32_array(0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
 
   i32 *item;
   u64 count    = array.count;
@@ -62,8 +62,8 @@ TestFuncResult test_i32_array_set(void) {
   b8 running  = true;
   while (running) {
     i32 num = (i32)(index * 2);
-    wapp_i32_array_set(&array, index, &num);
+    wapp_array_set(i32, &array, index, &num);
-    item   = wapp_i32_array_get(&array, index);
+    item   = wapp_array_get(i32, &array, index);
     result = result && item && (*item == (i32)(index * 2));
 
     ++index;
@@ -76,17 +76,17 @@ TestFuncResult test_i32_array_set(void) {
 TestFuncResult test_i32_array_append_capped(void) {
   b8 result;
 
-  I32Array array = wapp_i32_array_with_capacity(64);
+  I32Array array = wapp_array_with_capacity(i32, I32Array, 64);
   i32 item1 = 10;
-  wapp_i32_array_append_capped(&array, &item1);
+  wapp_array_append_capped(i32, &array, &item1);
 
   result = array.count == 1;
-  i32 *item = wapp_i32_array_get(&array, 0);
+  i32 *item = wapp_array_get(i32, &array, 0);
   result = result && item && *item == 10;
 
-  array = wapp_i32_array(1);
+  array = wapp_array(i32, I32Array, 1);
   i32 item2 = 10;
-  wapp_i32_array_append_capped(&array, &item2);
+  wapp_array_append_capped(i32, &array, &item2);
 
   result = result && array.count == 2;
 
@@ -96,73 +96,46 @@ TestFuncResult test_i32_array_append_capped(void) {
 TestFuncResult test_i32_array_extend_capped(void) {
   b8 result;
 
-  I32Array array1 = wapp_i32_array(1, 2, 3, 4);
+  I32Array array1 = wapp_array(i32, I32Array, 1, 2, 3, 4);
-  I32Array array2 = wapp_i32_array(10, 20);
+  I32Array array2 = wapp_array(i32, I32Array, 10, 20);
 
   result = array1.count == 4 && array2.count == 2;
 
-  wapp_i32_array_extend_capped(&array1, &array2);
+  wapp_array_extend_capped(i32, &array1, &array2);
 
   result = result && array1.count == 6;
 
   return wapp_tester_result(result);
 }
 
-TestFuncResult test_i32_array_clear(void) {
-  b8 result;
-
-  I32Array array = wapp_i32_array(0, 1, 2, 3, 4, 5, 6, 7, 8);
-  result = array.count == 9;
-
-  wapp_i32_array_clear(&array);
-
-  result = result && array.count == 0;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_pop(void) {
-  b8 result;
-
-  I32Array array1 = wapp_i32_array(0, 1, 2, 3, 4, 5, 6, 7, 8);
-  I32Array array2 = wapp_i32_array_with_capacity(32);
-
-  i32 item1 = wapp_i32_array_pop(&array1);
-  i32 item2 = wapp_i32_array_pop(&array2);
-
-  result = item1 == 8 && item2 == 0;
-
-  return wapp_tester_result(result);
-}
-
 TestFuncResult test_i32_array_copy_capped(void) {
   b8 result;
 
-  I32Array src  = wapp_i32_array(1, 2, 3, 4, 5);
+  I32Array src  = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
-  I32Array dst1 = wapp_i32_array(1, 2, 3, 4, 5, 6);
+  I32Array dst1 = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
-  I32Array dst2 = wapp_i32_array(1, 2);
+  I32Array dst2 = wapp_array(i32, I32Array, 1, 2);
 
   u64 expected_count = 5;
-  wapp_i32_array_copy_capped(&src, &dst1);
+  wapp_array_copy_capped(i32, &dst1, &src);
   result = dst1.count == expected_count;
 
   u64 index    = 0;
   b8 running  = true;
   while (running) {
-    result = result && (*wapp_i32_array_get(&src, index) == *wapp_i32_array_get(&dst1, index));
+    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst1, index));
 
     ++index;
     running = index < expected_count;
   }
 
   expected_count = 4;
-  wapp_i32_array_copy_capped(&src, &dst2);
+  wapp_array_copy_capped(i32, &dst2, &src);
   result = result && dst2.count == expected_count;
 
   index   = 0;
   running = true;
   while (running) {
-    result = result && (*wapp_i32_array_get(&src, index) == *wapp_i32_array_get(&dst2, index));
+    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst2, index));
 
     ++index;
     running = index < expected_count;
@@ -174,9 +147,9 @@ TestFuncResult test_i32_array_copy_capped(void) {
 TestFuncResult test_i32_array_alloc_capacity(void) {
   b8 result;
 
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
   u64 capacity        = 32;
-  I32Array *array     = wapp_i32_array_alloc_capacity(&allocator, capacity);
+  I32Array *array     = wapp_array_alloc_capacity(i32, I32Array, &allocator, capacity);
 
   result = array && array->capacity == capacity;
 
@@ -188,20 +161,20 @@ TestFuncResult test_i32_array_alloc_capacity(void) {
 TestFuncResult test_i32_array_append_alloc(void) {
   b8 result;
 
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-  I32Array array1     = wapp_i32_array(1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
-  I32Array array2     = wapp_i32_array(1, 2);
+  I32Array array2     = wapp_array(i32, I32Array, 1, 2);
 
   i32 num = 10;
-  I32Array *arr_ptr = wapp_i32_array_append_alloc(&allocator, &array1, &num);
+  I32Array *arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array1, &num);
   result = arr_ptr == &array1;
 
   u64 count    = 4;
   u64 index    = 0;
   b8 running  = true;
   while (running) {
-    i32 num = (i32)index;
+    num = (i32)index;
-    arr_ptr = wapp_i32_array_append_alloc(&allocator, &array2, &num);
+    arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array2, &num);
 
     ++index;
     running = index < count;
@@ -216,15 +189,15 @@ TestFuncResult test_i32_array_append_alloc(void) {
 TestFuncResult test_i32_array_extend_alloc(void) {
   b8 result;
 
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-  I32Array array1     = wapp_i32_array(1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
-  I32Array array2     = wapp_i32_array(1, 2);
+  I32Array array2     = wapp_array(i32, I32Array, 1, 2);
-  I32Array array3     = wapp_i32_array(1, 2, 3, 4);
+  I32Array array3     = wapp_array(i32, I32Array, 1, 2, 3, 4);
 
-  I32Array *arr_ptr = wapp_i32_array_extend_alloc(&allocator, &array1, &array3);
+  I32Array *arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array1, &array3);
   result = arr_ptr == &array1;
 
-  arr_ptr = wapp_i32_array_extend_alloc(&allocator, &array2, &array3);
+  arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array2, &array3);
   result  = result && arr_ptr != &array2;
 
   wapp_mem_arena_allocator_destroy(&allocator);
@@ -235,33 +208,33 @@ TestFuncResult test_i32_array_extend_alloc(void) {
 TestFuncResult test_i32_array_copy_alloc(void) {
   b8 result;
 
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
+  Allocator allocator = wapp_mem_arena_allocator_init(MiB(4));
-  I32Array src        = wapp_i32_array(1, 2, 3, 4, 5);
+  I32Array src        = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
-  I32Array dst1       = wapp_i32_array(1, 2, 3, 4, 5, 6);
+  I32Array dst1       = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
-  I32Array dst2       = wapp_i32_array(1, 2);
+  I32Array dst2       = wapp_array(i32, I32Array, 1, 2);
   I32Array *array_ptr = nullptr;
 
   u64 expected_count = 5;
-  array_ptr = wapp_i32_array_copy_alloc(&allocator, &src, &dst1);
+  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst1, &src);
   result = array_ptr->count == expected_count && array_ptr == &dst1;
 
   u64 index    = 0;
   b8 running  = true;
   while (running) {
-    result = result && (*wapp_i32_array_get(&src, index) == *wapp_i32_array_get(array_ptr, index));
+    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index));
 
     ++index;
     running = index < expected_count;
   }
 
   expected_count = 5;
-  array_ptr = wapp_i32_array_copy_alloc(&allocator, &src, &dst2);
+  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst2, &src);
   result = result && array_ptr->count == expected_count && array_ptr != &dst2;
 
   index   = 0;
   running = true;
   while (running) {
-    result = result && (*wapp_i32_array_get(&src, index) == *wapp_i32_array_get(array_ptr, index));
+    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index));
 
     ++index;
     running = index < expected_count;
@@ -271,3 +244,30 @@ TestFuncResult test_i32_array_copy_alloc(void) {
 
   return wapp_tester_result(result);
 }
+
+TestFuncResult test_i32_array_clear(void) {
+  b8 result;
+
+  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  result = array.count == 9;
+
+  wapp_array_clear(i32, &array);
+
+  result = result && array.count == 0;
+
+  return wapp_tester_result(result);
+}
+
+TestFuncResult test_i32_array_pop(void) {
+  b8 result;
+
+  I32Array array1 = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+  I32Array array2 = wapp_array_with_capacity(i32, I32Array, 32);
+
+  i32 item1 = wapp_array_pop(i32, &array1);
+  i32 item2 = wapp_array_pop(i32, &array2);
+
+  result = item1 == 8 && item2 == 0;
+
+  return wapp_tester_result(result);
+}

tests/array/test_str8_array.c

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

tests/array/test_str8_array.cc

@@ -10,7 +10,7 @@ TestFuncResult test_str8_array(void) {
   Str8 str1       = wapp_str8_lit("Hello");
   Str8 str2       = wapp_str8_lit("Hi");
   Str8 str3       = wapp_str8_lit("Bye");
-  Str8Array array = wapp_str8_array(str1, str2, str3);
+  Str8Array array = wapp_array(Str8, Str8Array, str1, str2, str3);
 
   result = array.count == 3 && array.capacity == 8;
 
@@ -19,11 +19,11 @@ TestFuncResult test_str8_array(void) {
   u64 index   = 0;
   b8 running = true;
   while (running) {
-      item   = wapp_str8_array_get(&array, index);
+    item   = wapp_array_get(Str8, &array, index);
-      result = result && item && (wapp_str8_equal(item, &expected[index]));
+    result = result && item && (wapp_str8_equal(item, &expected[index]));
 
-      ++index;
+    ++index;
-      running = index < count;
+    running = index < count;
   }
 
   return wapp_tester_result(result);

tests/cpath/test_cpath.c

@@ -16,16 +16,16 @@ TestFuncResult test_cpath_join_path(void) {
   wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
   wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
 
-  Str8List parts = {0};
+  Str8List parts = wapp_dbl_list(Str8, Str8List);
-  wapp_str8_list_push_back(&parts, &wapp_str8_node_from_str8(tmp));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_str8(tmp));
-  wapp_str8_list_push_back(&parts, &wapp_str8_node_from_cstr("home"));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("home"));
-  wapp_str8_list_push_back(&parts, &wapp_str8_node_from_cstr("abdelrahman"));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("abdelrahman"));
-  wapp_str8_list_push_back(&parts, &wapp_str8_node_from_cstr("Documents"));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("Documents"));
 
   wapp_cpath_join_path(&out, &parts);
   result = wapp_str8_equal(&out, &expected);
 
-  wapp_str8_list_pop_front(&parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
 
   wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
 
@@ -33,8 +33,8 @@ TestFuncResult test_cpath_join_path(void) {
   result = result && wapp_str8_equal(&out, &expected);
 
   wapp_str8_concat_capped(&tmp, &wapp_str8_lit_ro("home"));
-  wapp_str8_list_pop_front(&parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
-  wapp_str8_list_push_front(&parts, &wapp_str8_node_from_str8(tmp));
+  wapp_dbl_list_push_front(Str8, &parts, &wapp_str8_node_from_str8(tmp));
 
   wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
 
@@ -42,35 +42,35 @@ TestFuncResult test_cpath_join_path(void) {
   result = result && wapp_str8_equal(&out, &expected);
 
   wapp_str8_format(&tmp, "home%c", WAPP_PATH_SEP);
-  wapp_str8_list_pop_front(&parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
-  wapp_str8_list_push_front(&parts, &wapp_str8_node_from_cstr("home"));
+  wapp_dbl_list_push_front(Str8, &parts, &wapp_str8_node_from_cstr("home"));
 
   wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
 
   wapp_cpath_join_path(&out, &parts);
   result = result && wapp_str8_equal(&out, &expected);
 
-  wapp_str8_list_empty(&parts);
+  wapp_dbl_list_empty(Str8, &parts);
 
   wapp_str8_format(&tmp, "%chome", WAPP_PATH_SEP);
-  wapp_str8_list_push_back(&parts, &wapp_str8_node_from_str8(tmp));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_str8(tmp));
-  wapp_str8_list_push_back(&parts, &wapp_str8_node_from_cstr(""));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr(""));
 
   wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
 
   wapp_cpath_join_path(&out, &parts);
   result = result && wapp_str8_equal(&out, &expected);
 
-  wapp_str8_list_pop_front(&parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
-  wapp_str8_list_push_back(&parts, &wapp_str8_node_from_cstr(""));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr(""));
 
   wapp_str8_format(&expected, "%s", "");
 
   wapp_cpath_join_path(&out, &parts);
   result = result && wapp_str8_equal(&out, &expected);
 
-  wapp_str8_list_pop_back(&parts);
+  wapp_dbl_list_pop_back(Str8, Str8Node, &parts);
-  wapp_str8_list_push_back(&parts, &wapp_str8_node_from_cstr("home"));
+  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("home"));
 
   wapp_str8_copy_cstr_capped(&expected, "home");
 
@@ -81,7 +81,7 @@ TestFuncResult test_cpath_join_path(void) {
 }
 
 TestFuncResult test_cpath_dirname(void) {
-  Allocator arena = wapp_mem_arena_allocator_init(MB(8));
+  Allocator arena = wapp_mem_arena_allocator_init(MiB(8));
   if (wapp_mem_allocator_invalid(&arena)) {
     return wapp_tester_result(false);
   }
@@ -129,7 +129,7 @@ TestFuncResult test_cpath_dirname(void) {
 }
 
 TestFuncResult test_cpath_dirup(void) {
-  Allocator arena = wapp_mem_arena_allocator_init(MB(8));
+  Allocator arena = wapp_mem_arena_allocator_init(MiB(8));
   if (wapp_mem_allocator_invalid(&arena)) {
     return wapp_tester_result(false);
   }

tests/cpath/test_cpath.cc

@@ -16,24 +16,24 @@ TestFuncResult test_cpath_join_path(void) {
   wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
   wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
 
-  Str8List parts = {};
+  Str8List parts = wapp_dbl_list(Str8, Str8List);
 
   Str8Node tmp_node = wapp_str8_node_from_str8(tmp);
-  wapp_str8_list_push_back(&parts, &tmp_node);
+  wapp_dbl_list_push_back(Str8, &parts, &tmp_node);
 
   Str8Node home_node = wapp_str8_node_from_cstr("home");
-  wapp_str8_list_push_back(&parts, &home_node);
+  wapp_dbl_list_push_back(Str8, &parts, &home_node);
 
   Str8Node user_node = wapp_str8_node_from_cstr("abdelrahman");
-  wapp_str8_list_push_back(&parts, &user_node);
+  wapp_dbl_list_push_back(Str8, &parts, &user_node);
 
   Str8Node docs_node = wapp_str8_node_from_cstr("Documents");
-  wapp_str8_list_push_back(&parts, &docs_node);
+  wapp_dbl_list_push_back(Str8, &parts, &docs_node);
 
   wapp_cpath_join_path(&out, &parts);
   result = wapp_str8_equal(&out, &expected);
 
-  wapp_str8_list_pop_front(&parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
 
   wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
 
@@ -42,10 +42,10 @@ TestFuncResult test_cpath_join_path(void) {
 
   Str8RO str = wapp_str8_lit_ro("home");
   wapp_str8_concat_capped(&tmp, &str);
-  wapp_str8_list_pop_front(&parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
 
   Str8Node tmp_node_2 = wapp_str8_node_from_str8(tmp);
-  wapp_str8_list_push_front(&parts, &tmp_node_2);
+  wapp_dbl_list_push_front(Str8, &parts, &tmp_node_2);
 
   wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
 
@@ -53,45 +53,45 @@ TestFuncResult test_cpath_join_path(void) {
   result = result && wapp_str8_equal(&out, &expected);
 
   wapp_str8_format(&tmp, "home%c", WAPP_PATH_SEP);
-  wapp_str8_list_pop_front(&parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
 
   Str8Node home_node_2 = wapp_str8_node_from_cstr("home");
-  wapp_str8_list_push_front(&parts, &home_node_2);
+  wapp_dbl_list_push_front(Str8, &parts, &home_node_2);
 
   wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
 
   wapp_cpath_join_path(&out, &parts);
   result = result && wapp_str8_equal(&out, &expected);
 
-  wapp_str8_list_empty(&parts);
+  wapp_dbl_list_empty(Str8, &parts);
 
   wapp_str8_format(&tmp, "%chome", WAPP_PATH_SEP);
 
   Str8Node tmp_node_3 = wapp_str8_node_from_str8(tmp);
-  wapp_str8_list_push_back(&parts, &tmp_node_3);
+  wapp_dbl_list_push_back(Str8, &parts, &tmp_node_3);
 
   Str8Node empty_node = wapp_str8_node_from_cstr("");
-  wapp_str8_list_push_back(&parts, &empty_node);
+  wapp_dbl_list_push_back(Str8, &parts, &empty_node);
 
   wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
 
   wapp_cpath_join_path(&out, &parts);
   result = result && wapp_str8_equal(&out, &expected);
 
-  wapp_str8_list_pop_front(&parts);
+  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
 
   Str8Node empty_node_2 = wapp_str8_node_from_cstr("");
-  wapp_str8_list_push_back(&parts, &empty_node_2);
+  wapp_dbl_list_push_back(Str8, &parts, &empty_node_2);
 
   wapp_str8_format(&expected, "%s", "");
 
   wapp_cpath_join_path(&out, &parts);
   result = result && wapp_str8_equal(&out, &expected);
 
-  wapp_str8_list_pop_back(&parts);
+  wapp_dbl_list_pop_back(Str8, Str8Node, &parts);
 
   Str8Node home_node_3 = wapp_str8_node_from_cstr("home");
-  wapp_str8_list_push_back(&parts, &home_node_3);
+  wapp_dbl_list_push_back(Str8, &parts, &home_node_3);
 
   wapp_str8_copy_cstr_capped(&expected, "home");
 
@@ -102,7 +102,7 @@ TestFuncResult test_cpath_join_path(void) {
 }
 
 TestFuncResult test_cpath_dirname(void) {
-  Allocator arena = wapp_mem_arena_allocator_init(MB(8));
+  Allocator arena = wapp_mem_arena_allocator_init(MiB(8));
   if (wapp_mem_allocator_invalid(&arena)) {
     return wapp_tester_result(false);
   }
@@ -152,7 +152,7 @@ TestFuncResult test_cpath_dirname(void) {
 }
 
 TestFuncResult test_cpath_dirup(void) {
-  Allocator arena = wapp_mem_arena_allocator_init(MB(8));
+  Allocator arena = wapp_mem_arena_allocator_init(MiB(8));
   if (wapp_mem_allocator_invalid(&arena)) {
     return wapp_tester_result(false);
   }

tests/shell_commander/test_shell_commander.c

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

tests/shell_commander/test_shell_commander.cc

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

tests/str8/test_str8.c

@@ -77,7 +77,7 @@ TestFuncResult test_str8_buf(void) {
 
 TestFuncResult test_str8_alloc_buf(void) {
   b8 result;
-  Allocator allocator = wapp_mem_arena_allocator_init(KB(100));
+  Allocator allocator = wapp_mem_arena_allocator_init(KiB(100));
   if (wapp_mem_allocator_invalid(&allocator)) {
     return wapp_tester_result(false);
   }
@@ -105,7 +105,7 @@ TEST_ALLOC_BUF_CLEANUP:
 
 TestFuncResult test_str8_alloc_cstr(void) {
   b8 result;
-  Allocator allocator = wapp_mem_arena_allocator_init(KB(100));
+  Allocator allocator = wapp_mem_arena_allocator_init(KiB(100));
   if (wapp_mem_allocator_invalid(&allocator)) {
     return wapp_tester_result(false);
   }
@@ -126,7 +126,7 @@ TestFuncResult test_str8_alloc_cstr(void) {
 
 TestFuncResult test_str8_alloc_str8(void) {
   b8 result;
-  Allocator allocator = wapp_mem_arena_allocator_init(KB(100));
+  Allocator allocator = wapp_mem_arena_allocator_init(KiB(100));
   if (wapp_mem_allocator_invalid(&allocator)) {
     return wapp_tester_result(false);
   }
@@ -146,7 +146,7 @@ TestFuncResult test_str8_alloc_str8(void) {
 
 TestFuncResult test_str8_alloc_substr(void) {
   b8 result;
-  Allocator allocator = wapp_mem_arena_allocator_init(KB(100));
+  Allocator allocator = wapp_mem_arena_allocator_init(KiB(100));
   if (wapp_mem_allocator_invalid(&allocator)) {
     return wapp_tester_result(false);
   }
@@ -289,7 +289,7 @@ TestFuncResult test_str8_slice(void) {
 
 TestFuncResult test_str8_alloc_concat(void) {
   b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
+  Allocator arena = wapp_mem_arena_allocator_init(KiB(100));
 
   Str8 str     = wapp_str8_lit("Hello world");
   Str8 suffix1 = wapp_str8_lit(" from me.");
@@ -410,7 +410,7 @@ TestFuncResult test_str8_rfind(void) {
 
 TestFuncResult test_str8_split(void) {
   b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
+  Allocator arena = wapp_mem_arena_allocator_init(KiB(100));
 
   Str8 str        = wapp_str8_lit("hello world from me");
   Str8 delim1     = wapp_str8_lit(" ");
@@ -443,7 +443,7 @@ TestFuncResult test_str8_split(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running1) {
-    Str8Node *node = wapp_str8_list_get(list1, index1);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list1, index1);
     result = result && wapp_str8_equal(node->item, &(splits1[index1]));
 
     ++index1;
@@ -453,7 +453,7 @@ TestFuncResult test_str8_split(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running2) {
-    Str8Node *node = wapp_str8_list_get(list2, index2);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list2, index2);
     result = result && wapp_str8_equal(node->item, &(splits2[index2]));
 
     ++index2;
@@ -467,7 +467,7 @@ TestFuncResult test_str8_split(void) {
 
 TestFuncResult test_str8_split_with_max(void) {
   b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
+  Allocator arena = wapp_mem_arena_allocator_init(KiB(100));
 
   Str8 str       = wapp_str8_lit("hello world from me");
   Str8 delim     = wapp_str8_lit(" ");
@@ -488,7 +488,7 @@ TestFuncResult test_str8_split_with_max(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running) {
-    Str8Node *node = wapp_str8_list_get(list, index);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list, index);
     result = result && wapp_str8_equal(node->item, &(splits[index]));
 
     ++index;
@@ -502,7 +502,7 @@ TestFuncResult test_str8_split_with_max(void) {
 
 TestFuncResult test_str8_rsplit(void) {
   b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
+  Allocator arena = wapp_mem_arena_allocator_init(KiB(100));
 
   Str8 str        = wapp_str8_lit("hello world from me");
   Str8 delim1     = wapp_str8_lit(" ");
@@ -535,7 +535,7 @@ TestFuncResult test_str8_rsplit(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running1) {
-    Str8Node *node = wapp_str8_list_get(list1, index1);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list1, index1);
     result = result && wapp_str8_equal(node->item, &(splits1[index1]));
 
     ++index1;
@@ -545,7 +545,7 @@ TestFuncResult test_str8_rsplit(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running2) {
-    Str8Node *node = wapp_str8_list_get(list2, index2);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list2, index2);
     result = result && wapp_str8_equal(node->item, &(splits2[index2]));
 
     ++index2;
@@ -559,7 +559,7 @@ TestFuncResult test_str8_rsplit(void) {
 
 TestFuncResult test_str8_rsplit_with_max(void) {
   b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
+  Allocator arena = wapp_mem_arena_allocator_init(KiB(100));
 
   Str8 str       = wapp_str8_lit("hello world from me");
   Str8 delim     = wapp_str8_lit(" ");
@@ -580,7 +580,7 @@ TestFuncResult test_str8_rsplit_with_max(void) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   while (running) {
-    Str8Node *node = wapp_str8_list_get(list, index);
+    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list, index);
     result = result && wapp_str8_equal(node->item, &(splits[index]));
 
     ++index;
@@ -594,7 +594,7 @@ TestFuncResult test_str8_rsplit_with_max(void) {
 
 TestFuncResult test_str8_join(void) {
   b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
+  Allocator arena = wapp_mem_arena_allocator_init(KiB(100));
 
   Str8 str        = wapp_str8_lit("hello world from me");
   Str8 delim1     = wapp_str8_lit(" ");
@@ -615,11 +615,11 @@ TestFuncResult test_str8_join(void) {
 TestFuncResult test_str8_from_bytes(void) {
   b8 result;
 
-  Str8 str  = wapp_str8_buf(1024);
+  Str8 str      = wapp_str8_buf(1024);
-  u8 *bytes = wapp_array(u8, 'W', 'A', 'P', 'P');
+  U8Array bytes = wapp_array(u8, U8Array, 'W', 'A', 'P', 'P');
-  wapp_str8_from_bytes(&str, bytes);
+  wapp_str8_from_bytes(&str, &bytes);
 
-  result = str.size == wapp_array_count(u8, bytes) * wapp_array_item_size(u8, bytes);
+  result = str.size == bytes.count * bytes.item_size;
   result = result && wapp_str8_equal(&str, &wapp_str8_lit_ro("WAPP"));
 
   return wapp_tester_result(result);