Switch macos back to using bear instead of intercept-build

.gitea/workflows/release.yml

@@ -1,81 +0,0 @@
-name: Release
-
-on:
-  push:
-    branches:
-      - main  # or your default branch
-
-jobs:
-  release:
-    runs-on: self-hosted
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-            fetch-depth: 0   # fetch full history
-            tags: true       # fetch all tags
-
-      - name: Check/Create Tag
-        id: tag
-        run: |
-          VERSION=$(cat VERSION | tr -d '[:space:]')  # read version and trim whitespace
-          echo "Version: $VERSION"
-
-          if git rev-parse "v$VERSION" >/dev/null 2>&1; then
-            echo "Tag v$VERSION already exists. Skipping release."
-            exit 0
-          fi
-
-          # Tag does not exist → create it
-          echo "Creating tag v$VERSION"
-          git tag "v$VERSION"
-          git push origin "v$VERSION"
-
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Build Artifacts
-        if: steps.tag.outputs.version
-        run: |
-          chmod +x ./package
-          ./package
-          ls -l dist/
-
-      - name: Create Release
-        if: steps.tag.outputs.version
-        id: create_release
-        run: |
-          VERSION="${{ steps.tag.outputs.version }}"
-          RESPONSE=$(curl -s -X POST \
-            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
-            -H "Content-Type: application/json" \
-            "https://git.thewizardapprentice.com/api/v1/repos/${{ gitea.repository }}/releases" \
-            -d '{
-              "tag_name": "v'"$VERSION"'",
-              "name": "wapp-v'"$VERSION"'",
-              "body": "Automated release for wapp-v'"$VERSION"'",
-              "draft": false,
-              "prerelease": false
-            }')
-
-          echo "$RESPONSE"
-          RELEASE_ID=$(echo $RESPONSE | jq -r '.id')
-          echo "release_id=$RELEASE_ID" >> $GITHUB_OUTPUT
-
-      - name: Upload Artifacts
-        if: steps.tag.outputs.version
-        run: |
-          RELEASE_ID="${{ steps.create_release.outputs.release_id }}"
-          for FILE in dist/*; do
-            FILENAME=$(basename "$FILE")
-            echo "Uploading $FILENAME"
-            curl -X POST \
-              -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
-              -H "Content-Type: application/octet-stream" \
-              --data-binary @"$FILE" \
-              "https://git.thewizardapprentice.com/api/v1/repos/${{ gitea.repository }}/releases/$RELEASE_ID/assets?name=$FILENAME"
-          done
-
-      - name: Cleanup
-        if: steps.tag.outputs.version
-        run: rm -rf dist/*

LICENSE

@@ -1,201 +0,0 @@
-                             Apache License
-                       Version 2.0, January 2004
-                    http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-  "License" shall mean the terms and conditions for use, reproduction,
-  and distribution as defined by Sections 1 through 9 of this document.
-
-  "Licensor" shall mean the copyright owner or entity authorized by
-  the copyright owner that is granting the License.
-
-  "Legal Entity" shall mean the union of the acting entity and all
-  other entities that control, are controlled by, or are under common
-  control with that entity. For the purposes of this definition,
-  "control" means (i) the power, direct or indirect, to cause the
-  direction or management of such entity, whether by contract or
-  otherwise, or (ii) ownership of fifty percent (50%) or more of the
-  outstanding shares, or (iii) beneficial ownership of such entity.
-
-  "You" (or "Your") shall mean an individual or Legal Entity
-  exercising permissions granted by this License.
-
-  "Source" form shall mean the preferred form for making modifications,
-  including but not limited to software source code, documentation
-  source, and configuration files.
-
-  "Object" form shall mean any form resulting from mechanical
-  transformation or translation of a Source form, including but
-  not limited to compiled object code, generated documentation,
-  and conversions to other media types.
-
-  "Work" shall mean the work of authorship, whether in Source or
-  Object form, made available under the License, as indicated by a
-  copyright notice that is included in or attached to the work
-  (an example is provided in the Appendix below).
-
-  "Derivative Works" shall mean any work, whether in Source or Object
-  form, that is based on (or derived from) the Work and for which the
-  editorial revisions, annotations, elaborations, or other modifications
-  represent, as a whole, an original work of authorship. For the purposes
-  of this License, Derivative Works shall not include works that remain
-  separable from, or merely link (or bind by name) to the interfaces of,
-  the Work and Derivative Works thereof.
-
-  "Contribution" shall mean any work of authorship, including
-  the original version of the Work and any modifications or additions
-  to that Work or Derivative Works thereof, that is intentionally
-  submitted to Licensor for inclusion in the Work by the copyright owner
-  or by an individual or Legal Entity authorized to submit on behalf of
-  the copyright owner. For the purposes of this definition, "submitted"
-  means any form of electronic, verbal, or written communication sent
-  to the Licensor or its representatives, including but not limited to
-  communication on electronic mailing lists, source code control systems,
-  and issue tracking systems that are managed by, or on behalf of, the
-  Licensor for the purpose of discussing and improving the Work, but
-  excluding communication that is conspicuously marked or otherwise
-  designated in writing by the copyright owner as "Not a Contribution."
-
-  "Contributor" shall mean Licensor and any individual or Legal Entity
-  on behalf of whom a Contribution has been received by Licensor and
-  subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-  this License, each Contributor hereby grants to You a perpetual,
-  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-  copyright license to reproduce, prepare Derivative Works of,
-  publicly display, publicly perform, sublicense, and distribute the
-  Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-  this License, each Contributor hereby grants to You a perpetual,
-  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-  (except as stated in this section) patent license to make, have made,
-  use, offer to sell, sell, import, and otherwise transfer the Work,
-  where such license applies only to those patent claims licensable
-  by such Contributor that are necessarily infringed by their
-  Contribution(s) alone or by combination of their Contribution(s)
-  with the Work to which such Contribution(s) was submitted. If You
-  institute patent litigation against any entity (including a
-  cross-claim or counterclaim in a lawsuit) alleging that the Work
-  or a Contribution incorporated within the Work constitutes direct
-  or contributory patent infringement, then any patent licenses
-  granted to You under this License for that Work shall terminate
-  as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-  Work or Derivative Works thereof in any medium, with or without
-  modifications, and in Source or Object form, provided that You
-  meet the following conditions:
-
-  (a) You must give any other recipients of the Work or
-      Derivative Works a copy of this License; and
-
-  (b) You must cause any modified files to carry prominent notices
-      stating that You changed the files; and
-
-  (c) You must retain, in the Source form of any Derivative Works
-      that You distribute, all copyright, patent, trademark, and
-      attribution notices from the Source form of the Work,
-      excluding those notices that do not pertain to any part of
-      the Derivative Works; and
-
-  (d) If the Work includes a "NOTICE" text file as part of its
-      distribution, then any Derivative Works that You distribute must
-      include a readable copy of the attribution notices contained
-      within such NOTICE file, excluding those notices that do not
-      pertain to any part of the Derivative Works, in at least one
-      of the following places: within a NOTICE text file distributed
-      as part of the Derivative Works; within the Source form or
-      documentation, if provided along with the Derivative Works; or,
-      within a display generated by the Derivative Works, if and
-      wherever such third-party notices normally appear. The contents
-      of the NOTICE file are for informational purposes only and
-      do not modify the License. You may add Your own attribution
-      notices within Derivative Works that You distribute, alongside
-      or as an addendum to the NOTICE text from the Work, provided
-      that such additional attribution notices cannot be construed
-      as modifying the License.
-
-  You may add Your own copyright statement to Your modifications and
-  may provide additional or different license terms and conditions
-  for use, reproduction, or distribution of Your modifications, or
-  for any such Derivative Works as a whole, provided Your use,
-  reproduction, and distribution of the Work otherwise complies with
-  the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-  any Contribution intentionally submitted for inclusion in the Work
-  by You to the Licensor shall be under the terms and conditions of
-  this License, without any additional terms or conditions.
-  Notwithstanding the above, nothing herein shall supersede or modify
-  the terms of any separate license agreement you may have executed
-  with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-  names, trademarks, service marks, or product names of the Licensor,
-  except as required for reasonable and customary use in describing the
-  origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-  agreed to in writing, Licensor provides the Work (and each
-  Contributor provides its Contributions) on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-  implied, including, without limitation, any warranties or conditions
-  of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-  PARTICULAR PURPOSE. You are solely responsible for determining the
-  appropriateness of using or redistributing the Work and assume any
-  risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-  whether in tort (including negligence), contract, or otherwise,
-  unless required by applicable law (such as deliberate and grossly
-  negligent acts) or agreed to in writing, shall any Contributor be
-  liable to You for damages, including any direct, indirect, special,
-  incidental, or consequential damages of any character arising as a
-  result of this License or out of the use or inability to use the
-  Work (including but not limited to damages for loss of goodwill,
-  work stoppage, computer failure or malfunction, or any and all
-  other commercial damages or losses), even if such Contributor
-  has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-  the Work or Derivative Works thereof, You may choose to offer,
-  and charge a fee for, acceptance of support, warranty, indemnity,
-  or other liability obligations and/or rights consistent with this
-  License. However, in accepting such obligations, You may act only
-  on Your own behalf and on Your sole responsibility, not on behalf
-  of any other Contributor, and only if You agree to indemnify,
-  defend, and hold each Contributor harmless for any liability
-  incurred by, or claims asserted against, such Contributor by reason
-  of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-  To apply the Apache License to your work, attach the following
-  boilerplate notice, with the fields enclosed by brackets "[]"
-  replaced with your own identifying information. (Don't include
-  the brackets!)  The text should be enclosed in the appropriate
-  comment syntax for the file format. We also recommend that a
-  file or class name and description of purpose be included on the
-  same "printed page" as the copyright notice for easier
-  identification within third-party archives.
-
-Copyright [2026] [Abdelrahman Said]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

Makefile

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

README.md

@@ -1,5 +1,3 @@
 # Wizard Apprentice Standard Library
 
-**Wizard Apprentice Standard Library** (`wapp`) is a lightweight collection of reusable utilities for **C and C++** projects.
-
-For more information about the library and how to use it, check the [wiki](https://git.thewizardapprentice.com/abdelrahman/wizapp-stdlib/wiki).
+A collection of useful C utilities for my projects

VERSION

@@ -1 +0,0 @@
-1.0.0

build.ps1

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

ccodegen/datatypes.c

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

ccodegen/datatypes.h

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

ccodegen/dbl_list.h

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

ccodegen/main.c

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

ccodegen/type_enums.h

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

codegen/__main__.py

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

codegen/constants.py

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

codegen/datatypes.py

@@ -0,0 +1,503 @@
+from enum import Enum
+from pathlib import Path
+from typing import Optional, Union, List, Dict, Type, Any, TypeVar, cast
+from dataclasses import dataclass, asdict, field, fields
+
+from codegen.constants import WAPP_SRC_ROOT
+from codegen.utils import convert_to_relative
+
+E = TypeVar("E", bound="Enum")
+S = TypeVar("S", bound="SerialisableDataclass")
+F = TypeVar("F", bound="CFile")
+
+@dataclass
+class SerialisableDataclass:
+    def to_dict(self) -> Dict[str, Any]:
+        d = asdict(self)
+        for f in fields(self):
+            member = getattr(self, f.name)
+
+            if isinstance(member, list):
+                d[f.name] = [self.__serialise_member(i) for i in member]
+            else:
+                d[f.name] = self.__serialise_member(member)
+
+        return d
+
+    def __serialise_member(self, member: Any) -> Any:
+        if isinstance(member, Enum):
+            return member.value
+        elif isinstance(member, SerialisableDataclass):
+            return member.to_dict()
+
+        return member
+
+    @staticmethod
+    def to_enum_value(value: Any, _type: Type[E]) -> "E":
+        if isinstance(value, _type):
+            return value
+
+        return _type(value)
+
+    @staticmethod
+    def to_c_usertype(value: dict[str, Any]) -> "CUserType":
+        try:
+            output = CStruct.from_dict(value)
+        except TypeError:
+            output = CEnum.from_dict(value)
+
+        return output
+
+    @staticmethod
+    def to_cdatatype(value: Any) -> "CDataType":
+        if isinstance(value, dict):
+            output = SerialisableDataclass.to_c_usertype(value)
+        else:
+            try:
+                output = CType(value)
+            except ValueError:
+                output = value
+
+        return output
+
+    @classmethod
+    def from_dict(cls: Type[S], d: Dict[str, Any]) -> "S":
+        return cls(**d)
+
+
+class CType(Enum):
+    VOID = "void"
+    BOOL = "b8"
+    CHAR = "char"
+    C8   = "c8"
+    C16  = "c16"
+    C32  = "c32"
+    I8   = "i8"
+    I16  = "i16"
+    I32  = "i32"
+    I64  = "i64"
+    U8   = "u8"
+    U16  = "u16"
+    U32  = "u32"
+    U64  = "u64"
+    F32  = "f32"
+    F64  = "f64"
+    F128 = "f128"
+    IPTR = "iptr"
+    UPTR = "uptr"
+
+    def __str__(self) -> str:
+        return self.value
+
+
+class CQualifier(Enum):
+    NONE       = ""
+    CONST      = "const "
+    EXTERNAL   = "wapp_extern "
+    INTERNAL   = "wapp_intern "
+    PERSISTENT = "wapp_persist "
+
+    def __str__(self) -> str:
+        return self.value
+
+
+class CPointerType(Enum):
+    NONE   = ""
+    SINGLE = "*"
+    DOUBLE = "**"
+
+    def __str__(self) -> str:
+        return self.value
+
+
+@dataclass
+class CPointer(SerialisableDataclass):
+    _type: CPointerType = CPointerType.NONE
+    qualifier: CQualifier = CQualifier.NONE
+
+    def __str__(self) -> str:
+        return str(self._type) + str(self.qualifier)
+
+    @classmethod
+    def from_dict(cls: Type["CPointer"], d: Dict[str, Any]) -> "CPointer":
+        ptr = CPointer(**d)
+        ptr._type = CPointer.to_enum_value(ptr._type, CPointerType)
+        ptr.qualifier = CPointer.to_enum_value(ptr.qualifier, CQualifier)
+        return ptr
+
+
+@dataclass
+class CEnumVal(SerialisableDataclass):
+    name: str
+    value: Optional[int] = None
+
+    def __str__(self) -> str:
+        return self.name + "" if self.value is None else f" = {self.value}"
+
+
+@dataclass
+class CEnum(SerialisableDataclass):
+    name: str
+    values: List[CEnumVal]
+    typedef: bool = False
+
+    def __str__(self) -> str:
+        if self.typedef:
+            header = "typedef enum {\n"
+            footer = f"}} {self.name};\n"
+        else:
+            header = f"enum {self.name} {{\n"
+            footer = "};\n"
+
+        values = ""
+        for value in self.values:
+            values += f"  {str(value)},\n"
+
+        return header + values + footer
+
+    @classmethod
+    def from_dict(cls: Type["CEnum"], d: Dict[str, Any]) -> "CEnum":
+        e = CEnum(**d)
+        e.values = [CEnumVal.from_dict(v) for v in e.values if isinstance(v, dict)]
+        return e
+
+
+@dataclass
+class CMacro(SerialisableDataclass):
+    name: str
+    value: str
+
+    def __str__(self) -> str:
+        return f"#define {self.name} {self.value}\n"
+
+
+@dataclass
+class CStruct(SerialisableDataclass):
+    name: str
+    cargs: List["CArg"]
+    typedef_name: Optional[str] = None
+
+    def __str__(self) -> str:
+        return self.declare() + self.define()
+
+    def declare(self) -> str:
+        declaration = f"typedef struct {self.name} {self.typedef_name if self.typedef_name is not None else self.name};\n"
+        return declaration
+
+    def define(self):
+        definition = f"struct {self.name} {{\n"
+        args = ""
+        for arg in self.cargs:
+            args += f"  {str(arg)};\n"
+        footer = "};\n"
+
+        return definition + args + footer;
+
+    @classmethod
+    def from_dict(cls: Type["CStruct"], d: Dict[str, Any]) -> "CStruct":
+        s = CStruct(**d)
+        s.cargs = [CArg.from_dict(v) for v in s.cargs if isinstance(v, dict)]
+        return s
+
+
+CUserType = Union[CStruct, CEnum]
+CDataType = Union[CType, CUserType, str]
+
+
+@dataclass
+class CArg(SerialisableDataclass):
+    name: str
+    _type: CDataType
+    array: bool = False
+    pointer: CPointer = field(default_factory=CPointer)
+    qualifier: CQualifier = CQualifier.NONE
+
+    def __str__(self) -> str:
+        qualifier = str(self.qualifier)
+        _type = get_datatype_string(self._type) + " "
+        pointer = str(self.pointer)
+        array = "[]" if self.array else ""
+
+        return qualifier + _type + pointer + self.name + array
+
+    @classmethod
+    def from_dict(cls: Type["CArg"], d: Dict[str, Any]) -> "CArg":
+        arg = CArg(**d)
+        arg._type = CArg.to_cdatatype(arg._type)
+
+        if isinstance(arg.pointer, dict):
+            arg.pointer = CPointer.from_dict(arg.pointer)
+
+        arg.qualifier = CArg.to_enum_value(arg.qualifier, CQualifier)
+
+        return arg
+
+
+@dataclass
+class CFunc(SerialisableDataclass):
+    name: str
+    ret_type: CDataType
+    args: List[CArg]
+    body: str
+    pointer: CPointer = field(default_factory=CPointer)
+    qualifiers: List[CQualifier] = field(default_factory=list)
+
+    def __str__(self) -> str:
+        qualifiers = ""
+        for qualifier in self.qualifiers:
+            if qualifier == CQualifier.NONE:
+                continue
+            if len(qualifiers) > 0:
+                qualifiers += " "
+            qualifiers += f"{str(qualifier)}"
+
+        args = ""
+        for i, arg in enumerate(self.args):
+            args += f"{str(arg)}"
+            if i + 1 < len(self.args):
+                args += ", "
+
+        return qualifiers + get_datatype_string(self.ret_type) + " " + str(self.pointer) + self.name + f"({args})"
+
+    def declare(self) -> str:
+        return f"{str(self)};\n"
+
+    def define(self) -> str:
+        return f"{str(self)} {{\n{self.body}\n}}\n\n"
+
+    @classmethod
+    def from_dict(cls: Type["CFunc"], d: Dict[str, Any]) -> "CFunc":
+        f = CFunc(**d)
+        f.ret_type = CFunc.to_cdatatype(f.ret_type)
+        f.args = [CArg.from_dict(v) for v in f.args if isinstance(v, dict)]
+        f.qualifiers = [CFunc.to_enum_value(v, CQualifier) for v in f.qualifiers]
+
+        if isinstance(f.pointer, dict):
+            f.pointer = CPointer.from_dict(f.pointer)
+
+        return f
+
+
+@dataclass
+class CInclude(SerialisableDataclass):
+    header: Union[str, "CHeader"]
+    local: bool = False
+    same_dir: bool = False
+
+    def __str__(self) -> str:
+        if isinstance(self.header, CHeader):
+            name = f"{self.header.name}.{self.header.extension}"
+        else:
+            name = self.header
+
+        if self.local:
+            open_symbol = '"'
+            close_symbol = '"'
+
+            if self.same_dir:
+                name = f"./{name}"
+        else:
+            open_symbol = '<'
+            close_symbol = '>'
+        
+        return f"#include {open_symbol}{name}{close_symbol}\n"
+
+    @classmethod
+    def from_dict(cls: Type["CInclude"], d: Dict[str, Any]) -> "CInclude":
+        inc = CInclude(**d)
+
+        if isinstance(inc.header, dict):
+            inc.header = CHeader.from_dict(inc.header)
+
+        return inc
+
+
+@dataclass
+class CFile(SerialisableDataclass):
+    name: str
+    extension: str
+    includes: List[CInclude] = field(default_factory=list)
+    types: List[CUserType] = field(default_factory=list)
+    funcs: List[CFunc] = field(default_factory=list)
+    decl_types: List[CStruct] = field(default_factory=list)
+    macros: List[CMacro] = field(default_factory=list)
+    c_macros: List[CMacro] = field(default_factory=list)
+    cpp_macros: List[CMacro] = field(default_factory=list)
+
+    def save(self, output_dir: Path):
+        self.includes.extend(
+            [
+                CInclude(
+                    header=str(convert_to_relative(WAPP_SRC_ROOT / "common" / "aliases" / "aliases.h", output_dir)).replace("\\", "/"),
+                    local=True,
+                ),
+                CInclude(
+                    header=str(convert_to_relative(WAPP_SRC_ROOT / "common" / "platform" / "platform.h", output_dir)).replace("\\", "/"),
+                    local=True,
+                )
+            ]
+        )
+        output_file = output_dir / f"{self.name}.{self.extension}"
+        with open(output_file, "w+") as outfile:
+            outfile.write(str(self))
+
+    def __str__(self) -> str:
+        return """\
+/**
+ * THIS FILE IS AUTOMATICALLY GENERATED. ANY MODIFICATIONS TO IT WILL BE OVERWRITTEN.
+ */
+
+"""
+
+    @classmethod
+    def from_dict(cls: Type["CFile"], d: Dict[str, Any]) -> "CFile":
+        f = CFile(**d)
+        f.deserialise_c_file_data()
+
+        return f
+
+    def deserialise_c_file_data(self) -> None:
+        self.includes = [CInclude.from_dict(v) for v in self.includes if isinstance(v, dict)]
+        self.types = [CFile.to_c_usertype(v) for v in self.types if isinstance(v, dict)]
+        self.funcs = [CFunc.from_dict(v) for v in self.funcs if isinstance(v, dict)]
+        self.decl_types = [CStruct.from_dict(v) for v in self.decl_types if isinstance(v, dict)]
+        self.macros = [CMacro.from_dict(v) for v in self.macros if isinstance(v, dict)]
+        self.c_macros = [CMacro.from_dict(v) for v in self.c_macros if isinstance(v, dict)]
+        self.cpp_macros = [CMacro.from_dict(v) for v in self.cpp_macros if isinstance(v, dict)]
+
+
+@dataclass
+class CHeader(CFile):
+    extension: str = "h"
+
+    def __str__(self) -> str:
+        name_upper = self.name.upper()
+        header_guard_name = f"{name_upper}_H"
+        header_guard_open = f"#ifndef {header_guard_name}\n#define {header_guard_name}\n\n"
+        header_guard_close = f"#endif // !{header_guard_name}\n"
+
+        c_linkage_open = "#ifdef WAPP_PLATFORM_CPP\nBEGIN_C_LINKAGE\n#endif // !WAPP_PLATFORM_CPP\n\n"
+        c_linkage_close = "\n#ifdef WAPP_PLATFORM_CPP\nEND_C_LINKAGE\n#endif // !WAPP_PLATFORM_CPP\n\n"
+
+        includes = _get_includes_string(self.includes)
+
+        macros = ""
+        for macro in self.macros:
+            macros += str(macro)
+        if len(macros) > 0:
+            macros += "\n"
+
+        if len(self.cpp_macros) > 0:
+            macros += "#ifdef WAPP_PLATFORM_CPP\n"
+            for macro in self.cpp_macros:
+                macros += str(macro)
+            macros += "#else\n"
+            for macro in self.c_macros:
+                macros += str(macro)
+            macros += "#endif // !WAPP_PLATFORM_CPP\n\n"
+
+        forward_declarations = ""
+        for _type in self.decl_types:
+            forward_declarations += _type.declare()
+        if len(forward_declarations) > 0:
+            forward_declarations += "\n"
+
+        types = ""
+        for _type in self.types:
+            types += str(_type) + "\n"
+
+        funcs = ""
+        for func in self.funcs:
+            funcs += func.declare()
+
+        return (
+            super().__str__() +
+            header_guard_open +
+            includes +
+            c_linkage_open +
+            macros +
+            forward_declarations +
+            types +
+            funcs +
+            c_linkage_close +
+            header_guard_close
+        )
+
+    @classmethod
+    def from_dict(cls: Type["CHeader"], d: Dict[str, Any]) -> "CHeader":
+        return cast("CHeader", super().from_dict(d))
+
+
+@dataclass
+class CSource(CFile):
+    extension: str = "c"
+    internal_funcs: List[CFunc] = field(default_factory=list)
+
+    def __str__(self) -> str:
+        includes = _get_includes_string(self.includes)
+
+        macros = ""
+        for macro in self.macros:
+            macros += str(macro)
+        if len(macros) > 0:
+            macros += "\n"
+
+        forward_declarations = ""
+        for _type in self.decl_types:
+            forward_declarations += _type.declare()
+        if len(forward_declarations) > 0:
+            forward_declarations += "\n"
+
+        types = ""
+        for _type in self.types:
+            types += str(_type) + "\n"
+
+        internal_funcs_decl = ""
+        internal_funcs_def = ""
+        for func in self.internal_funcs:
+            internal_funcs_decl += func.declare()
+            internal_funcs_def += func.define()
+
+        if len(internal_funcs_decl) > 0:
+            internal_funcs_decl += "\n"
+
+        funcs = ""
+        for func in self.funcs:
+            funcs += func.define()
+
+        return (
+            super().__str__() +
+            includes +
+            macros +
+            forward_declarations +
+            types +
+            internal_funcs_decl +
+            funcs +
+            internal_funcs_def
+        )
+
+    @classmethod
+    def from_dict(cls: Type["CSource"], d: Dict[str, Any]) -> "CSource":
+        s = CSource(**d)
+        s.deserialise_c_file_data()
+        s.internal_funcs = [CFunc.from_dict(v) for v in s.funcs if isinstance(v, dict)]
+        return s
+
+
+def get_datatype_string(_type: CDataType) -> str:
+    if isinstance(_type, CType):
+        return str(_type)
+    elif isinstance(_type, CStruct) or isinstance(_type, CEnum):
+        return _type.name
+    elif isinstance(_type, str):
+        return _type
+
+
+def _get_includes_string(includes: List[CInclude]) -> str:
+    output = ""
+    for include in sorted(includes, key=lambda inc: inc.local, reverse=True):
+        output += str(include)
+    if len(output) > 0:
+        output += "\n"
+
+    return output

codegen/dbl_list/make_dbl_list.py

@@ -0,0 +1,339 @@
+from pathlib import Path
+from dataclasses import dataclass, field
+from typing import List, Dict, Any, Type
+from codegen.constants import WAPP_SRC_ROOT
+from codegen.utils import load_func_body_from_file, convert_to_relative
+from codegen.datatypes import (
+    CDataType,
+    CMacro,
+    CStruct,
+    CFunc,
+    CHeader,
+    CSource,
+    CArg,
+    CType,
+    CPointer,
+    CPointerType,
+    CQualifier,
+    CInclude,
+    SerialisableDataclass,
+    get_datatype_string,
+)
+
+
+@dataclass
+class DblListData(SerialisableDataclass):
+    node_typename: str
+    list_typename: str
+    hdr_decl_types: List[CStruct] = field(default_factory=list)
+    src_decl_types: List[CStruct] = field(default_factory=list)
+
+    @classmethod
+    def from_dict(cls: Type["DblListData"], d: Dict[str, Any]) -> "DblListData":
+        data = DblListData(**d)
+        data.hdr_decl_types = [CStruct.from_dict(v) for v in data.hdr_decl_types if isinstance(v, dict)]
+        data.src_decl_types = [CStruct.from_dict(v) for v in data.src_decl_types if isinstance(v, dict)]
+        return data
+
+
+def make_dbl_list(user_datatypes: Dict[CDataType, DblListData] = {}):
+    def __format_func_body(
+        filename: Path,
+        type_string: str,
+        type_string_upper: str,
+        type_string_lower: str,
+        node_typename: str,
+        list_typename: str
+    ):
+        return load_func_body_from_file(filename).format(
+            T=type_string,
+            NodeType=node_typename,
+            ListType=list_typename,
+            Tupper=type_string_upper,
+            Tlower=type_string_lower,
+        )
+
+    out_dir = WAPP_SRC_ROOT / "primitives" / "dbl_list"
+    out_dir.mkdir(parents=True, exist_ok=True)
+
+    common_decl_types: List[CStruct] = []
+
+    datatypes: dict[CDataType, DblListData] = {
+        CType.VOID: DblListData(node_typename="GenericNode", list_typename="GenericList"),
+        "void *": DblListData(node_typename="VoidPNode", list_typename="VoidPList"),
+        "Str8": DblListData(
+            node_typename="Str8Node",
+            list_typename="Str8List",
+            hdr_decl_types=[
+                CStruct(name="str8", cargs=[], typedef_name="Str8"),
+            ],
+        ),
+    }
+
+    for _type in CType:
+        if _type == CType.VOID:
+            continue
+
+        type_title = _type.value.title()
+        datatypes[_type] = DblListData(
+            node_typename=f"{type_title}Node",
+            list_typename=f"{type_title}List",
+        )
+
+    datatypes.update(user_datatypes)
+
+    snippets_dir = Path(__file__).parent / "snippets"
+
+    header = CHeader(
+        name="dbl_list",
+        decl_types=[*common_decl_types],
+        includes=[],
+        types=[],
+        funcs=[]
+    )
+
+    source = CSource(
+        name=header.name,
+        decl_types=[*common_decl_types],
+        includes=[
+            CInclude(header, local=True, same_dir=True),
+            CInclude(
+                header=str(convert_to_relative(WAPP_SRC_ROOT / "common" / "assert" / "assert.h", out_dir)).replace("\\", "/"),
+                local=True
+            ),
+            CInclude(header="stddef.h"),
+        ],
+        internal_funcs=[],
+        funcs=header.funcs
+    )
+
+    for _type, dbl_list_data in datatypes.items():
+        type_string = get_datatype_string(_type)
+        clean_type_string = type_string.replace(" ", "").replace("*", "_ptr")
+        type_string_upper = clean_type_string.upper()
+        type_string_lower = clean_type_string.lower()
+
+        node = CStruct(
+            name=dbl_list_data.node_typename,
+            cargs=[
+                CArg(name="item", _type=type_string, pointer=CPointer(_type=CPointerType.SINGLE)),
+            ],
+        )
+        node.cargs.extend([
+            CArg(name="prev", _type=node, pointer=CPointer(_type=CPointerType.SINGLE)),
+            CArg(name="next", _type=node, pointer=CPointer(_type=CPointerType.SINGLE)),
+        ])
+        
+        dl_list = CStruct(
+            name=dbl_list_data.list_typename,
+            cargs=[
+                CArg(name="first", _type=node, pointer=CPointer(_type=CPointerType.SINGLE)),
+                CArg(name="last", _type=node, pointer=CPointer(_type=CPointerType.SINGLE)),
+                CArg(name="node_count", _type=CType.U64),
+            ],
+        )
+
+        header.types.extend([node, dl_list])
+        header.decl_types.extend(dbl_list_data.hdr_decl_types)
+        source.decl_types.extend(dbl_list_data.src_decl_types)
+        if isinstance(_type, CType) and _type == CType.VOID:
+            # Don't define any functions for the generic node and list
+            continue
+
+        node_cmacro = CMacro(
+            name=f"wapp_{type_string_lower}_list_node(ITEM_PTR)",
+            value=__format_func_body(
+                filename=snippets_dir / "list_node",
+                type_string=type_string,
+                type_string_upper=type_string_upper,
+                type_string_lower=type_string_lower,
+                node_typename=dbl_list_data.node_typename,
+                list_typename=dbl_list_data.list_typename
+            ),
+        )
+
+        node_cppmacro = CMacro(
+            name=f"wapp_{type_string_lower}_list_node(ITEM_PTR)",
+            value=__format_func_body(
+                filename=snippets_dir / "list_node_cpp",
+                type_string=type_string,
+                type_string_upper=type_string_upper,
+                type_string_lower=type_string_lower,
+                node_typename=dbl_list_data.node_typename,
+                list_typename=dbl_list_data.list_typename
+            ),
+        )
+
+        get_func = CFunc(
+            name=f"wapp_{type_string_lower}_list_get",
+            ret_type=node,
+            args=[
+                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE), qualifier=CQualifier.CONST),
+                CArg(name="index", _type=CType.U64),
+            ],
+            body=__format_func_body(
+                filename=snippets_dir / "list_get",
+                type_string=type_string,
+                type_string_upper=type_string_upper,
+                type_string_lower=type_string_lower,
+                node_typename=dbl_list_data.node_typename,
+                list_typename=dbl_list_data.list_typename
+            ),
+            pointer=CPointer(CPointerType.SINGLE),
+        )
+
+        push_front_func = CFunc(
+            name=f"wapp_{type_string_lower}_list_push_front",
+            ret_type=CType.VOID,
+            args=[
+                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE)),
+                CArg(name="node", _type=node, pointer=CPointer(CPointerType.SINGLE)),
+            ],
+            body=__format_func_body(
+                filename=snippets_dir / "list_push_front",
+                type_string=type_string,
+                type_string_upper=type_string_upper,
+                type_string_lower=type_string_lower,
+                node_typename=dbl_list_data.node_typename,
+                list_typename=dbl_list_data.list_typename
+            ),
+        )
+
+        push_back_func = CFunc(
+            name=f"wapp_{type_string_lower}_list_push_back",
+            ret_type=CType.VOID,
+            args=[
+                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE)),
+                CArg(name="node", _type=node, pointer=CPointer(CPointerType.SINGLE)),
+            ],
+            body=__format_func_body(
+                filename=snippets_dir / "list_push_back",
+                type_string=type_string,
+                type_string_upper=type_string_upper,
+                type_string_lower=type_string_lower,
+                node_typename=dbl_list_data.node_typename,
+                list_typename=dbl_list_data.list_typename
+            ),
+        )
+
+        insert_func = CFunc(
+            name=f"wapp_{type_string_lower}_list_insert",
+            ret_type=CType.VOID,
+            args=[
+                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE)),
+                CArg(name="node", _type=node, pointer=CPointer(CPointerType.SINGLE)),
+                CArg(name="index", _type=CType.U64),
+            ],
+            body=__format_func_body(
+                filename=snippets_dir / "list_insert",
+                type_string=type_string,
+                type_string_upper=type_string_upper,
+                type_string_lower=type_string_lower,
+                node_typename=dbl_list_data.node_typename,
+                list_typename=dbl_list_data.list_typename
+            ),
+        )
+
+        pop_front_func = CFunc(
+            name=f"wapp_{type_string_lower}_list_pop_front",
+            ret_type=node,
+            args=[
+                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE)),
+            ],
+            body=__format_func_body(
+                filename=snippets_dir / "list_pop_front",
+                type_string=type_string,
+                type_string_upper=type_string_upper,
+                type_string_lower=type_string_lower,
+                node_typename=dbl_list_data.node_typename,
+                list_typename=dbl_list_data.list_typename
+            ),
+            pointer=CPointer(CPointerType.SINGLE),
+        )
+
+        pop_back_func = CFunc(
+            name=f"wapp_{type_string_lower}_list_pop_back",
+            ret_type=node,
+            args=[
+                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE)),
+            ],
+            body=__format_func_body(
+                filename=snippets_dir / "list_pop_back",
+                type_string=type_string,
+                type_string_upper=type_string_upper,
+                type_string_lower=type_string_lower,
+                node_typename=dbl_list_data.node_typename,
+                list_typename=dbl_list_data.list_typename
+            ),
+            pointer=CPointer(CPointerType.SINGLE),
+        )
+
+        remove_func = CFunc(
+            name=f"wapp_{type_string_lower}_list_remove",
+            ret_type=node,
+            args=[
+                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE)),
+                CArg(name="index", _type=CType.U64),
+            ],
+            body=__format_func_body(
+                filename=snippets_dir / "list_remove",
+                type_string=type_string,
+                type_string_upper=type_string_upper,
+                type_string_lower=type_string_lower,
+                node_typename=dbl_list_data.node_typename,
+                list_typename=dbl_list_data.list_typename
+            ),
+            pointer=CPointer(CPointerType.SINGLE),
+        )
+
+        empty_func = CFunc(
+            name=f"wapp_{type_string_lower}_list_empty",
+            ret_type=CType.VOID,
+            args=[
+                CArg(name="list", _type=dl_list, pointer=CPointer(CPointerType.SINGLE)),
+            ],
+            body=__format_func_body(
+                filename=snippets_dir / "list_empty",
+                type_string=type_string,
+                type_string_upper=type_string_upper,
+                type_string_lower=type_string_lower,
+                node_typename=dbl_list_data.node_typename,
+                list_typename=dbl_list_data.list_typename
+            ),
+        )
+
+        node_to_list_func = CFunc(
+            name=f"{type_string_lower}_node_to_list",
+            ret_type=dl_list,
+            args=[
+                CArg(name="node", _type=node, pointer=CPointer(CPointerType.SINGLE)),
+            ],
+            body=__format_func_body(
+                filename=snippets_dir / "node_to_list",
+                type_string=type_string,
+                type_string_upper=type_string_upper,
+                type_string_lower=type_string_lower,
+                node_typename=dbl_list_data.node_typename,
+                list_typename=dbl_list_data.list_typename
+            ),
+            qualifiers=[CQualifier.INTERNAL],
+        )
+
+        header.c_macros.append(node_cmacro)
+        header.cpp_macros.append(node_cppmacro)
+        header.funcs.extend([
+            get_func,
+            push_front_func,
+            push_back_func,
+            insert_func,
+            pop_front_func,
+            pop_back_func,
+            remove_func,
+            empty_func,
+        ])
+
+        source.internal_funcs.append(node_to_list_func)
+        source.funcs = header.funcs
+
+    header.save(out_dir)
+    source.save(out_dir)

codegen/dbl_list/snippets/list_empty

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

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

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

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

codegen/dbl_list/snippets/list_node_cpp

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

codegen/dbl_list/snippets/list_pop_back

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

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

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

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

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

@@ -0,0 +1,13 @@
+  {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

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

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

package

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-cp -r src wapp
-
-mkdir -p dist
-
-ARCHIVE_NAME="wapp-v$(cat VERSION)"
-tar -czvf dist/$ARCHIVE_NAME.tar.gz wapp
-zip -r dist/$ARCHIVE_NAME.zip wapp
-
-rm -rf wapp

src/base/array/array.c

@@ -1,266 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "./array.h"
-#include "../../common/assert/assert.h"
-#include "../mem/allocator/mem_allocator.h"
-#include "../../common/misc/misc_utils.h"
-#include "../../common/aliases/aliases.h"
-#include <stddef.h>
-
-#define _array_header(ARRAY) (ArrayHeader *)(wapp_pointer_offset(ARRAY, (i64)sizeof(ArrayHeader) * -1))
-
-wapp_persist inline void _array_validate(const GenericArray array, u64 item_size);
-
-u64 _array_count(GenericArray array) {
-	wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(WAPP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
-
-	return header->count;
-}
-
-u64 _array_capacity(GenericArray array) {
-	wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(WAPP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
-
-	return header->capacity;
-}
-
-u64 _array_item_size(GenericArray array) {
-	wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(WAPP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
-
-	return header->item_size;
-}
-
-void _array_set_count(GenericArray array, u64 count) {
-	wapp_debug_assert(array != NULL, "`array` should not be NULL");
-
-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(WAPP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
-
-	header->count = count;
-}
-
-void *_array_get(GenericArray array, u64 index, u64 item_size) {
-	wapp_runtime_assert(array != NULL, "`array` should not be NULL");
-	_array_validate(array, item_size);
-
-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(index < header->count, "`index` is out of bounds");
-
-	return wapp_pointer_offset(array, header->item_size * index);
-}
-
-void _array_set(GenericArray array, u64 index, void *value, u64 item_size) {
-	void *item = _array_get(array, index, item_size);
-
-	ArrayHeader *header = _array_header(array);
-	memcpy(item, value, header->item_size);
-}
-
-void _array_append_capped(GenericArray array, void *value, u64 item_size) {
-	wapp_runtime_assert(array != NULL, "`array` should not be NULL");
-	_array_validate(array, item_size);
-
-	ArrayHeader *header = _array_header(array);
-	if (header->count >= header->capacity) { return; }
-
-	u64 index = (header->count)++;
-	_array_set(array, index, value, item_size);
-}
-
-void _array_extend_capped(GenericArray dst, const GenericArray src, u64 item_size) {
-	wapp_runtime_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
-	_array_validate(dst, item_size);
-	_array_validate(src, item_size);
-
-	ArrayHeader *src_header = _array_header(src);
-	ArrayHeader *dst_header = _array_header(dst);
-	u64 remaining_capacity = dst_header->capacity - dst_header->count;
-
-	u64 copy_count = src_header->count < remaining_capacity ? src_header->count : remaining_capacity;
-	void *dst_ptr  = wapp_pointer_offset(dst, dst_header->count * dst_header->item_size);
-	memcpy(dst_ptr, src, copy_count * src_header->item_size);
-	dst_header->count += copy_count;
-}
-
-void _array_copy_capped(GenericArray dst, const GenericArray src, u64 item_size) {
-	wapp_runtime_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
-	_array_validate(dst, item_size);
-	_array_validate(src, item_size);
-
-	_array_clear(dst, item_size);
-
-	ArrayHeader *src_header = _array_header(src);
-	ArrayHeader *dst_header = _array_header(dst);
-	u64 copy_count = src_header->count < dst_header->capacity ? src_header->count : dst_header->capacity;
-	memcpy((void *)dst, (void *)src, copy_count * src_header->item_size);
-	dst_header->count = copy_count;
-}
-
-GenericArray _array_append_alloc(const Allocator *allocator, GenericArray array, void *value,
-                                 ArrayInitFlags flags, u64 item_size) {
-	wapp_runtime_assert(allocator != NULL && array != NULL, "`allocator` and `array` should not be NULL");
-	_array_validate(array, item_size);
-
-	GenericArray output = array;
-
-	ArrayHeader *header = _array_header(array);
-	if (header->count >= header->capacity) {
-		u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(header->capacity * 2);
-		output           = (GenericArray )_array_alloc_capacity(allocator, new_capacity, flags,
-		                                                        header->item_size);
-		if (!output) {
-			output = array;
-			goto RETURN_ARRAY_APPEND_ALLOC;
-		}
-		_array_copy_capped(output, array, item_size);
-	}
-
-	_array_append_capped(output, value, item_size);
-
-	if ((flags & ARRAY_INIT_FILLED) == ARRAY_INIT_FILLED) {
-		_array_set_count(output, _array_capacity(output));
-	}
-
-RETURN_ARRAY_APPEND_ALLOC:
-	return output;
-}
-
-GenericArray _array_extend_alloc(const Allocator *allocator, GenericArray dst, const GenericArray src,
-                                 ArrayInitFlags flags, u64 item_size) {
-	wapp_runtime_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
-	_array_validate(dst, item_size);
-	_array_validate(src, item_size);
-
-	GenericArray output = dst;
-
-	ArrayHeader *src_header = _array_header(src);
-	ArrayHeader *dst_header = _array_header(dst);
-	u64 remaining_capacity = dst_header->capacity - dst_header->count;
-	if (src_header->count >= remaining_capacity) {
-		u64 new_capacity  = wapp_misc_utils_u64_round_up_pow2(dst_header->capacity * 2);
-		output            = (GenericArray )_array_alloc_capacity(allocator, new_capacity,
-		                                                         flags, dst_header->item_size);
-		if (!output) {
-			output = dst;
-			goto RETURN_ARRAY_EXTEND_ALLOC;
-		}
-		_array_copy_capped(output, dst, item_size);
-	}
-
-	_array_extend_capped(output, src, item_size);
-
-	if ((flags & ARRAY_INIT_FILLED) == ARRAY_INIT_FILLED) {
-		_array_set_count(output, _array_capacity(output));
-	}
-
-RETURN_ARRAY_EXTEND_ALLOC:
-	return output;
-}
-
-GenericArray _array_copy_alloc(const Allocator *allocator, GenericArray dst, const GenericArray src,
-                               ArrayInitFlags flags, u64 item_size) {
-	wapp_runtime_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
-	_array_validate(dst, item_size);
-	_array_validate(src, item_size);
-
-	GenericArray output = dst;
-
-	ArrayHeader *src_header = _array_header(src);
-	ArrayHeader *dst_header = _array_header(dst);
-	if (src_header->count >= dst_header->capacity) {
-		u64 new_capacity  = wapp_misc_utils_u64_round_up_pow2(dst_header->capacity * 2);
-		output            = (GenericArray )_array_alloc_capacity(allocator, new_capacity,
-		                                                         flags, src_header->item_size);
-		if (!output) {
-			output = dst;
-			goto RETURN_ARRAY_COPY_ALLOC;
-		}
-	}
-
-	_array_copy_capped(output, src, item_size);
-
-	if ((flags & ARRAY_INIT_FILLED) == ARRAY_INIT_FILLED) {
-		_array_set_count(output, _array_capacity(output));
-	}
-
-RETURN_ARRAY_COPY_ALLOC:
-	return output;
-}
-
-void *_array_pop(GenericArray array, u64 item_size) {
-	wapp_runtime_assert(array != NULL, "`array` should not be NULL");
-	_array_validate(array, item_size);
-
-	ArrayHeader *header = _array_header(array);
-	if (header->count == 0) { return NULL; }
-
-	u64 index = header->count - 1;
-	void *out = _array_get(array, index, item_size);
-	--(header->count);
-	return out;
-}
-
-void _array_clear(GenericArray array, u64 item_size) {
-	wapp_runtime_assert(array != NULL, "`array` should not be NULL");
-	_array_validate(array, item_size);
-
-	ArrayHeader *header = _array_header(array);
-	header->count = 0;
-}
-
-u64 _array_calc_alloc_size(u64 capacity, u64 item_size) {
-	return sizeof(ArrayHeader) + item_size * capacity;
-}
-
-GenericArray _array_alloc_capacity(const Allocator *allocator, u64 capacity, ArrayInitFlags flags,
-                                   u64 item_size) {
-	wapp_runtime_assert(allocator != NULL, "`allocator` should not be NULL");
-
-	GenericArray output = NULL;
-
-	u64 allocation_size = _array_calc_alloc_size(capacity, item_size);
-	void *buffer        = wapp_mem_allocator_alloc(allocator, allocation_size);
-	if (!buffer) {
-		goto RETURN_ARRAY_ALLOC;
-	}
-
-	output = _array_from_preallocated_buffer(buffer, allocation_size, flags, item_size);
-
-RETURN_ARRAY_ALLOC:
-	return output;
-}
-
-
-GenericArray _array_from_preallocated_buffer(void *buffer, u64 buffer_size, ArrayInitFlags flags,
-                                             u64 item_size) {
-	wapp_runtime_assert(buffer != NULL, "`buffer` should not be NULL");
-
-	i64 data_buffer_size = (i64)buffer_size - (i64)(sizeof(ArrayHeader));
-	if (data_buffer_size <= 0) {
-		return NULL;
-	}
-
-	u64 item_capacity   = (u64)data_buffer_size / item_size;
-	ArrayHeader *header = (ArrayHeader *)buffer;
-	GenericArray output = (u8 *)(header + 1);
-	header->magic       = WAPP_ARRAY_MAGIC;
-	header->count       = flags & ARRAY_INIT_FILLED ? item_capacity : 0;
-	header->capacity    = item_capacity;
-	header->item_size   = item_size;
-
-	return output;
-}
-
-wapp_persist inline void _array_validate(const GenericArray array, u64 item_size) {
-	ArrayHeader *header = _array_header(array);
-	wapp_runtime_assert(WAPP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
-	wapp_runtime_assert(item_size == header->item_size, "Invalid item type provided");
-}

src/base/array/array.h

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

src/base/dbl_list/dbl_list.c

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

src/base/dbl_list/dbl_list.h

@@ -1,184 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef DBL_LIST_H
-#define DBL_LIST_H
-
-#include "../mem/allocator/mem_allocator.h"
-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#define WAPP_DBL_LIST_MAGIC (u64)0x57415f444c5354
-#define WAPP_DBL_NODE_MAGIC (u64)0x57415f444e44
-
-typedef struct GenericNode GenericNode;
-
-typedef struct {
-	u64 magic;
-	u64 item_size;
-	GenericNode *prev;
-	GenericNode *next;
-} NodeHeader;
-
-struct GenericNode {
-	NodeHeader header;
-	void *item;
-};
-
-typedef struct {
-	u64 magic;
-	u64 node_count;
-	u64 item_size;
-	GenericNode *first;
-	GenericNode *last;
-} GenericList;
-
-// NOTE (Abdelrahman): GenericList typedefs for readability
-typedef GenericList VoidPtrList;
-typedef GenericList C8List;
-typedef GenericList C16List;
-typedef GenericList C32List;
-typedef GenericList U8List;
-typedef GenericList U16List;
-typedef GenericList U32List;
-typedef GenericList U64List;
-typedef GenericList B8List;
-typedef GenericList I8List;
-typedef GenericList I16List;
-typedef GenericList I32List;
-typedef GenericList I64List;
-typedef GenericList F32List;
-typedef GenericList F64List;
-typedef GenericList F128List;
-typedef GenericList UptrList;
-typedef GenericList IptrList;
-typedef GenericList Str8List;
-
-// NOTE (Abdelrahman): GenericNode typedefs for readability
-typedef GenericNode VoidPtrNode;
-typedef GenericNode C8Node;
-typedef GenericNode C16Node;
-typedef GenericNode C32Node;
-typedef GenericNode U8Node;
-typedef GenericNode U16Node;
-typedef GenericNode U32Node;
-typedef GenericNode U64Node;
-typedef GenericNode B8Node;
-typedef GenericNode I8Node;
-typedef GenericNode I16Node;
-typedef GenericNode I32Node;
-typedef GenericNode I64Node;
-typedef GenericNode F32Node;
-typedef GenericNode F64Node;
-typedef GenericNode F128Node;
-typedef GenericNode UptrNode;
-typedef GenericNode IptrNode;
-typedef GenericNode Str8Node;
-
-#ifdef WAPP_PLATFORM_CPP
-#define wapp_dbl_list(TYPE)                                                                        \
-	GenericList{WAPP_DBL_LIST_MAGIC, 0, sizeof(TYPE), nullptr, nullptr}
-#define _dbl_list_node(TYPE, ITEM_PTR) ([&]() {                                                    \
-	wapp_persist GenericNode node = {                                                                \
-		NodeHeader{WAPP_DBL_NODE_MAGIC, sizeof(TYPE), nullptr, nullptr},                               \
-		ITEM_PTR,                                                                                      \
-	};                                                                                               \
-                                                                                                   \
-	return &node;                                                                                    \
-}())
-#else
-#define wapp_dbl_list(TYPE) (                                                                      \
-	(GenericList){.magic = WAPP_DBL_LIST_MAGIC, .item_size = sizeof(TYPE)}                           \
-)
-#define _dbl_list_node(TYPE, ITEM_PTR) (                                                           \
-	&((GenericNode){.header = {.magic = WAPP_DBL_NODE_MAGIC, .item_size = sizeof(TYPE)},             \
-	                .item = ITEM_PTR})                                                               \
-)
-#endif // !WAPP_PLATFORM_CPP
-
-#define wapp_dbl_list_alloc(TYPE, ALLOCATOR)                                                       \
-	(_dbl_list_alloc(ALLOCATOR, sizeof(TYPE)))
-#define wapp_dbl_list_get(TYPE, LIST_PTR, ITEM_INDEX)                                              \
-	((TYPE *)(_dbl_list_get(LIST_PTR, ITEM_INDEX, sizeof(TYPE))->item))
-#define wapp_dbl_list_get_node(TYPE, LIST_PTR, ITEM_INDEX)                                         \
-	(_dbl_list_get(LIST_PTR, ITEM_INDEX, sizeof(TYPE)))
-#define wapp_dbl_list_get_node_item(TYPE, NODE_PTR)                                                \
-	((TYPE *)(                                                                                       \
-		(NODE_PTR == NULL) ?                                                                           \
-		NULL :                                                                                         \
-		(NODE_PTR)->item                                                                               \
-	))
-#define wapp_dbl_list_push_front(TYPE, LIST_PTR, ITEM_PTR)                                         \
-	(_dbl_list_push_front(LIST_PTR, _dbl_list_node(TYPE, ITEM_PTR), sizeof(TYPE)))
-#define wapp_dbl_list_push_back(TYPE, LIST_PTR, ITEM_PTR)                                          \
-	(_dbl_list_push_back(LIST_PTR, _dbl_list_node(TYPE, ITEM_PTR), sizeof(TYPE)))
-#define wapp_dbl_list_insert(TYPE, LIST_PTR, ITEM_PTR, ITEM_INDEX)                                 \
-	(_dbl_list_insert(LIST_PTR, _dbl_list_node(TYPE, ITEM_PTR),                                      \
-	                  ITEM_INDEX, sizeof(TYPE)))
-#define wapp_dbl_list_push_front_alloc(TYPE, ALLOCATOR, LIST_PTR, ITEM_PTR)                        \
-	(_dbl_list_push_front(LIST_PTR, _dbl_list_node_alloc(ALLOCATOR, ITEM_PTR, sizeof(TYPE)),         \
-	                      sizeof(TYPE)))
-#define wapp_dbl_list_push_back_alloc(TYPE, ALLOCATOR, LIST_PTR, ITEM_PTR)                         \
-	(_dbl_list_push_back(LIST_PTR, _dbl_list_node_alloc(ALLOCATOR, ITEM_PTR, sizeof(TYPE)),          \
-	                     sizeof(TYPE)))
-#define wapp_dbl_list_insert_alloc(TYPE, ALLOCATOR, LIST_PTR, ITEM_PTR, ITEM_INDEX)                \
-	(_dbl_list_insert(LIST_PTR, _dbl_list_node_alloc(ALLOCATOR, ITEM_PTR, sizeof(TYPE)),             \
-	                  ITEM_INDEX, sizeof(TYPE)))
-#define wapp_dbl_list_pop_front(TYPE, LIST_PTR)                                                    \
-	((TYPE *)(                                                                                       \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
-		NULL :                                                                                         \
-		_dbl_list_pop_front(LIST_PTR, sizeof(TYPE))->item                                              \
-	))
-#define wapp_dbl_list_pop_back(TYPE, LIST_PTR)                                                     \
-	((TYPE *)(                                                                                       \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
-		NULL :                                                                                         \
-		_dbl_list_pop_back(LIST_PTR, sizeof(TYPE))->item                                               \
-	))
-#define wapp_dbl_list_remove(TYPE, LIST_PTR, ITEM_INDEX)                                           \
-	((TYPE *)(                                                                                       \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0 || ITEM_INDEX >= (LIST_PTR)->node_count) ?    \
-		NULL :                                                                                         \
-		_dbl_list_remove(LIST_PTR, ITEM_INDEX, sizeof(TYPE))->item                                     \
-	))
-#define wapp_dbl_list_pop_front_node(TYPE, LIST_PTR)                                               \
-	(                                                                                                \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
-		NULL :                                                                                         \
-		_dbl_list_pop_front(LIST_PTR, sizeof(TYPE))                                                    \
-	)
-#define wapp_dbl_list_pop_back_node(TYPE, LIST_PTR)                                                \
-	(                                                                                                \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
-		NULL :                                                                                         \
-		_dbl_list_pop_back(LIST_PTR, sizeof(TYPE))                                                     \
-	)
-#define wapp_dbl_list_remove_node(TYPE, LIST_PTR, ITEM_INDEX)                                      \
-	(                                                                                                \
-		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0 || ITEM_INDEX >= (LIST_PTR)->node_count) ?    \
-		NULL :                                                                                         \
-		_dbl_list_remove(LIST_PTR, ITEM_INDEX, sizeof(TYPE))                                           \
-	)
-#define wapp_dbl_list_empty(TYPE, LIST_PTR)                                                        \
-	(_dbl_list_empty(LIST_PTR, sizeof(TYPE)))
-
-GenericList *_dbl_list_alloc(const Allocator *allocator, u64 item_size);
-GenericNode *_dbl_list_node_alloc(const Allocator *allocator, void *item, u64 item_size);
-GenericNode *_dbl_list_get(const GenericList *list, u64 index, u64 item_size);
-void         _dbl_list_push_front(GenericList *list, GenericNode *node, u64 item_size);
-void         _dbl_list_push_back(GenericList *list, GenericNode *node, u64 item_size);
-void         _dbl_list_insert(GenericList *list, GenericNode *node, u64 index, u64 item_size);
-GenericNode *_dbl_list_pop_front(GenericList *list, u64 item_size);
-GenericNode *_dbl_list_pop_back(GenericList *list, u64 item_size);
-GenericNode *_dbl_list_remove(GenericList *list, u64 index, u64 item_size);
-void         _dbl_list_empty(GenericList *list, u64 item_size);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !DBL_LIST_H

src/base/mem/allocator/mem_allocator.c

@@ -1,35 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "mem_allocator.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");
-	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");
-	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");
-	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");
-	return allocator->realloc_aligned(ptr, old_size, new_size, alignment, allocator->obj);
-}
-
-void wapp_mem_allocator_free(const Allocator *allocator, void **ptr, u64 size) {
-	if (!allocator || !(allocator->free)) {
-		return;
-	}
-
-	allocator->free(ptr, size, allocator->obj);
-}

src/base/mem/utils/mem_utils.c

@@ -1,25 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "mem_utils.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/assert/assert.h"
-#include "../../../common/misc/misc_utils.h"
-#include <stddef.h>
-
-void *wapp_mem_util_align_forward(void *ptr, u64 alignment) {
-	wapp_debug_assert(ptr != NULL, "`ptr` should not be NULL");
-	wapp_runtime_assert(wapp_is_power_of_two(alignment), "`alignment` value is not a power of two");
-
-	uptr p      = (uptr)ptr;
-	uptr align  = (uptr)alignment;
-
-	// Similar to p % align, but it's a faster implementation that works fine
-	// because align is guaranteed to be a power of 2
-	uptr modulo = p & (align - 1);
-
-	if (modulo != 0) {
-		p += align - modulo;
-	}
-
-	return (void *)p;
-}

src/base/queue/queue.c

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

src/base/queue/queue.h

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

src/base/strings/str8/str8.c

@@ -1,480 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "str8.h"
-#include "../../array/array.h"
-#include "../../mem/allocator/mem_allocator.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/assert/assert.h"
-#include <ctype.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
-
-#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 = wapp_mem_allocator_alloc(allocator, STR8_BUF_ALLOC_SIZE(capacity));
-	if (!str) {
-		goto RETURN_STR8;
-	}
-
-	str->buf      = (u8 *)str + sizeof(Str8);
-	str->size     = 0;
-	str->capacity = capacity;
-
-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");
-
-	u64 length    = strlen(str);
-	Str8 *output  = wapp_str8_alloc_buf(allocator, length * 2);
-	if (!output) {
-		goto RETURN_ALLOC_CSTR;
-	}
-
-	output->size = length;
-	memcpy(output->buf, str, length);
-
-RETURN_ALLOC_CSTR:
-	return output;
-}
-
-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 = wapp_str8_alloc_buf(allocator, str->capacity);
-	if (!output) {
-		goto RETURN_ALLOC_STR8;
-	}
-
-	output->size = str->size;
-	memcpy(output->buf, str->buf, str->size);
-
-RETURN_ALLOC_STR8:
-	return output;
-}
-
-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 (start >= str->size || start >= end) {
-		goto RETURN_ALLOC_SUBSTR;
-	}
-
-	if (end > str->size) {
-		end = str->size;
-	}
-
-	output = wapp_str8_alloc_buf(allocator, str->capacity);
-	if (!output) {
-		goto RETURN_ALLOC_SUBSTR;
-	}
-
-	output->size = end - start;
-	memcpy(output->buf, str->buf + start, output->size);
-
-RETURN_ALLOC_SUBSTR:
-	return output;
-}
-
-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");
-	wapp_mem_allocator_free(allocator, (void **)str, STR8_BUF_ALLOC_SIZE((*str)->capacity));
-}
-
-c8 wapp_str8_get(const Str8 *str, u64 index) {
-	if (index >= str->size) {
-		return '\0';
-	}
-
-	return str->buf[index];
-}
-
-void wapp_str8_set(Str8 *str, u64 index, c8 c) {
-	if (index >= str->size) {
-		return;
-	}
-
-	str->buf[index] = c;
-}
-
-void wapp_str8_push_back(Str8 *str, c8 c) {
-	if (!(str->size < str->capacity)) {
-		return;
-	}
-
-	u64 index = (str->size)++;
-	wapp_str8_set(str, index, c);
-}
-
-b8 wapp_str8_equal(Str8RO *s1, Str8RO *s2) {
-	if (s1->size != s2->size) {
-		return false;
-	}
-
-	return wapp_str8_equal_to_count(s1, s2, s1->size);
-}
-
-b8 wapp_str8_equal_to_count(Str8RO* s1, Str8RO* s2, u64 count) {
-	if (!s1 || !s2) {
-		return false;
-	}
-
-	return memcmp(s1->buf, s2->buf, count) == 0;
-}
-
-Str8 wapp_str8_slice(Str8RO *str, u64 start, u64 end) {
-	if (start >= str->size || start >= end) {
-		start  = str->size;
-		end    = str->size;
-	}
-
-	if (end > str->size) {
-		end = str->size;
-	}
-
-	return (Str8RO){
-		.capacity = end - start,
-		.size     = end - start,
-		.buf      = str->buf + start,
-	};
-}
-
-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");
-
-	Str8 *output  = NULL;
-	u64 remaining = dst->capacity - dst->size;
-	if (src->size <= remaining) {
-		output = dst;
-		goto SOURCE_STRING_STR8_CONCAT;
-	}
-
-	u64 capacity = dst->capacity + src->size;
-
-	output = wapp_str8_alloc_buf(allocator, capacity);
-	if (!output) {
-		goto RETURN_STR8_CONCAT;
-	}
-
-	wapp_str8_concat_capped(output, dst);
-
-SOURCE_STRING_STR8_CONCAT:
-	wapp_str8_concat_capped(output, src);
-
-RETURN_STR8_CONCAT:
-	return output;
-}
-
-void wapp_str8_concat_capped(Str8 *dst, Str8RO *src) {
-	wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
-
-	u64 remaining = dst->capacity - dst->size;
-	u64 to_copy   = remaining < src->size ? remaining : src->size;
-
-	memcpy(dst->buf + dst->size, src->buf, to_copy);
-	dst->size += to_copy;
-}
-
-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");
-
-	u64 length  = strlen(src);
-	u64 to_copy = length <= dst->capacity ? length : dst->capacity;
-
-	memset(dst->buf, 0, dst->size);
-	memcpy(dst->buf, src, to_copy);
-	dst->size = to_copy;
-}
-
-void wapp_str8_copy_str8_capped(Str8 *dst, Str8RO *src) {
-	wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
-
-	u64 to_copy = src->size <= dst->capacity ? src->size : dst->capacity;
-
-	memset(dst->buf, 0, dst->size);
-	memcpy(dst->buf, src->buf, to_copy);
-	dst->size = to_copy;
-}
-
-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");
-
-	u64 to_copy = src->size < dst_capacity ? src->size : dst_capacity - 1;
-
-	memset(dst, 0, dst_capacity);
-	memcpy(dst, src->buf, to_copy);
-}
-
-void wapp_str8_format(Str8 *dst, const char *format, ...) {
-	wapp_debug_assert(dst != NULL && format != NULL, "`dst` and `format` should not be NULL");
-
-	va_list args1;
-	va_list args2;
-
-	va_start(args1, format);
-	va_copy(args2, args1);
-
-	u64 total_size = vsnprintf(NULL, 0, format, args1);
-	dst->size      = total_size <= dst->capacity ? total_size : dst->capacity;
-
-	vsnprintf((char *)(dst->buf), dst->capacity, format, args2);
-
-	va_end(args1);
-	va_end(args2);
-}
-
-void wapp_str8_to_lower(Str8 *dst, Str8RO *src) {
-	wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
-	wapp_debug_assert(dst->capacity >= src->capacity, "`dst` does not have enough capacity");
-
-	dst->size = src->size;
-
-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		wapp_str8_set(dst, index, (u8)tolower(wapp_str8_get(src, index)));
-		++index;
-		running = index < src->size;
-	}
-}
-
-void wapp_str8_to_upper(Str8 *dst, Str8RO *src) {
-	wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
-	wapp_debug_assert(dst->capacity >= src->capacity, "`dst` does not have enough capacity");
-
-	dst->size = src->size;
-
-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	u64 index  = 0;
-	b8 running = true;
-	while (running) {
-		wapp_str8_set(dst, index, (u8)toupper(wapp_str8_get(src, index)));
-		++index;
-		running = index < src->size;
-	}
-}
-
-void wapp_str8_from_bytes(Str8 *dst, const U8Array src) {
-	wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
-
-	u64 size = wapp_array_count(src) * wapp_array_item_size(src);
-
-	wapp_debug_assert(dst->capacity >= size, "`dst` does not have enough capacity");
-
-	dst->size = size;
-	memcpy(dst->buf, src, size);
-}
-
-i64 wapp_str8_find(Str8RO *str, Str8RO substr) {
-	if (!str || substr.size > str->size) {
-		return -1;
-	}
-
-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	u64 char_index  = 0;
-	b8 running      = char_index < str->size;
-	while (running) {
-		const c8 *sub = str->buf + char_index;
-		if (memcmp(sub, substr.buf, substr.size) == 0) {
-			return char_index;
-		}
-
-		++char_index;
-		running = char_index < str->size;
-	}
-
-	return -1;
-}
-
-i64 wapp_str8_rfind(Str8RO *str, Str8RO substr) {
-	if (!str || substr.size > str->size) {
-		return -1;
-	}
-
-	// 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;
-	b8 running     = char_index >= 0;
-	while (running) {
-		const c8 *sub = str->buf + char_index;
-		if (memcmp(sub, substr.buf, substr.size) == 0) {
-			return char_index;
-		}
-
-		--char_index;
-		running = char_index >= 0;
-	}
-
-	return -1;
-}
-
-Str8List *wapp_str8_split_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits) {
-	wapp_debug_assert(allocator != NULL && str != NULL && delimiter != NULL, "`allocator`, `str` and `delimiter` should not be NULL");
-
-	Str8List *output = wapp_dbl_list_alloc(Str8, allocator);
-
-	if (delimiter->size > str->size) {
-		Str8 *full = wapp_str8_alloc_str8(allocator, str);
-		if (full) {
-			wapp_dbl_list_push_back_alloc(Str8, allocator, output, full);
-		}
-
-		goto RETURN_STR8_SPLIT;
-	}
-
-	i64 start  = 0;
-	i64 end    = 0;
-	i64 splits = 0;
-	Str8 *rest = wapp_str8_alloc_str8(allocator, str);
-	Str8 *before_str;
-
-	while ((end = wapp_str8_find(rest, *delimiter)) != -1) {
-		if (max_splits > 0 && splits >= max_splits) {
-			break;
-		}
-
-		before_str = wapp_str8_alloc_substr(allocator, str, start, start + end);
-		if (before_str) {
-			wapp_dbl_list_push_back_alloc(Str8, allocator, output, before_str);
-		}
-
-		wapp_mem_allocator_free(allocator, (void **)&rest, sizeof(Str8));
-		rest   = wapp_str8_alloc_substr(allocator, str, start + end + delimiter->size, str->size);
-		start += end + delimiter->size;
-
-		++splits;
-	}
-
-	// Ensure the last part of the string after the delimiter is added to the list
-	rest = wapp_str8_alloc_substr(allocator, str, start, str->size);
-	if (rest) {
-		wapp_dbl_list_push_back_alloc(Str8, allocator, output, rest);
-	}
-
-RETURN_STR8_SPLIT:
-	return output;
-}
-
-Str8List *wapp_str8_rsplit_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits) {
-	wapp_debug_assert(allocator != NULL && str != NULL && delimiter != NULL, "`allocator`, `str` and `delimiter` should not be NULL");
-
-	Str8List *output = wapp_dbl_list_alloc(Str8, allocator);
-
-	if (delimiter->size > str->size) {
-		Str8 *full = wapp_str8_alloc_str8(allocator, str);
-		if (full) {
-			wapp_dbl_list_push_back_alloc(Str8, allocator, output, full);
-		}
-
-		goto RETURN_STR8_SPLIT;
-	}
-
-	i64 end    = 0;
-	i64 splits = 0;
-	Str8 *rest = wapp_str8_alloc_str8(allocator, str);
-	Str8 *after_str;
-
-	while ((end = wapp_str8_rfind(rest, *delimiter)) != -1) {
-		if (max_splits > 0 && splits >= max_splits) {
-			break;
-		}
-
-		after_str = wapp_str8_alloc_substr(allocator, rest, end + delimiter->size, str->size);
-		if (after_str) {
-			wapp_dbl_list_push_front_alloc(Str8, allocator, output, after_str);
-		}
-
-		wapp_mem_allocator_free(allocator, (void **)&rest, sizeof(Str8));
-		rest = wapp_str8_alloc_substr(allocator, rest, 0, end);
-
-		++splits;
-	}
-
-	rest = wapp_str8_alloc_substr(allocator, str, 0, rest->size);
-	if (rest) {
-		wapp_dbl_list_push_front_alloc(Str8, allocator, output, rest);
-	}
-
-RETURN_STR8_SPLIT:
-	return output;
-}
-
-Str8 *wapp_str8_join(const Allocator *allocator, const Str8List *list, Str8RO *delimiter) {
-	wapp_debug_assert(allocator != NULL && list != NULL && delimiter != NULL, "`allocator`, `list` and `delimiter` should not be NULL");
-
-	u64 capacity = wapp_str8_list_total_size(list) + (delimiter->size * (list->node_count - 1));
-	Str8 *output = wapp_str8_alloc_buf(allocator, capacity * 2);
-
-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	Str8 *node;
-	u64 node_index = 0;
-	b8 running     = node_index < list->node_count;
-	while (running) {
-		node = wapp_dbl_list_get(Str8, list, node_index);
-		if (!node) {
-			break;
-		}
-
-		wapp_str8_concat_capped(output, node);
-
-		// NOTE (Abdelrahman): Comparison extracted to variable to silence
-		// MSVC Spectre mitigation warnings
-		b8 not_last = node_index + 1 < list->node_count;
-		if (not_last) {
-			wapp_str8_concat_capped(output, delimiter);
-		}
-
-		++node_index;
-		running = node_index < list->node_count;
-	}
-
-	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
-	Str8 *node;
-	u64 node_index = 0;
-	u64 output     = 0;
-	b8 running     = node_index < list->node_count;
-	while (running) {
-		node = wapp_dbl_list_get(Str8, list, node_index);
-		if (!node) {
-				break;
-		}
-
-		output += node->size;
-		++node_index;
-		running = node_index < list->node_count;
-	}
-
-	return output;
-}

src/base/wapp_base.c

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

src/common/aliases/aliases.h

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

src/common/assert/assert.h

@@ -14,12 +14,7 @@ BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP
 
 #define wapp_static_assert(EXPR, MSG) extern char ASSERTION_FAILED[EXPR ? 1 : -1]
-
-#ifndef WAPP_NO_RUNTIME_ASSERT
 #define wapp_runtime_assert(EXPR, MSG) __wapp_runtime_assert(EXPR, MSG)
-#else
-	#define wapp_runtime_assert(EXPR, MSG)
-#endif
 
 #ifdef WAPP_DEBUG_ASSERT
   #define wapp_debug_assert(EXPR, MSG) wapp_runtime_assert(EXPR, MSG)
@@ -27,24 +22,8 @@ BEGIN_C_LINKAGE
   #define wapp_debug_assert(EXPR, MSG)
 #endif
 
-#ifdef WAPP_PLATFORM_WINDOWS
-#define __wapp_runtime_assert(EXPR, MSG) do {                                       \
-	__pragma(warning(push))                                                           \
-	__pragma(warning(disable:4127))                                                   \
-	if (!(EXPR)) {                                                                    \
-	__pragma(warning(pop))                                                            \
-		__runtime_assert_failed(EXPR, MSG);                                             \
-	}                                                                                 \
-} while(false)
-#else
 #define __wapp_runtime_assert(EXPR, MSG) do {                                         \
   if (!(EXPR)) {                                                                      \
-		__runtime_assert_failed(EXPR, MSG);                                             \
-	}                                                                                 \
-} while(false)
-#endif // !WAPP_PLATFORM_WINDOWS
-
-#define __runtime_assert_failed(EXPR, MSG) do {                                     \
     fprintf(                                                                          \
       stderr,                                                                         \
       "%s:%d (In function `%s`): Assertion failed (%" PRIu32 ")\nDiagnostic: %s\n\n", \
@@ -52,6 +31,7 @@ BEGIN_C_LINKAGE
       EXPR, MSG                                                                       \
     );                                                                                \
     abort();                                                                          \
+  }                                                                                   \
 } while(false)
 
 #ifdef WAPP_PLATFORM_CPP

src/common/misc/misc_utils.h

@@ -9,21 +9,12 @@
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP
 
-#define KiB(SIZE) (((u64)SIZE) << 10)
-#define MiB(SIZE) (((u64)SIZE) << 20)
-#define GiB(SIZE) (((u64)SIZE) << 30)
-#define TiB(SIZE) (((u64)SIZE) << 40)
-#define PiB(SIZE) (((u64)SIZE) << 50)
-#define EiB(SIZE) (((u64)SIZE) << 60)
+#define KB(SIZE) (SIZE * 1024ull)
+#define MB(SIZE) (KB(SIZE) * 1024)
+#define GB(SIZE) (MB(SIZE) * 1024)
+#define TB(SIZE) (GB(SIZE) * 1024)
 
-#define KB(SIZE) (((u64)SIZE) * 1000llu)
-#define MB(SIZE) (KB(SIZE)    * 1000llu)
-#define GB(SIZE) (MB(SIZE)    * 1000llu)
-#define TB(SIZE) (GB(SIZE)    * 1000llu)
-#define PB(SIZE) (TB(SIZE)    * 1000llu)
-#define EB(SIZE) (PB(SIZE)    * 1000llu)
-
-#define wapp_misc_utils_reserve_padding(SIZE) u8 reserved_padding[sizeof(void *) - ((SIZE) % sizeof(void *))]
+#define wapp_misc_utils_padding_size(SIZE) u8 reserved_padding[sizeof(void *) - ((SIZE) % sizeof(void *))]
 
 #define U64_RSHIFT_OR_1(X)  (((u64)X) | (((u64)X) >> 1))
 #define U64_RSHIFT_OR_2(X)  (((u64)X) | (((u64)X) >> 2))
@@ -47,17 +38,19 @@ BEGIN_C_LINKAGE
   ) + 1 \
 )
 
-#define wapp_is_power_of_two(NUM) ((NUM & (NUM - 1)) == 0)
-#define wapp_pointer_offset(PTR, OFFSET) ((void *)((uptr)(PTR) + (OFFSET)))
-
 #ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-
-#include <tuple>
-
-#define wapp_misc_utils_va_args_count(T, ...) (std::tuple_size<decltype(std::make_tuple(__VA_ARGS__))>::value)
+#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/core/file/file.c

@@ -0,0 +1,103 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "file.h"
+#include "../os/cpath/cpath.h"
+#include "../../common/assert/assert.h"
+#include "../../common/aliases/aliases.h"
+#include "../../primitives/array/array.h"
+#include "../../primitives/strings/str8/str8.h"
+#include <stdio.h>
+
+File *wapp_file_open(Str8RO *filepath, FileAccessMode mode) {
+  wapp_persist const char *modes[FILE_ACCESS_MODE_COUNT] = {
+    [WAPP_FA_MODE_R]      = "r",
+    [WAPP_FA_MODE_W]      = "w",
+    [WAPP_FA_MODE_A]      = "a",
+    [WAPP_FA_MODE_R_EX]   = "r+",
+    [WAPP_FA_MODE_W_EX]   = "w+",
+    [WAPP_FA_MODE_A_EX]   = "a+",
+    [WAPP_FA_MODE_RB]     = "rb",
+    [WAPP_FA_MODE_WB]     = "wb",
+    [WAPP_FA_MODE_AB]     = "ab",
+    [WAPP_FA_MODE_RB_EX]  = "rb+",
+    [WAPP_FA_MODE_WB_EX]  = "wb+",
+    [WAPP_FA_MODE_AB_EX]  = "ab+",
+    [WAPP_FA_MODE_WX]     = "wx",
+    [WAPP_FA_MODE_WX_EX]  = "wx+",
+    [WAPP_FA_MODE_WBX]    = "wbx",
+    [WAPP_FA_MODE_WBX_EX] = "wbx+",
+  };
+  wapp_persist c8 tmp[WAPP_PATH_MAX] = {0};
+  wapp_debug_assert(filepath->size < WAPP_PATH_MAX, "`filepath` exceeds max path limit.");
+
+  memset(tmp, 0, WAPP_PATH_MAX);
+  memcpy(tmp, filepath->buf, filepath->size);
+
+  return fopen((const char *)tmp, modes[mode]);
+}
+
+u64 wapp_file_get_current_position(File *file) {
+  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
+  return (u64)ftell(file);
+}
+
+i32 wapp_file_seek(File *file, u64 offset, FileSeekOrigin origin) {
+  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
+  return fseek(file, offset, origin);
+}
+
+u64 wapp_file_get_length(File *file) {
+  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
+
+  u64 current = wapp_file_get_current_position(file);
+
+  wapp_file_seek(file, 0, WAPP_SEEK_END);
+
+  u64 output = ftell(file);
+
+  // Restore position
+  wapp_file_seek(file, current, WAPP_SEEK_START);
+
+  return output;
+}
+
+u64 wapp_file_read(GenericArray *dst, File *file, u64 item_count) {
+  wapp_debug_assert(dst != NULL && dst->items != NULL && file != NULL,
+                    "`dst`, `dst->items` and `file` should not be NULL.");
+
+  u64 file_length       = wapp_file_get_length(file);
+  u64 dst_byte_capacity = dst->header.item_size * dst->header.capacity;
+  u64 req_byte_count    = item_count * dst->header.item_size;
+  u64 copy_byte_count   = 0;
+
+  if (req_byte_count <= file_length && req_byte_count <= dst_byte_capacity) {
+    copy_byte_count = req_byte_count;
+  } else {
+    copy_byte_count = file_length <= dst_byte_capacity ? file_length : dst_byte_capacity;
+  }
+
+  dst->header.count = fread(dst->items, sizeof(u8), copy_byte_count, file) / dst->header.item_size;
+
+  return dst->header.count;
+}
+
+u64 wapp_file_write(const GenericArray *src, File *file, u64 item_count) {
+  wapp_debug_assert(src != NULL && src->items != NULL && file != NULL,
+                    "`src`, `src->items` and `file` should not be NULL.");
+
+  u64 src_byte_count = src->header.count * src->header.item_size;
+  u64 req_byte_count = item_count * src->header.item_size;
+  u64 to_copy        = req_byte_count <= src_byte_count ? req_byte_count : src_byte_count;
+
+  return fwrite(src->items, sizeof(u8), to_copy, file);
+}
+
+i32 wapp_file_flush(File *file) {
+  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
+  return fflush(file);
+}
+
+i32 wapp_file_close(File *file) {
+  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
+  return fclose(file);
+}

src/core/file/file.h

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

src/core/mem/arena/mem_arena.c

@@ -0,0 +1,146 @@
+// 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 <stdlib.h>
+#include <string.h>
+
+#ifndef DEFAULT_ALIGNMENT
+// Why 2 * sizeof(void *) instead of sizeof(void *)
+// https://handmade.network/forums/t/6860-alignment_arena_allocator
+#define DEFAULT_ALIGNMENT (2 * sizeof(void *))
+#endif /* ifndef DEFAULT_ALIGNMENT */
+
+#define ARENA_MINIMUM_CAPACITY KB(16) // Allocate minimum of 4 pages
+
+struct arena {
+  u8 *buf;
+  u8 *offset;
+  u64 capacity;
+  b8 committed;
+
+#ifdef WAPP_PLATFORM_WINDOWS
+  wapp_misc_utils_padding_size(sizeof(u8 *) * 2 + sizeof(u64) + sizeof(b8));
+#endif // ifdef WAPP_PLATFORM_WINDOWS
+};
+
+b8 wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b8 zero_buffer) {
+  if (!arena || *arena || base_capacity == 0) {
+    return false;
+  }
+
+  *arena = (Arena *)calloc(1, sizeof(Arena));
+  Arena *arena_ptr = *arena;
+  if (!arena_ptr) {
+    return false;
+  }
+
+  u64 arena_capacity = wapp_misc_utils_u64_round_up_pow2(
+      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);
+
+  if (!(arena_ptr->buf)) {
+    wapp_mem_arena_destroy(arena);
+    return false;
+  }
+
+  arena_ptr->capacity  = arena_capacity;
+  arena_ptr->offset    = arena_ptr->buf;
+  arena_ptr->committed = (flags & WAPP_MEM_ALLOC_COMMIT) == WAPP_MEM_ALLOC_COMMIT;
+
+  return true;
+}
+
+void *wapp_mem_arena_alloc(Arena *arena, u64 size) {
+  return wapp_mem_arena_alloc_aligned(arena, size, DEFAULT_ALIGNMENT);
+}
+
+void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) {
+  wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
+
+  u8 *alloc_start = arena->offset;
+
+  u8 *output = wapp_mem_util_align_forward((void *)alloc_start, alignment);
+  if (output + size >= arena->buf + arena->capacity) {
+    return NULL;
+  }
+
+  arena->offset = output + size;
+
+#ifdef WAPP_PLATFORM_WINDOWS
+  if (!(arena->committed)) {
+    wapp_mem_util_alloc(alloc_start, (uptr)(arena->offset) - (uptr)(alloc_start),
+                        WAPP_MEM_ACCESS_READ_WRITE, WAPP_MEM_ALLOC_COMMIT,
+                        WAPP_MEM_INIT_UNINITIALISED);
+  }
+#endif // ifdef WAPP_PLATFORM_WINDOWS
+
+  memset(output, 0, size);
+
+  return (void *)output;
+}
+
+void *wapp_mem_arena_realloc(Arena *arena, void *ptr, u64 old_size, u64 new_size) {
+  if ((u8*)ptr < arena->buf || (u8*)ptr > arena->offset ||
+      arena->offset + new_size >= arena->buf + arena->capacity) {
+    return NULL;
+  }
+
+  void *new_ptr = wapp_mem_arena_alloc(arena, new_size);
+  if (!new_ptr) {
+    return NULL;
+  }
+
+  u64 copy_size = new_size <= old_size ? new_size : old_size;
+  memcpy(new_ptr, ptr, copy_size);
+
+  return new_ptr;
+}
+
+void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64 new_size, u64 alignment) {
+  if ((u8*)ptr < arena->buf || (u8*)ptr > arena->offset ||
+      arena->offset + new_size >= arena->buf + arena->capacity) {
+    return NULL;
+  }
+
+  void *new_ptr = wapp_mem_arena_alloc_aligned(arena, new_size, alignment);
+  if (!new_ptr) {
+    return NULL;
+  }
+
+  u64 copy_size = new_size <= old_size ? new_size : old_size;
+  memcpy(new_ptr, ptr, copy_size);
+
+  return new_ptr;
+}
+
+void wapp_mem_arena_clear(Arena *arena) {
+  wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
+
+  memset(arena->buf, 0, arena->offset - arena->buf);
+  arena->offset = arena->buf;
+}
+
+void wapp_mem_arena_destroy(Arena **arena) {
+  wapp_debug_assert(arena != NULL && (*arena) != NULL, "`arena` double pointer is not valid");
+
+  Arena *arena_ptr = *arena;
+  if (arena_ptr->buf) {
+    wapp_mem_util_free(arena_ptr->buf, arena_ptr->capacity);
+  }
+
+  arena_ptr->buf = arena_ptr->offset = NULL;
+  arena_ptr->capacity = 0;
+
+  free(*arena);
+  *arena = NULL;
+}

src/core/mem/arena/mem_arena.h

@@ -0,0 +1,42 @@
+// 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"
+
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+typedef struct arena Arena;
+
+#define wapp_mem_arena_init(arena_dptr, base_capacity)                         \
+  (wapp_mem_arena_init_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, false))
+#define wapp_mem_arena_init_commit(arena_dptr, base_capacity)                  \
+  (wapp_mem_arena_init_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, false))
+#define wapp_mem_arena_init_zero(arena_dptr, base_capacity)                    \
+  (wapp_mem_arena_init_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, true))
+#define wapp_mem_arena_init_commit_and_zero(arena_dptr, base_capacity)         \
+  (wapp_mem_arena_init_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, true))
+
+/**
+ * Arena initialisation function. `wapp_mem_arena_init_custom` provides the most
+ * control over how the Arena is initialised. Wrapper macros are provided for
+ * easier use.
+ */
+b8  wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b8 zero_buffer);
+void *wapp_mem_arena_alloc(Arena *arena, u64 size);
+void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment);
+void *wapp_mem_arena_realloc(Arena *arena, void *ptr, u64 old_size, u64 new_size);
+void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64 new_size, u64 alignment);
+void wapp_mem_arena_clear(Arena *arena);
+void wapp_mem_arena_destroy(Arena **arena);
+
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#endif // !MEM_ARENA_H

src/core/mem/arena/mem_arena_allocator.c

@@ -0,0 +1,59 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "mem_arena_allocator.h"
+#include "mem_arena.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../os/mem/mem_os.h"
+
+wapp_intern inline void *mem_arena_alloc(u64 size, void *alloc_obj);
+wapp_intern inline void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj);
+wapp_intern inline void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
+wapp_intern inline void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
+                                                void *alloc_obj);
+
+
+Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, b8 zero_buffer) {
+  Allocator allocator = {0};
+  b8 initialised = wapp_mem_arena_init_custom((Arena **)(&allocator.obj), base_capacity, flags, zero_buffer);
+  if (!initialised) {
+    return allocator;
+  }
+
+  allocator.alloc           = mem_arena_alloc;
+  allocator.alloc_aligned   = mem_arena_alloc_aligned;
+  allocator.realloc         = mem_arena_realloc;
+  allocator.realloc_aligned = mem_arena_realloc_aligned;
+
+  return allocator;
+}
+
+void wapp_mem_arena_allocator_clear(Allocator *allocator) {
+  wapp_mem_arena_clear((Arena *)(allocator->obj));
+}
+
+void wapp_mem_arena_allocator_destroy(Allocator *allocator) {
+  wapp_mem_arena_destroy((Arena **)(&(allocator->obj)));
+  *allocator = (Allocator){0};
+}
+
+
+wapp_intern inline void *mem_arena_alloc(u64 size, void *alloc_obj) {
+  Arena *arena = (Arena *)alloc_obj;
+  return wapp_mem_arena_alloc(arena, size);
+}
+
+wapp_intern inline void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj) {
+  Arena *arena = (Arena *)alloc_obj;
+  return wapp_mem_arena_alloc_aligned(arena, size, alignment);
+}
+
+wapp_intern inline void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj) {
+  Arena *arena = (Arena *)alloc_obj;
+  return wapp_mem_arena_realloc(arena, ptr, old_size, new_size);
+}
+
+wapp_intern inline void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
+                                                void *alloc_obj) {
+  Arena *arena = (Arena *)alloc_obj;
+  return wapp_mem_arena_realloc_aligned(arena, ptr, old_size, new_size, alignment);
+}

src/core/mem/arena/mem_arena_allocator.h

@@ -3,10 +3,10 @@
 #ifndef MEM_ARENA_ALLOCATOR_H
 #define MEM_ARENA_ALLOCATOR_H
 
-#include "../../mem/mem_os.h"
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/platform/platform.h"
-#include "../../../base/mem/allocator/mem_allocator.h"
+#include "../../../primitives/mem_allocator/mem_allocator.h"
+#include "../../os/mem/mem_os.h"
 
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
@@ -33,9 +33,6 @@ BEGIN_C_LINKAGE
  * the Arena is initialised. Wrapper macros are provided for easier use.
  */
 Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, b8 zero_buffer);
-Allocator wapp_mem_arena_allocator_init_with_buffer(u8 *buffer, u64 buffer_size);
-void      wapp_mem_arena_allocator_temp_begin(const Allocator *allocator);
-void      wapp_mem_arena_allocator_temp_end(const Allocator *allocator);
 void wapp_mem_arena_allocator_clear(Allocator *allocator);
 void wapp_mem_arena_allocator_destroy(Allocator *allocator);
 

src/core/mem/utils/mem_utils.c

@@ -0,0 +1,26 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "mem_utils.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/assert/assert.h"
+#include <stddef.h>
+
+wapp_intern b8 is_power_of_two(u64 num) { return (num & (num - 1)) == 0; }
+
+void *wapp_mem_util_align_forward(void *ptr, u64 alignment) {
+  wapp_debug_assert(ptr != NULL, "`ptr` should not be NULL");
+  wapp_runtime_assert(is_power_of_two(alignment), "`alignment` value is not a power of two");
+
+  uptr p = (uptr)ptr;
+  uptr align = (uptr)alignment;
+
+  // Similar to p % align, but it's a faster implementation that works fine
+  // because align is guaranteed to be a power of 2
+  uptr modulo = p & (align - 1);
+
+  if (modulo != 0) {
+    p += align - modulo;
+  }
+
+  return (void *)p;
+}

src/core/os/cpath/cpath.c

@@ -0,0 +1,135 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "cpath.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/misc/misc_utils.h"
+#include "../../mem/arena/mem_arena_allocator.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 <stdio.h>
+#include <string.h>
+
+u32 wapp_cpath_join_path(Str8 *dst, const Str8List *parts) {
+  if (!dst || !parts) {
+    return CPATH_JOIN_INVALID_ARGS;
+  }
+
+  if (parts->node_count == 0) {
+    return CPATH_JOIN_EMPTY_PARTS;
+  }
+
+  Str8 separator = wapp_str8_buf(4);
+  wapp_str8_push_back(&separator, WAPP_PATH_SEP);
+
+  u64 required_capacity = parts->node_count * separator.size + wapp_str8_list_total_size(parts);
+  if (dst->capacity < required_capacity) {
+    return CPATH_JOIN_INSUFFICIENT_DST_CAPACITY;
+  }
+
+  // Handle first node
+  const Str8Node *first_node = wapp_str8_list_get(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;
+  u64 node_index       = 1;
+  b8 running          = node_index < parts->node_count;
+  while (running && node->next) {
+    node = node->next;
+    if (node->item->size == 0) {
+      continue;
+    }
+
+    if (dst->size > 0) {
+      char dst_last    = wapp_str8_get(dst, dst->size - 1);
+      char node_start  = wapp_str8_get(node->item, 0);
+      b8 add_path_sep = dst_last != WAPP_PATH_SEP && node_start != WAPP_PATH_SEP;
+
+      if (add_path_sep) {
+        wapp_str8_concat_capped(dst, &separator);
+      }
+    }
+
+    wapp_str8_concat_capped(dst, node->item);
+
+    ++node_index;
+    running = node_index < parts->node_count;
+  }
+
+  return CPATH_JOIN_SUCCESS;
+}
+
+Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels) {
+  Str8 *output = NULL;
+  if (!allocator || !path) {
+    goto RETURN_DIRUP;
+  }
+
+  b8 absolute   = wapp_str8_get(path, 0) == WAPP_PATH_SEP;
+  Str8 separator = wapp_str8_buf(4);
+  wapp_str8_push_back(&separator, WAPP_PATH_SEP);
+
+  if (path->size == 0) {
+    output = wapp_str8_alloc_buf(allocator, 16);
+    if (!output) {
+      goto RETURN_DIRUP;
+    }
+
+    wapp_str8_push_back(output, absolute ? WAPP_PATH_SEP : '.');
+    goto RETURN_DIRUP;
+  }
+
+  if (levels < 1) {
+    output = wapp_str8_alloc_str8(allocator, path);
+    goto RETURN_DIRUP;
+  }
+
+  Allocator tmp_arena = wapp_mem_arena_allocator_init(MB(8));
+  if (wapp_mem_allocator_invalid(&tmp_arena)) {
+    goto RETURN_DIRUP;
+  }
+
+  Str8List *parts = wapp_str8_split(&tmp_arena, path, &separator);
+  if (!parts) {
+    goto RETURN_DIRUP;
+  }
+
+  if (levels >= parts->node_count) {
+    output = wapp_str8_alloc_buf(allocator, 16);
+    if (!output) {
+      goto LIST_CLEANUP_DIRUP;
+    }
+
+    wapp_str8_push_back(output, absolute ? WAPP_PATH_SEP : '.');
+  } else {
+    for (u64 i = 0; i < levels; ++i) {
+      wapp_str8_list_pop_back(parts);
+    }
+    
+    u64 alignment  = sizeof(void *) * 2;
+    u64 alloc_size = wapp_str8_list_total_size(parts) + parts->node_count * separator.size;
+    u64 modulo     = alloc_size & (alignment - 1);
+    alloc_size    += alignment - modulo;
+
+    output = wapp_str8_alloc_buf(allocator, alloc_size);
+    if (output) {
+      if (absolute) {
+        wapp_str8_push_back(output, WAPP_PATH_SEP);
+      }
+
+      Str8 *joined = wapp_str8_join(&tmp_arena, parts, &separator);
+      if (joined) {
+        wapp_str8_concat_capped(output, joined);
+      }
+    }
+  }
+
+LIST_CLEANUP_DIRUP:
+  wapp_mem_arena_allocator_destroy(&tmp_arena);
+
+RETURN_DIRUP:
+  return output;
+}

src/core/os/cpath/cpath.h

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

src/core/os/mem/mem_os.c

@@ -0,0 +1,30 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "mem_os.h"
+#include "mem_os_ops.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/platform/platform.h"
+#include <assert.h>
+#include <string.h>
+
+#if defined(WAPP_PLATFORM_WINDOWS)
+#include "win/mem_os_win.h"
+#elif defined(WAPP_PLATFORM_POSIX)
+#include "posix/mem_os_posix.h"
+#else
+#error "Unrecognised platform"
+#endif
+
+void *wapp_mem_util_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
+  void *output = mem_util_allocate(addr, size, access, flags, type);
+
+  if (type == WAPP_MEM_INIT_INITIALISED) {
+    memset(output, 0, size);
+  }
+
+  return output;
+}
+
+void wapp_mem_util_free(void *ptr, u64 size) {
+  mem_util_free(ptr, size);
+}

src/core/os/mem/mem_os.h

@@ -3,8 +3,8 @@
 #ifndef MEM_OS_H
 #define MEM_OS_H
 
-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/platform/platform.h"
 
 #include "mem_os_ops.h"
 
@@ -20,11 +20,11 @@ BEGIN_C_LINKAGE
 #error "Unrecognised platform"
 #endif
 
-void *wapp_os_mem_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
-void wapp_os_mem_free(void *ptr, u64 size);
+void *wapp_mem_util_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
+void wapp_mem_util_free(void *ptr, u64 size);
 
-wapp_extern void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
-wapp_extern void os_mem_free(void *ptr, u64 size);
+wapp_extern void *mem_util_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
+wapp_extern void mem_util_free(void *ptr, u64 size);
 
 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE

src/core/os/mem/mem_os_ops.h

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

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

@@ -0,0 +1,36 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "../../../../common/aliases/aliases.h"
+#include "../../../../common/platform/platform.h"
+
+#ifdef WAPP_PLATFORM_POSIX
+
+#include "mem_os_posix.h"
+#include "../mem_os_ops.h"
+#include <sys/mman.h>
+
+wapp_intern const i32 access_types[] = {
+    [WAPP_MEM_ACCESS_NONE]            = PROT_NONE,
+    [WAPP_MEM_ACCESS_READ_ONLY]       = PROT_READ,
+    [WAPP_MEM_ACCESS_EXEC_ONLY]       = PROT_EXEC,
+    [WAPP_MEM_ACCESS_READ_WRITE]      = PROT_READ | PROT_WRITE,
+    [WAPP_MEM_ACCESS_READ_EXEC]       = PROT_READ | PROT_EXEC,
+    [WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PROT_READ | PROT_WRITE | PROT_EXEC,
+};
+
+void *mem_util_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
+  (void)type;
+  i32 alloc_flags = flags | MAP_ANON | MAP_PRIVATE;
+
+#if defined(WAPP_PLATFORM_LINUX) || defined(WAPP_PLATFORM_GNU) || defined(WAPP_PLATFORM_NET_BSD)
+  alloc_flags |= MAP_NORESERVE;
+#endif
+
+  return mmap(addr, size, access_types[access], alloc_flags, -1, 0);
+}
+
+void mem_util_free(void *ptr, u64 size) {
+  munmap(ptr, size);
+}
+
+#endif // !WAPP_PLATFORM_POSIX

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

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

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

@@ -0,0 +1,37 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "../../../../common/aliases/aliases.h"
+#include "../../../../common/platform/platform.h"
+
+#ifdef WAPP_PLATFORM_WINDOWS
+
+#include "mem_os_win.h"
+#include "../mem_os_ops.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#include <memoryapi.h>
+
+wapp_intern const i32 access_types[] = {
+    [WAPP_MEM_ACCESS_NONE]            = PAGE_NOACCESS,
+    [WAPP_MEM_ACCESS_READ_ONLY]       = PAGE_READONLY,
+    [WAPP_MEM_ACCESS_EXEC_ONLY]       = PAGE_EXECUTE,
+    [WAPP_MEM_ACCESS_READ_WRITE]      = PAGE_READWRITE,
+    [WAPP_MEM_ACCESS_READ_EXEC]       = PAGE_EXECUTE_READ,
+    [WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PAGE_EXECUTE_READWRITE,
+};
+
+void *mem_util_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
+  // Ensure memory is committed if it's meant to be initialised
+  if (type == WAPP_MEM_INIT_INITIALISED) {
+    flags |= WAPP_MEM_ALLOC_COMMIT;
+  }
+
+  return VirtualAlloc(addr, (SIZE_T)size, flags, access_types[access]);
+}
+
+void mem_util_free(void *ptr, u64 size) {
+  VirtualFree(ptr, size, MEM_RELEASE);
+}
+
+#endif // !WAPP_PLATFORM_WINDOWS

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

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

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

@@ -0,0 +1,101 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "commander.h"
+#include "commander_output.h"
+#include "../utils/shell_utils.h"
+#include "../../../mem/arena/mem_arena_allocator.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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define CMD_BUF_LEN 8192
+#define OUT_BUF_LEN 4096
+
+wapp_intern inline CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf);
+wapp_intern inline CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf);
+
+CMDResult wapp_shell_commander_execute(CMDOutHandling out_handling, Str8 *out_buf, const Str8List *cmd) {
+  if (!cmd) {
+    return CMD_NO_EXIT(SHELL_ERR_INVALID_ARGS);
+  }
+
+  Allocator arena = wapp_mem_arena_allocator_init(KB(500));
+
+  Str8 *cmd_str = wapp_str8_join(&arena, cmd, &wapp_str8_lit_ro(" "));
+  if (!cmd_str) {
+    wapp_mem_arena_allocator_destroy(&arena);
+    return CMD_NO_EXIT(SHELL_ERR_ALLOCATION_FAIL);
+  }
+
+  // Redirect output
+  cmd_str = wapp_str8_alloc_concat(&arena, cmd_str, &wapp_str8_lit_ro(" 2>&1"));
+
+  CMDResult output = execute_command(cmd_str, out_handling, out_buf);
+
+  wapp_mem_arena_allocator_destroy(&arena);
+
+  return output;
+}
+
+wapp_intern inline CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf) {
+  char cmd_buf[CMD_BUF_LEN] = {0};
+  wapp_str8_copy_to_cstr(cmd_buf, cmd, CMD_BUF_LEN);
+
+  FILE *fp = wapp_shell_utils_popen(cmd_buf, "r");
+  if (!fp) {
+    return CMD_NO_EXIT(SHELL_ERR_PROC_START_FAIL);
+  }
+
+  CMDResult output;
+
+  CMDError err = get_command_output(fp, out_handling, out_buf);
+  if (err > SHELL_ERR_NO_ERROR) {
+    output = CMD_NO_EXIT(err);
+    goto EXECUTE_COMMAND_CLOSE;
+  }
+
+  i32 st = EXIT_SUCCESS;
+  err = get_output_status(fp, &st);
+  if (err > SHELL_ERR_NO_ERROR) {
+    output = CMD_NO_EXIT(err);
+    goto EXECUTE_COMMAND_CLOSE;
+  }
+
+  // Process is already closed in get_output_status
+  fp = NULL;
+
+  output = (CMDResult){
+      .exited = true,
+      .exit_code = st,
+      .error = SHELL_ERR_NO_ERROR,
+  };
+
+EXECUTE_COMMAND_CLOSE:
+  if (fp) {
+    wapp_shell_utils_pclose(fp);
+  }
+  return output;
+}
+
+wapp_intern inline CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf) {
+  Str8 out = wapp_str8_buf(OUT_BUF_LEN);
+
+  out.size = fread((void *)out.buf, sizeof(u8), out.capacity, fp);
+  if (out_handling == SHELL_OUTPUT_CAPTURE && out_buf != NULL) {
+    if (out.size >= out_buf->capacity) {
+      return SHELL_ERR_OUT_BUF_FULL;
+    }
+
+    wapp_str8_concat_capped(out_buf, &out);
+  } else if (out_handling == SHELL_OUTPUT_PRINT) {
+    printf(WAPP_STR8_SPEC, wapp_str8_varg(out));
+  }
+
+  return SHELL_ERR_NO_ERROR;
+}

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

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

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

@@ -0,0 +1,44 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef COMMANDER_OUTPUT_H
+#define COMMANDER_OUTPUT_H
+
+#include "../../../../common/aliases/aliases.h"
+#include "../../../../common/platform/platform.h"
+
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+typedef enum {
+  SHELL_OUTPUT_DISCARD,
+  SHELL_OUTPUT_PRINT,
+  SHELL_OUTPUT_CAPTURE,
+} CMDOutHandling;
+
+typedef enum {
+  SHELL_ERR_NO_ERROR,
+  SHELL_ERR_INVALID_ARGS,
+  SHELL_ERR_ALLOCATION_FAIL,
+  SHELL_ERR_PROC_START_FAIL,
+  SHELL_ERR_OUT_BUF_FULL,
+  SHELL_ERR_PROC_EXIT_FAIL,
+} CMDError;
+
+typedef struct commander_result CMDResult;
+struct commander_result {
+  i32 exit_code;
+  CMDError error;
+  b8 exited;
+
+#ifdef WAPP_PLATFORM_WINDOWS
+  #include "../../../../common/misc/misc_utils.h"
+  wapp_misc_utils_padding_size(sizeof(b8) + sizeof(i32) + sizeof(CMDError));
+#endif // !WAPP_PLATFORM_WINDOWS
+};
+
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#endif // !COMMANDER_OUTPUT_H

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

@@ -0,0 +1,25 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "../../../../../common/aliases/aliases.h"
+#include "../../../../../common/platform/platform.h"
+
+#ifdef WAPP_PLATFORM_POSIX
+
+#include "../commander_output.h"
+#include "../../utils/shell_utils.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+CMDError get_output_status(FILE *fp, i32 *status_out) {
+  *status_out = wapp_shell_utils_pclose(fp);
+
+  if (!WIFEXITED(*status_out)) {
+    return SHELL_ERR_PROC_EXIT_FAIL;
+  }
+
+  *status_out = WEXITSTATUS(*status_out);
+
+  return SHELL_ERR_NO_ERROR;
+}
+
+#endif // !WAPP_PLATFORM_POSIX

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

@@ -0,0 +1,24 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "../../../../../common/aliases/aliases.h"
+#include "../../../../../common/platform/platform.h"
+
+#ifdef WAPP_PLATFORM_WINDOWS
+
+#include "../commander_output.h"
+#include "../../utils/shell_utils.h"
+#include <stdio.h>
+
+CMDError get_output_status(FILE *fp, i32 *status_out) {
+  if (!feof(fp)) {
+    // Ensure process is closed on failure
+    wapp_shell_utils_pclose(fp);
+    return SHELL_ERR_PROC_EXIT_FAIL;
+  }
+
+  *status_out = wapp_shell_utils_pclose(fp);
+
+  return SHELL_ERR_NO_ERROR;
+}
+
+#endif // !WAPP_PLATFORM_WINDOWS

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

@@ -0,0 +1,36 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "../../../../../common/aliases/aliases.h"
+#include "../../../../../common/platform/platform.h"
+#include "../../../../../primitives/strings/str8/str8.h"
+
+#ifdef WAPP_PLATFORM_POSIX
+
+#include "../terminal_colours.h"
+#include <stdio.h>
+
+wapp_intern Str8RO colours[COUNT_TERM_COLOUR] = {
+    [WAPP_TERM_COLOUR_FG_BLACK]      = wapp_str8_lit_ro_initialiser_list("\033[30m"),
+    [WAPP_TERM_COLOUR_FG_RED]        = wapp_str8_lit_ro_initialiser_list("\033[31m"),
+    [WAPP_TERM_COLOUR_FG_GREEN]      = wapp_str8_lit_ro_initialiser_list("\033[32m"),
+    [WAPP_TERM_COLOUR_FG_BLUE]       = wapp_str8_lit_ro_initialiser_list("\033[34m"),
+    [WAPP_TERM_COLOUR_FG_CYAN]       = wapp_str8_lit_ro_initialiser_list("\033[36m"),
+    [WAPP_TERM_COLOUR_FG_MAGENTA]    = wapp_str8_lit_ro_initialiser_list("\033[35m"),
+    [WAPP_TERM_COLOUR_FG_YELLOW]     = wapp_str8_lit_ro_initialiser_list("\033[33m"),
+    [WAPP_TERM_COLOUR_FG_WHITE]      = wapp_str8_lit_ro_initialiser_list("\033[37m"),
+    [WAPP_TERM_COLOUR_FG_BR_BLACK]   = wapp_str8_lit_ro_initialiser_list("\033[90m"),
+    [WAPP_TERM_COLOUR_FG_BR_RED]     = wapp_str8_lit_ro_initialiser_list("\033[91m"),
+    [WAPP_TERM_COLOUR_FG_BR_GREEN]   = wapp_str8_lit_ro_initialiser_list("\033[92m"),
+    [WAPP_TERM_COLOUR_FG_BR_BLUE]    = wapp_str8_lit_ro_initialiser_list("\033[94m"),
+    [WAPP_TERM_COLOUR_FG_BR_CYAN]    = wapp_str8_lit_ro_initialiser_list("\033[96m"),
+    [WAPP_TERM_COLOUR_FG_BR_MAGENTA] = wapp_str8_lit_ro_initialiser_list("\033[95m"),
+    [WAPP_TERM_COLOUR_FG_BR_YELLOW]  = wapp_str8_lit_ro_initialiser_list("\033[93m"),
+    [WAPP_TERM_COLOUR_FG_BR_WHITE]   = wapp_str8_lit_ro_initialiser_list("\033[97m"),
+    [WAPP_TERM_COLOUR_CLEAR]         = wapp_str8_lit_ro_initialiser_list("\033[0m"),
+};
+
+void print_coloured_text(Str8RO *text, TerminalColour colour) {
+  printf(WAPP_STR8_SPEC WAPP_STR8_SPEC, wapp_str8_varg(colours[colour]), wapp_str8_varg((*text)));
+}
+
+#endif // !WAPP_PLATFORM_POSIX

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

@@ -0,0 +1,18 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "termcolour.h"
+#include "terminal_colours.h"
+#include "../../../../primitives/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) {
+    return;
+  }
+
+  print_coloured_text(text, colour);
+}
+
+void wapp_shell_termcolour_clear_colour(void) {
+  Str8RO empty = wapp_str8_lit_ro("");
+  print_coloured_text(&empty, WAPP_TERM_COLOUR_CLEAR);
+}

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

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

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

@@ -0,0 +1,39 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef TERMINAL_COLOURS_H
+#define TERMINAL_COLOURS_H
+
+#include "../../../../common/aliases/aliases.h"
+#include "../../../../common/platform/platform.h"
+
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+typedef enum {
+  WAPP_TERM_COLOUR_FG_BLACK,
+  WAPP_TERM_COLOUR_FG_RED,
+  WAPP_TERM_COLOUR_FG_GREEN,
+  WAPP_TERM_COLOUR_FG_BLUE,
+  WAPP_TERM_COLOUR_FG_CYAN,
+  WAPP_TERM_COLOUR_FG_MAGENTA,
+  WAPP_TERM_COLOUR_FG_YELLOW,
+  WAPP_TERM_COLOUR_FG_WHITE,
+  WAPP_TERM_COLOUR_FG_BR_BLACK,
+  WAPP_TERM_COLOUR_FG_BR_RED,
+  WAPP_TERM_COLOUR_FG_BR_GREEN,
+  WAPP_TERM_COLOUR_FG_BR_BLUE,
+  WAPP_TERM_COLOUR_FG_BR_CYAN,
+  WAPP_TERM_COLOUR_FG_BR_MAGENTA,
+  WAPP_TERM_COLOUR_FG_BR_YELLOW,
+  WAPP_TERM_COLOUR_FG_BR_WHITE,
+  WAPP_TERM_COLOUR_CLEAR,
+
+  COUNT_TERM_COLOUR,
+} TerminalColour;
+
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#endif // !TERMINAL_COLOURS_H

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

@@ -0,0 +1,73 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "../../../../../common/aliases/aliases.h"
+#include "../../../../../common/platform/platform.h"
+#include "../../../../../primitives/strings/str8/str8.h"
+
+#ifdef WAPP_PLATFORM_WINDOWS
+
+#include "../terminal_colours.h"
+#include "../../../../../common/misc/misc_utils.h"
+#include <stdio.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+typedef struct termcolour_data TermcolourData;
+struct termcolour_data {
+  HANDLE handle;
+  WORD   default_colour;
+  WORD   current_colour;
+
+  wapp_misc_utils_padding_size(sizeof(HANDLE) + sizeof(WORD) + sizeof(WORD));
+};
+
+wapp_intern void init_data(TermcolourData *data);
+
+wapp_intern WORD colours[COUNT_TERM_COLOUR] = {
+    [WAPP_TERM_COLOUR_FG_BLACK]      = 0,
+    [WAPP_TERM_COLOUR_FG_RED]        = FOREGROUND_RED,
+    [WAPP_TERM_COLOUR_FG_GREEN]      = FOREGROUND_GREEN,
+    [WAPP_TERM_COLOUR_FG_BLUE]       = FOREGROUND_BLUE,
+    [WAPP_TERM_COLOUR_FG_CYAN]       = FOREGROUND_GREEN | FOREGROUND_BLUE,
+    [WAPP_TERM_COLOUR_FG_MAGENTA]    = FOREGROUND_RED | FOREGROUND_BLUE,
+    [WAPP_TERM_COLOUR_FG_YELLOW]     = FOREGROUND_RED | FOREGROUND_GREEN,
+    [WAPP_TERM_COLOUR_FG_WHITE]      = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,
+    [WAPP_TERM_COLOUR_FG_BR_BLACK]   = FOREGROUND_INTENSITY,
+    [WAPP_TERM_COLOUR_FG_BR_RED]     = FOREGROUND_RED | FOREGROUND_INTENSITY,
+    [WAPP_TERM_COLOUR_FG_BR_GREEN]   = FOREGROUND_GREEN | FOREGROUND_INTENSITY,
+    [WAPP_TERM_COLOUR_FG_BR_BLUE]    = FOREGROUND_BLUE | FOREGROUND_INTENSITY,
+    [WAPP_TERM_COLOUR_FG_BR_CYAN]    = FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
+    [WAPP_TERM_COLOUR_FG_BR_MAGENTA] = FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
+    [WAPP_TERM_COLOUR_FG_BR_YELLOW]  = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY,
+    [WAPP_TERM_COLOUR_FG_BR_WHITE]   = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
+};
+
+void print_coloured_text(Str8RO *text, TerminalColour colour) {
+  wapp_persist TermcolourData data = {0};
+  if (data.handle == 0) {
+    init_data(&data);
+  }
+
+  if (colour == WAPP_TERM_COLOUR_CLEAR) {
+    data.current_colour = data.default_colour;
+  } else {
+    data.current_colour = colours[colour];
+  }
+
+  SetConsoleTextAttribute(data.handle, data.current_colour);
+  printf(WAPP_STR8_SPEC, wapp_str8_varg((*text)));
+}
+
+wapp_intern void init_data(TermcolourData *data) {
+  // create handle
+  data->handle = GetStdHandle(STD_OUTPUT_HANDLE);
+
+  // get console colour information
+  CONSOLE_SCREEN_BUFFER_INFO csbi;
+  GetConsoleScreenBufferInfo(data->handle, &csbi);
+  data->default_colour = csbi.wAttributes;
+  data->current_colour = data->default_colour;
+}
+
+#endif // !WAPP_PLATFORM_WINDOWS

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

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

src/core/wapp_core.c

@@ -0,0 +1,23 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef WAPP_CORE_C
+#define WAPP_CORE_C
+
+#include "wapp_core.h"
+#include "file/file.c"
+#include "os/shell/termcolour/posix/termcolour_posix.c"
+#include "os/shell/termcolour/win/termcolour_win.c"
+#include "os/shell/termcolour/termcolour.c"
+#include "os/shell/commander/posix/commander_posix.c"
+#include "os/shell/commander/win/commander_win.c"
+#include "os/shell/commander/commander.c"
+#include "os/cpath/cpath.c"
+#include "os/mem/posix/mem_os_posix.c"
+#include "os/mem/win/mem_os_win.c"
+#include "os/mem/mem_os.c"
+#include "mem/utils/mem_utils.c"
+#include "mem/arena/mem_arena.c"
+#include "mem/arena/mem_arena_allocator.c"
+#include "../primitives/wapp_primitives.c"
+
+#endif // !WAPP_CORE_C

src/core/wapp_core.h

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

src/os/allocators/arena/mem_arena.c

@@ -1,192 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "mem_arena.h"
-#include "../../mem/mem_os.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/assert/assert.h"
-#include "../../../common/misc/misc_utils.h"
-#include "../../../base/mem/utils/mem_utils.h"
-#include <string.h>
-
-#ifndef DEFAULT_ALIGNMENT
-// Why 2 * sizeof(void *) instead of sizeof(void *)
-// https://handmade.network/forums/t/6860-alignment_arena_allocator
-#define DEFAULT_ALIGNMENT (2 * sizeof(void *))
-#endif /* ifndef DEFAULT_ALIGNMENT */
-
-#define ARENA_MINIMUM_CAPACITY KiB(16) // Allocate minimum of 4 pages
-
-typedef enum {
-	ARENA_STORAGE_TYPE_ALLOCATED,
-	ARENA_STORAGE_TYPE_BUFFER,
-} ArenaStorageType;
-
-struct Arena {
-	u8 *buf;
-	u8 *offset;
-	u8 *prev_offset;
-	u64 capacity;
-	ArenaStorageType type;
-	b8 committed;
-
-	wapp_misc_utils_reserve_padding(sizeof(u8 *) * 3 + sizeof(u64) + sizeof(ArenaStorageType) + sizeof(b8));
-};
-
-b8 wapp_mem_arena_init_buffer(Arena **arena, u8 *buffer, u64 buffer_size) {
-	if (!arena || *arena || buffer_size < sizeof(Arena)) {
-		return false;
-	}
-
-	*arena           = (Arena *)buffer;
-	Arena *arena_ptr = *arena;
-
-	arena_ptr->buf         = (u8 *)(arena_ptr + 1);
-	arena_ptr->offset      = arena_ptr->buf;
-	arena_ptr->prev_offset = NULL;
-	arena_ptr->capacity    = buffer_size - sizeof(Arena);
-	arena_ptr->type        = ARENA_STORAGE_TYPE_BUFFER;
-	arena_ptr->committed   = true;
-
-	return true;
-}
-
-b8 wapp_mem_arena_init_allocated_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b8 zero_buffer) {
-	if (!arena || *arena || base_capacity == 0) {
-		return false;
-	}
-
-	u64 size       = sizeof(Arena) + (base_capacity >= ARENA_MINIMUM_CAPACITY ? base_capacity : ARENA_MINIMUM_CAPACITY);
-	u64 alloc_size = wapp_misc_utils_u64_round_up_pow2(size);
-	u8 *allocated  = (u8 *)wapp_os_mem_alloc(NULL, alloc_size, WAPP_MEM_ACCESS_READ_WRITE, flags,
-	                                         zero_buffer ? WAPP_MEM_INIT_INITIALISED : WAPP_MEM_INIT_UNINITIALISED);
-	if (!allocated) {
-		return false;
-	}
-
-	b8 committed = (flags & WAPP_MEM_ALLOC_COMMIT) == WAPP_MEM_ALLOC_COMMIT;
-
-#ifdef WAPP_PLATFORM_WINDOWS
-	if (!committed) {
-		wapp_os_mem_alloc(allocated, sizeof(Arena), WAPP_MEM_ACCESS_READ_WRITE, WAPP_MEM_ALLOC_COMMIT,
-		                  WAPP_MEM_INIT_INITIALISED);
-	}
-#endif // ifdef WAPP_PLATFORM_WINDOWS
-
-	if (!wapp_mem_arena_init_buffer(arena, allocated, alloc_size)) {
-		wapp_mem_arena_destroy(arena);
-		return false;
-	}
-
-	Arena *arena_ptr     = *arena;
-	arena_ptr->type      = ARENA_STORAGE_TYPE_ALLOCATED;
-	arena_ptr->committed = committed;
-
-	return true;
-}
-
-void *wapp_mem_arena_alloc(Arena *arena, u64 size) {
-	return wapp_mem_arena_alloc_aligned(arena, size, DEFAULT_ALIGNMENT);
-}
-
-void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
-
-	u8 *alloc_start = arena->offset;
-
-	u8 *output = wapp_mem_util_align_forward((void *)alloc_start, alignment);
-	if (output + size >= arena->buf + arena->capacity) {
-		return NULL;
-	}
-
-	arena->offset = output + size;
-
-#ifdef WAPP_PLATFORM_WINDOWS
-	if (arena->type == ARENA_STORAGE_TYPE_ALLOCATED && !(arena->committed)) {
-		wapp_os_mem_alloc(alloc_start, (uptr)(arena->offset) - (uptr)(alloc_start),
-		                  WAPP_MEM_ACCESS_READ_WRITE, WAPP_MEM_ALLOC_COMMIT,
-		                  WAPP_MEM_INIT_UNINITIALISED);
-	}
-#endif // ifdef WAPP_PLATFORM_WINDOWS
-
-	memset(output, 0, size);
-
-	return (void *)output;
-}
-
-void *wapp_mem_arena_realloc(Arena *arena, void *ptr, u64 old_size, u64 new_size) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
-
-	if ((u8*)ptr < arena->buf || (u8*)ptr > arena->offset ||
-		  arena->offset + new_size >= arena->buf + arena->capacity) {
-		return NULL;
-	}
-
-	void *new_ptr = wapp_mem_arena_alloc(arena, new_size);
-	if (!new_ptr) {
-		return NULL;
-	}
-
-	u64 copy_size = new_size <= old_size ? new_size : old_size;
-	memcpy(new_ptr, ptr, copy_size);
-
-	return new_ptr;
-}
-
-void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64 new_size, u64 alignment) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
-
-	if ((u8*)ptr < arena->buf || (u8*)ptr > arena->offset ||
-		  arena->offset + new_size >= arena->buf + arena->capacity) {
-		return NULL;
-	}
-
-	void *new_ptr = wapp_mem_arena_alloc_aligned(arena, new_size, alignment);
-	if (!new_ptr) {
-		return NULL;
-	}
-
-	u64 copy_size = new_size <= old_size ? new_size : old_size;
-	memcpy(new_ptr, ptr, copy_size);
-
-	return new_ptr;
-}
-
-void wapp_mem_arena_temp_begin(Arena *arena) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
-
-	if (arena->prev_offset != NULL) {
-		return;
-	}
-
-	arena->prev_offset = arena->offset;
-}
-
-void wapp_mem_arena_temp_end(Arena *arena) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
-
-	if (arena->prev_offset == NULL) {
-		return;
-	}
-
-	arena->offset      = arena->prev_offset;
-	arena->prev_offset = NULL;
-}
-
-void wapp_mem_arena_clear(Arena *arena) {
-	wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
-
-	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");
-
-	Arena *arena_ptr = *arena;
-
-	if (arena_ptr->type == ARENA_STORAGE_TYPE_ALLOCATED) {
-		wapp_os_mem_free(*arena, sizeof(Arena) + arena_ptr->capacity);
-	}
-
-	*arena = NULL;
-}

src/os/allocators/arena/mem_arena.h

@@ -1,45 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef MEM_ARENA_H
-#define MEM_ARENA_H
-
-#include "../../mem/mem_os.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-typedef struct Arena Arena;
-
-#define wapp_mem_arena_init_allocated(arena_dptr, base_capacity)                                                           \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, false))
-#define wapp_mem_arena_init_allocated_commit(arena_dptr, base_capacity)                                                    \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, false))
-#define wapp_mem_arena_init_allocated_zero(arena_dptr, base_capacity)                                                      \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, true))
-#define wapp_mem_arena_init_allocated_commit_and_zero(arena_dptr, base_capacity)                                           \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, true))
-
-/**
- * Arena initialisation function. `wapp_mem_arena_init_allocated_custom` provides the most
- * control over how the Arena is initialised. Wrapper macros are provided for
- * easier use.
- */
-b8    wapp_mem_arena_init_allocated_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b8 zero_buffer);
-b8    wapp_mem_arena_init_buffer(Arena **arena, u8 *buffer, u64 buffer_size);
-void *wapp_mem_arena_alloc(Arena *arena, u64 size);
-void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment);
-void *wapp_mem_arena_realloc(Arena *arena, void *ptr, u64 old_size, u64 new_size);
-void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64 new_size, u64 alignment);
-void  wapp_mem_arena_temp_begin(Arena *arena);
-void  wapp_mem_arena_temp_end(Arena *arena);
-void  wapp_mem_arena_clear(Arena *arena);
-void  wapp_mem_arena_destroy(Arena **arena);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !MEM_ARENA_H

src/os/allocators/arena/mem_arena_allocator.c

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

src/os/cpath/cpath.c

@@ -1,136 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "cpath.h"
-#include "../allocators/arena/mem_arena_allocator.h"
-#include "../../common/aliases/aliases.h"
-#include "../../common/misc/misc_utils.h"
-#include "../../base/dbl_list/dbl_list.h"
-#include "../../base/mem/allocator/mem_allocator.h"
-#include "../../base/strings/str8/str8.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-u32 wapp_cpath_join_path(Str8 *dst, const Str8List *parts) {
-	if (!dst || !parts) {
-		return CPATH_JOIN_INVALID_ARGS;
-	}
-
-	if (parts->node_count == 0) {
-		return CPATH_JOIN_EMPTY_PARTS;
-	}
-
-	Str8 separator = wapp_str8_buf(4);
-	wapp_str8_push_back(&separator, WAPP_PATH_SEP);
-
-	u64 required_capacity = parts->node_count * separator.size + wapp_str8_list_total_size(parts);
-	if (dst->capacity < required_capacity) {
-		return CPATH_JOIN_INSUFFICIENT_DST_CAPACITY;
-	}
-
-	// Handle first node
-	Str8 *first_node = wapp_dbl_list_get(Str8, parts, 0);
-	wapp_str8_copy_str8_capped(dst, first_node);
-
-	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-	// MSVC Spectre mitigation warnings
-	Str8 *node       = first_node;
-	u64 node_index   = 1;
-	b8 running       = node_index < parts->node_count;
-	while (running) {
-		node = wapp_dbl_list_get(Str8, parts, node_index);
-		if (node->size == 0) {
-			goto CPATH_JOIN_LOOP_END;
-		}
-
-		if (dst->size > 0) {
-			char dst_last   = wapp_str8_get(dst, dst->size - 1);
-			char node_start = wapp_str8_get(node, 0);
-			b8 add_path_sep = dst_last != WAPP_PATH_SEP && node_start != WAPP_PATH_SEP;
-
-			if (add_path_sep) {
-				wapp_str8_concat_capped(dst, &separator);
-			}
-		}
-
-		wapp_str8_concat_capped(dst, node);
-
-CPATH_JOIN_LOOP_END:
-		++node_index;
-		running = node_index < parts->node_count;
-	}
-
-	return CPATH_JOIN_SUCCESS;
-}
-
-Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels) {
-	Str8 *output = NULL;
-	if (!allocator || !path) {
-		goto RETURN_DIRUP;
-	}
-
-	b8 absolute    = wapp_str8_get(path, 0) == WAPP_PATH_SEP;
-	Str8 separator = wapp_str8_buf(4);
-	wapp_str8_push_back(&separator, WAPP_PATH_SEP);
-
-	if (path->size == 0) {
-		output = wapp_str8_alloc_buf(allocator, 16);
-		if (!output) {
-			goto RETURN_DIRUP;
-		}
-
-		wapp_str8_push_back(output, absolute ? WAPP_PATH_SEP : '.');
-		goto RETURN_DIRUP;
-	}
-
-	if (levels < 1) {
-		output = wapp_str8_alloc_str8(allocator, path);
-		goto RETURN_DIRUP;
-	}
-
-	Allocator tmp_arena = wapp_mem_arena_allocator_init(MiB(8));
-	if (wapp_mem_allocator_invalid(&tmp_arena)) {
-		goto RETURN_DIRUP;
-	}
-
-	Str8List *parts = wapp_str8_split(&tmp_arena, path, &separator);
-	if (!parts) {
-		goto RETURN_DIRUP;
-	}
-
-	if (levels >= parts->node_count) {
-		output = wapp_str8_alloc_buf(allocator, 16);
-		if (!output) {
-			goto LIST_CLEANUP_DIRUP;
-		}
-
-		wapp_str8_push_back(output, absolute ? WAPP_PATH_SEP : '.');
-	} else {
-		for (u64 i = 0; i < levels; ++i) {
-			wapp_dbl_list_pop_back(Str8, parts);
-		}
-		
-		u64 alignment  = sizeof(void *) * 2;
-		u64 alloc_size = wapp_str8_list_total_size(parts) + parts->node_count * separator.size;
-		u64 modulo     = alloc_size & (alignment - 1);
-		alloc_size    += alignment - modulo;
-
-		output = wapp_str8_alloc_buf(allocator, alloc_size);
-		if (output) {
-			if (absolute) {
-				wapp_str8_push_back(output, WAPP_PATH_SEP);
-			}
-
-			Str8 *joined = wapp_str8_join(&tmp_arena, parts, &separator);
-			if (joined) {
-				wapp_str8_concat_capped(output, joined);
-			}
-		}
-	}
-
-LIST_CLEANUP_DIRUP:
-	wapp_mem_arena_allocator_destroy(&tmp_arena);
-
-RETURN_DIRUP:
-	return output;
-}

src/os/file/file.c

@@ -1,129 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "file.h"
-#include "../cpath/cpath.h"
-#include "../../common/assert/assert.h"
-#include "../../common/aliases/aliases.h"
-#include "../../base/array/array.h"
-#include "../../base/strings/str8/str8.h"
-
-WFile *wapp_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode) {
-	wapp_debug_assert(allocator != NULL && filepath != NULL, "`allocator` and `filepath` should not be NULL");
-	wapp_debug_assert(filepath->size < WAPP_PATH_MAX, "`filepath` exceeds max path limit.");
-	return _file_open(allocator, filepath, mode);
-}
-
-i64 wapp_file_get_current_position(WFile *file) {
-	wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-	return _file_seek(file, 0, WAPP_SEEK_CURRENT);
-}
-
-i64 wapp_file_seek(WFile *file, i64 offset, FileSeekOrigin origin) {
-	wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-	return _file_seek(file, offset, origin);
-}
-
-i64 wapp_file_get_length(WFile *file) {
-	wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-
-	i64 current = wapp_file_get_current_position(file);
-
-	_file_seek(file, 0, WAPP_SEEK_END);
-
-	i64 output = wapp_file_get_current_position(file);
-
-	// Restore position
-	_file_seek(file, current, WAPP_SEEK_START);
-
-	return output;
-}
-
-u64 wapp_file_read(void *dst_buf, WFile *file, u64 byte_count) {
-	wapp_debug_assert(dst_buf != NULL && file != NULL,
-	                  "`dst_buf` and `file` should not be NULL.");
-
-	i64 file_length = wapp_file_get_length(file);
-	if (file_length < 0) {
-		return 0;
-	}
-
-	return _file_read(dst_buf, byte_count, file, file_length);
-}
-
-i64 wapp_file_write(const void *src_buf, WFile *file, u64 byte_count) {
-	wapp_debug_assert(src_buf != NULL && file != NULL,
-	                  "`src_buf` and `file` should not be NULL.");
-	return _file_write(src_buf, file, byte_count);
-}
-
-u64 wapp_file_read_array(GenericArray dst_buf, WFile *file, u64 item_count) {
-	wapp_debug_assert(dst_buf != NULL && file != NULL,
-	                  "`dst_buf` and `file` should not be NULL.");
-
-	i64 _file_length = wapp_file_get_length(file);
-	if (_file_length < 0) {
-		return 0;
-	}
-
-	u64 file_length       = (u64)_file_length;
-	u64 item_size         = wapp_array_item_size(dst_buf);
-	u64 dst_byte_capacity = wapp_array_capacity(dst_buf) * item_size;
-	u64 req_byte_count    = item_count * item_size;
-	u64 copy_byte_count   = 0;
-
-	if (req_byte_count <= file_length && req_byte_count <= dst_byte_capacity) {
-		copy_byte_count = req_byte_count;
-	} else {
-		copy_byte_count = file_length <= dst_byte_capacity ? file_length : dst_byte_capacity;
-	}
-
-	u64 byte_count = _file_read(dst_buf, copy_byte_count, file, file_length);
-	if (byte_count == 0) {
-		return 0;
-	}
-
-	wapp_array_set_count(dst_buf, byte_count / item_size);
-
-	return wapp_array_count(dst_buf);
-}
-
-i64 wapp_file_write_array(const GenericArray src_buf, WFile *file, u64 item_count) {
-	wapp_debug_assert(src_buf != NULL && file != NULL,
-	                  "`src_buf` and `file` should not be NULL.");
-
-	u64 item_size      = wapp_array_item_size(src_buf);
-	u64 src_byte_count = wapp_array_count(src_buf) * item_size;
-	u64 req_byte_count = item_count * item_size;
-	u64 to_copy        = req_byte_count <= src_byte_count ? req_byte_count : src_byte_count;
-
-	i64 bytes_written = _file_write(src_buf, file, to_copy);
-	if (bytes_written < 0) {
-		return 0;
-	}
-
-	return (u64)bytes_written / item_size;
-}
-
-i32 wapp_file_flush(WFile *file) {
-	wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-	return _file_flush(file);
-}
-
-i32 wapp_file_close(WFile *file) {
-	wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-	return _file_close(file);
-}
-
-i32 wapp_file_rename(Str8RO *old_filepath, Str8RO *new_filepath) {
-	wapp_debug_assert(old_filepath != NULL && new_filepath != NULL,
-	                  "`old_filepath` and `new_filepath` should not be NULL");
-	wapp_debug_assert(old_filepath->size < WAPP_PATH_MAX, "`old_filepath` exceeds max path limit.");
-	wapp_debug_assert(new_filepath->size < WAPP_PATH_MAX, "`new_filepath` exceeds max path limit.");
-	return _file_rename(old_filepath, new_filepath);
-}
-
-i32 wapp_file_remove(Str8RO *filepath) {
-	wapp_debug_assert(filepath != NULL, "`filepath` should not be NULL");
-	wapp_debug_assert(filepath->size < WAPP_PATH_MAX, "`filepath` exceeds max path limit.");
-	return _file_remove(filepath);
-}

src/os/file/file.h

@@ -1,63 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef FILE_H
-#define FILE_H
-
-#include "../../base/mem/allocator/mem_allocator.h"
-#include "../../common/aliases/aliases.h"
-#include "../../base/strings/str8/str8.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-typedef struct WFile WFile;
-
-typedef enum {
-	WAPP_ACCESS_READ,                       // Equivalent to r
-	WAPP_ACCESS_WRITE,                      // Equivalent to w
-	WAPP_ACCESS_APPEND,                     // Equivalent to a
-	WAPP_ACCESS_READ_EX,                    // Equivalent to r+
-	WAPP_ACCESS_WRITE_EX,                   // Equivalent to w+
-	WAPP_ACCESS_APPEND_EX,                  // Equivalent to a+
-	WAPP_ACCESS_WRITE_FAIL_ON_EXIST,        // Equivalent to wx
-	WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX,     // Equivalent to wx+
-
-	FILE_ACCESS_MODE_COUNT,
-} FileAccessMode;
-
-typedef enum {
-	WAPP_SEEK_START,
-	WAPP_SEEK_CURRENT,
-	WAPP_SEEK_END,
-
-	FILE_SEEK_ORIGIN_COUNT,
-} FileSeekOrigin;
-
-WFile *wapp_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode);
-i64    wapp_file_get_current_position(WFile *file);
-i64    wapp_file_seek(WFile *file, i64 offset, FileSeekOrigin origin);
-i64    wapp_file_get_length(WFile *file);
-u64    wapp_file_read(void *dst_buf, WFile *file, u64 byte_count);
-i64    wapp_file_write(const void *src_buf, WFile *file, u64 byte_count);
-u64    wapp_file_read_array(GenericArray dst_buf, WFile *file, u64 item_count);
-i64    wapp_file_write_array(const GenericArray src_buf, WFile *file, u64 item_count);
-i32    wapp_file_flush(WFile *file);
-i32    wapp_file_close(WFile *file);
-i32    wapp_file_rename(Str8RO *old_filepath, Str8RO *new_filepath);
-i32    wapp_file_remove(Str8RO *filepath);
-
-extern WFile *_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode);
-extern i64    _file_seek(WFile *file, i64 offset, FileSeekOrigin origin);
-extern u64    _file_read(void *dst_buf, u64 byte_count, WFile *file, u64 file_length);
-extern i64    _file_write(const void *src_buf, WFile *file, u64 byte_count);
-extern i32    _file_flush(WFile *file);
-extern i32    _file_close(WFile *file);
-extern i32    _file_rename(Str8RO *old_filepath, Str8RO *new_filepath);
-extern i32    _file_remove(Str8RO *filepath);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !FILE_H

src/os/file/posix/file_posix.c

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

src/os/file/posix/file_posix.h

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

src/os/file/win/file_win.c

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

src/os/file/win/file_win.h

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

src/os/mem/mem_os.c

@@ -1,30 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "mem_os.h"
-#include "mem_os_ops.h"
-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
-#include <assert.h>
-#include <string.h>
-
-#if defined(WAPP_PLATFORM_WINDOWS)
-#include "win/mem_os_win.h"
-#elif defined(WAPP_PLATFORM_POSIX)
-#include "posix/mem_os_posix.h"
-#else
-#error "Unrecognised platform"
-#endif
-
-void *wapp_os_mem_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
-	void *output = os_mem_allocate(addr, size, access, flags, type);
-
-	if (type == WAPP_MEM_INIT_INITIALISED) {
-		memset(output, 0, size);
-	}
-
-	return output;
-}
-
-void wapp_os_mem_free(void *ptr, u64 size) {
-	os_mem_free(ptr, size);
-}

src/os/mem/posix/mem_os_posix.c

@@ -1,36 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_POSIX
-
-#include "mem_os_posix.h"
-#include "../mem_os_ops.h"
-#include <sys/mman.h>
-
-wapp_intern const i32 access_types[] = {
-	[WAPP_MEM_ACCESS_NONE]            = PROT_NONE,
-	[WAPP_MEM_ACCESS_READ_ONLY]       = PROT_READ,
-	[WAPP_MEM_ACCESS_EXEC_ONLY]       = PROT_EXEC,
-	[WAPP_MEM_ACCESS_READ_WRITE]      = PROT_READ | PROT_WRITE,
-	[WAPP_MEM_ACCESS_READ_EXEC]       = PROT_READ | PROT_EXEC,
-	[WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PROT_READ | PROT_WRITE | PROT_EXEC,
-};
-
-void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
-	(void)type;
-	i32 alloc_flags = flags | MAP_ANON | MAP_PRIVATE;
-
-#if defined(WAPP_PLATFORM_LINUX) || defined(WAPP_PLATFORM_GNU) || defined(WAPP_PLATFORM_NET_BSD)
-	alloc_flags |= MAP_NORESERVE;
-#endif
-
-	return mmap(addr, size, access_types[access], alloc_flags, -1, 0);
-}
-
-void os_mem_free(void *ptr, u64 size) {
-	munmap(ptr, size);
-}
-
-#endif // !WAPP_PLATFORM_POSIX

src/os/mem/win/mem_os_win.c

@@ -1,37 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_WINDOWS
-
-#include "mem_os_win.h"
-#include "../mem_os_ops.h"
-
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#include <memoryapi.h>
-
-wapp_intern const i32 access_types[] = {
-	[WAPP_MEM_ACCESS_NONE]            = PAGE_NOACCESS,
-	[WAPP_MEM_ACCESS_READ_ONLY]       = PAGE_READONLY,
-	[WAPP_MEM_ACCESS_EXEC_ONLY]       = PAGE_EXECUTE,
-	[WAPP_MEM_ACCESS_READ_WRITE]      = PAGE_READWRITE,
-	[WAPP_MEM_ACCESS_READ_EXEC]       = PAGE_EXECUTE_READ,
-	[WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PAGE_EXECUTE_READWRITE,
-};
-
-void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
-	// Ensure memory is committed if it's meant to be initialised
-	if (type == WAPP_MEM_INIT_INITIALISED) {
-		flags |= WAPP_MEM_ALLOC_COMMIT;
-	}
-
-	return VirtualAlloc(addr, (SIZE_T)size, flags, access_types[access]);
-}
-
-void os_mem_free(void *ptr, u64 size) {
-	VirtualFree(ptr, size, MEM_RELEASE);
-}
-
-#endif // !WAPP_PLATFORM_WINDOWS

src/os/shell/commander/commander.c

@@ -1,101 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "commander.h"
-#include "commander_output.h"
-#include "../utils/shell_utils.h"
-#include "../../allocators/arena/mem_arena_allocator.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/misc/misc_utils.h"
-#include "../../../base/dbl_list/dbl_list.h"
-#include "../../../base/mem/allocator/mem_allocator.h"
-#include "../../../base/strings/str8/str8.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define CMD_BUF_LEN 8192
-#define OUT_BUF_LEN 4096
-
-wapp_intern CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf);
-wapp_intern CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf);
-
-CMDResult wapp_shell_commander_execute(CMDOutHandling out_handling, Str8 *out_buf, const Str8List *cmd) {
-	if (!cmd) {
-		return CMD_NO_EXIT(SHELL_ERR_INVALID_ARGS);
-	}
-
-	Allocator arena = wapp_mem_arena_allocator_init(KiB(500));
-
-	Str8 *cmd_str = wapp_str8_join(&arena, cmd, &wapp_str8_lit_ro(" "));
-	if (!cmd_str) {
-		wapp_mem_arena_allocator_destroy(&arena);
-		return CMD_NO_EXIT(SHELL_ERR_ALLOCATION_FAIL);
-	}
-
-	// Redirect output
-	cmd_str = wapp_str8_alloc_concat(&arena, cmd_str, &wapp_str8_lit_ro(" 2>&1"));
-
-	CMDResult output = execute_command(cmd_str, out_handling, out_buf);
-
-	wapp_mem_arena_allocator_destroy(&arena);
-
-	return output;
-}
-
-wapp_intern CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf) {
-	char cmd_buf[CMD_BUF_LEN] = {0};
-	wapp_str8_copy_to_cstr(cmd_buf, cmd, CMD_BUF_LEN);
-
-	FILE *fp = wapp_shell_utils_popen(cmd_buf, "r");
-	if (!fp) {
-		return CMD_NO_EXIT(SHELL_ERR_PROC_START_FAIL);
-	}
-
-	CMDResult output;
-
-	CMDError err = get_command_output(fp, out_handling, out_buf);
-	if (err > SHELL_ERR_NO_ERROR) {
-		output = CMD_NO_EXIT(err);
-		goto EXECUTE_COMMAND_CLOSE;
-	}
-
-	i32 st = EXIT_SUCCESS;
-	err = get_output_status(fp, &st);
-	if (err > SHELL_ERR_NO_ERROR) {
-		output = CMD_NO_EXIT(err);
-		goto EXECUTE_COMMAND_CLOSE;
-	}
-
-	// Process is already closed in get_output_status
-	fp = NULL;
-
-	output = (CMDResult){
-		.exited    = true,
-		.exit_code = st,
-		.error     = SHELL_ERR_NO_ERROR,
-	};
-
-EXECUTE_COMMAND_CLOSE:
-	if (fp) {
-		wapp_shell_utils_pclose(fp);
-	}
-	return output;
-}
-
-wapp_intern CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf) {
-	Str8 out = wapp_str8_buf(OUT_BUF_LEN);
-
-	out.size = fread((void *)out.buf, sizeof(u8), out.capacity, fp);
-	if (out_handling == SHELL_OUTPUT_CAPTURE && out_buf != NULL) {
-		if (out.size >= out_buf->capacity) {
-			return SHELL_ERR_OUT_BUF_FULL;
-		}
-
-		wapp_str8_concat_capped(out_buf, &out);
-	} else if (out_handling == SHELL_OUTPUT_PRINT) {
-		printf(WAPP_STR8_SPEC, wapp_str8_varg(out));
-	}
-
-	return SHELL_ERR_NO_ERROR;
-}

src/os/shell/commander/commander_output.h

@@ -1,42 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef COMMANDER_OUTPUT_H
-#define COMMANDER_OUTPUT_H
-
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-#include "../../../common/misc/misc_utils.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-typedef enum {
-	SHELL_OUTPUT_DISCARD,
-	SHELL_OUTPUT_PRINT,
-	SHELL_OUTPUT_CAPTURE,
-} CMDOutHandling;
-
-typedef enum {
-	SHELL_ERR_NO_ERROR,
-	SHELL_ERR_INVALID_ARGS,
-	SHELL_ERR_ALLOCATION_FAIL,
-	SHELL_ERR_PROC_START_FAIL,
-	SHELL_ERR_OUT_BUF_FULL,
-	SHELL_ERR_PROC_EXIT_FAIL,
-} CMDError;
-
-typedef struct CMDResult CMDResult;
-struct CMDResult {
-	i32 exit_code;
-	CMDError error;
-	b8 exited;
-
-	wapp_misc_utils_reserve_padding(sizeof(b8) + sizeof(i32) + sizeof(CMDError));
-};
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !COMMANDER_OUTPUT_H

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

@@ -1,25 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_POSIX
-
-#include "../commander_output.h"
-#include "../../utils/shell_utils.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-CMDError get_output_status(FILE *fp, i32 *status_out) {
-	*status_out = wapp_shell_utils_pclose(fp);
-
-	if (!WIFEXITED(*status_out)) {
-		return SHELL_ERR_PROC_EXIT_FAIL;
-	}
-
-	*status_out = WEXITSTATUS(*status_out);
-
-	return SHELL_ERR_NO_ERROR;
-}
-
-#endif // !WAPP_PLATFORM_POSIX

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

@@ -1,24 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_WINDOWS
-
-#include "../commander_output.h"
-#include "../../utils/shell_utils.h"
-#include <stdio.h>
-
-CMDError get_output_status(FILE *fp, i32 *status_out) {
-	if (!feof(fp)) {
-		// Ensure process is closed on failure
-		wapp_shell_utils_pclose(fp);
-		return SHELL_ERR_PROC_EXIT_FAIL;
-	}
-
-	*status_out = wapp_shell_utils_pclose(fp);
-
-	return SHELL_ERR_NO_ERROR;
-}
-
-#endif // !WAPP_PLATFORM_WINDOWS

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

@@ -1,36 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
-#include "../../../../base/strings/str8/str8.h"
-
-#ifdef WAPP_PLATFORM_POSIX
-
-#include "../terminal_colours.h"
-#include <stdio.h>
-
-wapp_intern Str8RO colours[COUNT_TERM_COLOUR] = {
-	[WAPP_TERM_COLOUR_FG_BLACK]      = wapp_str8_lit_ro_initialiser_list("\033[30m"),
-	[WAPP_TERM_COLOUR_FG_RED]        = wapp_str8_lit_ro_initialiser_list("\033[31m"),
-	[WAPP_TERM_COLOUR_FG_GREEN]      = wapp_str8_lit_ro_initialiser_list("\033[32m"),
-	[WAPP_TERM_COLOUR_FG_BLUE]       = wapp_str8_lit_ro_initialiser_list("\033[34m"),
-	[WAPP_TERM_COLOUR_FG_CYAN]       = wapp_str8_lit_ro_initialiser_list("\033[36m"),
-	[WAPP_TERM_COLOUR_FG_MAGENTA]    = wapp_str8_lit_ro_initialiser_list("\033[35m"),
-	[WAPP_TERM_COLOUR_FG_YELLOW]     = wapp_str8_lit_ro_initialiser_list("\033[33m"),
-	[WAPP_TERM_COLOUR_FG_WHITE]      = wapp_str8_lit_ro_initialiser_list("\033[37m"),
-	[WAPP_TERM_COLOUR_FG_BR_BLACK]   = wapp_str8_lit_ro_initialiser_list("\033[90m"),
-	[WAPP_TERM_COLOUR_FG_BR_RED]     = wapp_str8_lit_ro_initialiser_list("\033[91m"),
-	[WAPP_TERM_COLOUR_FG_BR_GREEN]   = wapp_str8_lit_ro_initialiser_list("\033[92m"),
-	[WAPP_TERM_COLOUR_FG_BR_BLUE]    = wapp_str8_lit_ro_initialiser_list("\033[94m"),
-	[WAPP_TERM_COLOUR_FG_BR_CYAN]    = wapp_str8_lit_ro_initialiser_list("\033[96m"),
-	[WAPP_TERM_COLOUR_FG_BR_MAGENTA] = wapp_str8_lit_ro_initialiser_list("\033[95m"),
-	[WAPP_TERM_COLOUR_FG_BR_YELLOW]  = wapp_str8_lit_ro_initialiser_list("\033[93m"),
-	[WAPP_TERM_COLOUR_FG_BR_WHITE]   = wapp_str8_lit_ro_initialiser_list("\033[97m"),
-	[WAPP_TERM_COLOUR_CLEAR]         = wapp_str8_lit_ro_initialiser_list("\033[0m"),
-};
-
-void print_coloured_text(Str8RO *text, TerminalColour colour) {
-	printf(WAPP_STR8_SPEC WAPP_STR8_SPEC, wapp_str8_varg(colours[colour]), wapp_str8_varg((*text)));
-}
-
-#endif // !WAPP_PLATFORM_POSIX

src/os/shell/termcolour/termcolour.c

@@ -1,18 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "termcolour.h"
-#include "terminal_colours.h"
-#include "../../../base/strings/str8/str8.h"
-
-void wapp_shell_termcolour_print_text(Str8RO *text, TerminalColour colour) {
-	if (colour < WAPP_TERM_COLOUR_FG_BLACK || colour > WAPP_TERM_COLOUR_FG_BR_WHITE) {
-		return;
-	}
-
-	print_coloured_text(text, colour);
-}
-
-void wapp_shell_termcolour_clear_colour(void) {
-	Str8RO empty = wapp_str8_lit_ro("");
-	print_coloured_text(&empty, WAPP_TERM_COLOUR_CLEAR);
-}

src/os/shell/termcolour/terminal_colours.h

@@ -1,39 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef TERMINAL_COLOURS_H
-#define TERMINAL_COLOURS_H
-
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-typedef enum {
-	WAPP_TERM_COLOUR_FG_BLACK,
-	WAPP_TERM_COLOUR_FG_RED,
-	WAPP_TERM_COLOUR_FG_GREEN,
-	WAPP_TERM_COLOUR_FG_BLUE,
-	WAPP_TERM_COLOUR_FG_CYAN,
-	WAPP_TERM_COLOUR_FG_MAGENTA,
-	WAPP_TERM_COLOUR_FG_YELLOW,
-	WAPP_TERM_COLOUR_FG_WHITE,
-	WAPP_TERM_COLOUR_FG_BR_BLACK,
-	WAPP_TERM_COLOUR_FG_BR_RED,
-	WAPP_TERM_COLOUR_FG_BR_GREEN,
-	WAPP_TERM_COLOUR_FG_BR_BLUE,
-	WAPP_TERM_COLOUR_FG_BR_CYAN,
-	WAPP_TERM_COLOUR_FG_BR_MAGENTA,
-	WAPP_TERM_COLOUR_FG_BR_YELLOW,
-	WAPP_TERM_COLOUR_FG_BR_WHITE,
-	WAPP_TERM_COLOUR_CLEAR,
-
-	COUNT_TERM_COLOUR,
-} TerminalColour;
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !TERMINAL_COLOURS_H

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

@@ -1,73 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
-#include "../../../../base/strings/str8/str8.h"
-
-#ifdef WAPP_PLATFORM_WINDOWS
-
-#include "../terminal_colours.h"
-#include "../../../../common/misc/misc_utils.h"
-#include <stdio.h>
-
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-
-typedef struct TermcolourData TermcolourData;
-struct TermcolourData {
-	HANDLE handle;
-	WORD   default_colour;
-	WORD   current_colour;
-
-	wapp_misc_utils_reserve_padding(sizeof(HANDLE) + sizeof(WORD) + sizeof(WORD));
-};
-
-wapp_intern void init_data(TermcolourData *data);
-
-wapp_intern WORD colours[COUNT_TERM_COLOUR] = {
-	[WAPP_TERM_COLOUR_FG_BLACK]      = 0,
-	[WAPP_TERM_COLOUR_FG_RED]        = FOREGROUND_RED,
-	[WAPP_TERM_COLOUR_FG_GREEN]      = FOREGROUND_GREEN,
-	[WAPP_TERM_COLOUR_FG_BLUE]       = FOREGROUND_BLUE,
-	[WAPP_TERM_COLOUR_FG_CYAN]       = FOREGROUND_GREEN | FOREGROUND_BLUE,
-	[WAPP_TERM_COLOUR_FG_MAGENTA]    = FOREGROUND_RED | FOREGROUND_BLUE,
-	[WAPP_TERM_COLOUR_FG_YELLOW]     = FOREGROUND_RED | FOREGROUND_GREEN,
-	[WAPP_TERM_COLOUR_FG_WHITE]      = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,
-	[WAPP_TERM_COLOUR_FG_BR_BLACK]   = FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_RED]     = FOREGROUND_RED | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_GREEN]   = FOREGROUND_GREEN | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_BLUE]    = FOREGROUND_BLUE | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_CYAN]    = FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_MAGENTA] = FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_YELLOW]  = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_WHITE]   = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
-};
-
-void print_coloured_text(Str8RO *text, TerminalColour colour) {
-	wapp_persist TermcolourData data = {0};
-	if (data.handle == 0) {
-		init_data(&data);
-	}
-
-	if (colour == WAPP_TERM_COLOUR_CLEAR) {
-		data.current_colour = data.default_colour;
-	} else {
-		data.current_colour = colours[colour];
-	}
-
-	SetConsoleTextAttribute(data.handle, data.current_colour);
-	printf(WAPP_STR8_SPEC, wapp_str8_varg((*text)));
-}
-
-wapp_intern void init_data(TermcolourData *data) {
-	// create handle
-	data->handle = GetStdHandle(STD_OUTPUT_HANDLE);
-
-	// get console colour information
-	CONSOLE_SCREEN_BUFFER_INFO csbi;
-	GetConsoleScreenBufferInfo(data->handle, &csbi);
-	data->default_colour = csbi.wAttributes;
-	data->current_colour = data->default_colour;
-}
-
-#endif // !WAPP_PLATFORM_WINDOWS

src/os/wapp_os.c

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

src/os/wapp_os.h

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

src/primitives/array/array.c

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

src/primitives/array/array.h

@@ -0,0 +1,136 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef ARRAY_H
+#define ARRAY_H
+
+#include "../mem_allocator/mem_allocator.h"
+#include "../../common/misc/misc_utils.h"
+#include "../../common/aliases/aliases.h"
+#include "../../common/platform/platform.h"
+
+#ifdef WAPP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#define WAPP_ARRAY_MAGIC (u64)0x57415F415252
+
+#define _calc_array_count(TYPE, ...) wapp_misc_utils_va_args_count(TYPE, __VA_ARGS__)
+#define _calc_array_capacity(TYPE, ...) wapp_misc_utils_u64_round_up_pow2(_calc_array_count(TYPE, __VA_ARGS__) * 2)
+
+#define wapp_array_alloc_capacity(TYPE, ALLOCATOR_PTR, CAPACITY) ((TYPE *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(TYPE)))
+
+#ifdef WAPP_PLATFORM_CPP
+#define wapp_i32_array(...) ([&]() { \
+  wapp_persist i32 buf[wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i32, __VA_ARGS__) * 2)] = {__VA_ARGS__}; \
+  return I32Array{ \
+    buf, \
+    wapp_misc_utils_va_args_count(i32, __VA_ARGS__), \
+    wapp_misc_utils_u64_round_up_pow2(wapp_misc_utils_va_args_count(i32, __VA_ARGS__) * 2), \
+    sizeof(i32) \
+  }; \
+}())
+#define wapp_i32_array_with_capacity(CAPACITY) ([&]() { \
+  wapp_persist i32 buf[CAPACITY] = {}; \
+  return I32Array{buf, 0, CAPACITY, sizeof(i32)}; \
+}())
+#define wapp_i32_array_pop(ARRAY_PTR) (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ? \
+  *_i32_array_pop(ARRAY_PTR) : \
+  i32{} \
+)
+#else
+#define _stack_array(TYPE, SIZE) struct { ArrayHeader header; TYPE items[SIZE]; }
+#define wapp_array(TYPE, ...)                                      \
+  (TYPE *)(                                                        \
+    (_stack_array(TYPE, _calc_array_capacity(TYPE, __VA_ARGS__))){ \
+      .header = {                                                  \
+        .magic     = WAPP_ARRAY_MAGIC,                             \
+        .count     = _calc_array_count(TYPE, __VA_ARGS__),         \
+        .capacity  = _calc_array_capacity(TYPE, __VA_ARGS__),      \
+        .item_size = sizeof(TYPE),                                 \
+      },                                                           \
+      .items  = {__VA_ARGS__},                                     \
+    }.items                                                        \
+  )
+#define wapp_array_with_capacity(TYPE, CAPACITY) \
+  (TYPE *)(                                      \
+    (_stack_array(TYPE, CAPACITY)){              \
+      .header = {                                \
+        .magic     = WAPP_ARRAY_MAGIC,           \
+        .count     = 0,                          \
+        .capacity  = CAPACITY,                   \
+        .item_size = sizeof(TYPE),               \
+      },                                         \
+      .items  = {0},                             \
+    }.items                                      \
+  )
+#define wapp_array_count(TYPE, ARRAY_PTR)                                                            \
+  _array_count((u8 *)ARRAY_PTR, sizeof(TYPE))
+#define wapp_array_capacity(TYPE, ARRAY_PTR)                                                         \
+  _array_capacity((u8 *)ARRAY_PTR, sizeof(TYPE))
+#define wapp_array_item_size(TYPE, ARRAY_PTR)                                                        \
+  _array_item_size((u8 *)ARRAY_PTR, sizeof(TYPE))
+#define wapp_array_get(TYPE, ARRAY_PTR, INDEX)                                                       \
+  (*((TYPE *)_array_get((u8 *)ARRAY_PTR, INDEX, sizeof(TYPE))))
+#define wapp_array_set(TYPE, ARRAY_PTR, INDEX, VALUE_PTR)                                            \
+  _array_set((u8 *)ARRAY_PTR, INDEX, (u8 *)VALUE_PTR, sizeof(TYPE))
+#define wapp_array_append_capped(TYPE, ARRAY_PTR, VALUE_PTR)                                         \
+  _array_append_capped((u8 *)ARRAY_PTR, (u8 *)VALUE_PTR, sizeof(TYPE))
+#define wapp_array_extend_capped(TYPE, DST_ARRAY_PTR, SRC_ARRAY_PTR)                                 \
+  _array_extend_capped((u8 *)DST_ARRAY_PTR, (u8 *)SRC_ARRAY_PTR, sizeof(TYPE))
+#define wapp_array_copy_capped(TYPE, DST_ARRAY_PTR, SRC_ARRAY_PTR)                                   \
+  _array_copy_capped((u8 *)DST_ARRAY_PTR, (u8 *)SRC_ARRAY_PTR, sizeof(TYPE))
+#define wapp_array_append_alloc(TYPE, ALLOCATOR_PTR, ARRAY_PTR, VALUE_PTR)                           \
+  (TYPE *)_array_append_alloc(ALLOCATOR_PTR, (u8 *)ARRAY_PTR, (u8 *)VALUE_PTR, sizeof(TYPE))
+#define wapp_array_extend_alloc(TYPE, ALLOCATOR_PTR, DST_ARRAY_PTR, SRC_ARRAY_PTR)                   \
+  (TYPE *)_array_extend_alloc(ALLOCATOR_PTR, (u8 *)DST_ARRAY_PTR, (u8 *)SRC_ARRAY_PTR, sizeof(TYPE))
+#define wapp_array_copy_alloc(TYPE, ALLOCATOR_PTR, DST_ARRAY_PTR, SRC_ARRAY_PTR)                     \
+  (TYPE *)_array_copy_alloc(ALLOCATOR_PTR, (u8 *)DST_ARRAY_PTR, (u8 *)SRC_ARRAY_PTR, sizeof(TYPE))
+#define wapp_array_pop(TYPE, ARRAY_PTR)                                                              \
+  (ARRAY_PTR != NULL && _array_count((u8 *)ARRAY_PTR, sizeof(TYPE)) > 0 ?                            \
+    *((TYPE *)_array_pop((u8 *)ARRAY_PTR, sizeof(TYPE))) :                                           \
+    (TYPE){0}                                                                                        \
+  )
+#define wapp_array_clear(TYPE, ARRAY_PTR)                                                            \
+  _array_clear((u8 *)ARRAY_PTR, sizeof(TYPE))
+#endif // !WAPP_PLATFORM_CPP
+
+typedef struct header ArrayHeader;
+struct header {
+  u64 magic;
+  u64 count;
+  u64 capacity;
+  u64 item_size;
+};
+
+typedef struct array Array;
+struct array {
+  ArrayHeader header;
+  u8 *items;
+};
+
+typedef struct GenericArray GenericArray;
+struct GenericArray {
+  ArrayHeader header;
+  void *items;
+};
+
+u64 _array_count(u8 *array, u64 item_size);
+u64 _array_capacity(u8 *array, u64 item_size);
+u64 _array_item_size(u8 *array, u64 item_size);
+u8 *_array_get(u8 *array, u64 index, u64 item_size);
+void _array_set(u8 *array, u64 index, u8 *value, u64 item_size);
+void _array_append_capped(u8 *array, u8 *value, u64 item_size);
+void _array_extend_capped(u8 *array, const u8 *other, u64 item_size);
+void _array_copy_capped(u8 *array, const u8 *other, u64 item_size);
+u8 *_array_append_alloc(const Allocator *allocator, u8 *array, u8 *value, u64 item_size);
+u8 *_array_extend_alloc(const Allocator *allocator, u8 *array, const u8 *other, u64 item_size);
+u8 *_array_copy_alloc(const Allocator *allocator, u8 *array, const u8 *other, u64 item_size);
+u8 *_array_pop(u8 *array, u64 item_size);
+void _array_clear(u8 *array, u64 item_size);
+u8 *_array_alloc_capacity(const Allocator *allocator, u64 capacity, u64 item_size);
+
+#ifdef WAPP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WAPP_PLATFORM_CPP
+
+#endif // !ARRAY_H