.clangd

@@ -1,2 +0,0 @@
-CompileFlags:
-  Add: -ferror-limit=0

.gitignore

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

Makefile

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

README.md

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

build

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

build.ps1

@@ -4,7 +4,7 @@ Param(
 
 $Compiler = "cl.exe"
 
-$GeneralFlags = "/Wall /WX /wd4996 /wd4464 /wd5105 /std:c11"
+$GeneralFlags = "/Wall /WX /wd4996"
 $LibraryFlags = "/LD"
 
 $Kernel = (Get-ChildItem Env:OS).Value
@@ -46,7 +46,7 @@ mkdir -p $OutDir > $null
 mkdir -p $TestsDir > $null
 
 # Run code generation
-Invoke-Expression "python -m codegen"
+Invoke-Expression "python3 -m codegen"
 
 # Build and run tests
 Invoke-Expression "$Compiler $GeneralFlags $IncludeDirs $TestIncludeDirs $SrcFiles $TestSrcFiles $TestOutputs" -ErrorAction Stop

codegen/__main__.py

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

codegen/array/make_array.py

@@ -1,439 +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 ArrayData(SerialisableDataclass):
-    array_typename: str
-    hdr_decl_types: List[CStruct] = field(default_factory=list)
-    src_decl_types: List[CStruct] = field(default_factory=list)
-
-    @classmethod
-    def from_dict(cls: Type["ArrayData"], d: Dict[str, Any]) -> "ArrayData":
-        data = ArrayData(**d)
-        data.hdr_decl_types = [CStruct.from_dict(v) for v in data.hdr_decl_types if isinstance(v, dict)]
-        data.src_decl_types = [CStruct.from_dict(v) for v in data.src_decl_types if isinstance(v, dict)]
-        return data
-
-
-def make_array(user_datatypes: Dict[CDataType, ArrayData] = {}):
-    def __format_func_body(
-        filename: Path,
-        type_string: str,
-        type_string_upper: str,
-        type_string_lower: str,
-        array_typename: str
-    ):
-        return load_func_body_from_file(filename).format(
-            T=type_string,
-            ArrayType=array_typename,
-            Tupper=type_string_upper,
-            Tlower=type_string_lower,
-        )
-
-    out_dir = WAPP_SRC_ROOT / "primitives" / "array"
-    out_dir.mkdir(parents=True, exist_ok=True)
-
-    common_includes: List[CInclude] = [
-        CInclude(
-            header=str(convert_to_relative(WAPP_SRC_ROOT / "common" / "aliases" / "aliases.h", out_dir)).replace("\\", "/"),
-            local=True,
-        ),
-        CInclude(
-            header=str(convert_to_relative(WAPP_SRC_ROOT / "primitives" / "mem_allocator" / "mem_allocator.h", out_dir)).replace("\\", "/"),
-            local=True,
-        ),
-        CInclude(
-            header=str(convert_to_relative(WAPP_SRC_ROOT / "common" / "misc" / "misc_utils.h", out_dir)).replace("\\", "/"),
-            local=True,
-        ),
-    ]
-
-    common_decl_types: List[CStruct] = []
-
-    datatypes: dict[CDataType, ArrayData] = {
-        "Str8": ArrayData(
-            array_typename="Str8Array",
-            hdr_decl_types=[
-                CStruct(name="str8", cargs=[], typedef_name="Str8"),
-            ],
-        ),
-    }
-
-    for _type in CType:
-        if _type == CType.VOID:
-            datatypes["void *"] = ArrayData(
-                array_typename="VoidPArray",
-            )
-            continue
-
-        type_title = _type.value.title()
-        datatypes[_type.value] = ArrayData(
-            array_typename=f"{type_title}Array",
-        )
-
-    datatypes.update(user_datatypes)
-
-    snippets_dir = Path(__file__).parent / "snippets"
-
-    header = CHeader(
-        name="array",
-        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="stddef.h"),
-            CInclude(
-                header=str(convert_to_relative(WAPP_SRC_ROOT / "common" / "assert" / "assert.h", out_dir)).replace("\\", "/"),
-                local=True
-            ),
-        ],
-        internal_funcs=[],
-        funcs=header.funcs
-    )
-
-    if len(common_includes) > 0:
-        header.includes.extend(common_includes)
-        source.includes.extend(common_includes)
-
-
-    generic_funcs = []
-
-    for _type, array_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()
-
-        array = CStruct(
-            name=array_data.array_typename,
-            cargs=[
-                CArg(name="items", _type=type_string, pointer=CPointer(_type=CPointerType.SINGLE)),
-                CArg(name="count", _type=CType.U64),
-                CArg(name="capacity", _type=CType.U64),
-                CArg(name="item_size", _type=CType.U64),
-            ],
-        )
-
-        if isinstance(_type, str) and _type == "void *":
-            alloc_capacity_func = CFunc(
-                name=f"_array_alloc_capacity",
-                ret_type=array,
-                args=[
-                    CArg(name="allocator", _type="Allocator", pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-                    CArg(name="capacity", _type=CType.U64),
-                    CArg(name="item_size", _type=CType.U64),
-                ],
-                body=__format_func_body(
-                    filename=snippets_dir / "alloc_capacity",
-                    type_string=type_string,
-                    type_string_upper=type_string_upper,
-                    type_string_lower=type_string_lower,
-                    array_typename=array_data.array_typename,
-                ),
-                pointer=CPointer(CPointerType.SINGLE),
-            )
-            generic_funcs.append(alloc_capacity_func)
-        
-        stack_array_cmacro = CMacro(
-            name=f"wapp_{type_string_lower}_array(...)",
-            value=__format_func_body(
-                filename=snippets_dir / "stack_array",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
-        stack_array_cppmacro = CMacro(
-            name=f"wapp_{type_string_lower}_array(...)",
-            value=__format_func_body(
-                filename=snippets_dir / "stack_array_cpp",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
-
-        stack_capacity_array_cmacro = CMacro(
-            name=f"wapp_{type_string_lower}_array_with_capacity(CAPACITY)",
-            value=__format_func_body(
-                filename=snippets_dir / "stack_capacity_array",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
-        stack_capacity_array_cppmacro = CMacro(
-            name=f"wapp_{type_string_lower}_array_with_capacity(CAPACITY)",
-            value=__format_func_body(
-                filename=snippets_dir / "stack_capacity_array_cpp",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
-
-        alloc_capacity_array_macro = CMacro(
-            name=f"wapp_{type_string_lower}_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY)",
-            value=__format_func_body(
-                filename=snippets_dir / "alloc_capacity_macro",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
-
-        array_pop_cmacro = CMacro(
-            name=f"wapp_{type_string_lower}_array_pop(ARRAY_PTR)",
-            value=__format_func_body(
-                filename=snippets_dir / "array_pop_macro",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
-        array_pop_cppmacro = CMacro(
-            name=f"wapp_{type_string_lower}_array_pop(ARRAY_PTR)",
-            value=__format_func_body(
-                filename=snippets_dir / "array_pop_macro_cpp",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
-
-        get_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_get",
-            ret_type=type_string,
-            args=[
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-                CArg(name="index", _type=CType.U64),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "array_get",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-            pointer=CPointer(CPointerType.SINGLE),
-        )
-
-        set_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_set",
-            ret_type=CType.VOID,
-            args=[
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-                CArg(name="index", _type=CType.U64),
-                CArg(name="item", _type=type_string, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "array_set",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
-
-        append_capped_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_append_capped",
-            ret_type=CType.VOID,
-            args=[
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-                CArg(name="item", _type=type_string, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "append_capped",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
-
-        extend_capped_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_extend_capped",
-            ret_type=CType.VOID,
-            args=[
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-                CArg(name="other", _type=array, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "extend_capped",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
-
-        clear_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_clear",
-            ret_type=CType.VOID,
-            args=[
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "clear",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
-
-        copy_capped_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_copy_capped",
-            ret_type=CType.VOID,
-            args=[
-                CArg(name="src", _type=array, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-                CArg(name="dst", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "copy_capped",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-        )
-
-        append_alloc_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_append_alloc",
-            ret_type=array,
-            args=[
-                CArg(name="allocator", _type="Allocator", pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-                CArg(name="item", _type=type_string, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "append_alloc",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-            pointer=CPointer(CPointerType.SINGLE),
-        )
-
-        extend_alloc_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_extend_alloc",
-            ret_type=array,
-            args=[
-                CArg(name="allocator", _type="Allocator", pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-                CArg(name="other", _type=array, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "extend_alloc",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-            pointer=CPointer(CPointerType.SINGLE),
-        )
-
-        copy_alloc_func = CFunc(
-            name=f"wapp_{type_string_lower}_array_copy_alloc",
-            ret_type=array,
-            args=[
-                CArg(name="allocator", _type="Allocator", pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-                CArg(name="src", _type=array, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
-                CArg(name="dst", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "copy_alloc",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-            pointer=CPointer(CPointerType.SINGLE),
-        )
-
-        pop_func = CFunc(
-            name=f"_{type_string_lower}_array_pop",
-            ret_type=type_string,
-            args=[
-                CArg(name="array", _type=array, pointer=CPointer(CPointerType.SINGLE)),
-            ],
-            body=__format_func_body(
-                filename=snippets_dir / "array_pop",
-                type_string=type_string,
-                type_string_upper=type_string_upper,
-                type_string_lower=type_string_lower,
-                array_typename=array_data.array_typename,
-            ),
-            pointer=CPointer(CPointerType.SINGLE),
-        )
-
-        header.decl_types.extend(array_data.hdr_decl_types)
-        header.macros.extend([
-            alloc_capacity_array_macro,
-        ])
-        header.c_macros.extend([
-            stack_array_cmacro,
-            stack_capacity_array_cmacro,
-            array_pop_cmacro,
-        ])
-        header.cpp_macros.extend([
-            stack_array_cppmacro,
-            stack_capacity_array_cppmacro,
-            array_pop_cppmacro,
-        ])
-        header.types.extend([array])
-        header.funcs.extend([
-            get_func,
-            set_func,
-            append_capped_func,
-            extend_capped_func,
-            clear_func,
-            copy_capped_func,
-            append_alloc_func,
-            extend_alloc_func,
-            copy_alloc_func,
-            pop_func,
-        ])
-
-        source.decl_types.extend(array_data.src_decl_types)
-        source.funcs = header.funcs
-
-
-    header.funcs.extend(generic_funcs)
-    header.save(out_dir)
-    source.save(out_dir)

codegen/array/snippets/alloc_capacity

@@ -1,15 +0,0 @@
-  wapp_debug_assert(allocator != NULL, "`array` should not be NULL");
-
-  u64 allocation_size = sizeof({ArrayType}) + item_size * capacity;
-  {ArrayType} *array  = wapp_mem_allocator_alloc(allocator, allocation_size);
-  if (!array) {{
-    goto RETURN_GENERIC_ARRAY_ALLOC;
-  }}
-
-  array->items     = ({T} *)((u8 *)array + sizeof({ArrayType}));
-  array->count     = 0;
-  array->capacity  = capacity;
-  array->item_size = item_size;
-
-RETURN_GENERIC_ARRAY_ALLOC:
-  return array;

codegen/array/snippets/alloc_capacity_macro

@@ -1 +0,0 @@
-(({ArrayType} *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof({T})))

codegen/array/snippets/append_alloc

@@ -1,18 +0,0 @@
-  wapp_debug_assert(allocator != NULL && array != NULL, "`allocator` and `array` should not be NULL");
-
-  {ArrayType} *output = array;
-
-  if (array->count >= array->capacity) {{
-    u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(array->capacity * 2);
-    output           = ({ArrayType} *)_array_alloc_capacity(allocator, new_capacity, array->item_size);
-    if (!output) {{
-      output = array;
-      goto RETURN_{Tupper}_ARRAY_APPEND_ALLOC;
-    }}
-    wapp_{Tlower}_array_copy_capped(array, output);
-  }}
-
-  wapp_{Tlower}_array_append_capped(output, item);
-
-RETURN_{Tupper}_ARRAY_APPEND_ALLOC:
-  return output;

codegen/array/snippets/append_capped

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

codegen/array/snippets/array_get

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

codegen/array/snippets/array_pop

@@ -1,4 +0,0 @@
-  u64 index = array->count - 1;
-  {T} *out = wapp_{Tlower}_array_get(array, index);
-  --(array->count);
-  return out;

codegen/array/snippets/array_pop_macro

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

codegen/array/snippets/array_pop_macro_cpp

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

codegen/array/snippets/array_set

@@ -1,3 +0,0 @@
-  {T} *ptr = wapp_{Tlower}_array_get(array, index);
-
-  memcpy((void *)ptr, (void *)item, array->item_size);

codegen/array/snippets/clear

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

codegen/array/snippets/copy_alloc

@@ -1,18 +0,0 @@
-  wapp_debug_assert(allocator != NULL && src != NULL && dst != NULL, "`allocator`, `src` and `dst` should not be NULL");
-
-  {ArrayType} *output = dst;
-
-  if (src->count >= dst->capacity) {{
-    u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(dst->capacity * 2);
-    output           = ({ArrayType} *)_array_alloc_capacity(allocator, new_capacity, src->item_size);
-    if (!output) {{
-      output = dst;
-      goto RETURN_{Tupper}_ARRAY_COPY_ALLOC;
-    }}
-  }}
-
-  wapp_{Tlower}_array_clear(output);
-  wapp_{Tlower}_array_copy_capped(src, output);
-
-RETURN_{Tupper}_ARRAY_COPY_ALLOC:
-  return output;

codegen/array/snippets/copy_capped

@@ -1,22 +0,0 @@
-  wapp_debug_assert(src != NULL && dst != NULL, "`src` and `dst` should not be NULL");
-
-  wapp_{Tlower}_array_clear(dst);
-
-  {T} *item;
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  u64 to_copy    = src->count < dst->capacity ? src->count : dst->capacity;
-  u64 item_index = 0;
-  b32 running    = true;
-  while (running) {{
-    item = wapp_{Tlower}_array_get(src, item_index);
-    ++item_index;
-    running = item_index < to_copy;
-
-    if (!item) {{
-      continue;
-    }}
-    
-    wapp_{Tlower}_array_append_capped(dst, item);
-  }}

codegen/array/snippets/extend_alloc

@@ -1,19 +0,0 @@
-  wapp_debug_assert(allocator != NULL && array != NULL && other != NULL, "`allocator`, `array` and `other` should not be NULL");
-
-  {ArrayType} *output = array;
-
-  u64 remaining_capacity = array->capacity - array->count;
-  if (other->count >= remaining_capacity) {{
-    u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(array->capacity * 2);
-    output           = ({ArrayType} *)_array_alloc_capacity(allocator, new_capacity, array->item_size);
-    if (!output) {{
-      output = array;
-      goto RETURN_{Tupper}_ARRAY_EXTEND_ALLOC;
-    }}
-    wapp_{Tlower}_array_copy_capped(array, output);
-  }}
-
-  wapp_{Tlower}_array_extend_capped(output, other);
-
-RETURN_{Tupper}_ARRAY_EXTEND_ALLOC:
-  return output;

codegen/array/snippets/extend_capped

@@ -1,23 +0,0 @@
-  wapp_debug_assert(array != NULL && other != NULL, "`array` and `other` should not be NULL");
-
-  u64 remaining_capacity = array->capacity - array->count;
-  wapp_runtime_assert(other->count < remaining_capacity, "`array` does not have enough capacity");
-
-  {T} *item;
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  u64 items_to_add = other->count;
-  u64 item_index   = 0;
-  b32 running      = true;
-  while (running) {{
-    item = wapp_{Tlower}_array_get(other, item_index);
-    ++item_index;
-    running = item_index < items_to_add;
-
-    if (!item) {{
-      continue;
-    }}
-
-    wapp_{Tlower}_array_append_capped(array, item);
-  }}

codegen/array/snippets/stack_array

@@ -1,6 +0,0 @@
-(({ArrayType}){{ \
-  .items = ({T}[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count({T}, __VA_ARGS__) * 2)]){{__VA_ARGS__}}, \
-  .count = wapp_misc_utils_va_args_count({T}, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count({T}, __VA_ARGS__) * 2), \
-  .item_size = sizeof({T}) \
-}})

codegen/array/snippets/stack_array_cpp

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

codegen/array/snippets/stack_capacity_array

@@ -1 +0,0 @@
-(({ArrayType}){{.items = ({T}[CAPACITY]){{0}}, .count = 0, .capacity = CAPACITY, .item_size = sizeof({T})}})

codegen/array/snippets/stack_capacity_array_cpp

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

codegen/constants.py

@@ -1,10 +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"
-ARRAY_DATA = "array_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 = "b32"
-    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   = "external "
-    INTERNAL   = "internal "
-    PERSISTENT = "persistent "
-
-    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,349 +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_includes: List[CInclude] = [
-        CInclude(
-            header=str(convert_to_relative(WAPP_SRC_ROOT / "common" / "aliases" / "aliases.h", out_dir)).replace("\\", "/"),
-            local=True,
-        )
-    ]
-
-    common_decl_types: List[CStruct] = []
-
-    datatypes: dict[CDataType, DblListData] = {
-        "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:
-            datatypes["void *"] = DblListData(
-                node_typename="VoidPNode",
-                list_typename="VoidPList",
-            )
-            continue
-
-        type_title = _type.value.title()
-        datatypes[_type.value] = 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"),
-            CInclude(header="assert.h"),
-        ],
-        internal_funcs=[],
-        funcs=header.funcs
-    )
-
-    if len(common_includes) > 0:
-        header.includes.extend(common_includes)
-        source.includes.extend(common_includes)
-
-    for _type, dbl_list_data in datatypes.items():
-        type_string = get_datatype_string(_type)
-        clean_type_string = type_string.replace(" ", "").replace("*", "_ptr")
-        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),
-            ],
-        )
-
-        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.decl_types.extend(dbl_list_data.hdr_decl_types)
-        header.c_macros.append(node_cmacro)
-        header.cpp_macros.append(node_cppmacro)
-        header.types.extend([node, dl_list])
-        header.funcs.extend([
-            get_func,
-            push_front_func,
-            push_back_func,
-            insert_func,
-            pop_front_func,
-            pop_back_func,
-            remove_func,
-            empty_func,
-        ])
-
-        source.decl_types.extend(dbl_list_data.src_decl_types)
-        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,29 +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": []
-    }
-  },
-  "array_data": {
-    "CustomType": {
-      "array_typename": "CustomTypeArray",
-      "hdr_decl_types": [
-        {
-          "name": "custom_type",
-          "cargs": [],
-          "typedef_name": "CustomType"
-        }
-      ],
-      "src_decl_types": []
-    }
-  }
-}

scripts/header_install.sh

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

src/common/aliases/aliases.h

@@ -1,47 +1,17 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef ALIASES_H
 #define ALIASES_H
 
-#include "../platform/platform.h"
 #include <stdint.h>
 
-#if WAPP_PLATFORM_C_VERSION >= WAPP_PLATFORM_C11_VERSION && !defined(WAPP_PLATFORM_APPLE)
+#define c8 uint8_t
-  #include <uchar.h>
+#define c16 uint16_t
-
+#define c32 uint32_t
-  #if WAPP_PLATFORM_C_VERSION >= WAPP_PLATFORM_C23_VERSION
-    #define c8 char8_t
-  #else
-    #define c8 uint8_t
-  #endif // !WAPP_PLATFORM_C23_VERSION
-
-  #define c16 char16_t
-  #define c32 char32_t
-#else
-  #define c8 uint8_t
-  #define c16 uint16_t
-  #define c32 uint32_t
-#endif // !WAPP_PLATFORM_C11_VERSION
 
 #define u8 uint8_t
 #define u16 uint16_t
 #define u32 uint32_t
 #define u64 uint64_t
 
-#define b32 uint32_t
-
-#ifndef WAPP_PLATFORM_CPP
-
-#ifndef false
-#define false (b32)0
-#endif // !false
-
-#ifndef true
-#define true (b32)1
-#endif // !true
-
-#endif // !WAPP_PLATFORM_CPP
-
 #define i8 int8_t
 #define i16 int16_t
 #define i32 int32_t
@@ -58,10 +28,10 @@
 #define internal static
 #define persistent static
 
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 #define class_mem static
 #define BEGIN_C_LINKAGE extern "C" {
 #define END_C_LINKAGE }
-#endif // WAPP_PLATFORM_CPP
+#endif // __cplusplus
 
 #endif // !ALIASES_H

src/common/assert/assert.h

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

src/common/misc/misc_utils.h

@@ -1,14 +1,8 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef MISC_UTILS_H
 #define MISC_UTILS_H
 
 #include "../aliases/aliases.h"
 
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
 #define KB(SIZE) (SIZE * 1024ull)
 #define MB(SIZE) (KB(SIZE) * 1024)
 #define GB(SIZE) (MB(SIZE) * 1024)
@@ -16,41 +10,4 @@ BEGIN_C_LINKAGE
 
 #define wapp_misc_utils_padding_size(SIZE) u8 reserved_padding[sizeof(void *) - ((SIZE) % sizeof(void *))]
 
-#define U64_RSHIFT_OR_1(X)  (((u64)X) | (((u64)X) >> 1))
-#define U64_RSHIFT_OR_2(X)  (((u64)X) | (((u64)X) >> 2))
-#define U64_RSHIFT_OR_4(X)  (((u64)X) | (((u64)X) >> 4))
-#define U64_RSHIFT_OR_8(X)  (((u64)X) | (((u64)X) >> 8))
-#define U64_RSHIFT_OR_16(X) (((u64)X) | (((u64)X) >> 16))
-#define U64_RSHIFT_OR_32(X) (((u64)X) | (((u64)X) >> 32))
-#define wapp_misc_utils_u64_round_up_pow2(X) ( \
-  ( \
-    U64_RSHIFT_OR_32( \
-      U64_RSHIFT_OR_16( \
-        U64_RSHIFT_OR_8( \
-          U64_RSHIFT_OR_4( \
-            U64_RSHIFT_OR_2( \
-              U64_RSHIFT_OR_1(X - 1) \
-            ) \
-          ) \
-        ) \
-      ) \
-    ) \
-  ) + 1 \
-)
-
-#ifdef WAPP_PLATFORM_CPP
-#define wapp_misc_utils_va_args_count(T, ...) va_args_count<T>(__VA_ARGS__)
-#else
-#define wapp_misc_utils_va_args_count(T, ...) (sizeof((T[]){__VA_ARGS__})/sizeof(T))
-#endif // !WAPP_PLATFORM_CPP
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-
-template <typename T, typename... Args>
-constexpr u64 va_args_count(Args&&...) {
-    return sizeof...(Args);
-}
-#endif // !WAPP_PLATFORM_CPP
-
 #endif // !MISC_UTILS_H

src/common/platform/platform.h

@@ -1,5 +1,3 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef PLATFORM_H
 #define PLATFORM_H
 
@@ -60,55 +58,4 @@
   #error "Unrecognised platform"
 #endif
 
-#ifdef __cplusplus
-  #define WAPP_PLATFORM_CPP
-  #define WAPP_PLATFORM_CPP_VERSION __cplusplus
-  #define WAPP_PLATFORM_CPP98_VERSION 199711L
-  #define WAPP_PLATFORM_CPP11_VERSION 201103L
-  #define WAPP_PLATFORM_CPP14_VERSION 201402L
-  #define WAPP_PLATFORM_CPP17_VERSION 201703L
-  #define WAPP_PLATFORM_CPP20_VERSION 202002L
-  #define WAPP_PLATFORM_CPP23_VERSION 202302L
-
-  #if WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP98_VERSION
-    #define WAPP_PLATFORM_CPP98
-  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP11_VERSION
-    #define WAPP_PLATFORM_CPP11
-  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP14_VERSION
-    #define WAPP_PLATFORM_CPP14
-  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP17_VERSION
-    #define WAPP_PLATFORM_CPP17
-  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP20_VERSION
-    #define WAPP_PLATFORM_CPP20
-  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP23_VERSION
-    #define WAPP_PLATFORM_CPP23
-  #else
-    #error "Unrecognised C++ version"
-  #endif
-#else
-  #define WAPP_PLATFORM_C
-
-  #if defined(__STDC_VERSION__)
-    #define WAPP_PLATFORM_C_VERSION __STDC_VERSION__
-    #define WAPP_PLATFORM_C99_VERSION 199901L
-    #define WAPP_PLATFORM_C11_VERSION 201112L
-    #define WAPP_PLATFORM_C17_VERSION 201710L
-    #define WAPP_PLATFORM_C23_VERSION 202311L
-
-    #if WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C99_VERSION
-      #define WAPP_PLATFORM_C99
-    #elif WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C11_VERSION
-      #define WAPP_PLATFORM_C11
-    #elif WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C17_VERSION
-      #define WAPP_PLATFORM_C17
-    #elif WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C23_VERSION
-      #define WAPP_PLATFORM_C23
-    #else
-      #error "Unrecognised C version"
-    #endif
-  #else
-    #define WAPP_PLATFORM_C89
-  #endif
-#endif // !__cplusplus
-
 #endif // !PLATFORM_H

src/common/wapp_common.h

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

src/containers/dbl_list/dbl_list.c

@@ -0,0 +1,209 @@
+#include "./dbl_list.h"
+#include "../../common/aliases/aliases.h"
+#include <stddef.h>
+
+internal DBL_LIST(void) node_to_list(DBL_NODE(void) *node);
+
+DBL_NODE(void) *_dbl_list_get(const DBL_LIST(void) *list, u64 index) {
+  if (index >= list->node_count) {
+    return NULL;
+  }
+
+  DBL_NODE(void) *output  = NULL;
+  DBL_NODE(void) *current = list->first;
+  for (u64 i = 1; i <= index; ++i) {
+    current = current->next;
+  }
+
+  output = current;
+
+  return output;
+
+}
+
+void _dbl_list_push_front(DBL_LIST(void) *list, DBL_NODE(void) *node) {
+  if (!list || !node || !(node->item)) {
+    return;
+  }
+
+  DBL_LIST(void) node_list = node_to_list(node);
+
+  if (list->node_count == 0) {
+    *list = node_list;
+    return;
+  }
+
+  list->node_count += node_list.node_count;
+
+  DBL_NODE(void) *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(DBL_LIST(void) *list, DBL_NODE(void) *node) {
+  if (!list || !node || !(node->item)) {
+    return;
+  }
+
+  DBL_LIST(void) node_list = node_to_list(node);
+
+  if (list->node_count == 0) {
+    *list = node_list;
+    return;
+  }
+
+  list->node_count += node_list.node_count;
+
+  DBL_NODE(void) *last = list->last;
+  if (last) {
+    last->next = node_list.first;
+  }
+
+  list->last = node_list.last;
+  node_list.first->prev = last;
+
+}
+
+void _dbl_list_insert(DBL_LIST(void) *list, DBL_NODE(void) *node, u64 index) {
+  if (!list || !node || !(node->item)) {
+    return;
+  }
+
+  if (index == 0) {
+    _dbl_list_push_front(list, node);
+    return;
+  } else if (index == list->node_count) {
+    _dbl_list_push_back(list, node);
+    return;
+  }
+
+  DBL_NODE(void) *dst_node = _dbl_list_get(list, index);
+  if (!dst_node) {
+    return;
+  }
+
+  DBL_LIST(void) node_list = node_to_list(node);
+
+  list->node_count += node_list.node_count;
+
+  DBL_NODE(void) *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;
+
+}
+
+DBL_NODE(void) *_dbl_list_pop_front(DBL_LIST(void) *list) {
+  DBL_NODE(void) *output = NULL;
+
+  if (!list || list->node_count == 0) {
+    goto RETURN_STR8_LIST_POP_FRONT;
+  }
+
+  output = list->first;
+
+  if (list->node_count == 1) {
+    *list = (DBL_LIST(void)){0};
+    goto RETURN_STR8_LIST_POP_FRONT;
+  }
+
+  --(list->node_count);
+  list->first = output->next;
+
+  output->prev = output->next = NULL;
+
+RETURN_STR8_LIST_POP_FRONT:
+  return output;
+
+}
+
+DBL_NODE(void) *_dbl_list_pop_back(DBL_LIST(void) *list) {
+  DBL_NODE(void) *output = NULL;
+
+  if (!list || list->node_count == 0) {
+    goto RETURN_STR8_LIST_POP_BACK;
+  }
+
+  output = list->last;
+
+  if (list->node_count == 1) {
+    *list = (DBL_LIST(void)){0};
+    goto RETURN_STR8_LIST_POP_BACK;
+  }
+
+  --(list->node_count);
+  list->last = output->prev;
+
+  output->prev = output->next = NULL;
+
+RETURN_STR8_LIST_POP_BACK:
+  return output;
+
+}
+
+DBL_NODE(void) *_dbl_list_remove(DBL_LIST(void) *list, u64 index) {
+  DBL_NODE(void) *output = NULL;
+  if (!list) {
+    goto RETURN_STR8_LIST_REMOVE;
+  }
+
+  if (index == 0) {
+    output = _dbl_list_pop_front(list);
+    goto RETURN_STR8_LIST_REMOVE;
+  } else if (index == list->node_count) {
+    output = _dbl_list_pop_back(list);
+    goto RETURN_STR8_LIST_REMOVE;
+  }
+
+  output = _dbl_list_get(list, index);
+  if (!output) {
+    goto RETURN_STR8_LIST_REMOVE;
+  }
+
+  output->prev->next = output->next;
+  output->next->prev = output->prev;
+
+  --(list->node_count);
+
+  output->prev = output->next = NULL;
+
+RETURN_STR8_LIST_REMOVE:
+  return output;
+
+}
+
+void _dbl_list_empty(DBL_LIST(void) *list) {
+  if (!list) {
+    return;
+  }
+
+  u64 count = list->node_count;
+  for (u64 i = 0; i < count; ++i) {
+    _dbl_list_pop_back(list);
+  }
+
+}
+
+internal DBL_LIST(void) node_to_list(DBL_NODE(void) *node) {
+  DBL_LIST(void) 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;
+}

src/containers/dbl_list/dbl_list.h

@@ -0,0 +1,75 @@
+#ifndef DBL_LIST_H
+#define DBL_LIST_H
+
+#include "../../common/aliases/aliases.h"
+
+#ifdef __cplusplus
+BEGIN_C_LINKAGE
+#endif // !__cplusplus
+
+#define DBL_NODE(T) T##Node
+#define DBL_LIST(T) T##List
+
+#define CAST_NODE(NODE) ((DBL_NODE(void))(NODE))
+#define CAST_LIST(LIST) ((DBL_LIST(void))(LIST))
+
+#define CAST_NODE_PTR(NODE_PTR) ((DBL_NODE(void)*)(NODE_PTR))
+#define CAST_LIST_PTR(LIST_PTR) ((DBL_LIST(void)*)(LIST_PTR))
+
+#define DBL_LIST_DECL(T) typedef struct DBL_NODE(T) DBL_NODE(T); \
+  struct DBL_NODE(T) {                                           \
+    T *item;                                                     \
+    DBL_NODE(T) *prev;                                           \
+    DBL_NODE(T) *next;                                           \
+  };                                                             \
+                                                                 \
+  typedef struct DBL_LIST(T) DBL_LIST(T);                        \
+  struct DBL_LIST(T) {                                           \
+    DBL_NODE(T) *first;                                          \
+    DBL_NODE(T) *last;                                           \
+    u64 node_count;                                              \
+  }
+
+DBL_LIST_DECL(void);
+
+#define wapp_dbl_list_node_from_item(T, ITEM_PTR) \
+    ((DBL_NODE(T)){ .item = ITEM_PTR })
+
+#define wapp_dbl_list_get(T, LIST_PTR, INDEX) \
+    (DBL_NODE(T)*)_dbl_list_get(CAST_LIST_PTR(LIST_PTR), INDEX)
+
+#define wapp_dbl_list_push_front(LIST_PTR, NODE_PTR) \
+    _dbl_list_push_front(CAST_LIST_PTR(LIST_PTR), CAST_NODE_PTR(NODE_PTR))
+
+#define wapp_dbl_list_push_back(LIST_PTR, NODE_PTR) \
+    _dbl_list_push_back(CAST_LIST_PTR(LIST_PTR), CAST_NODE_PTR(NODE_PTR))
+
+#define wapp_dbl_list_insert(LIST_PTR, NODE_PTR, INDEX) \
+    _dbl_list_insert(CAST_LIST_PTR(LIST_PTR), CAST_NODE_PTR(NODE_PTR), INDEX)
+
+#define wapp_dbl_list_pop_front(T, LIST_PTR) \
+    (DBL_NODE(T)*)_dbl_list_pop_front(CAST_LIST_PTR(LIST_PTR))
+
+#define wapp_dbl_list_pop_back(T, LIST_PTR) \
+    (DBL_NODE(T)*)_dbl_list_pop_back(CAST_LIST_PTR(LIST_PTR))
+
+#define wapp_dbl_list_remove(T, LIST_PTR, INDEX) \
+    (DBL_NODE(T)*)_dbl_list_remove(CAST_LIST_PTR(LIST_PTR), INDEX)
+
+#define wapp_dbl_list_empty(LIST_PTR) \
+    _dbl_list_empty(CAST_LIST_PTR(LIST_PTR))
+
+DBL_NODE(void) *_dbl_list_get(const DBL_LIST(void) *list, u64 index);
+void            _dbl_list_push_front(DBL_LIST(void) *list, DBL_NODE(void) *node);
+void            _dbl_list_push_back(DBL_LIST(void) *list, DBL_NODE(void) *node);
+void            _dbl_list_insert(DBL_LIST(void) *list, DBL_NODE(void) *node, u64 index);
+DBL_NODE(void) *_dbl_list_pop_front(DBL_LIST(void) *list);
+DBL_NODE(void) *_dbl_list_pop_back(DBL_LIST(void) *list);
+DBL_NODE(void) *_dbl_list_remove(DBL_LIST(void) *list, u64 index);
+void            _dbl_list_empty(DBL_LIST(void) *list);
+
+#ifdef __cplusplus
+END_C_LINKAGE
+#endif // !__cplusplus
+
+#endif // !DBL_LIST_H

src/containers/wapp_containers.c

@@ -0,0 +1,6 @@
+#ifndef WAPP_CONTAINERS_C
+#define WAPP_CONTAINERS_C
+
+#include "dbl_list/dbl_list.c"
+
+#endif // !WAPP_CONTAINERS_C

src/containers/wapp_containers.h

@@ -0,0 +1,7 @@
+#ifndef WAPP_CONTAINERS_H
+#define WAPP_CONTAINERS_H
+
+#include "dbl_list/dbl_list.h"
+#include "../common/wapp_common.h"
+
+#endif // !WAPP_CONTAINERS_H

src/core/mem/allocator/mem_allocator.c

@@ -1,28 +1,37 @@
-// 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 <stdlib.h>
 
 void *wapp_mem_allocator_alloc(const Allocator *allocator, u64 size) {
-  wapp_debug_assert(allocator != NULL && (allocator->alloc) != NULL, "`allocator` and `allocator->alloc` should not be NULL");
+  if (!allocator || !(allocator->alloc)) {
+    return NULL;
+  }
+
   return allocator->alloc(size, allocator->obj);
 }
 
 void *wapp_mem_allocator_alloc_aligned(const Allocator *allocator, u64 size, u64 alignment) {
-  wapp_debug_assert(allocator != NULL && (allocator->alloc_aligned) != NULL, "`allocator` and `allocator->alloc_aligned` should not be NULL");
+  if (!allocator || !(allocator->alloc_aligned)) {
+    return NULL;
+  }
+
   return allocator->alloc_aligned(size, alignment, allocator->obj);
 }
 
 void *wapp_mem_allocator_realloc(const Allocator *allocator, void *ptr, u64 old_size, u64 new_size) {
-  wapp_debug_assert(allocator != NULL && (allocator->realloc) != NULL, "`allocator` and `allocator->realloc` should not be NULL");
+  if (!allocator || !(allocator->realloc)) {
+    return NULL;
+  }
+
   return allocator->realloc(ptr, old_size, new_size, allocator->obj);
 }
 
 void *wapp_mem_allocator_realloc_aligned(const Allocator *allocator, void *ptr, u64 old_size,
                                          u64 new_size, u64 alignment) {
-  wapp_debug_assert(allocator != NULL && (allocator->realloc_aligned) != NULL, "`allocator` and `allocator->realloc_aligned` should not be NULL");
+  if (!allocator || !(allocator->realloc_aligned)) {
+    return NULL;
+  }
+
   return allocator->realloc_aligned(ptr, old_size, new_size, alignment, allocator->obj);
 }
 

src/core/mem/allocator/mem_allocator.h

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

src/core/mem/arena/mem_arena.c

@@ -1,9 +1,5 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #include "mem_arena.h"
-#include "../utils/mem_utils.h"
 #include "../../../common/aliases/aliases.h"
-#include "../../../common/assert/assert.h"
 #include "../../../common/misc/misc_utils.h"
 #include "../../os/mem/mem_os.h"
 #include <stdbool.h>
@@ -40,11 +36,7 @@ bool wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags
     return false;
   }
 
-  u64 arena_capacity = wapp_misc_utils_u64_round_up_pow2(
+  u64 arena_capacity = base_capacity >= ARENA_MINIMUM_CAPACITY ? base_capacity : ARENA_MINIMUM_CAPACITY;
-      base_capacity >= ARENA_MINIMUM_CAPACITY ?
-      base_capacity :
-      ARENA_MINIMUM_CAPACITY
-  );
 
   arena_ptr->buf = (u8 *)wapp_mem_util_alloc(NULL, arena_capacity, WAPP_MEM_ACCESS_READ_WRITE, flags,
                                              zero_buffer ? WAPP_MEM_INIT_INITIALISED : WAPP_MEM_INIT_UNINITIALISED);
@@ -66,7 +58,9 @@ void *wapp_mem_arena_alloc(Arena *arena, u64 size) {
 }
 
 void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) {
-  wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
+  if (!arena) {
+    return NULL;
+  }
 
   u8 *alloc_start = arena->offset;
 
@@ -125,14 +119,18 @@ void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64
 }
 
 void wapp_mem_arena_clear(Arena *arena) {
-  wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
+  if (!arena) {
+    return;
+  }
 
   memset(arena->buf, 0, arena->offset - arena->buf);
   arena->offset = arena->buf;
 }
 
 void wapp_mem_arena_destroy(Arena **arena) {
-  wapp_debug_assert(arena != NULL && (*arena) != NULL, "`arena` double pointer is not valid");
+  if (!arena) {
+    return;
+  }
 
   Arena *arena_ptr = *arena;
   if (arena_ptr->buf) {

src/core/mem/arena/mem_arena.h

@@ -1,16 +1,13 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef MEM_ARENA_H
 #define MEM_ARENA_H
 
 #include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
 #include "../../os/mem/mem_os.h"
 #include <stdbool.h>
 
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus
 
 typedef struct arena Arena;
 
@@ -36,8 +33,8 @@ void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64
 void wapp_mem_arena_clear(Arena *arena);
 void wapp_mem_arena_destroy(Arena **arena);
 
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus
 
 #endif // !MEM_ARENA_H

src/core/mem/arena/mem_arena_allocator.c

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

src/core/mem/arena/mem_arena_allocator.h

@@ -1,17 +1,14 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef MEM_ARENA_ALLOCATOR_H
 #define MEM_ARENA_ALLOCATOR_H
 
 #include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
+#include "../allocator/mem_allocator.h"
-#include "../../../primitives/mem_allocator/mem_allocator.h"
 #include "../../os/mem/mem_os.h"
 #include <stdbool.h>
 
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus
 
 #define wapp_mem_arena_allocator_init(base_capacity)                           \
   (wapp_mem_arena_allocator_init_custom(base_capacity, WAPP_MEM_ALLOC_RESERVE, false))
@@ -37,8 +34,8 @@ Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags
 void wapp_mem_arena_allocator_clear(Allocator *allocator);
 void wapp_mem_arena_allocator_destroy(Allocator *allocator);
 
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus
 
 #endif // !MEM_ARENA_ALLOCATOR_H

src/core/mem/utils/mem_utils.c

@@ -1,16 +1,17 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #include "mem_utils.h"
 #include "../../../common/aliases/aliases.h"
-#include "../../../common/assert/assert.h"
 #include <stdbool.h>
 #include <stddef.h>
+#include <assert.h>
 
 internal bool is_power_of_two(u64 num) { return (num & (num - 1)) == 0; }
 
 void *wapp_mem_util_align_forward(void *ptr, u64 alignment) {
-  wapp_debug_assert(ptr != NULL, "`ptr` should not be NULL");
+  if (!ptr) {
-  wapp_runtime_assert(is_power_of_two(alignment), "`alignment` value is not a power of two");
+    return NULL;
+  }
+
+  assert(is_power_of_two(alignment));
 
   uptr p = (uptr)ptr;
   uptr align = (uptr)alignment;

src/core/mem/utils/mem_utils.h

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

src/core/os/cpath/cpath.c

@@ -1,18 +1,16 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #include "cpath.h"
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/misc/misc_utils.h"
+#include "../../mem/allocator/mem_allocator.h"
 #include "../../mem/arena/mem_arena_allocator.h"
-#include "../../../primitives/dbl_list/dbl_list.h"
+#include "../../strings/str8/str8.h"
-#include "../../../primitives/mem_allocator/mem_allocator.h"
+#include "../../strings/str8/str8_list.h"
-#include "../../../primitives/strings/str8/str8.h"
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
-u32 wapp_cpath_join_path(Str8 *dst, const Str8List *parts) {
+u32 wapp_cpath_join_path(Str8 *dst, const DBL_LIST(Str8) *parts) {
   if (!dst || !parts) {
     return CPATH_JOIN_INVALID_ARGS;
   }
@@ -30,14 +28,14 @@ u32 wapp_cpath_join_path(Str8 *dst, const Str8List *parts) {
   }
 
   // Handle first node
-  const Str8Node *first_node = wapp_str8_list_get(parts, 0);
+  const DBL_NODE(Str8) *first_node = wapp_dbl_list_get(Str8, 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
   // MSVC Spectre mitigation warnings
-  const Str8Node *node = first_node;
+  const DBL_NODE(Str8) *node = first_node;
   u64 node_index       = 1;
-  bool running         = node_index < parts->node_count;
+  bool running         = true;
   while (running && node->next) {
     node = node->next;
     if (node->item->size == 0) {
@@ -93,7 +91,7 @@ Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels) {
     goto RETURN_DIRUP;
   }
 
-  Str8List *parts = wapp_str8_split(&tmp_arena, path, &separator);
+  DBL_LIST(Str8) *parts = wapp_str8_split(&tmp_arena, path, &separator);
   if (!parts) {
     goto RETURN_DIRUP;
   }
@@ -107,7 +105,7 @@ Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels) {
     wapp_str8_push_back(output, absolute ? PATH_SEP : '.');
   } else {
     for (u64 i = 0; i < levels; ++i) {
-      wapp_str8_list_pop_back(parts);
+      wapp_dbl_list_pop_back(Str8, parts);
     }
     
     u64 alignment  = sizeof(void *) * 2;

src/core/os/cpath/cpath.h

@@ -1,16 +1,14 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef CPATH_H
 #define CPATH_H
 
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/platform/platform.h"
-#include "../../../primitives/mem_allocator/mem_allocator.h"
+#include "../../mem/allocator/mem_allocator.h"
-#include "../../../primitives/strings/str8/str8.h"
+#include "../../strings/str8/str8.h"
 
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus
 
 #ifdef WAPP_PLATFORM_POSIX
 #define PATH_SEP '/'
@@ -30,11 +28,11 @@ enum {
   CPATH_JOIN_INSUFFICIENT_DST_CAPACITY,
 };
 
-u32  wapp_cpath_join_path(Str8 *dst, const Str8List *parts);
+u32  wapp_cpath_join_path(Str8 *dst, const DBL_LIST(Str8) *parts);
 Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels);
 
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus
 
 #endif // !CPATH_H

src/core/os/mem/mem_os.c

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

src/core/os/mem/mem_os.h

@@ -1,16 +1,14 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef MEM_OS_H
 #define MEM_OS_H
 
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/platform/platform.h"
 
-#include "mem_os_ops.h"
+#ifdef __cplusplus
-
-#ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus
+
+#include "mem_os_ops.h"
 
 #if defined(WAPP_PLATFORM_WINDOWS)
 #include "win/mem_os_win.h"
@@ -20,14 +18,15 @@ BEGIN_C_LINKAGE
 #error "Unrecognised platform"
 #endif
 
+void *wapp_mem_util_align_forward(void *ptr, u64 alignment);
 void *wapp_mem_util_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
 void wapp_mem_util_free(void *ptr, u64 size);
 
 external void *mem_util_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
 external void mem_util_free(void *ptr, u64 size);
 
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus
 
 #endif // !MEM_OS_H

src/core/os/mem/mem_os_ops.h

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

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

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

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

@@ -1,13 +1,11 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef MEM_OS_POSIX_H
 #define MEM_OS_POSIX_H
 
 #include "../../../../common/platform/platform.h"
 
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // !__cplusplus
 
 #ifdef WAPP_PLATFORM_POSIX
 
@@ -28,8 +26,8 @@ typedef enum mem_alloc_flags {
 
 #endif // !WAPP_PLATFORM_POSIX
 
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // !__cplusplus
 
 #endif // !MEM_OS_POSIX_H

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

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

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

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

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

@@ -1,14 +1,11 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #include "commander.h"
 #include "commander_output.h"
 #include "../utils/shell_utils.h"
+#include "../../../mem/allocator/mem_allocator.h"
 #include "../../../mem/arena/mem_arena_allocator.h"
+#include "../../../strings/str8/str8.h"
 #include "../../../../common/aliases/aliases.h"
 #include "../../../../common/misc/misc_utils.h"
-#include "../../../../primitives/dbl_list/dbl_list.h"
-#include "../../../../primitives/mem_allocator/mem_allocator.h"
-#include "../../../../primitives/strings/str8/str8.h"
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -21,7 +18,7 @@
 internal inline CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf);
 internal inline CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf);
 
-CMDResult wapp_shell_commander_execute(CMDOutHandling out_handling, Str8 *out_buf, const Str8List *cmd) {
+CMDResult wapp_shell_commander_execute(CMDOutHandling out_handling, Str8 *out_buf, const DBL_LIST(Str8) *cmd) {
   if (!cmd) {
     return CMD_NO_EXIT(SHELL_ERR_INVALID_ARGS);
   }

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

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

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

@@ -1,5 +1,3 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef COMMANDER_OUTPUT_H
 #define COMMANDER_OUTPUT_H
 
@@ -7,9 +5,9 @@
 #include "../../../../common/platform/platform.h"
 #include <stdbool.h>
 
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus
 
 typedef enum {
   SHELL_OUTPUT_DISCARD,
@@ -33,13 +31,13 @@ struct commander_result {
   bool exited;
 
 #ifdef WAPP_PLATFORM_WINDOWS
-  #include "../../../../common/misc/misc_utils.h"
+  #include "misc_utils.h"
   wapp_misc_utils_padding_size(sizeof(bool) + sizeof(i32) + sizeof(CMDError));
 #endif // !WAPP_PLATFORM_WINDOWS
 };
 
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus
 
 #endif // !COMMANDER_OUTPUT_H

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

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

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

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

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

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

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

@@ -1,8 +1,6 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #include "termcolour.h"
 #include "terminal_colours.h"
-#include "../../../../primitives/strings/str8/str8.h"
+#include "../../../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/core/os/shell/termcolour/termcolour.h

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

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

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

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

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

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

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

src/core/strings/str8/str8.c

@@ -1,9 +1,8 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #include "str8.h"
+#include "str8_list.h"
 #include "../../../common/aliases/aliases.h"
-#include "../../../common/assert/assert.h"
+#include "../../../containers/dbl_list/dbl_list.h"
-#include "../../mem_allocator/mem_allocator.h"
+#include "../../mem/allocator/mem_allocator.h"
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -13,9 +12,13 @@
 #define STR8_BUF_ALLOC_SIZE(CAPACITY) (sizeof(Str8) + sizeof(c8) * CAPACITY)
 
 Str8 *wapp_str8_alloc_buf(const Allocator *allocator, u64 capacity) {
-  wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
+  Str8 *str = NULL;
 
-  Str8 *str = wapp_mem_allocator_alloc(allocator, STR8_BUF_ALLOC_SIZE(capacity));
+  if (!allocator) {
+    goto RETURN_STR8;
+  }
+
+  str = wapp_mem_allocator_alloc(allocator, STR8_BUF_ALLOC_SIZE(capacity));
   if (!str) {
     goto RETURN_STR8;
   }
@@ -28,20 +31,15 @@ RETURN_STR8:
   return str;
 }
 
-Str8 *wapp_str8_alloc_and_fill_buf(const Allocator *allocator, u64 capacity) {
-  Str8 *out = wapp_str8_alloc_buf(allocator, capacity);
-  if (out) {
-    memset(out->buf, 0, capacity);
-    out->size = capacity;
-  }
-  return out;
-}
-
 Str8 *wapp_str8_alloc_cstr(const Allocator *allocator, const char *str) {
-  wapp_debug_assert(allocator != NULL && str != NULL, "`allocator` and `str` should not be NULL");
+  Str8 *output = NULL;
+
+  if (!allocator || !str) {
+    goto RETURN_ALLOC_CSTR;
+  }
 
   u64 length = strlen(str);
-  Str8 *output     = wapp_str8_alloc_buf(allocator, length * 2);
+  output     = wapp_str8_alloc_buf(allocator, length * 2);
   if (!output) {
     goto RETURN_ALLOC_CSTR;
   }
@@ -54,9 +52,13 @@ RETURN_ALLOC_CSTR:
 }
 
 Str8 *wapp_str8_alloc_str8(const Allocator *allocator, Str8RO *str) {
-  wapp_debug_assert(allocator != NULL && str != NULL, "`allocator` and `str` should not be NULL");
+  Str8 *output = NULL;
 
-  Str8 *output = wapp_str8_alloc_buf(allocator, str->capacity);
+  if (!allocator || !str) {
+    goto RETURN_ALLOC_STR8;
+  }
+
+  output = wapp_str8_alloc_buf(allocator, str->capacity);
   if (!output) {
     goto RETURN_ALLOC_STR8;
   }
@@ -69,9 +71,10 @@ RETURN_ALLOC_STR8:
 }
 
 Str8 *wapp_str8_alloc_substr(const Allocator *allocator, Str8RO *str, u64 start, u64 end) {
-  wapp_debug_assert(allocator != NULL && str != NULL, "`allocator` and `str` should not be NULL");
-
   Str8 *output = NULL;
+  if (!allocator || !str) {
+    goto RETURN_ALLOC_SUBSTR;
+  }
 
   if (start >= str->size || start >= end) {
     goto RETURN_ALLOC_SUBSTR;
@@ -94,7 +97,10 @@ RETURN_ALLOC_SUBSTR:
 }
 
 void wapp_str8_dealloc_buf(const Allocator *allocator, Str8 **str) {
-  wapp_debug_assert(allocator != NULL && str != NULL && (*str) != NULL, "Either `allocator` is NULL or `str` is an invalid double pointer");
+  if (!allocator || !str || !(*str)) {
+    return;
+  }
+
   wapp_mem_allocator_free(allocator, (void **)str, STR8_BUF_ALLOC_SIZE((*str)->capacity));
 }
 
@@ -157,7 +163,9 @@ Str8 wapp_str8_slice(Str8RO *str, u64 start, u64 end) {
 }
 
 Str8 *wapp_str8_alloc_concat(const Allocator *allocator, Str8 *dst, Str8RO *src) {
-  wapp_debug_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
+  if (!allocator || !dst || !src) {
+    return NULL;
+  }
 
   Str8 *output  = NULL;
   u64 remaining = dst->capacity - dst->size;
@@ -183,7 +191,9 @@ RETURN_STR8_CONCAT:
 }
 
 void wapp_str8_concat_capped(Str8 *dst, Str8RO *src) {
-  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
+  if (!dst || !src) {
+    return;
+  }
 
   u64 remaining = dst->capacity - dst->size;
   u64 to_copy   = remaining < src->size ? remaining : src->size;
@@ -193,7 +203,9 @@ void wapp_str8_concat_capped(Str8 *dst, Str8RO *src) {
 }
 
 void wapp_str8_copy_cstr_capped(Str8 *dst, const char *src) {
-  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
+  if (!dst || !src) {
+    return;
+  }
 
   u64 length  = strlen(src);
   u64 to_copy = length <= dst->capacity ? length : dst->capacity;
@@ -204,7 +216,9 @@ void wapp_str8_copy_cstr_capped(Str8 *dst, const char *src) {
 }
 
 void wapp_str8_copy_str8_capped(Str8 *dst, Str8RO *src) {
-  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
+  if (!dst || !src) {
+    return;
+  }
 
   u64 to_copy = src->size <= dst->capacity ? src->size : dst->capacity;
 
@@ -214,7 +228,9 @@ void wapp_str8_copy_str8_capped(Str8 *dst, Str8RO *src) {
 }
 
 void wapp_str8_copy_to_cstr(char *dst, Str8RO *src, u64 dst_capacity) {
-  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
+  if (!dst || !src) {
+    return;
+  }
 
   u64 to_copy = src->size < dst_capacity ? src->size : dst_capacity - 1;
 
@@ -223,7 +239,9 @@ void wapp_str8_copy_to_cstr(char *dst, Str8RO *src, u64 dst_capacity) {
 }
 
 void wapp_str8_format(Str8 *dst, const char *format, ...) {
-  wapp_debug_assert(dst != NULL && format != NULL, "`dst` and `format` should not be NULL");
+  if (!dst || !format) {
+    return;
+  }
 
   va_list args1;
   va_list args2;
@@ -248,7 +266,7 @@ i64 wapp_str8_find(Str8RO *str, Str8RO substr) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   u64 char_index = 0;
-  bool running   = char_index < str->size;
+  bool running   = true;
   while (running) {
     const c8 *sub = str->buf + char_index;
     if (memcmp(sub, substr.buf, substr.size) == 0) {
@@ -270,7 +288,7 @@ i64 wapp_str8_rfind(Str8RO *str, Str8RO substr) {
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
   i64 char_index = str->size - substr.size;
-  bool running   = char_index >= 0;
+  bool running   = true;
   while (running) {
     const c8 *sub = str->buf + char_index;
     if (memcmp(sub, substr.buf, substr.size) == 0) {
@@ -284,17 +302,19 @@ i64 wapp_str8_rfind(Str8RO *str, Str8RO substr) {
   return -1;
 }
 
-Str8List *wapp_str8_split_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits) {
+DBL_LIST(Str8) *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");
+  if (!allocator || !str || !delimiter) {
+    return NULL;
+  }
 
-  Str8List *output = wapp_mem_allocator_alloc(allocator, sizeof(Str8List));
+  DBL_LIST(Str8) *output = wapp_mem_allocator_alloc(allocator, sizeof(DBL_LIST(Str8)));
 
   if (delimiter->size > str->size) {
     Str8 *full     = wapp_str8_alloc_str8(allocator, str);
-    Str8Node *node = wapp_mem_allocator_alloc(allocator, sizeof(Str8Node));
+    DBL_NODE(Str8) *node = wapp_mem_allocator_alloc(allocator, sizeof(DBL_NODE(Str8)));
     if (node) {
       node->item = full;
-      wapp_str8_list_push_back(output, node);
+      wapp_dbl_list_push_back(output, node);
     }
 
     goto RETURN_STR8_SPLIT;
@@ -312,10 +332,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));
+    DBL_NODE(Str8) *node = wapp_mem_allocator_alloc(allocator, sizeof(DBL_NODE(Str8)));
-    if (node && before_str) {
+    if (node) {
       node->item = before_str;
-      wapp_str8_list_push_back(output, node);
+      wapp_dbl_list_push_back(output, node);
     }
 
     wapp_mem_allocator_free(allocator, (void **)&rest, sizeof(Str8));
@@ -327,27 +347,29 @@ 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));
+  DBL_NODE(Str8) *node = wapp_mem_allocator_alloc(allocator, sizeof(DBL_NODE(Str8)));
-  if (node && rest) {
+  if (node) {
     node->item = rest;
-    wapp_str8_list_push_back(output, node);
+    wapp_dbl_list_push_back(output, node);
   }
 
 RETURN_STR8_SPLIT:
   return output;
 }
 
-Str8List *wapp_str8_rsplit_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits) {
+DBL_LIST(Str8) *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");
+  if (!allocator || !str || !delimiter) {
+    return NULL;
+  }
 
-  Str8List *output = wapp_mem_allocator_alloc(allocator, sizeof(Str8List));
+  DBL_LIST(Str8) *output = wapp_mem_allocator_alloc(allocator, sizeof(DBL_LIST(Str8)));
 
   if (delimiter->size > str->size) {
     Str8 *full     = wapp_str8_alloc_str8(allocator, str);
-    Str8Node *node = wapp_mem_allocator_alloc(allocator, sizeof(Str8Node));
+    DBL_NODE(Str8) *node = wapp_mem_allocator_alloc(allocator, sizeof(DBL_NODE(Str8)));
-    if (node && full) {
+    if (node) {
       node->item = full;
-      wapp_str8_list_push_back(output, node);
+      wapp_dbl_list_push_back(output, node);
     }
 
     goto RETURN_STR8_SPLIT;
@@ -364,10 +386,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));
+    DBL_NODE(Str8) *node = wapp_mem_allocator_alloc(allocator, sizeof(DBL_NODE(Str8)));
     if (node) {
       node->item = after_str;
-      wapp_str8_list_push_front(output, node);
+      wapp_dbl_list_push_front(output, node);
     }
 
     wapp_mem_allocator_free(allocator, (void **)&rest, sizeof(Str8));
@@ -377,39 +399,33 @@ 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));
+  DBL_NODE(Str8) *node = wapp_mem_allocator_alloc(allocator, sizeof(DBL_NODE(Str8)));
-  if (node && rest) {
+  if (node) {
     node->item = rest;
-    wapp_str8_list_push_front(output, node);
+    wapp_dbl_list_push_front(output, node);
   }
 
 RETURN_STR8_SPLIT:
   return output;
 }
 
-Str8 *wapp_str8_join(const Allocator *allocator, const Str8List *list, Str8RO *delimiter) {
+Str8 *wapp_str8_join(const Allocator *allocator, const DBL_LIST(Str8) *list, Str8RO *delimiter) {
-  wapp_debug_assert(allocator != NULL && list != NULL && delimiter != NULL, "`allocator`, `list` and `delimiter` should not be NULL");
+  if (!allocator || !list || !delimiter) {
+    return NULL;
+  }
 
   u64 capacity = wapp_str8_list_total_size(list) + (delimiter->size * (list->node_count - 1));
   Str8 *output = wapp_str8_alloc_buf(allocator, capacity * 2);
 
   // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
   // MSVC Spectre mitigation warnings
-  Str8Node *node;
+  DBL_NODE(Str8) *node;
   u64 node_index = 0;
-  bool running   = node_index < list->node_count;
+  bool running   = true;
   while (running) {
-    node = wapp_str8_list_get(list, node_index);
+    node = wapp_dbl_list_get(Str8, list, node_index);
-    if (!node) {
-        break;
-    }
-
     wapp_str8_concat_capped(output, node->item);
-
+    if (node_index + 1 < list->node_count) {
-    // NOTE (Abdelrahman): Comparison extracted to variable to silence
-    // MSVC Spectre mitigation warnings
-    bool not_last = node_index + 1 < list->node_count;
-    if (not_last) {
       wapp_str8_concat_capped(output, delimiter);
     }
 
@@ -419,28 +435,3 @@ Str8 *wapp_str8_join(const Allocator *allocator, const Str8List *list, Str8RO *d
 
   return output;
 }
-
-u64 wapp_str8_list_total_size(const Str8List *list) {
-  if (!list) {
-    return 0;
-  }
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  Str8Node* node;
-  u64 node_index = 0;
-  u64 output     = 0;
-  bool running   = node_index < list->node_count;
-  while (running) {
-      node = wapp_str8_list_get(list, node_index);
-      if (!node) {
-          break;
-      }
-
-      output += node->item->size;
-      ++node_index;
-      running = node_index < list->node_count;
-  }
-
-  return output;
-}

src/core/strings/str8/str8.h

@@ -1,19 +1,16 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef STR8_H
 #define STR8_H
 
+#include "./str8_list.h"
 #include "../../../common/aliases/aliases.h"
-#include "../../../common/assert/assert.h"
+#include "../../../containers/dbl_list/dbl_list.h"
-#include "../../../common/platform/platform.h"
+#include "../../mem/allocator/mem_allocator.h"
-#include "../../../primitives/dbl_list/dbl_list.h"
-#include "../../mem_allocator/mem_allocator.h"
 #include <string.h>
 #include <stdbool.h>
 
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // !__cplusplus
 
 typedef struct str8 Str8;
 struct str8 {
@@ -33,25 +30,6 @@ typedef const Str8 Str8RO;
 /**
  * Str8 stack buffers
  */
-
-#ifdef WAPP_PLATFORM_CPP
-// Uses a lambda to achieve the same behaviour achieved by the C macro
-#define wapp_str8_buf(CAPACITY) ([&](){ \
-  persistent 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) ([&]() {                            \
-  persistent c8 buf[sizeof(STRING) * 2] = {};                     \
-  memcpy(buf, STRING, sizeof(STRING));                            \
-  return Str8{(sizeof(STRING) - 1) * 2, sizeof(STRING) - 1, buf}; \
-}())
-
-#define wapp_str8_lit_ro(STRING) Str8RO{sizeof(STRING) - 1, sizeof(STRING) - 1, (c8 *)STRING}
-#define wapp_str8_lit_ro_initialiser_list(STRING) {sizeof(STRING) - 1, sizeof(STRING) - 1, (c8 *)STRING}
-#else
 #define wapp_str8_buf(CAPACITY) ((Str8){.capacity = CAPACITY, .size = 0, .buf = (c8[CAPACITY]){0}})
 
 // Utilises the fact that memcpy returns pointer to dest buffer and that getting
@@ -68,13 +46,11 @@ typedef const Str8 Str8RO;
 #define wapp_str8_lit_ro_initialiser_list(STRING) {.capacity = sizeof(STRING) - 1, \
                                                    .size     = sizeof(STRING) - 1, \
                                                    .buf      = (c8 *)STRING}
-#endif // !WAPP_PLATFORM_CPP
 
 /**
  * Str8 allocated buffers
  */
 Str8 *wapp_str8_alloc_buf(const Allocator *allocator, u64 capacity);
-Str8 *wapp_str8_alloc_and_fill_buf(const Allocator *allocator, u64 capacity);
 Str8 *wapp_str8_alloc_cstr(const Allocator *allocator, const char *str);
 Str8 *wapp_str8_alloc_str8(const Allocator *allocator, Str8RO *str);
 Str8 *wapp_str8_alloc_substr(const Allocator *allocator, Str8RO *str, u64 start, u64 end);
@@ -109,30 +85,18 @@ i64 wapp_str8_rfind(Str8RO *str, Str8RO substr);
  */
 #define wapp_str8_split(ALLOCATOR, STR, DELIMITER) wapp_str8_split_with_max(ALLOCATOR, STR, DELIMITER, -1)
 #define wapp_str8_rsplit(ALLOCATOR, STR, DELIMITER) wapp_str8_rsplit_with_max(ALLOCATOR, STR, DELIMITER, -1)
-Str8List *wapp_str8_split_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits);
+DBL_LIST(Str8) *wapp_str8_split_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits);
-Str8List *wapp_str8_rsplit_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits);
+DBL_LIST(Str8) *wapp_str8_rsplit_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits);
-Str8     *wapp_str8_join(const Allocator *allocator, const Str8List *list, Str8RO *delimiter);
+Str8           *wapp_str8_join(const Allocator *allocator, const DBL_LIST(Str8) *list, Str8RO *delimiter);
 
 /**
  * Str8 list utilities
  */
-#ifdef WAPP_PLATFORM_CPP
+#define wapp_str8_node_from_cstr(STRING) wapp_dbl_list_node_from_item(Str8, &wapp_str8_lit(STRING))
-#define wapp_str8_node_from_cstr(STRING) wapp_str8_list_node([&]() { \
+#define wapp_str8_node_from_str8(STRING) wapp_dbl_list_node_from_item(Str8, &(STRING))
-  persistent Str8 str = wapp_str8_lit(STRING);                      \
-  return &str;                                                      \
-}())
-#define wapp_str8_node_from_str8(STRING) wapp_str8_list_node([&]() { \
-  persistent 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
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // !__cplusplus
 
 #endif // !STR8_H

src/core/strings/str8/str8_list.c

@@ -0,0 +1,18 @@
+#include "./str8_list.h"
+#include "./str8.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../containers/dbl_list/dbl_list.h"
+
+u64 wapp_str8_list_total_size(const DBL_LIST(Str8) *list) {
+	if (!list) {
+		return 0;
+	}
+
+	u64 output = 0;
+	for (u64 i = 0; i < list->node_count; ++i) {
+		DBL_NODE(Str8) *node = wapp_dbl_list_get(Str8, list, i);
+		output += node->item->size;
+	}
+
+	return output;
+}

src/core/strings/str8/str8_list.h

@@ -0,0 +1,25 @@
+/**
+ * THIS FILE IS AUTOMATICALLY GENERATED. ANY MODIFICATIONS TO IT WILL BE OVERWRITTEN
+ */
+
+#ifndef STR8_LIST_H
+#define STR8_LIST_H
+
+#include "../../../common/aliases/aliases.h"
+#include "../../../containers/dbl_list/dbl_list.h"
+
+#ifdef __cplusplus
+BEGIN_C_LINKAGE
+#endif // !__cplusplus
+
+typedef struct str8 Str8;
+
+DBL_LIST_DECL(Str8);
+
+u64 wapp_str8_list_total_size(const DBL_LIST(Str8) *list);
+
+#ifdef __cplusplus
+END_C_LINKAGE
+#endif // !__cplusplus
+
+#endif // !STR8_LIST_H

src/core/wapp_core.c

@@ -1,9 +1,9 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef WAPP_CORE_C
 #define WAPP_CORE_C
 
 #include "wapp_core.h"
+#include "strings/str8/str8.c"
+#include "strings/str8/str8_list.c"
 #include "os/shell/termcolour/posix/termcolour_posix.c"
 #include "os/shell/termcolour/win/termcolour_win.c"
 #include "os/shell/termcolour/termcolour.c"
@@ -15,8 +15,8 @@
 #include "os/mem/win/mem_os_win.c"
 #include "os/mem/mem_os.c"
 #include "mem/utils/mem_utils.c"
+#include "mem/allocator/mem_allocator.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,8 +1,8 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef WAPP_CORE_H
 #define WAPP_CORE_H
 
+#include "strings/str8/str8.h"
+#include "strings/str8/str8_list.h"
 #include "os/shell/termcolour/termcolour.h"
 #include "os/shell/termcolour/terminal_colours.h"
 #include "os/shell/commander/commander.h"
@@ -14,9 +14,9 @@
 #include "os/mem/mem_os_ops.h"
 #include "os/mem/mem_os.h"
 #include "mem/utils/mem_utils.h"
+#include "mem/allocator/mem_allocator.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/primitives/array/array.h

@@ -1,971 +0,0 @@
-/**
- * THIS FILE IS AUTOMATICALLY GENERATED. ANY MODIFICATIONS TO IT WILL BE OVERWRITTEN
- */
-
-#ifndef ARRAY_H
-#define ARRAY_H
-
-#include "../../common/aliases/aliases.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_str8_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((Str8Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(Str8)))
-#define wapp_void_ptr_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((VoidPArray *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(void *)))
-#define wapp_b32_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((B32Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(b32)))
-#define wapp_char_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((CharArray *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(char)))
-#define wapp_c8_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((C8Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(c8)))
-#define wapp_c16_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((C16Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(c16)))
-#define wapp_c32_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((C32Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(c32)))
-#define wapp_i8_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((I8Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(i8)))
-#define wapp_i16_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((I16Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(i16)))
-#define wapp_i32_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((I32Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(i32)))
-#define wapp_i64_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((I64Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(i64)))
-#define wapp_u8_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((U8Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(u8)))
-#define wapp_u16_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((U16Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(u16)))
-#define wapp_u32_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((U32Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(u32)))
-#define wapp_u64_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((U64Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(u64)))
-#define wapp_f32_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((F32Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(f32)))
-#define wapp_f64_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((F64Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(f64)))
-#define wapp_f128_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((F128Array *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(f128)))
-#define wapp_iptr_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((IptrArray *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(iptr)))
-#define wapp_uptr_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY) ((UptrArray *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(uptr)))
-
-#ifdef WAPP_PLATFORM_CPP
-#define wapp_str8_array(...) ([&]() { \
-  persistent Str8 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(Str8, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return Str8Array{ \
-    buf, \
-    wapp_misc_utils_va_args_count(Str8, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(Str8, __VA_ARGS__) * 2), \
-    sizeof(Str8) \
-  }; \
-}())
-#define wapp_str8_array_with_capacity(CAPACITY) ([&]() { \
-  persistent Str8 buf[CAPACITY] = {}; \
-  return Str8Array{buf, 0, CAPACITY, sizeof(Str8)}; \
-}())
-#define wapp_str8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_str8_array_pop(ARRAY_PTR) : \
-  Str8{} \
-)
-#define wapp_void_ptr_array(...) ([&]() { \
-  persistent void * buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(void *, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return VoidPArray{ \
-    buf, \
-    wapp_misc_utils_va_args_count(void *, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(void *, __VA_ARGS__) * 2), \
-    sizeof(void *) \
-  }; \
-}())
-#define wapp_void_ptr_array_with_capacity(CAPACITY) ([&]() { \
-  persistent void * buf[CAPACITY] = {}; \
-  return VoidPArray{buf, 0, CAPACITY, sizeof(void *)}; \
-}())
-#define wapp_void_ptr_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_void_ptr_array_pop(ARRAY_PTR) : \
-  void *{} \
-)
-#define wapp_b32_array(...) ([&]() { \
-  persistent b32 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(b32, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return B32Array{ \
-    buf, \
-    wapp_misc_utils_va_args_count(b32, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(b32, __VA_ARGS__) * 2), \
-    sizeof(b32) \
-  }; \
-}())
-#define wapp_b32_array_with_capacity(CAPACITY) ([&]() { \
-  persistent b32 buf[CAPACITY] = {}; \
-  return B32Array{buf, 0, CAPACITY, sizeof(b32)}; \
-}())
-#define wapp_b32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_b32_array_pop(ARRAY_PTR) : \
-  b32{} \
-)
-#define wapp_char_array(...) ([&]() { \
-  persistent char buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(char, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return CharArray{ \
-    buf, \
-    wapp_misc_utils_va_args_count(char, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(char, __VA_ARGS__) * 2), \
-    sizeof(char) \
-  }; \
-}())
-#define wapp_char_array_with_capacity(CAPACITY) ([&]() { \
-  persistent char buf[CAPACITY] = {}; \
-  return CharArray{buf, 0, CAPACITY, sizeof(char)}; \
-}())
-#define wapp_char_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_char_array_pop(ARRAY_PTR) : \
-  char{} \
-)
-#define wapp_c8_array(...) ([&]() { \
-  persistent c8 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c8, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return C8Array{ \
-    buf, \
-    wapp_misc_utils_va_args_count(c8, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c8, __VA_ARGS__) * 2), \
-    sizeof(c8) \
-  }; \
-}())
-#define wapp_c8_array_with_capacity(CAPACITY) ([&]() { \
-  persistent c8 buf[CAPACITY] = {}; \
-  return C8Array{buf, 0, CAPACITY, sizeof(c8)}; \
-}())
-#define wapp_c8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_c8_array_pop(ARRAY_PTR) : \
-  c8{} \
-)
-#define wapp_c16_array(...) ([&]() { \
-  persistent c16 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c16, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return C16Array{ \
-    buf, \
-    wapp_misc_utils_va_args_count(c16, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c16, __VA_ARGS__) * 2), \
-    sizeof(c16) \
-  }; \
-}())
-#define wapp_c16_array_with_capacity(CAPACITY) ([&]() { \
-  persistent c16 buf[CAPACITY] = {}; \
-  return C16Array{buf, 0, CAPACITY, sizeof(c16)}; \
-}())
-#define wapp_c16_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_c16_array_pop(ARRAY_PTR) : \
-  c16{} \
-)
-#define wapp_c32_array(...) ([&]() { \
-  persistent c32 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c32, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return C32Array{ \
-    buf, \
-    wapp_misc_utils_va_args_count(c32, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c32, __VA_ARGS__) * 2), \
-    sizeof(c32) \
-  }; \
-}())
-#define wapp_c32_array_with_capacity(CAPACITY) ([&]() { \
-  persistent c32 buf[CAPACITY] = {}; \
-  return C32Array{buf, 0, CAPACITY, sizeof(c32)}; \
-}())
-#define wapp_c32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_c32_array_pop(ARRAY_PTR) : \
-  c32{} \
-)
-#define wapp_i8_array(...) ([&]() { \
-  persistent i8 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i8, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return I8Array{ \
-    buf, \
-    wapp_misc_utils_va_args_count(i8, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i8, __VA_ARGS__) * 2), \
-    sizeof(i8) \
-  }; \
-}())
-#define wapp_i8_array_with_capacity(CAPACITY) ([&]() { \
-  persistent i8 buf[CAPACITY] = {}; \
-  return I8Array{buf, 0, CAPACITY, sizeof(i8)}; \
-}())
-#define wapp_i8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_i8_array_pop(ARRAY_PTR) : \
-  i8{} \
-)
-#define wapp_i16_array(...) ([&]() { \
-  persistent i16 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i16, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return I16Array{ \
-    buf, \
-    wapp_misc_utils_va_args_count(i16, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i16, __VA_ARGS__) * 2), \
-    sizeof(i16) \
-  }; \
-}())
-#define wapp_i16_array_with_capacity(CAPACITY) ([&]() { \
-  persistent i16 buf[CAPACITY] = {}; \
-  return I16Array{buf, 0, CAPACITY, sizeof(i16)}; \
-}())
-#define wapp_i16_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_i16_array_pop(ARRAY_PTR) : \
-  i16{} \
-)
-#define wapp_i32_array(...) ([&]() { \
-  persistent 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) ([&]() { \
-  persistent i32 buf[CAPACITY] = {}; \
-  return I32Array{buf, 0, CAPACITY, sizeof(i32)}; \
-}())
-#define wapp_i32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_i32_array_pop(ARRAY_PTR) : \
-  i32{} \
-)
-#define wapp_i64_array(...) ([&]() { \
-  persistent i64 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i64, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return I64Array{ \
-    buf, \
-    wapp_misc_utils_va_args_count(i64, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i64, __VA_ARGS__) * 2), \
-    sizeof(i64) \
-  }; \
-}())
-#define wapp_i64_array_with_capacity(CAPACITY) ([&]() { \
-  persistent i64 buf[CAPACITY] = {}; \
-  return I64Array{buf, 0, CAPACITY, sizeof(i64)}; \
-}())
-#define wapp_i64_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_i64_array_pop(ARRAY_PTR) : \
-  i64{} \
-)
-#define wapp_u8_array(...) ([&]() { \
-  persistent u8 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u8, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return U8Array{ \
-    buf, \
-    wapp_misc_utils_va_args_count(u8, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u8, __VA_ARGS__) * 2), \
-    sizeof(u8) \
-  }; \
-}())
-#define wapp_u8_array_with_capacity(CAPACITY) ([&]() { \
-  persistent u8 buf[CAPACITY] = {}; \
-  return U8Array{buf, 0, CAPACITY, sizeof(u8)}; \
-}())
-#define wapp_u8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_u8_array_pop(ARRAY_PTR) : \
-  u8{} \
-)
-#define wapp_u16_array(...) ([&]() { \
-  persistent u16 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u16, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return U16Array{ \
-    buf, \
-    wapp_misc_utils_va_args_count(u16, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u16, __VA_ARGS__) * 2), \
-    sizeof(u16) \
-  }; \
-}())
-#define wapp_u16_array_with_capacity(CAPACITY) ([&]() { \
-  persistent u16 buf[CAPACITY] = {}; \
-  return U16Array{buf, 0, CAPACITY, sizeof(u16)}; \
-}())
-#define wapp_u16_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_u16_array_pop(ARRAY_PTR) : \
-  u16{} \
-)
-#define wapp_u32_array(...) ([&]() { \
-  persistent u32 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u32, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return U32Array{ \
-    buf, \
-    wapp_misc_utils_va_args_count(u32, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u32, __VA_ARGS__) * 2), \
-    sizeof(u32) \
-  }; \
-}())
-#define wapp_u32_array_with_capacity(CAPACITY) ([&]() { \
-  persistent u32 buf[CAPACITY] = {}; \
-  return U32Array{buf, 0, CAPACITY, sizeof(u32)}; \
-}())
-#define wapp_u32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_u32_array_pop(ARRAY_PTR) : \
-  u32{} \
-)
-#define wapp_u64_array(...) ([&]() { \
-  persistent u64 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u64, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return U64Array{ \
-    buf, \
-    wapp_misc_utils_va_args_count(u64, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u64, __VA_ARGS__) * 2), \
-    sizeof(u64) \
-  }; \
-}())
-#define wapp_u64_array_with_capacity(CAPACITY) ([&]() { \
-  persistent u64 buf[CAPACITY] = {}; \
-  return U64Array{buf, 0, CAPACITY, sizeof(u64)}; \
-}())
-#define wapp_u64_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_u64_array_pop(ARRAY_PTR) : \
-  u64{} \
-)
-#define wapp_f32_array(...) ([&]() { \
-  persistent f32 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f32, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return F32Array{ \
-    buf, \
-    wapp_misc_utils_va_args_count(f32, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f32, __VA_ARGS__) * 2), \
-    sizeof(f32) \
-  }; \
-}())
-#define wapp_f32_array_with_capacity(CAPACITY) ([&]() { \
-  persistent f32 buf[CAPACITY] = {}; \
-  return F32Array{buf, 0, CAPACITY, sizeof(f32)}; \
-}())
-#define wapp_f32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_f32_array_pop(ARRAY_PTR) : \
-  f32{} \
-)
-#define wapp_f64_array(...) ([&]() { \
-  persistent f64 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f64, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return F64Array{ \
-    buf, \
-    wapp_misc_utils_va_args_count(f64, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f64, __VA_ARGS__) * 2), \
-    sizeof(f64) \
-  }; \
-}())
-#define wapp_f64_array_with_capacity(CAPACITY) ([&]() { \
-  persistent f64 buf[CAPACITY] = {}; \
-  return F64Array{buf, 0, CAPACITY, sizeof(f64)}; \
-}())
-#define wapp_f64_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_f64_array_pop(ARRAY_PTR) : \
-  f64{} \
-)
-#define wapp_f128_array(...) ([&]() { \
-  persistent f128 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f128, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return F128Array{ \
-    buf, \
-    wapp_misc_utils_va_args_count(f128, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f128, __VA_ARGS__) * 2), \
-    sizeof(f128) \
-  }; \
-}())
-#define wapp_f128_array_with_capacity(CAPACITY) ([&]() { \
-  persistent f128 buf[CAPACITY] = {}; \
-  return F128Array{buf, 0, CAPACITY, sizeof(f128)}; \
-}())
-#define wapp_f128_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_f128_array_pop(ARRAY_PTR) : \
-  f128{} \
-)
-#define wapp_iptr_array(...) ([&]() { \
-  persistent iptr buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(iptr, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return IptrArray{ \
-    buf, \
-    wapp_misc_utils_va_args_count(iptr, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(iptr, __VA_ARGS__) * 2), \
-    sizeof(iptr) \
-  }; \
-}())
-#define wapp_iptr_array_with_capacity(CAPACITY) ([&]() { \
-  persistent iptr buf[CAPACITY] = {}; \
-  return IptrArray{buf, 0, CAPACITY, sizeof(iptr)}; \
-}())
-#define wapp_iptr_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_iptr_array_pop(ARRAY_PTR) : \
-  iptr{} \
-)
-#define wapp_uptr_array(...) ([&]() { \
-  persistent uptr buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(uptr, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
-  return UptrArray{ \
-    buf, \
-    wapp_misc_utils_va_args_count(uptr, __VA_ARGS__), \
-    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(uptr, __VA_ARGS__) * 2), \
-    sizeof(uptr) \
-  }; \
-}())
-#define wapp_uptr_array_with_capacity(CAPACITY) ([&]() { \
-  persistent uptr buf[CAPACITY] = {}; \
-  return UptrArray{buf, 0, CAPACITY, sizeof(uptr)}; \
-}())
-#define wapp_uptr_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_uptr_array_pop(ARRAY_PTR) : \
-  uptr{} \
-)
-#else
-#define wapp_str8_array(...) ((Str8Array){ \
-  .items = (Str8[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(Str8, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(Str8, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(Str8, __VA_ARGS__) * 2), \
-  .item_size = sizeof(Str8) \
-})
-#define wapp_str8_array_with_capacity(CAPACITY) ((Str8Array){.items = (Str8[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(Str8)})
-#define wapp_str8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_str8_array_pop(ARRAY_PTR) : \
-  (Str8){0} \
-)
-#define wapp_void_ptr_array(...) ((VoidPArray){ \
-  .items = (void *[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(void *, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(void *, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(void *, __VA_ARGS__) * 2), \
-  .item_size = sizeof(void *) \
-})
-#define wapp_void_ptr_array_with_capacity(CAPACITY) ((VoidPArray){.items = (void *[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(void *)})
-#define wapp_void_ptr_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_void_ptr_array_pop(ARRAY_PTR) : \
-  (void *){0} \
-)
-#define wapp_b32_array(...) ((B32Array){ \
-  .items = (b32[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(b32, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(b32, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(b32, __VA_ARGS__) * 2), \
-  .item_size = sizeof(b32) \
-})
-#define wapp_b32_array_with_capacity(CAPACITY) ((B32Array){.items = (b32[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(b32)})
-#define wapp_b32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_b32_array_pop(ARRAY_PTR) : \
-  (b32){0} \
-)
-#define wapp_char_array(...) ((CharArray){ \
-  .items = (char[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(char, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(char, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(char, __VA_ARGS__) * 2), \
-  .item_size = sizeof(char) \
-})
-#define wapp_char_array_with_capacity(CAPACITY) ((CharArray){.items = (char[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(char)})
-#define wapp_char_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_char_array_pop(ARRAY_PTR) : \
-  (char){0} \
-)
-#define wapp_c8_array(...) ((C8Array){ \
-  .items = (c8[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c8, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(c8, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c8, __VA_ARGS__) * 2), \
-  .item_size = sizeof(c8) \
-})
-#define wapp_c8_array_with_capacity(CAPACITY) ((C8Array){.items = (c8[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(c8)})
-#define wapp_c8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_c8_array_pop(ARRAY_PTR) : \
-  (c8){0} \
-)
-#define wapp_c16_array(...) ((C16Array){ \
-  .items = (c16[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c16, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(c16, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c16, __VA_ARGS__) * 2), \
-  .item_size = sizeof(c16) \
-})
-#define wapp_c16_array_with_capacity(CAPACITY) ((C16Array){.items = (c16[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(c16)})
-#define wapp_c16_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_c16_array_pop(ARRAY_PTR) : \
-  (c16){0} \
-)
-#define wapp_c32_array(...) ((C32Array){ \
-  .items = (c32[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c32, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(c32, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(c32, __VA_ARGS__) * 2), \
-  .item_size = sizeof(c32) \
-})
-#define wapp_c32_array_with_capacity(CAPACITY) ((C32Array){.items = (c32[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(c32)})
-#define wapp_c32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_c32_array_pop(ARRAY_PTR) : \
-  (c32){0} \
-)
-#define wapp_i8_array(...) ((I8Array){ \
-  .items = (i8[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i8, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(i8, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i8, __VA_ARGS__) * 2), \
-  .item_size = sizeof(i8) \
-})
-#define wapp_i8_array_with_capacity(CAPACITY) ((I8Array){.items = (i8[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(i8)})
-#define wapp_i8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_i8_array_pop(ARRAY_PTR) : \
-  (i8){0} \
-)
-#define wapp_i16_array(...) ((I16Array){ \
-  .items = (i16[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i16, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(i16, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i16, __VA_ARGS__) * 2), \
-  .item_size = sizeof(i16) \
-})
-#define wapp_i16_array_with_capacity(CAPACITY) ((I16Array){.items = (i16[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(i16)})
-#define wapp_i16_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_i16_array_pop(ARRAY_PTR) : \
-  (i16){0} \
-)
-#define wapp_i32_array(...) ((I32Array){ \
-  .items = (i32[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i32, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(i32, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i32, __VA_ARGS__) * 2), \
-  .item_size = sizeof(i32) \
-})
-#define wapp_i32_array_with_capacity(CAPACITY) ((I32Array){.items = (i32[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(i32)})
-#define wapp_i32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_i32_array_pop(ARRAY_PTR) : \
-  (i32){0} \
-)
-#define wapp_i64_array(...) ((I64Array){ \
-  .items = (i64[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i64, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(i64, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i64, __VA_ARGS__) * 2), \
-  .item_size = sizeof(i64) \
-})
-#define wapp_i64_array_with_capacity(CAPACITY) ((I64Array){.items = (i64[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(i64)})
-#define wapp_i64_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_i64_array_pop(ARRAY_PTR) : \
-  (i64){0} \
-)
-#define wapp_u8_array(...) ((U8Array){ \
-  .items = (u8[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u8, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(u8, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u8, __VA_ARGS__) * 2), \
-  .item_size = sizeof(u8) \
-})
-#define wapp_u8_array_with_capacity(CAPACITY) ((U8Array){.items = (u8[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(u8)})
-#define wapp_u8_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_u8_array_pop(ARRAY_PTR) : \
-  (u8){0} \
-)
-#define wapp_u16_array(...) ((U16Array){ \
-  .items = (u16[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u16, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(u16, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u16, __VA_ARGS__) * 2), \
-  .item_size = sizeof(u16) \
-})
-#define wapp_u16_array_with_capacity(CAPACITY) ((U16Array){.items = (u16[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(u16)})
-#define wapp_u16_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_u16_array_pop(ARRAY_PTR) : \
-  (u16){0} \
-)
-#define wapp_u32_array(...) ((U32Array){ \
-  .items = (u32[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u32, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(u32, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u32, __VA_ARGS__) * 2), \
-  .item_size = sizeof(u32) \
-})
-#define wapp_u32_array_with_capacity(CAPACITY) ((U32Array){.items = (u32[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(u32)})
-#define wapp_u32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_u32_array_pop(ARRAY_PTR) : \
-  (u32){0} \
-)
-#define wapp_u64_array(...) ((U64Array){ \
-  .items = (u64[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u64, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(u64, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(u64, __VA_ARGS__) * 2), \
-  .item_size = sizeof(u64) \
-})
-#define wapp_u64_array_with_capacity(CAPACITY) ((U64Array){.items = (u64[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(u64)})
-#define wapp_u64_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_u64_array_pop(ARRAY_PTR) : \
-  (u64){0} \
-)
-#define wapp_f32_array(...) ((F32Array){ \
-  .items = (f32[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f32, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(f32, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f32, __VA_ARGS__) * 2), \
-  .item_size = sizeof(f32) \
-})
-#define wapp_f32_array_with_capacity(CAPACITY) ((F32Array){.items = (f32[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(f32)})
-#define wapp_f32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_f32_array_pop(ARRAY_PTR) : \
-  (f32){0} \
-)
-#define wapp_f64_array(...) ((F64Array){ \
-  .items = (f64[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f64, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(f64, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f64, __VA_ARGS__) * 2), \
-  .item_size = sizeof(f64) \
-})
-#define wapp_f64_array_with_capacity(CAPACITY) ((F64Array){.items = (f64[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(f64)})
-#define wapp_f64_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_f64_array_pop(ARRAY_PTR) : \
-  (f64){0} \
-)
-#define wapp_f128_array(...) ((F128Array){ \
-  .items = (f128[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f128, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(f128, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(f128, __VA_ARGS__) * 2), \
-  .item_size = sizeof(f128) \
-})
-#define wapp_f128_array_with_capacity(CAPACITY) ((F128Array){.items = (f128[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(f128)})
-#define wapp_f128_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_f128_array_pop(ARRAY_PTR) : \
-  (f128){0} \
-)
-#define wapp_iptr_array(...) ((IptrArray){ \
-  .items = (iptr[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(iptr, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(iptr, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(iptr, __VA_ARGS__) * 2), \
-  .item_size = sizeof(iptr) \
-})
-#define wapp_iptr_array_with_capacity(CAPACITY) ((IptrArray){.items = (iptr[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(iptr)})
-#define wapp_iptr_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_iptr_array_pop(ARRAY_PTR) : \
-  (iptr){0} \
-)
-#define wapp_uptr_array(...) ((UptrArray){ \
-  .items = (uptr[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(uptr, __VA_ARGS__) * 2)]){__VA_ARGS__}, \
-  .count = wapp_misc_utils_va_args_count(uptr, __VA_ARGS__), \
-  .capacity = wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(uptr, __VA_ARGS__) * 2), \
-  .item_size = sizeof(uptr) \
-})
-#define wapp_uptr_array_with_capacity(CAPACITY) ((UptrArray){.items = (uptr[CAPACITY]){0}, .count = 0, .capacity = CAPACITY, .item_size = sizeof(uptr)})
-#define wapp_uptr_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
-  *_uptr_array_pop(ARRAY_PTR) : \
-  (uptr){0} \
-)
-#endif // !WAPP_PLATFORM_CPP
-
-typedef struct str8 Str8;
-
-typedef struct Str8Array Str8Array;
-struct Str8Array {
-  Str8 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct VoidPArray VoidPArray;
-struct VoidPArray {
-  void * *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct B32Array B32Array;
-struct B32Array {
-  b32 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct CharArray CharArray;
-struct CharArray {
-  char *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct C8Array C8Array;
-struct C8Array {
-  c8 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct C16Array C16Array;
-struct C16Array {
-  c16 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct C32Array C32Array;
-struct C32Array {
-  c32 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct I8Array I8Array;
-struct I8Array {
-  i8 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct I16Array I16Array;
-struct I16Array {
-  i16 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct I32Array I32Array;
-struct I32Array {
-  i32 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct I64Array I64Array;
-struct I64Array {
-  i64 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct U8Array U8Array;
-struct U8Array {
-  u8 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct U16Array U16Array;
-struct U16Array {
-  u16 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct U32Array U32Array;
-struct U32Array {
-  u32 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct U64Array U64Array;
-struct U64Array {
-  u64 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct F32Array F32Array;
-struct F32Array {
-  f32 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct F64Array F64Array;
-struct F64Array {
-  f64 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct F128Array F128Array;
-struct F128Array {
-  f128 *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct IptrArray IptrArray;
-struct IptrArray {
-  iptr *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-typedef struct UptrArray UptrArray;
-struct UptrArray {
-  uptr *items;
-  u64 count;
-  u64 capacity;
-  u64 item_size;
-};
-
-Str8 *wapp_str8_array_get(const Str8Array *array, u64 index);
-void wapp_str8_array_set(Str8Array *array, u64 index, Str8 *item);
-void wapp_str8_array_append_capped(Str8Array *array, Str8 *item);
-void wapp_str8_array_extend_capped(Str8Array *array, const Str8Array *other);
-void wapp_str8_array_clear(Str8Array *array);
-void wapp_str8_array_copy_capped(const Str8Array *src, Str8Array *dst);
-Str8Array *wapp_str8_array_append_alloc(const Allocator *allocator, Str8Array *array, Str8 *item);
-Str8Array *wapp_str8_array_extend_alloc(const Allocator *allocator, Str8Array *array, const Str8Array *other);
-Str8Array *wapp_str8_array_copy_alloc(const Allocator *allocator, const Str8Array *src, Str8Array *dst);
-Str8 *_str8_array_pop(Str8Array *array);
-void * *wapp_void_ptr_array_get(const VoidPArray *array, u64 index);
-void wapp_void_ptr_array_set(VoidPArray *array, u64 index, void * *item);
-void wapp_void_ptr_array_append_capped(VoidPArray *array, void * *item);
-void wapp_void_ptr_array_extend_capped(VoidPArray *array, const VoidPArray *other);
-void wapp_void_ptr_array_clear(VoidPArray *array);
-void wapp_void_ptr_array_copy_capped(const VoidPArray *src, VoidPArray *dst);
-VoidPArray *wapp_void_ptr_array_append_alloc(const Allocator *allocator, VoidPArray *array, void * *item);
-VoidPArray *wapp_void_ptr_array_extend_alloc(const Allocator *allocator, VoidPArray *array, const VoidPArray *other);
-VoidPArray *wapp_void_ptr_array_copy_alloc(const Allocator *allocator, const VoidPArray *src, VoidPArray *dst);
-void * *_void_ptr_array_pop(VoidPArray *array);
-b32 *wapp_b32_array_get(const B32Array *array, u64 index);
-void wapp_b32_array_set(B32Array *array, u64 index, b32 *item);
-void wapp_b32_array_append_capped(B32Array *array, b32 *item);
-void wapp_b32_array_extend_capped(B32Array *array, const B32Array *other);
-void wapp_b32_array_clear(B32Array *array);
-void wapp_b32_array_copy_capped(const B32Array *src, B32Array *dst);
-B32Array *wapp_b32_array_append_alloc(const Allocator *allocator, B32Array *array, b32 *item);
-B32Array *wapp_b32_array_extend_alloc(const Allocator *allocator, B32Array *array, const B32Array *other);
-B32Array *wapp_b32_array_copy_alloc(const Allocator *allocator, const B32Array *src, B32Array *dst);
-b32 *_b32_array_pop(B32Array *array);
-char *wapp_char_array_get(const CharArray *array, u64 index);
-void wapp_char_array_set(CharArray *array, u64 index, char *item);
-void wapp_char_array_append_capped(CharArray *array, char *item);
-void wapp_char_array_extend_capped(CharArray *array, const CharArray *other);
-void wapp_char_array_clear(CharArray *array);
-void wapp_char_array_copy_capped(const CharArray *src, CharArray *dst);
-CharArray *wapp_char_array_append_alloc(const Allocator *allocator, CharArray *array, char *item);
-CharArray *wapp_char_array_extend_alloc(const Allocator *allocator, CharArray *array, const CharArray *other);
-CharArray *wapp_char_array_copy_alloc(const Allocator *allocator, const CharArray *src, CharArray *dst);
-char *_char_array_pop(CharArray *array);
-c8 *wapp_c8_array_get(const C8Array *array, u64 index);
-void wapp_c8_array_set(C8Array *array, u64 index, c8 *item);
-void wapp_c8_array_append_capped(C8Array *array, c8 *item);
-void wapp_c8_array_extend_capped(C8Array *array, const C8Array *other);
-void wapp_c8_array_clear(C8Array *array);
-void wapp_c8_array_copy_capped(const C8Array *src, C8Array *dst);
-C8Array *wapp_c8_array_append_alloc(const Allocator *allocator, C8Array *array, c8 *item);
-C8Array *wapp_c8_array_extend_alloc(const Allocator *allocator, C8Array *array, const C8Array *other);
-C8Array *wapp_c8_array_copy_alloc(const Allocator *allocator, const C8Array *src, C8Array *dst);
-c8 *_c8_array_pop(C8Array *array);
-c16 *wapp_c16_array_get(const C16Array *array, u64 index);
-void wapp_c16_array_set(C16Array *array, u64 index, c16 *item);
-void wapp_c16_array_append_capped(C16Array *array, c16 *item);
-void wapp_c16_array_extend_capped(C16Array *array, const C16Array *other);
-void wapp_c16_array_clear(C16Array *array);
-void wapp_c16_array_copy_capped(const C16Array *src, C16Array *dst);
-C16Array *wapp_c16_array_append_alloc(const Allocator *allocator, C16Array *array, c16 *item);
-C16Array *wapp_c16_array_extend_alloc(const Allocator *allocator, C16Array *array, const C16Array *other);
-C16Array *wapp_c16_array_copy_alloc(const Allocator *allocator, const C16Array *src, C16Array *dst);
-c16 *_c16_array_pop(C16Array *array);
-c32 *wapp_c32_array_get(const C32Array *array, u64 index);
-void wapp_c32_array_set(C32Array *array, u64 index, c32 *item);
-void wapp_c32_array_append_capped(C32Array *array, c32 *item);
-void wapp_c32_array_extend_capped(C32Array *array, const C32Array *other);
-void wapp_c32_array_clear(C32Array *array);
-void wapp_c32_array_copy_capped(const C32Array *src, C32Array *dst);
-C32Array *wapp_c32_array_append_alloc(const Allocator *allocator, C32Array *array, c32 *item);
-C32Array *wapp_c32_array_extend_alloc(const Allocator *allocator, C32Array *array, const C32Array *other);
-C32Array *wapp_c32_array_copy_alloc(const Allocator *allocator, const C32Array *src, C32Array *dst);
-c32 *_c32_array_pop(C32Array *array);
-i8 *wapp_i8_array_get(const I8Array *array, u64 index);
-void wapp_i8_array_set(I8Array *array, u64 index, i8 *item);
-void wapp_i8_array_append_capped(I8Array *array, i8 *item);
-void wapp_i8_array_extend_capped(I8Array *array, const I8Array *other);
-void wapp_i8_array_clear(I8Array *array);
-void wapp_i8_array_copy_capped(const I8Array *src, I8Array *dst);
-I8Array *wapp_i8_array_append_alloc(const Allocator *allocator, I8Array *array, i8 *item);
-I8Array *wapp_i8_array_extend_alloc(const Allocator *allocator, I8Array *array, const I8Array *other);
-I8Array *wapp_i8_array_copy_alloc(const Allocator *allocator, const I8Array *src, I8Array *dst);
-i8 *_i8_array_pop(I8Array *array);
-i16 *wapp_i16_array_get(const I16Array *array, u64 index);
-void wapp_i16_array_set(I16Array *array, u64 index, i16 *item);
-void wapp_i16_array_append_capped(I16Array *array, i16 *item);
-void wapp_i16_array_extend_capped(I16Array *array, const I16Array *other);
-void wapp_i16_array_clear(I16Array *array);
-void wapp_i16_array_copy_capped(const I16Array *src, I16Array *dst);
-I16Array *wapp_i16_array_append_alloc(const Allocator *allocator, I16Array *array, i16 *item);
-I16Array *wapp_i16_array_extend_alloc(const Allocator *allocator, I16Array *array, const I16Array *other);
-I16Array *wapp_i16_array_copy_alloc(const Allocator *allocator, const I16Array *src, I16Array *dst);
-i16 *_i16_array_pop(I16Array *array);
-i32 *wapp_i32_array_get(const I32Array *array, u64 index);
-void wapp_i32_array_set(I32Array *array, u64 index, i32 *item);
-void wapp_i32_array_append_capped(I32Array *array, i32 *item);
-void wapp_i32_array_extend_capped(I32Array *array, const I32Array *other);
-void wapp_i32_array_clear(I32Array *array);
-void wapp_i32_array_copy_capped(const I32Array *src, I32Array *dst);
-I32Array *wapp_i32_array_append_alloc(const Allocator *allocator, I32Array *array, i32 *item);
-I32Array *wapp_i32_array_extend_alloc(const Allocator *allocator, I32Array *array, const I32Array *other);
-I32Array *wapp_i32_array_copy_alloc(const Allocator *allocator, const I32Array *src, I32Array *dst);
-i32 *_i32_array_pop(I32Array *array);
-i64 *wapp_i64_array_get(const I64Array *array, u64 index);
-void wapp_i64_array_set(I64Array *array, u64 index, i64 *item);
-void wapp_i64_array_append_capped(I64Array *array, i64 *item);
-void wapp_i64_array_extend_capped(I64Array *array, const I64Array *other);
-void wapp_i64_array_clear(I64Array *array);
-void wapp_i64_array_copy_capped(const I64Array *src, I64Array *dst);
-I64Array *wapp_i64_array_append_alloc(const Allocator *allocator, I64Array *array, i64 *item);
-I64Array *wapp_i64_array_extend_alloc(const Allocator *allocator, I64Array *array, const I64Array *other);
-I64Array *wapp_i64_array_copy_alloc(const Allocator *allocator, const I64Array *src, I64Array *dst);
-i64 *_i64_array_pop(I64Array *array);
-u8 *wapp_u8_array_get(const U8Array *array, u64 index);
-void wapp_u8_array_set(U8Array *array, u64 index, u8 *item);
-void wapp_u8_array_append_capped(U8Array *array, u8 *item);
-void wapp_u8_array_extend_capped(U8Array *array, const U8Array *other);
-void wapp_u8_array_clear(U8Array *array);
-void wapp_u8_array_copy_capped(const U8Array *src, U8Array *dst);
-U8Array *wapp_u8_array_append_alloc(const Allocator *allocator, U8Array *array, u8 *item);
-U8Array *wapp_u8_array_extend_alloc(const Allocator *allocator, U8Array *array, const U8Array *other);
-U8Array *wapp_u8_array_copy_alloc(const Allocator *allocator, const U8Array *src, U8Array *dst);
-u8 *_u8_array_pop(U8Array *array);
-u16 *wapp_u16_array_get(const U16Array *array, u64 index);
-void wapp_u16_array_set(U16Array *array, u64 index, u16 *item);
-void wapp_u16_array_append_capped(U16Array *array, u16 *item);
-void wapp_u16_array_extend_capped(U16Array *array, const U16Array *other);
-void wapp_u16_array_clear(U16Array *array);
-void wapp_u16_array_copy_capped(const U16Array *src, U16Array *dst);
-U16Array *wapp_u16_array_append_alloc(const Allocator *allocator, U16Array *array, u16 *item);
-U16Array *wapp_u16_array_extend_alloc(const Allocator *allocator, U16Array *array, const U16Array *other);
-U16Array *wapp_u16_array_copy_alloc(const Allocator *allocator, const U16Array *src, U16Array *dst);
-u16 *_u16_array_pop(U16Array *array);
-u32 *wapp_u32_array_get(const U32Array *array, u64 index);
-void wapp_u32_array_set(U32Array *array, u64 index, u32 *item);
-void wapp_u32_array_append_capped(U32Array *array, u32 *item);
-void wapp_u32_array_extend_capped(U32Array *array, const U32Array *other);
-void wapp_u32_array_clear(U32Array *array);
-void wapp_u32_array_copy_capped(const U32Array *src, U32Array *dst);
-U32Array *wapp_u32_array_append_alloc(const Allocator *allocator, U32Array *array, u32 *item);
-U32Array *wapp_u32_array_extend_alloc(const Allocator *allocator, U32Array *array, const U32Array *other);
-U32Array *wapp_u32_array_copy_alloc(const Allocator *allocator, const U32Array *src, U32Array *dst);
-u32 *_u32_array_pop(U32Array *array);
-u64 *wapp_u64_array_get(const U64Array *array, u64 index);
-void wapp_u64_array_set(U64Array *array, u64 index, u64 *item);
-void wapp_u64_array_append_capped(U64Array *array, u64 *item);
-void wapp_u64_array_extend_capped(U64Array *array, const U64Array *other);
-void wapp_u64_array_clear(U64Array *array);
-void wapp_u64_array_copy_capped(const U64Array *src, U64Array *dst);
-U64Array *wapp_u64_array_append_alloc(const Allocator *allocator, U64Array *array, u64 *item);
-U64Array *wapp_u64_array_extend_alloc(const Allocator *allocator, U64Array *array, const U64Array *other);
-U64Array *wapp_u64_array_copy_alloc(const Allocator *allocator, const U64Array *src, U64Array *dst);
-u64 *_u64_array_pop(U64Array *array);
-f32 *wapp_f32_array_get(const F32Array *array, u64 index);
-void wapp_f32_array_set(F32Array *array, u64 index, f32 *item);
-void wapp_f32_array_append_capped(F32Array *array, f32 *item);
-void wapp_f32_array_extend_capped(F32Array *array, const F32Array *other);
-void wapp_f32_array_clear(F32Array *array);
-void wapp_f32_array_copy_capped(const F32Array *src, F32Array *dst);
-F32Array *wapp_f32_array_append_alloc(const Allocator *allocator, F32Array *array, f32 *item);
-F32Array *wapp_f32_array_extend_alloc(const Allocator *allocator, F32Array *array, const F32Array *other);
-F32Array *wapp_f32_array_copy_alloc(const Allocator *allocator, const F32Array *src, F32Array *dst);
-f32 *_f32_array_pop(F32Array *array);
-f64 *wapp_f64_array_get(const F64Array *array, u64 index);
-void wapp_f64_array_set(F64Array *array, u64 index, f64 *item);
-void wapp_f64_array_append_capped(F64Array *array, f64 *item);
-void wapp_f64_array_extend_capped(F64Array *array, const F64Array *other);
-void wapp_f64_array_clear(F64Array *array);
-void wapp_f64_array_copy_capped(const F64Array *src, F64Array *dst);
-F64Array *wapp_f64_array_append_alloc(const Allocator *allocator, F64Array *array, f64 *item);
-F64Array *wapp_f64_array_extend_alloc(const Allocator *allocator, F64Array *array, const F64Array *other);
-F64Array *wapp_f64_array_copy_alloc(const Allocator *allocator, const F64Array *src, F64Array *dst);
-f64 *_f64_array_pop(F64Array *array);
-f128 *wapp_f128_array_get(const F128Array *array, u64 index);
-void wapp_f128_array_set(F128Array *array, u64 index, f128 *item);
-void wapp_f128_array_append_capped(F128Array *array, f128 *item);
-void wapp_f128_array_extend_capped(F128Array *array, const F128Array *other);
-void wapp_f128_array_clear(F128Array *array);
-void wapp_f128_array_copy_capped(const F128Array *src, F128Array *dst);
-F128Array *wapp_f128_array_append_alloc(const Allocator *allocator, F128Array *array, f128 *item);
-F128Array *wapp_f128_array_extend_alloc(const Allocator *allocator, F128Array *array, const F128Array *other);
-F128Array *wapp_f128_array_copy_alloc(const Allocator *allocator, const F128Array *src, F128Array *dst);
-f128 *_f128_array_pop(F128Array *array);
-iptr *wapp_iptr_array_get(const IptrArray *array, u64 index);
-void wapp_iptr_array_set(IptrArray *array, u64 index, iptr *item);
-void wapp_iptr_array_append_capped(IptrArray *array, iptr *item);
-void wapp_iptr_array_extend_capped(IptrArray *array, const IptrArray *other);
-void wapp_iptr_array_clear(IptrArray *array);
-void wapp_iptr_array_copy_capped(const IptrArray *src, IptrArray *dst);
-IptrArray *wapp_iptr_array_append_alloc(const Allocator *allocator, IptrArray *array, iptr *item);
-IptrArray *wapp_iptr_array_extend_alloc(const Allocator *allocator, IptrArray *array, const IptrArray *other);
-IptrArray *wapp_iptr_array_copy_alloc(const Allocator *allocator, const IptrArray *src, IptrArray *dst);
-iptr *_iptr_array_pop(IptrArray *array);
-uptr *wapp_uptr_array_get(const UptrArray *array, u64 index);
-void wapp_uptr_array_set(UptrArray *array, u64 index, uptr *item);
-void wapp_uptr_array_append_capped(UptrArray *array, uptr *item);
-void wapp_uptr_array_extend_capped(UptrArray *array, const UptrArray *other);
-void wapp_uptr_array_clear(UptrArray *array);
-void wapp_uptr_array_copy_capped(const UptrArray *src, UptrArray *dst);
-UptrArray *wapp_uptr_array_append_alloc(const Allocator *allocator, UptrArray *array, uptr *item);
-UptrArray *wapp_uptr_array_extend_alloc(const Allocator *allocator, UptrArray *array, const UptrArray *other);
-UptrArray *wapp_uptr_array_copy_alloc(const Allocator *allocator, const UptrArray *src, UptrArray *dst);
-uptr *_uptr_array_pop(UptrArray *array);
-VoidPArray *_array_alloc_capacity(const Allocator *allocator, u64 capacity, u64 item_size);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !ARRAY_H

src/primitives/dbl_list/dbl_list.h

@@ -1,507 +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/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_str8_list_node(ITEM_PTR) Str8Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_void_ptr_list_node(ITEM_PTR) VoidPNode{ITEM_PTR, nullptr, nullptr}
-#define wapp_b32_list_node(ITEM_PTR) B32Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_char_list_node(ITEM_PTR) CharNode{ITEM_PTR, nullptr, nullptr}
-#define wapp_c8_list_node(ITEM_PTR) C8Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_c16_list_node(ITEM_PTR) C16Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_c32_list_node(ITEM_PTR) C32Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_i8_list_node(ITEM_PTR) I8Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_i16_list_node(ITEM_PTR) I16Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_i32_list_node(ITEM_PTR) I32Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_i64_list_node(ITEM_PTR) I64Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_u8_list_node(ITEM_PTR) U8Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_u16_list_node(ITEM_PTR) U16Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_u32_list_node(ITEM_PTR) U32Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_u64_list_node(ITEM_PTR) U64Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_f32_list_node(ITEM_PTR) F32Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_f64_list_node(ITEM_PTR) F64Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_f128_list_node(ITEM_PTR) F128Node{ITEM_PTR, nullptr, nullptr}
-#define wapp_iptr_list_node(ITEM_PTR) IptrNode{ITEM_PTR, nullptr, nullptr}
-#define wapp_uptr_list_node(ITEM_PTR) UptrNode{ITEM_PTR, nullptr, nullptr}
-#else
-#define wapp_str8_list_node(ITEM_PTR) ((Str8Node){.item = ITEM_PTR})
-#define wapp_void_ptr_list_node(ITEM_PTR) ((VoidPNode){.item = ITEM_PTR})
-#define wapp_b32_list_node(ITEM_PTR) ((B32Node){.item = ITEM_PTR})
-#define wapp_char_list_node(ITEM_PTR) ((CharNode){.item = ITEM_PTR})
-#define wapp_c8_list_node(ITEM_PTR) ((C8Node){.item = ITEM_PTR})
-#define wapp_c16_list_node(ITEM_PTR) ((C16Node){.item = ITEM_PTR})
-#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 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 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 B32Node B32Node;
-struct B32Node {
-  b32 *item;
-  B32Node *prev;
-  B32Node *next;
-};
-
-typedef struct B32List B32List;
-struct B32List {
-  B32Node *first;
-  B32Node *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;
-};
-
-Str8Node *wapp_str8_list_get(const Str8List *list, u64 index);
-void wapp_str8_list_push_front(Str8List *list, Str8Node *node);
-void wapp_str8_list_push_back(Str8List *list, Str8Node *node);
-void wapp_str8_list_insert(Str8List *list, Str8Node *node, u64 index);
-Str8Node *wapp_str8_list_pop_front(Str8List *list);
-Str8Node *wapp_str8_list_pop_back(Str8List *list);
-Str8Node *wapp_str8_list_remove(Str8List *list, u64 index);
-void wapp_str8_list_empty(Str8List *list);
-VoidPNode *wapp_void_ptr_list_get(const VoidPList *list, u64 index);
-void wapp_void_ptr_list_push_front(VoidPList *list, VoidPNode *node);
-void wapp_void_ptr_list_push_back(VoidPList *list, VoidPNode *node);
-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);
-B32Node *wapp_b32_list_get(const B32List *list, u64 index);
-void wapp_b32_list_push_front(B32List *list, B32Node *node);
-void wapp_b32_list_push_back(B32List *list, B32Node *node);
-void wapp_b32_list_insert(B32List *list, B32Node *node, u64 index);
-B32Node *wapp_b32_list_pop_front(B32List *list);
-B32Node *wapp_b32_list_pop_back(B32List *list);
-B32Node *wapp_b32_list_remove(B32List *list, u64 index);
-void wapp_b32_list_empty(B32List *list);
-CharNode *wapp_char_list_get(const CharList *list, u64 index);
-void wapp_char_list_push_front(CharList *list, CharNode *node);
-void wapp_char_list_push_back(CharList *list, CharNode *node);
-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/primitives/wapp_primitives.h

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

src/prng/wapp_prng.c

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

src/prng/wapp_prng.h

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

src/prng/xorshift/xorshift.c

@@ -1,9 +1,5 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #include "xorshift.h"
 #include "../../common/aliases/aliases.h"
-#include "../../common/assert/assert.h"
-#include "../../common/platform/platform.h"
 #include <stdbool.h>
 #include <stdlib.h>
 #include <time.h>
@@ -15,17 +11,19 @@ struct split_mix_64_state {
 
 internal u64 rol64(u64 x, u64 bits);
 internal u64 split_mix_64(SplitMix64State *state);
-internal void seed_os_generator(void);
-internal u64 generate_random_number(void);
 
 XOR256State wapp_prng_xorshift_init_state(void) {
   persistent bool seeded = false;
   if (!seeded) {
     seeded = true;
-    seed_os_generator();
+
+    struct timespec ts = {0};
+    clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
+
+    srand48(ts.tv_nsec);
   }
 
-  SplitMix64State sm64 = {.seed = generate_random_number()};
+  SplitMix64State sm64 = {.seed = lrand48()};
 
   return (XOR256State){
       .x = split_mix_64(&sm64),
@@ -89,48 +87,3 @@ internal u64 split_mix_64(SplitMix64State *state) {
 
   return result ^ (result >> 31);
 }
-
-#if defined(WAPP_PLATFORM_C) && WAPP_PLATFORM_C_VERSION >= WAPP_PLATFORM_C11_VERSION
-#ifdef WAPP_PLATFORM_POSIX
-internal void seed_os_generator(void) {
-    struct timespec ts = {0};
-    int result = clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
-    wapp_runtime_assert(result == 0, "Invalid seed value");
-
-    srand48(ts.tv_nsec);
-}
-
-internal u64 generate_random_number(void) {
-  return lrand48();
-}
-#else
-internal void seed_os_generator(void) {
-    struct timespec ts = {0};
-    int result = timespec_get(&ts, TIME_UTC);
-    wapp_runtime_assert(result != 0, "Invalid seed value");
-
-    srand(ts.tv_nsec);
-}
-
-internal u64 generate_random_number(void) {
-  i32 n1 = rand();
-  i32 n2 = rand();
-
-  return (((u64)n1) << 32 | (u64)n2);
-}
-#endif // !WAPP_PLATFORM_POSIX
-#else
-internal void seed_os_generator(void) {
-    time_t result = time(NULL);
-    wapp_runtime_assert(result != (time_t)(-1), "Invalid seed value");
-
-    srand(result);
-}
-
-internal u64 generate_random_number(void) {
-  i32 n1 = rand();
-  i32 n2 = rand();
-
-  return (((u64)n1) << 32 | (u64)n2);
-}
-#endif // !WAPP_PLATFORM_C

src/prng/xorshift/xorshift.h

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

src/testing/tester/tester.c

@@ -1,9 +1,7 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #include "tester.h"
 #include "../../common/aliases/aliases.h"
 #include "../../core/os/shell/termcolour/termcolour.h"
-#include "../../primitives/strings/str8/str8.h"
+#include "../../core/strings/str8/str8.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>

src/testing/tester/tester.h

@@ -1,23 +1,16 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef TESTER_H
 #define TESTER_H
 
 #include "../../common/misc/misc_utils.h"
 #include "../../common/platform/platform.h"
-#include "../../primitives/strings/str8/str8.h"
+#include "../../core/strings/str8/str8.h"
 #include <stdbool.h>
 
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus
 
-#ifdef WAPP_PLATFORM_CPP
-#define wapp_tester_result(PASSED) (TestFuncResult{wapp_str8_lit_ro(__func__), PASSED})
-#else
 #define wapp_tester_result(PASSED) ((TestFuncResult){.name = wapp_str8_lit_ro(__func__), .passed = PASSED})
-#endif // !WAPP_PLATFORM_CPP
-
 #define wapp_tester_run_tests(...) run_tests(__VA_ARGS__, NULL)
 
 typedef struct test_func_result TestFuncResult;
@@ -34,8 +27,8 @@ typedef TestFuncResult(TestFunc)(void);
 
 void run_tests(TestFunc *func1, ...);
 
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus
 
 #endif // !TESTER_H

src/testing/wapp_testing.c

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

src/testing/wapp_testing.h

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