Release v2.5.0

## Summary

Standardize naming conventions across the entire wizapp-stdlib codebase by replacing inconsistent prefixes and snake_case with a unified `wp` prefix + CamelCase scheme.

## Changes

### Naming convention applied

| Pattern | Before | After |
|---|---|---|
| Public functions | `wapp_module_function` | `wpModuleFunction` |
| Public types | `GenericXxx`, bare `Xxx` | `WpXxx` |
| Constants / enum values | `WAPP_XXX`, `SHELL_XXX` | `WP_XXX`, `WP_SHELL_XXX` |
| Internal functions | `_module_function` | `_moduleFunction` |
| Storage-class macros | `wapp_extern`, `wapp_intern` | `wp_extern`, `wp_intern` |

### Modules affected

All 20 modules were renamed: `arena`, `array`, `dbl_list`, `queue`, `str8`, `mem_allocator`, `mem_utils`, `mem_os`, `file`, `cpath`, `log`, `shell_commander`, `shell_termcolour`, `shell_utils`, `prng/xorshift`, `uuid`, `tester`, `aliases`, `assert`, `misc_utils`, `platform` — plus their test files.

### Backward compatibility

Added `src/oldnames.h` with `#define OLD_NAME NEW_NAME` for every renamed symbol, organized by module under Constants → Types → Functions sections. Existing code that includes this file will compile without changes.

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

.gitea/workflows/release.yml

@@ -34,6 +34,21 @@ jobs:
 
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
+      - name: Extract version changelog
+        if: steps.tag.outputs.version
+        id: changelog
+        run: |
+          VERSION="${{ steps.tag.outputs.version }}"
+          CHANGELOG_FILE=$(python3 scripts/get_changelog.py $VERSION)
+
+          if [[ $? != 0 ]]; then
+            echo "No changelog found for version $VERSION"
+            exit 1
+          fi
+
+          cat "$CHANGELOG_FILE"
+          echo "changelog_file=$CHANGELOG_FILE" >> $GITHUB_OUTPUT
+
       - name: Build Artifacts
         if: steps.tag.outputs.version
         run: |
@@ -46,17 +61,17 @@ jobs:
         id: create_release
         run: |
           VERSION="${{ steps.tag.outputs.version }}"
-          RESPONSE=$(curl -s -X POST \
+          CHANGELOG_FILE="${{ steps.changelog.outputs.changelog_file }}"
-            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+          RESPONSE=$(jq -n \
-            -H "Content-Type: application/json" \
+            --arg tag "v$VERSION" \
-            "https://git.thewizardapprentice.com/api/v1/repos/${{ gitea.repository }}/releases" \
+            --arg name "wapp-v$VERSION" \
-            -d '{
+            --rawfile body "$CHANGELOG_FILE" \
-              "tag_name": "v'"$VERSION"'",
+            '{tag_name: $tag, name: $name, body: $body, draft: false, prerelease: false}' \
-              "name": "wapp-v'"$VERSION"'",
+            | curl -s -X POST \
-              "body": "Automated release for wapp-v'"$VERSION"'",
+              -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
-              "draft": false,
+              -H "Content-Type: application/json" \
-              "prerelease": false
+              --data-binary @- \
-            }')
+              "https://git.thewizardapprentice.com/api/v1/repos/${{ gitea.repository }}/releases")
 
           echo "$RESPONSE"
           RELEASE_ID=$(echo $RESPONSE | jq -r '.id')
@@ -78,4 +93,7 @@ jobs:
 
       - name: Cleanup
         if: steps.tag.outputs.version
-        run: rm -rf dist/*
+        run: |
+          CHANGELOG_FILE="${{ steps.changelog.outputs.changelog_file }}"
+          rm -rf dist/*
+          rm -f "$CHANGELOG_FILE"

.gitignore

@@ -10,5 +10,6 @@ test.*
 compile_commands.json
 libwapp-build
 dist
+scratchpad
 *.vs
 __pycache__

CHANGELOG.md

@@ -0,0 +1,76 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [2.5.0] - 2026-09-24
+
+### Added
+
+- `wpMiscUtilsRotl64` utility
+- `WpHasher` interface
+- `wpCustomHasher` constructor for custom hasher with user-defined context
+- `wpHasherGetHash128` and `wpHasherGetHash64` utilities
+- `wpX64Mur3Hasher` and `wpX64Mur3HasherWithSeed` constructors for the hasher interface
+- `wpX64Mur3GetHash128` implementation for the x64 128-bit variant of the MurmurHash3 algorithm
+- `wpSip24Hasher`, `wpSip48Hasher`, `wpSip24HasherWithKey` and `wpSip48HasherWithKey` constructors for the hasher interface
+- `wpSipGetHash128` implementation for the 128 variant of siphash
+- `wpHashSet`, `wpHashSetCustomHasher`, `wpHashSetAlloc` and `wpHashSetCustomHasherAlloc` constructors
+- `wpHashSetFind`, `wpHashSetInsertCapped`, `wpHashSetInsertAlloc`, `wpHashSetRemove`, `wpHashSetItems`, `wpHashSetCapacity`, `wpHashSetCount`, `wpHashSetItemSize`, `wpHashSetClear` and `wpHashSetDealloc` utilities
+- `wpHashMap`, `wpHashMapCustomHasher`, `wpHashMapAlloc` and `wpHashMapCustomHasherAlloc` constructors
+- `wpHashMapKeys`, `wpHashMapValues`, `wpHashMapCapacity`, `wpHashMapCount`, `wpHashMapKeySize`, `wpHashMapValueSize`, `wpHashMapFind`, `wpHashMapInsertCapped`, `wpHashMapInsertOrUpdateCapped`, `wpHashMapUpdate`, `wpHashMapInsertAlloc`, `wpHashMapInsertOrUpdateAlloc`, `wpHashMapRemove`, `wpHashMapClear` and `wpHashMapDealloc` utilities
+- `wpU8Const`, `wpU16Const`, `wpU32Const`, `wpU64Const`, `wpI8Const`, `wpI16Const`, `wpI32Const`, and `wpI64Const` aliases
+- `wpPrngXorshiftInitWithSeed` to allow for user control with PRNG
+- `wpPrngXorshift256InRange`, `wpPrngXorshift256ssInRange`, `wpPrngXorshift256pInRange`, `wpPrngXorshift256Choice`, `wpPrngXorshift256ssChoice` and `wpPrngXorshift256pChoice` utilities
+- `WpSplitmix64State`
+- `wpPrngSplitmix64Init`, `wpPrngSplitmix64InitWithSeed`, `wpPrngSplitmix64`, `wpPrngSplitmix64InRange`, `wpPrngSplitmix64Choice`
+- `wpStr8Clear`
+- `wpArrayZero` to zero all elements in an array without setting the count to 0
+- `wpArrayRemoveSwapEnd` to remove an array element using its index and swap the last element in
+
+### Changed
+
+- Switched to using `wpMiscUtilsRotl64` in `xorshift`
+- Remove all uses of names starting with underscore
+- Ensure `wpArrayClear` memsets members to 0
+- Removed '%' from `WP_STR8_SPEC`
+
+## [2.4.0] - 2026-08-30
+
+### Added
+
+- `wpStreamHasCount`, `wpStreamPeekWithOffset` and `wpStreamConsumeCount` utilities
+
+### Fixed
+
+- Logic for peeking at stream contents
+
+## [2.3.0] - 2026-08-29
+
+### Added
+
+- Compiler detection macros:
+    - `WP_PLATFORM_CLANG` for the clang compiler
+    - `WP_PLATFORM_CLANGPP` for the clang++ compiler
+    - `WP_PLATFORM_CLANG_MAJOR` Major version number for the clang/clang++ compiler
+    - `WP_PLATFORM_CLANG_MINOR` Minor version number for the clang/clang++ compiler
+    - `WP_PLATFORM_CLANG_PATCH` Patch version number for the clang/clang++ compiler
+    - `WP_PLATFORM_GCC` for the gcc compiler
+    - `WP_PLATFORM_GPP` for the g++ compiler
+    - `WP_PLATFORM_GCC_MAJOR` Major version number for the gcc/g++ compiler
+    - `WP_PLATFORM_GCC_MINOR` Minor version number for the gcc/g++ compiler
+    - `WP_PLATFORM_GCC_PATCH` Patch version number for the gcc/g++ compiler
+    - `WP_PLATFORM_MSVC` for Microsoft's Visual C++ compiler
+    - `WP_PLATFORM_MSVC_FULL_VERSION` Full version string for the MSVC compiler
+    - `WP_PLATFORM_MSVC_VERSION` Version string for the MSVC compiler
+- Generic `WpStream` struct to wrap a stream of data
+- `WpVoidPtrStream`, `WpC8Stream`, `WpC16Stream`, `WpC32Stream`, `WpU8Stream`, `WpU16Stream`, `WpU32Stream`, `WpU64Stream`, `WpB8Stream`, `WpI8Stream`, `WpI16Stream`, `WpI32Stream`, `WpI64Stream`, `WpF32Stream`, `WpF64Stream`, `WpF128Stream`, `WpUptrStream`, `WpIptrStream` and `WpStr8Stream` aliases for `WpStream` for readability
+- Utilities for working with data streams:
+    - `wpStreamAtEnd`
+    - `wpStreamHasNext`
+    - `wpStreamPeek`
+    - `wpStreamConsume`

Makefile

@@ -121,13 +121,17 @@ help:
 	@$(ECHO_E) "  $(GREEN)make help$(RESET)         Print this help message and exit."
 
 full: LIB_SRC = src/wapp.c
-full: INCLUDES = common os base prng testing uuid
+full: INCLUDES = common os base log prng testing uuid
 full: install
 
 base: LIB_SRC = src/base/wapp_base.c
 base: INCLUDES = common base
 base: install
 
+log: LIB_SRC = src/log/wapp_log.c
+log: INCLUDES = common os base log
+log: install
+
 os: LIB_SRC = src/os/wapp_os.c
 os: INCLUDES = common os base
 os: install

VERSION

@@ -1 +1 @@
-1.2.0
+2.5.0

documents/hash_tables_refs.md

@@ -0,0 +1,51 @@
+# Hash Tables References
+
+## SwissTable
+
+- [Designing a Fast, Efficient, Cache-friendly Hash Table, Step by Step](https://www.youtube.com/watch?v=ncHmEUmJZf4)
+- [Abseil blog announcement](https://abseil.io/blog/20180927-swisstables)
+- [Abseil design notes](https://abseil.io/about/design/swisstables)
+- [Faultlore hashbrown-TLDR](https://faultlore.com/blah/hashbrown-tldr)
+- [hashbrown source](https://github.com/rust-lang/hashbrown/tree/master/src/raw)
+- [Faster Go maps with Swiss Tables](https://go.dev/blog/swisstable)
+
+### 64-bit hash from 128-bit hash
+MurmurHash3 and SipHash return 128 bits. SwissTable expects 64 bits. XOR folding is the approach to use:
+
+```c
+uint64_t fold_128_to_64(uint128_t hash) {
+    return (uint64_t)(hash >> 64) ^ (uint64_t)(hash & 0xFFFFFFFFFFFFFFFF);
+}
+```
+
+## Robin Hood
+
+- [Celis (1986) — original paper proving O(1) variance, Θ(log n) max probe](https://cs.uwaterloo.ca/research/tr/1986/CS-86-14.pdf)
+- [Gankra/Faultlore — clearest walkthrough from first principles](https://faultlore.com/blah/robinhood-part-1)
+- [On Worst Case Robin Hood Hashing](https://cglab.ca/~morin/publications/hashing/robinhood-siamjc.pdf)
+- [Sebastian Sylvan — popularized Robin Hood in systems programming](https://www.sebastiansylvan.com/post/robin-hood-hashing-should-be-your-default-hash-table-implementation/)
+- [Emmanuel Goossaert — detailed C++ implementation + backward-shift deletion](http://codecapsule.com/2013/11/11/robin-hood-hashing/)
+- [Martinus (Ankerl) — most widely used C++ implementation](https://github.com/martinus/unordered_dense)
+- [Tessil — clean header-only C++ implementation](https://github.com/Tessil/robin-map)
+- [Malte Skarupke — Robin Hood with probe count limit](https://github.com/skarupke/flat_hash_map)
+- [Robin Hood Hashing – Fairness in Collision Resolution](https://blog.hieunt.me/blog/robinhood-hashing)
+
+## Robin Hood vs SwissTable
+
+- [Rust migration PR](https://github.com/rust-lang/rust/pull/56241)
+- [hashbrown deletion discussion](https://github.com/rust-lang/hashbrown/issues/503)
+- [Jackson Allan benchmark](https://jacksonallan.github.io/c_cpp_hash_tables_benchmark/)
+- [Richter et al. (VLDB 2015)](https://bigdata.uni-saarland.de/publications/p249-richter.pdf)
+- [Poblete & Viola (2018)](https://www.cambridge.org/core/journals/combinatorics-probability-and-computing/article/abs/analysis-of-robin-hood-and-other-hashing-algorithms-under-the-random-probing-model/933D4F203E3C70EF15053287412242E0)
+
+## Hybrid Open-Addressing/Separate-Chaining
+
+- [Verstable](https://github.com/JacksonAllan/Verstable)
+
+## Double Hashing
+
+- Knuth, TAOCP Vol. 3 §6.4 — definitive analysis of double hashing probe counts
+- Guibas & Szemerédi (1978) — proved double hashing is asymptotically equivalent to uniform probing
+- [Heileman & Luo (2005) — "How Caching Affects Hashing" — cache-aware experimental comparison](http://siam.org/meetings/alenex05/papers/13gheileman.pdf)
+- [VT Hashing Tutorial — excellent pedagogical walkthrough](https://research.cs.vt.edu/AVresearch/hashing/double.php)
+- [Paul Khuong — "The Other Robin Hood Hashing" (original Celis double-hashing variant)](https://www.pvk.ca/Blog/2013/11/26/the-other-robin-hood-hashing/)

package

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 cp -r src wapp
+cp CHANGELOG.md wapp
 
 mkdir -p dist
 

scripts/get_changelog.py

@@ -0,0 +1,56 @@
+import os
+import re
+import argparse
+from pathlib import Path
+
+VERSION_HEADER = re.compile(r"\[\d+.\d+.\d+\]")
+SCRIPT_DIR = Path(__file__).absolute().parent.parent
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("version")
+    args = parser.parse_args()
+
+    changelog = get_changelog(args.version)
+    outfilename = save_changelog(args.version, changelog)
+
+    print(outfilename)
+
+
+def get_changelog(version: str) -> list[str]:
+    changelog = SCRIPT_DIR / "CHANGELOG.md"
+
+    with changelog.open("r") as infile:
+        lines = infile.readlines()
+
+    start = -1
+    end = -1
+
+    for i, line in enumerate(lines):
+        if start == -1:
+            match = re.search(version, line)
+            if match is None:
+                continue
+            start = i
+        else:
+            match = VERSION_HEADER.search(line)
+            if match is not None:
+                end = i
+                break
+
+    if start == -1:
+        exit(1)
+
+    return lines[start:end] if end > -1 else lines[start:]
+
+
+def save_changelog(version: str, lines: list[str]) -> str:
+    version_changelog = SCRIPT_DIR / f"wapp-changelog-{version}.md"
+    with version_changelog.open("w") as outfile:
+        outfile.writelines(lines)
+    return str(version_changelog)
+
+
+if __name__ == "__main__":
+    main()

src/base/array/array.c

@@ -7,81 +7,82 @@
 #include "../../common/aliases/aliases.h"
 #include <stddef.h>
 
-#define _array_header(ARRAY) (WpArrayHeader *)(wpMiscUtilsOffsetPointer(ARRAY, (i64)sizeof(WpArrayHeader) * -1))
+#define arrayHeader(ARRAY) (WpArrayHeader *)(wpMiscUtilsOffsetPointer(ARRAY, (i64)sizeof(WpArrayHeader) * -1))
 
-wp_persist inline void _array_validate(const WpArray array, u64 item_size);
+wp_persist inline void  arrayValidate(const WpArray array, u64 item_size);
+wp_persist inline void *arrayGetItemWithOffset(const WpArray array, u64 offset);
 
-u64 _arrayCount(WpArray array) {
+u64 arrayCount(WpArray array) {
 	wpDebugAssert(array != NULL, "`array` should not be NULL");
 
-	WpArrayHeader *header = _array_header(array);
+	WpArrayHeader *header = arrayHeader(array);
 	wpRuntimeAssert(WP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
 
 	return header->count;
 }
 
-u64 _arrayCapacity(WpArray array) {
+u64 arrayCapacity(WpArray array) {
 	wpDebugAssert(array != NULL, "`array` should not be NULL");
 
-	WpArrayHeader *header = _array_header(array);
+	WpArrayHeader *header = arrayHeader(array);
 	wpRuntimeAssert(WP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
 
 	return header->capacity;
 }
 
-u64 _arrayItemSize(WpArray array) {
+u64 arrayItemSize(WpArray array) {
 	wpDebugAssert(array != NULL, "`array` should not be NULL");
 
-	WpArrayHeader *header = _array_header(array);
+	WpArrayHeader *header = arrayHeader(array);
 	wpRuntimeAssert(WP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
 
 	return header->item_size;
 }
 
-void _arraySetCount(WpArray array, u64 count) {
+void arraySetCount(WpArray array, u64 count) {
 	wpDebugAssert(array != NULL, "`array` should not be NULL");
 
-	WpArrayHeader *header = _array_header(array);
+	WpArrayHeader *header = arrayHeader(array);
 	wpRuntimeAssert(WP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
 
 	header->count = count;
 }
 
-void *_arrayGet(WpArray array, u64 index, u64 item_size) {
+void *arrayGet(WpArray array, u64 index, u64 item_size) {
-	wpRuntimeAssert(array != NULL, "`array` should not be NULL");
+	wpDebugAssert(array != NULL, "`array` should not be NULL");
-	_array_validate(array, item_size);
+	arrayValidate(array, item_size);
 
-	WpArrayHeader *header = _array_header(array);
+	WpArrayHeader *header = arrayHeader(array);
 	wpRuntimeAssert(index < header->count, "`index` is out of bounds");
 
-	return wpMiscUtilsOffsetPointer(array, header->item_size * index);
+	return arrayGetItemWithOffset(array, header->item_size * index);
 }
 
-void _arraySet(WpArray array, u64 index, void *value, u64 item_size) {
+void arraySet(WpArray array, u64 index, void *value, u64 item_size) {
-	void *item = _arrayGet(array, index, item_size);
+	void *item = arrayGet(array, index, item_size);
 
-	WpArrayHeader *header = _array_header(array);
+	WpArrayHeader *header = arrayHeader(array);
 	memcpy(item, value, header->item_size);
 }
 
-void _arrayAppendCapped(WpArray array, void *value, u64 item_size) {
+void arrayAppendCapped(WpArray array, void *value, u64 item_size) {
-	wpRuntimeAssert(array != NULL, "`array` should not be NULL");
+	wpDebugAssert(array != NULL, "`array` should not be NULL");
-	_array_validate(array, item_size);
+	arrayValidate(array, item_size);
 
-	WpArrayHeader *header = _array_header(array);
+	WpArrayHeader *header = arrayHeader(array);
 	if (header->count >= header->capacity) { return; }
 
 	u64 index = (header->count)++;
-	_arraySet(array, index, value, item_size);
+	arraySet(array, index, value, item_size);
 }
 
-void _arrayExtendCappend(WpArray dst, const WpArray src, u64 item_size) {
+void arrayExtendCappend(WpArray dst, const WpArray src, u64 item_size) {
-	wpRuntimeAssert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
+	wpDebugAssert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
-	_array_validate(dst, item_size);
+	arrayValidate(dst, item_size);
-	_array_validate(src, item_size);
+	arrayValidate(src, item_size);
 
-	WpArrayHeader *src_header = _array_header(src);
+	WpArrayHeader *src_header = arrayHeader(src);
-	WpArrayHeader *dst_header = _array_header(dst);
+	WpArrayHeader *dst_header = arrayHeader(dst);
 	u64 remaining_capacity = dst_header->capacity - dst_header->count;
 
 	u64 copy_count = src_header->count < remaining_capacity ? src_header->count : remaining_capacity;
@@ -90,94 +91,94 @@ void _arrayExtendCappend(WpArray dst, const WpArray src, u64 item_size) {
 	dst_header->count += copy_count;
 }
 
-void _arrayCopyCapped(WpArray dst, const WpArray src, u64 item_size) {
+void arrayCopyCapped(WpArray dst, const WpArray src, u64 item_size) {
-	wpRuntimeAssert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
+	wpDebugAssert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
-	_array_validate(dst, item_size);
+	arrayValidate(dst, item_size);
-	_array_validate(src, item_size);
+	arrayValidate(src, item_size);
 
-	_arrayClear(dst, item_size);
+	arrayClear(dst, item_size);
 
-	WpArrayHeader *src_header = _array_header(src);
+	WpArrayHeader *src_header = arrayHeader(src);
-	WpArrayHeader *dst_header = _array_header(dst);
+	WpArrayHeader *dst_header = arrayHeader(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;
 }
 
-WpArray _arrayAppendAlloc(const WpAllocator *allocator, WpArray array, void *value,
+WpArray arrayAppendAlloc(const WpAllocator *allocator, WpArray array, void *value,
-                                 WpArrayInitFlags flags, u64 item_size) {
+                         WpArrayInitFlags flags, u64 item_size) {
-	wpRuntimeAssert(allocator != NULL && array != NULL, "`allocator` and `array` should not be NULL");
+	wpDebugAssert(allocator != NULL && array != NULL, "`allocator` and `array` should not be NULL");
-	_array_validate(array, item_size);
+	arrayValidate(array, item_size);
 
 	WpArray output = array;
 
-	WpArrayHeader *header = _array_header(array);
+	WpArrayHeader *header = arrayHeader(array);
 	if (header->count >= header->capacity) {
 		u64 new_capacity = wpMiscUtilsU64RoundUpPow2(header->capacity * 2);
-		output           = (WpArray )_arrayAllocCapacity(allocator, new_capacity, flags,
+		output           = (WpArray )arrayAllocCapacity(allocator, new_capacity, flags,
 		                                                        header->item_size);
 		if (!output) {
 			output = array;
 			goto RETURN_ARRAY_APPEND_ALLOC;
 		}
-		_arrayCopyCapped(output, array, item_size);
+		arrayCopyCapped(output, array, item_size);
 	}
 
-	_arrayAppendCapped(output, value, item_size);
+	arrayAppendCapped(output, value, item_size);
 
 	if ((flags & WP_ARRAY_INIT_FILLED) == WP_ARRAY_INIT_FILLED) {
-		_arraySetCount(output, _arrayCapacity(output));
+		arraySetCount(output, arrayCapacity(output));
 	}
 
 RETURN_ARRAY_APPEND_ALLOC:
 	return output;
 }
 
-WpArray _arrayExtendAlloc(const WpAllocator *allocator, WpArray dst, const WpArray src,
+WpArray arrayExtendAlloc(const WpAllocator *allocator, WpArray dst, const WpArray src,
-                                 WpArrayInitFlags flags, u64 item_size) {
+                         WpArrayInitFlags flags, u64 item_size) {
-	wpRuntimeAssert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
+	wpDebugAssert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
-	_array_validate(dst, item_size);
+	arrayValidate(dst, item_size);
-	_array_validate(src, item_size);
+	arrayValidate(src, item_size);
 
 	WpArray output = dst;
 
-	WpArrayHeader *src_header = _array_header(src);
+	WpArrayHeader *src_header = arrayHeader(src);
-	WpArrayHeader *dst_header = _array_header(dst);
+	WpArrayHeader *dst_header = arrayHeader(dst);
 	u64 remaining_capacity = dst_header->capacity - dst_header->count;
 	if (src_header->count >= remaining_capacity) {
 		u64 new_capacity  = wpMiscUtilsU64RoundUpPow2(dst_header->capacity * 2);
-		output            = (WpArray )_arrayAllocCapacity(allocator, new_capacity,
+		output            = (WpArray )arrayAllocCapacity(allocator, new_capacity,
 		                                                         flags, dst_header->item_size);
 		if (!output) {
 			output = dst;
 			goto RETURN_ARRAY_EXTEND_ALLOC;
 		}
-		_arrayCopyCapped(output, dst, item_size);
+		arrayCopyCapped(output, dst, item_size);
 	}
 
-	_arrayExtendCappend(output, src, item_size);
+	arrayExtendCappend(output, src, item_size);
 
 	if ((flags & WP_ARRAY_INIT_FILLED) == WP_ARRAY_INIT_FILLED) {
-		_arraySetCount(output, _arrayCapacity(output));
+		arraySetCount(output, arrayCapacity(output));
 	}
 
 RETURN_ARRAY_EXTEND_ALLOC:
 	return output;
 }
 
-WpArray _arrayCopyAlloc(const WpAllocator *allocator, WpArray dst, const WpArray src,
+WpArray arrayCopyAlloc(const WpAllocator *allocator, WpArray dst, const WpArray src,
-                               WpArrayInitFlags flags, u64 item_size) {
+                       WpArrayInitFlags flags, u64 item_size) {
-	wpRuntimeAssert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
+	wpDebugAssert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
-	_array_validate(dst, item_size);
+	arrayValidate(dst, item_size);
-	_array_validate(src, item_size);
+	arrayValidate(src, item_size);
 
 	WpArray output = dst;
 
-	WpArrayHeader *src_header = _array_header(src);
+	WpArrayHeader *src_header = arrayHeader(src);
-	WpArrayHeader *dst_header = _array_header(dst);
+	WpArrayHeader *dst_header = arrayHeader(dst);
 	if (src_header->count >= dst_header->capacity) {
 		u64 new_capacity  = wpMiscUtilsU64RoundUpPow2(dst_header->capacity * 2);
-		output            = (WpArray )_arrayAllocCapacity(allocator, new_capacity,
+		output            = (WpArray )arrayAllocCapacity(allocator, new_capacity,
 		                                                         flags, src_header->item_size);
 		if (!output) {
 			output = dst;
@@ -185,63 +186,92 @@ WpArray _arrayCopyAlloc(const WpAllocator *allocator, WpArray dst, const WpArray
 		}
 	}
 
-	_arrayCopyCapped(output, src, item_size);
+	arrayCopyCapped(output, src, item_size);
 
 	if ((flags & WP_ARRAY_INIT_FILLED) == WP_ARRAY_INIT_FILLED) {
-		_arraySetCount(output, _arrayCapacity(output));
+		arraySetCount(output, arrayCapacity(output));
 	}
 
 RETURN_ARRAY_COPY_ALLOC:
 	return output;
 }
 
-void *_arrayPop(WpArray array, u64 item_size) {
+void arrayRemoveSwapEnd(WpArray array, u64 index, u64 item_size) {
-	wpRuntimeAssert(array != NULL, "`array` should not be NULL");
+	wpDebugAssert(array != NULL, "`array` should not be NULL");
-	_array_validate(array, item_size);
+	arrayValidate(array, item_size);
 
-	WpArrayHeader *header = _array_header(array);
+	WpArrayHeader *header = arrayHeader(array);
+	if (header->count == 0 || index > header->count) { return; }
+
+	u64 last_item_index = header->count - 1;
+
+	if (index < last_item_index) {
+		void *cur_item  = arrayGetItemWithOffset(array, header->item_size * index);
+		void *last_item = arrayGetItemWithOffset(array, header->item_size * last_item_index);
+
+		memcpy(cur_item, last_item, header->item_size);
+		memset(last_item, 0, header->item_size);
+	}
+
+	--(header->count);
+}
+
+void *arrayPop(WpArray array, u64 item_size) {
+	wpDebugAssert(array != NULL, "`array` should not be NULL");
+	arrayValidate(array, item_size);
+
+	WpArrayHeader *header = arrayHeader(array);
 	if (header->count == 0) { return NULL; }
 
 	u64 index = header->count - 1;
-	void *out = _arrayGet(array, index, item_size);
+	void *out = arrayGetItemWithOffset(array, header->item_size * index);
 	--(header->count);
 	return out;
 }
 
-void _arrayClear(WpArray array, u64 item_size) {
+void arrayZero(WpArray array, u64 item_size) {
-	wpRuntimeAssert(array != NULL, "`array` should not be NULL");
+	wpDebugAssert(array != NULL, "`array` should not be NULL");
-	_array_validate(array, item_size);
+	arrayValidate(array, item_size);
 
-	WpArrayHeader *header = _array_header(array);
+	WpArrayHeader *header = arrayHeader(array);
-	header->count = 0;
+	memset(array, 0, header->capacity * header->item_size);
 }
 
-u64 _arrayCalcAllocSize(u64 capacity, u64 item_size) {
+void arrayClear(WpArray array, u64 item_size) {
+	wpDebugAssert(array != NULL, "`array` should not be NULL");
+	arrayValidate(array, item_size);
+
+	WpArrayHeader *header = arrayHeader(array);
+	header->count = 0;
+	memset(array, 0, header->capacity * header->item_size);
+}
+
+u64 arrayCalcAllocSize(u64 capacity, u64 item_size) {
 	return sizeof(WpArrayHeader) + item_size * capacity;
 }
 
-WpArray _arrayAllocCapacity(const WpAllocator *allocator, u64 capacity, WpArrayInitFlags flags,
+WpArray arrayAllocCapacity(const WpAllocator *allocator, u64 capacity, WpArrayInitFlags flags,
-                                   u64 item_size) {
+                           u64 item_size) {
-	wpRuntimeAssert(allocator != NULL, "`allocator` should not be NULL");
+	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
 
 	WpArray output = NULL;
 
-	u64 allocation_size = _arrayCalcAllocSize(capacity, item_size);
+	u64 allocation_size = arrayCalcAllocSize(capacity, item_size);
 	void *buffer        = wpMemAllocatorAlloc(allocator, allocation_size);
 	if (!buffer) {
 		goto RETURN_ARRAY_ALLOC;
 	}
 
-	output = _arrayFromPreallocatedBuffer(buffer, allocation_size, flags, item_size);
+	output = arrayFromPreallocatedBuffer(buffer, allocation_size, flags, item_size);
 
 RETURN_ARRAY_ALLOC:
 	return output;
 }
 
 
-WpArray _arrayFromPreallocatedBuffer(void *buffer, u64 buffer_size, WpArrayInitFlags flags,
+WpArray arrayFromPreallocatedBuffer(void *buffer, u64 buffer_size, WpArrayInitFlags flags,
-                                             u64 item_size) {
+                                    u64 item_size) {
-	wpRuntimeAssert(buffer != NULL, "`buffer` should not be NULL");
+	wpDebugAssert(buffer != NULL, "`buffer` should not be NULL");
 
 	i64 data_buffer_size = (i64)buffer_size - (i64)(sizeof(WpArrayHeader));
 	if (data_buffer_size <= 0) {
@@ -259,8 +289,22 @@ WpArray _arrayFromPreallocatedBuffer(void *buffer, u64 buffer_size, WpArrayInitF
 	return output;
 }
 
-wp_persist inline void _array_validate(const WpArray array, u64 item_size) {
+void arrayDealloc(const WpAllocator *allocator, WpArray *array, u64 item_size) {
-	WpArrayHeader *header = _array_header(array);
+	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
+
+	u64 capacity          = wpArrayCapacity(*array);
+	u64 allocation_size   = arrayCalcAllocSize(capacity, item_size);
+	void *header          = (void *)arrayHeader(*array);
+	wpMemAllocatorFree(allocator, &header, allocation_size);
+	*array = NULL;
+}
+
+wp_persist inline void arrayValidate(const WpArray array, u64 item_size) {
+	WpArrayHeader *header = arrayHeader(array);
 	wpRuntimeAssert(WP_ARRAY_MAGIC == header->magic, "`array` is not a valid wapp array");
 	wpRuntimeAssert(item_size == header->item_size, "Invalid item type provided");
 }
+
+wp_persist inline void *arrayGetItemWithOffset(const WpArray array, u64 offset) {
+	return wpMiscUtilsOffsetPointer(array, offset);
+}

src/base/array/array.h

@@ -12,10 +12,10 @@
 BEGIN_C_LINKAGE
 #endif // !WP_PLATFORM_CPP
 
-#define WP_ARRAY_MAGIC (u64)0x57415f415252
+#define WP_ARRAY_MAGIC wpU64Const(0x57415f415252)
 
-#define _calcArrayCount(TYPE, ...) wpMiscUtilsVaArgsCount(TYPE, __VA_ARGS__)
+#define calcArrayCount(TYPE, ...) wpMiscUtilsVaArgsCount(TYPE, __VA_ARGS__)
-#define _calcArrayCapacity(TYPE, ...) wpMiscUtilsU64RoundUpPow2(_calcArrayCount(TYPE, __VA_ARGS__) * 2)
+#define calcArrayCapacity(TYPE, ...) wpMiscUtilsU64RoundUpPow2(calcArrayCount(TYPE, __VA_ARGS__) * 2)
 
 typedef struct WpStr8 WpStr8;
 
@@ -41,24 +41,24 @@ typedef uptr   *WpUptrArray;
 typedef iptr   *WpIptrArray;
 typedef WpStr8 *WpStr8Array;
 
-typedef enum {
+typedef enum WpArrayInitFlags {
 	WP_ARRAY_INIT_NONE   = 0,
 	WP_ARRAY_INIT_FILLED = 1 << 1,
 } WpArrayInitFlags;
 
 #ifdef WP_PLATFORM_CPP
 #define wpArray(TYPE, ...) ([&]() {                                                                \
-	u64 capacity = _calcArrayCapacity(TYPE, __VA_ARGS__);                                            \
+	u64 capacity = calcArrayCapacity(TYPE, __VA_ARGS__);                                             \
 	                                                                                                 \
-	TYPE items[_calcArrayCapacity(TYPE, __VA_ARGS__)] = {__VA_ARGS__};                               \
+	TYPE items[calcArrayCapacity(TYPE, __VA_ARGS__)] = {__VA_ARGS__};                                \
 	                                                                                                 \
 	wp_persist u8 array[                                                                             \
-		sizeof(WpArrayHeader) + _calcArrayCapacity(TYPE, __VA_ARGS__) * sizeof(TYPE)                   \
+		sizeof(WpArrayHeader) + calcArrayCapacity(TYPE, __VA_ARGS__) * sizeof(TYPE)                    \
 	] = {0};                                                                                         \
 	WpArrayHeader *header = (WpArrayHeader *)array;                                                  \
 	header->magic       = WP_ARRAY_MAGIC;                                                            \
-	header->count       = _calcArrayCount(TYPE, __VA_ARGS__);                                        \
+	header->count       = calcArrayCount(TYPE, __VA_ARGS__);                                         \
-	header->capacity    = _calcArrayCapacity(TYPE, __VA_ARGS__);                                     \
+	header->capacity    = calcArrayCapacity(TYPE, __VA_ARGS__);                                      \
 	header->item_size   = sizeof(TYPE);                                                              \
 	                                                                                                 \
 	u8 *buf = (u8 *)(header + 1);                                                                    \
@@ -78,25 +78,25 @@ typedef enum {
 	return (TYPE *)(header + 1);                                                                     \
 }())
 #define wpArrayPop(TYPE, ARRAY) ([&]() {                                                           \
-	if (ARRAY == NULL || _arrayCount((WpArray)ARRAY) == 0) {                                         \
+	if (ARRAY == NULL || arrayCount((WpArray)ARRAY) == 0) {                                          \
 		TYPE result{};                                                                                 \
 		return result;                                                                                 \
 	}                                                                                                \
 	                                                                                                 \
-	return *((TYPE *)_arrayPop((WpArray)ARRAY, sizeof(TYPE)));                                       \
+	return *((TYPE *)arrayPop((WpArray)ARRAY, sizeof(TYPE)));                                        \
 }())
 #else
-#define _stackArray(TYPE, SIZE) struct {WpArrayHeader header;                                      \
+#define stackArray(TYPE, SIZE) struct {WpArrayHeader header;                                       \
-                                         TYPE items[SIZE];                                         \
+                                       TYPE items[SIZE];                                           \
-                                         wpMiscUtilsReservePadding(sizeof(WpArrayHeader) +         \
+                                       wpMiscUtilsReservePadding(sizeof(WpArrayHeader) +           \
-                                                                         sizeof(TYPE) * SIZE);}    
+                                                                 sizeof(TYPE) * SIZE);}
 #define wpArray(TYPE, ...)                                                                         \
 	((TYPE *)(                                                                                       \
-		(_stackArray(TYPE, _calcArrayCapacity(TYPE, __VA_ARGS__))){                                    \
+		(stackArray(TYPE, calcArrayCapacity(TYPE, __VA_ARGS__))){                                      \
 			.header = {                                                                                  \
 				.magic     = WP_ARRAY_MAGIC,                                                               \
-				.count     = _calcArrayCount(TYPE, __VA_ARGS__),                                           \
+				.count     = calcArrayCount(TYPE, __VA_ARGS__),                                            \
-				.capacity  = _calcArrayCapacity(TYPE, __VA_ARGS__),                                        \
+				.capacity  = calcArrayCapacity(TYPE, __VA_ARGS__),                                         \
 				.item_size = sizeof(TYPE),                                                                 \
 			},                                                                                           \
 			.items  = {__VA_ARGS__},                                                                     \
@@ -104,7 +104,7 @@ typedef enum {
 	))
 #define wpArrayWithCapacity(TYPE, CAPACITY, FLAGS)                                                 \
 	((TYPE *)(                                                                                       \
-		(_stackArray(TYPE, CAPACITY)){                                                                 \
+		(stackArray(TYPE, CAPACITY)){                                                                  \
 			.header = {                                                                                  \
 				.magic     = WP_ARRAY_MAGIC,                                                               \
 				.count     = (FLAGS & WP_ARRAY_INIT_FILLED) ? CAPACITY : 0,                                \
@@ -115,67 +115,71 @@ typedef enum {
 		}.items                                                                                        \
 	))
 #define wpArrayPop(TYPE, ARRAY)                                                                    \
-	(ARRAY == NULL || _arrayCount((WpArray)ARRAY) == 0 ?                                             \
+	(ARRAY == NULL || arrayCount((WpArray)ARRAY) == 0 ?                                              \
 		(TYPE){0} :                                                                                    \
-		*((TYPE *)_arrayPop((WpArray)ARRAY, sizeof(TYPE)))                                             \
+		*((TYPE *)arrayPop((WpArray)ARRAY, sizeof(TYPE)))                                              \
 	)
 #endif // !WP_PLATFORM_CPP
 
 #define wpArrayCount(ARRAY)                                                                        \
-	(_arrayCount((WpArray)ARRAY))
+	(arrayCount((WpArray)ARRAY))
 #define wpArrayCapacity(ARRAY)                                                                     \
-	(_arrayCapacity((WpArray)ARRAY))
+	(arrayCapacity((WpArray)ARRAY))
 #define wpArrayItemSize(ARRAY)                                                                     \
-	(_arrayItemSize((WpArray)ARRAY))
+	(arrayItemSize((WpArray)ARRAY))
 #define wpArraySetCount(ARRAY, COUNT)                                                              \
-	(_arraySetCount((WpArray)ARRAY, COUNT))
+	(arraySetCount((WpArray)ARRAY, COUNT))
 #define wpArrayGet(TYPE, ARRAY, INDEX)                                                             \
-	((TYPE *)_arrayGet((WpArray)ARRAY,                                                               \
+	((TYPE *)arrayGet((WpArray)ARRAY,                                                                \
-	                    INDEX,                                                                       \
+	                  INDEX,                                                                         \
-	                    sizeof(TYPE)))
+	                  sizeof(TYPE)))
 #define wpArraySet(TYPE, ARRAY, INDEX, VALUE_PTR)                                                  \
-	(_arraySet((WpArray)ARRAY,                                                                       \
+	(arraySet((WpArray)ARRAY,                                                                        \
-	            INDEX,                                                                               \
+	          INDEX,                                                                                 \
-	            (u8 *)VALUE_PTR,                                                                     \
+	          (u8 *)VALUE_PTR,                                                                       \
-	            sizeof(TYPE)))
+	          sizeof(TYPE)))
 #define wpArrayAppendCapped(TYPE, ARRAY, VALUE_PTR)                                                \
-	(_arrayAppendCapped((WpArray)ARRAY,                                                              \
+	(arrayAppendCapped((WpArray)ARRAY,                                                               \
-	                      (u8 *)VALUE_PTR,                                                           \
+	                   (u8 *)VALUE_PTR,                                                              \
-	                      sizeof(TYPE)))
+	                   sizeof(TYPE)))
 #define wpArrayExtendCapped(TYPE, DST_ARRAY, SRC_ARRAY)                                            \
-	(_arrayExtendCappend((WpArray)DST_ARRAY,                                                         \
+	(arrayExtendCappend((WpArray)DST_ARRAY,                                                          \
-	                      (WpArray)SRC_ARRAY,                                                        \
-	                      sizeof(TYPE)))
-#define wpArrayCopyCapped(TYPE, DST_ARRAY, SRC_ARRAY)                                              \
-	(_arrayCopyCapped((WpArray)DST_ARRAY,                                                            \
 	                    (WpArray)SRC_ARRAY,                                                          \
 	                    sizeof(TYPE)))
+#define wpArrayCopyCapped(TYPE, DST_ARRAY, SRC_ARRAY)                                              \
+	(arrayCopyCapped((WpArray)DST_ARRAY,                                                             \
+	                 (WpArray)SRC_ARRAY,                                                             \
+	                 sizeof(TYPE)))
 #define wpArrayAppendAlloc(TYPE, ALLOCATOR_PTR, ARRAY, VALUE_PTR, FLAGS)                           \
-	((TYPE *)_arrayAppendAlloc(ALLOCATOR_PTR,                                                        \
+	((TYPE *)arrayAppendAlloc(ALLOCATOR_PTR,                                                         \
-	                             (WpArray)ARRAY,                                                     \
+	                          (WpArray)ARRAY,                                                        \
-	                             (u8 *)VALUE_PTR,                                                    \
+	                          (u8 *)VALUE_PTR,                                                       \
-	                             FLAGS,                                                              \
+	                          FLAGS,                                                                 \
-	                             sizeof(TYPE)))
+	                          sizeof(TYPE)))
 #define wpArrayExtendAlloc(TYPE, ALLOCATOR_PTR, DST_ARRAY, SRC_ARRAY, FLAGS)                       \
-	((TYPE *)_arrayExtendAlloc(ALLOCATOR_PTR,                                                        \
+	((TYPE *)arrayExtendAlloc(ALLOCATOR_PTR,                                                         \
-	                             (WpArray)DST_ARRAY,                                                 \
+	                          (WpArray)DST_ARRAY,                                                    \
-	                             (WpArray)SRC_ARRAY,                                                 \
+	                          (WpArray)SRC_ARRAY,                                                    \
-	                             FLAGS,                                                              \
+	                          FLAGS,                                                                 \
-	                             sizeof(TYPE)))
+	                          sizeof(TYPE)))
 #define wpArrayCopyAlloc(TYPE, ALLOCATOR_PTR, DST_ARRAY, SRC_ARRAY, FLAGS)                         \
-	((TYPE *)_arrayCopyAlloc(ALLOCATOR_PTR,                                                          \
+	((TYPE *)arrayCopyAlloc(ALLOCATOR_PTR,                                                           \
-	                           (WpArray)DST_ARRAY,                                                   \
+	                        (WpArray)DST_ARRAY,                                                      \
-	                           (WpArray)SRC_ARRAY,                                                   \
+	                        (WpArray)SRC_ARRAY,                                                      \
-	                           FLAGS,                                                                \
+	                        FLAGS,                                                                   \
-	                           sizeof(TYPE)))
+	                        sizeof(TYPE)))
-#define wpArrayClear(TYPE, ARRAY)                                                                  \
+#define wpArrayRemoveSwapEnd(TYPE, ARRAY, INDEX) arrayRemoveSwapEnd(ARRAY, INDEX, sizeof(TYPE))
-	(_arrayClear((WpArray)ARRAY,                                                                     \
+#define wpArrayZero(TYPE, ARRAY) (arrayZero((WpArray)ARRAY, sizeof(TYPE)))
-	             sizeof(TYPE)))
+#define wpArrayClear(TYPE, ARRAY) (arrayClear((WpArray)ARRAY, sizeof(TYPE)))
-#define wpArrayCalcAllocSize(TYPE, CAPACITY) _arrayCalcAllocSize(CAPACITY, sizeof(TYPE))
+#define wpArrayCalcAllocSize(TYPE, CAPACITY) arrayCalcAllocSize(CAPACITY, sizeof(TYPE))
 #define wpArrayAllocCapacity(TYPE, ALLOCATOR_PTR, CAPACITY, FLAGS)                                 \
-	((TYPE *)_arrayAllocCapacity(ALLOCATOR_PTR, CAPACITY, FLAGS, sizeof(TYPE)))
+	((TYPE *)arrayAllocCapacity(ALLOCATOR_PTR, CAPACITY, FLAGS, sizeof(TYPE)))
 #define wpArrayFromPreallcatedBuffer(TYPE, BUFFER, BUFFER_SIZE)                                    \
-	((TYPE *)_array_from_preallcated_buffer(BUFFER, BUFFER_SIZE, sizeof(TYPE)))
+	((TYPE *)array_from_preallcated_buffer(BUFFER, BUFFER_SIZE, sizeof(TYPE)))
+// Only needed for allocators like malloc where each allocation has to be freed on its own.
+// No need to use it for allocators like Arena.
+#define wpArrayDealloc(TYPE, ALLOCATOR_PTR, ARRAY_DPTR)                                            \
+	(arrayDealloc(ALLOCATOR_PTR, (WpArray *)ARRAY_DPTR, sizeof(TYPE)))
 
 
 typedef struct WpArrayHeader WpArrayHeader;
@@ -186,28 +190,31 @@ struct WpArrayHeader {
   u64 item_size;
 };
 
-u64     _arrayCount(WpArray array);
+u64     arrayCount(WpArray array);
-u64     _arrayCapacity(WpArray array);
+u64     arrayCapacity(WpArray array);
-u64     _arrayItemSize(WpArray array);
+u64     arrayItemSize(WpArray array);
-void    _arraySetCount(WpArray array, u64 count);
+void    arraySetCount(WpArray array, u64 count);
-void   *_arrayGet(WpArray array, u64 index, u64 item_size);
+void   *arrayGet(WpArray array, u64 index, u64 item_size);
-void    _arraySet(WpArray array, u64 index, void *value, u64 item_size);
+void    arraySet(WpArray array, u64 index, void *value, u64 item_size);
-void    _arrayAppendCapped(WpArray array, void *value, u64 item_size);
+void    arrayAppendCapped(WpArray array, void *value, u64 item_size);
-void    _arrayExtendCappend(WpArray dst, const WpArray src, u64 item_size);
+void    arrayExtendCappend(WpArray dst, const WpArray src, u64 item_size);
-void    _arrayCopyCapped(WpArray dst, const WpArray src, u64 item_size);
+void    arrayCopyCapped(WpArray dst, const WpArray src, u64 item_size);
-WpArray _arrayAppendAlloc(const WpAllocator *allocator, WpArray array, void *value,
+WpArray arrayAppendAlloc(const WpAllocator *allocator, WpArray array, void *value,
-                          WpArrayInitFlags flags, u64 item_size);
+                         WpArrayInitFlags flags, u64 item_size);
-WpArray _arrayExtendAlloc(const WpAllocator *allocator, WpArray dst, const WpArray src,
+WpArray arrayExtendAlloc(const WpAllocator *allocator, WpArray dst, const WpArray src,
-                          WpArrayInitFlags flags, u64 item_size);
+                         WpArrayInitFlags flags, u64 item_size);
-WpArray _arrayCopyAlloc(const WpAllocator *allocator, WpArray dst, const WpArray src,
+WpArray arrayCopyAlloc(const WpAllocator *allocator, WpArray dst, const WpArray src,
-                        WpArrayInitFlags flags, u64 item_size);
+                       WpArrayInitFlags flags, u64 item_size);
-void   *_arrayPop(WpArray array, u64 item_size);
+void    arrayRemoveSwapEnd(WpArray array, u64 index, u64 item_size);
-void    _arrayClear(WpArray array, u64 item_size);
+void   *arrayPop(WpArray array, u64 item_size);
-u64     _arrayCalcAllocSize(u64 capacity, u64 item_size);
+void    arrayZero(WpArray array, u64 item_size);
-WpArray _arrayAllocCapacity(const WpAllocator *allocator, u64 capacity, WpArrayInitFlags flags,
+void    arrayClear(WpArray array, u64 item_size);
-                            u64 item_size);
+u64     arrayCalcAllocSize(u64 capacity, u64 item_size);
-WpArray _arrayFromPreallocatedBuffer(void *buffer, u64 buffer_size, WpArrayInitFlags flags,
+WpArray arrayAllocCapacity(const WpAllocator *allocator, u64 capacity, WpArrayInitFlags flags,
-                                     u64 item_size);
+                           u64 item_size);
+WpArray arrayFromPreallocatedBuffer(void *buffer, u64 buffer_size, WpArrayInitFlags flags,
+                                    u64 item_size);
+void    arrayDealloc(const WpAllocator *allocator, WpArray *array, u64 item_size);
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

src/base/dbl_list/dbl_list.c

@@ -7,11 +7,11 @@
 #include "../../common/platform/platform.h"
 #include <stddef.h>
 
-wp_intern WpDblList _node_to_list(WpDblNode *node, u64 item_size);
+wp_intern WpDblList nodeToList(WpDblNode *node, u64 item_size);
-wp_intern inline void _dblListValidate(const WpDblList *list, u64 item_size);
+wp_intern inline void dblListValidate(const WpDblList *list, u64 item_size);
-wp_intern inline void _dblListNodeValidate(const WpDblList *list, const WpDblNode *node, u64 item_size);
+wp_intern inline void dblListNodeValidate(const WpDblList *list, const WpDblNode *node, u64 item_size);
 
-WpDblList *_dblListAlloc(const WpAllocator *allocator, u64 item_size) {
+WpDblList *dblListAlloc(const WpAllocator *allocator, u64 item_size) {
 	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
 
 	WpDblList *list = wpMemAllocatorAlloc(allocator, sizeof(WpDblList));
@@ -25,7 +25,7 @@ DBL_LIST_ALLOC_RETURN:
 	return list;
 }
 
-WpDblNode *_dblListNodeAlloc(const WpAllocator *allocator, void *item, u64 item_size) {
+WpDblNode *dblListNodeAlloc(const WpAllocator *allocator, void *item, u64 item_size) {
 	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
 
 	WpDblNode *node = wpMemAllocatorAlloc(allocator, sizeof(WpDblNode));
@@ -40,9 +40,9 @@ DBL_LIST_NODE_ALLOC_RETURN:
 	return node;
 }
 
-WpDblNode *_dblListGet(const WpDblList *list, u64 index, u64 item_size) {
+WpDblNode *dblListGet(const WpDblList *list, u64 index, u64 item_size) {
 	wpDebugAssert(list != NULL, "`list` should not be NULL");
-	_dblListValidate(list, item_size);
+	dblListValidate(list, item_size);
 	wpRuntimeAssert(index < list->node_count, "`index` is out of bounds");
 
 	WpDblNode *output  = NULL;
@@ -56,12 +56,12 @@ WpDblNode *_dblListGet(const WpDblList *list, u64 index, u64 item_size) {
 	return output;
 }
 
-void _dblListPushFront(WpDblList *list, WpDblNode *node, u64 item_size) {
+void dblListPushFront(WpDblList *list, WpDblNode *node, u64 item_size) {
 	wpDebugAssert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
-	_dblListValidate(list, item_size);
+	dblListValidate(list, item_size);
-	_dblListNodeValidate(list, node, item_size);
+	dblListNodeValidate(list, node, item_size);
 
-	WpDblList node_list = _node_to_list(node, item_size);
+	WpDblList node_list = nodeToList(node, item_size);
 
 	if (list->node_count == 0) {
 		*list = node_list;
@@ -79,12 +79,12 @@ void _dblListPushFront(WpDblList *list, WpDblNode *node, u64 item_size) {
 	node_list.last->header.next = first;
 }
 
-void _dblListPushBack(WpDblList *list, WpDblNode *node, u64 item_size) {
+void dblListPushBack(WpDblList *list, WpDblNode *node, u64 item_size) {
 	wpDebugAssert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
-	_dblListValidate(list, item_size);
+	dblListValidate(list, item_size);
-	_dblListNodeValidate(list, node, item_size);
+	dblListNodeValidate(list, node, item_size);
 
-	WpDblList node_list = _node_to_list(node, item_size);
+	WpDblList node_list = nodeToList(node, item_size);
 
 	if (list->node_count == 0) {
 		*list = node_list;
@@ -102,25 +102,25 @@ void _dblListPushBack(WpDblList *list, WpDblNode *node, u64 item_size) {
 	node_list.first->header.prev = last;
 }
 
-void _dblListInsert(WpDblList *list, WpDblNode *node, u64 index, u64 item_size) {
+void dblListInsert(WpDblList *list, WpDblNode *node, u64 index, u64 item_size) {
 	wpDebugAssert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
-	_dblListValidate(list, item_size);
+	dblListValidate(list, item_size);
-	_dblListNodeValidate(list, node, item_size);
+	dblListNodeValidate(list, node, item_size);
 
 	if (index == 0) {
-		_dblListPushFront(list, node, item_size);
+		dblListPushFront(list, node, item_size);
 		return;
 	} else if (index == list->node_count) {
-		_dblListPushBack(list, node, item_size);
+		dblListPushBack(list, node, item_size);
 		return;
 	}
 
-	WpDblNode *dst_node = _dblListGet(list, index, item_size);
+	WpDblNode *dst_node = dblListGet(list, index, item_size);
 	if (!dst_node) {
 		return;
 	}
 
-	WpDblList node_list = _node_to_list(node, item_size);
+	WpDblList node_list = nodeToList(node, item_size);
 
 	list->node_count += node_list.node_count;
 
@@ -133,9 +133,9 @@ void _dblListInsert(WpDblList *list, WpDblNode *node, u64 index, u64 item_size)
 	node_list.last->header.next  = dst_node;
 }
 
-WpDblNode *_dblListPopFront(WpDblList *list, u64 item_size) {
+WpDblNode *dblListPopFront(WpDblList *list, u64 item_size) {
 	wpDebugAssert(list != NULL, "`list` should not be NULL");
-	_dblListValidate(list, item_size);
+	dblListValidate(list, item_size);
 
 	WpDblNode *output = NULL;
 
@@ -159,9 +159,9 @@ RETURN_LIST_POP_FRONT:
 	return output;
 }
 
-WpDblNode *_dblListPopBack(WpDblList *list, u64 item_size) {
+WpDblNode *dblListPopBack(WpDblList *list, u64 item_size) {
 	wpDebugAssert(list != NULL, "`list` should not be NULL");
-	_dblListValidate(list, item_size);
+	dblListValidate(list, item_size);
 
 	WpDblNode *output = NULL;
 
@@ -185,21 +185,21 @@ RETURN_LIST_POP_BACK:
 	return output;
 }
 
-WpDblNode *_dblListRemove(WpDblList *list, u64 index, u64 item_size) {
+WpDblNode *dblListRemove(WpDblList *list, u64 index, u64 item_size) {
 	wpDebugAssert(list != NULL, "`list` should not be NULL");
-	_dblListValidate(list, item_size);
+	dblListValidate(list, item_size);
 
 	WpDblNode *output = NULL;
 
 	if (index == 0) {
-		output = _dblListPopFront(list, item_size);
+		output = dblListPopFront(list, item_size);
 		goto RETURN_LIST_REMOVE;
 	} else if (index == list->node_count) {
-		output = _dblListPopBack(list, item_size);
+		output = dblListPopBack(list, item_size);
 		goto RETURN_LIST_REMOVE;
 	}
 
-	output = _dblListGet(list, index, item_size);
+	output = dblListGet(list, index, item_size);
 	if (!output) {
 		goto RETURN_LIST_REMOVE;
 	}
@@ -215,17 +215,17 @@ RETURN_LIST_REMOVE:
 	return output;
 }
 
-void _dblListEmpty(WpDblList *list, u64 item_size) {
+void dblListEmpty(WpDblList *list, u64 item_size) {
 	wpDebugAssert(list != NULL, "`list` should not be NULL");
-	_dblListValidate(list, item_size);
+	dblListValidate(list, item_size);
 
 	u64 count = list->node_count;
 	for (u64 i = 0; i < count; ++i) {
-		_dblListPopBack(list, item_size);
+		dblListPopBack(list, item_size);
 	}
 }
 
-wp_intern WpDblList _node_to_list(WpDblNode *node, u64 item_size) {
+wp_intern WpDblList nodeToList(WpDblNode *node, u64 item_size) {
 	WpDblList output = {
 		.magic      = WP_DBL_LIST_MAGIC,
 		.first      = node,
@@ -247,12 +247,12 @@ wp_intern WpDblList _node_to_list(WpDblNode *node, u64 item_size) {
 	return output;
 }
 
-wp_intern inline void _dblListValidate(const WpDblList *list, u64 item_size) {
+wp_intern inline void dblListValidate(const WpDblList *list, u64 item_size) {
 	wpRuntimeAssert(list->magic == WP_DBL_LIST_MAGIC, "`list` isn't a valid wp list type");
 	wpRuntimeAssert(list->item_size == item_size, "Invalid item provided");
 }
 
-wp_intern inline void _dblListNodeValidate(const WpDblList *list, const WpDblNode *node, u64 item_size) {
+wp_intern inline void dblListNodeValidate(const WpDblList *list, const WpDblNode *node, u64 item_size) {
 	wpRuntimeAssert(node->header.magic == WP_DBL_NODE_MAGIC, "`node` isn't a valid wp node type");
 	wpRuntimeAssert(list->item_size == node->header.item_size, "Mismatched `list` and `node` types");
 	wpRuntimeAssert(node->header.item_size == item_size, "Invalid item provided");

src/base/dbl_list/dbl_list.h

@@ -11,12 +11,12 @@
 BEGIN_C_LINKAGE
 #endif // !WP_PLATFORM_CPP
 
-#define WP_DBL_LIST_MAGIC (u64)0x57415f444c5354
+#define WP_DBL_LIST_MAGIC wpU64Const(0x57415f444c5354)
-#define WP_DBL_NODE_MAGIC (u64)0x57415f444e44
+#define WP_DBL_NODE_MAGIC wpU64Const(0x57415f444e44)
 
 typedef struct WpDblNode WpDblNode;
 
-typedef struct {
+typedef struct WpDblNodeHeader {
 	u64 magic;
 	u64 item_size;
 	WpDblNode *prev;
@@ -28,7 +28,7 @@ struct WpDblNode {
 	void *item;
 };
 
-typedef struct {
+typedef struct WpDblList {
 	u64 magic;
 	u64 node_count;
 	u64 item_size;
@@ -81,7 +81,7 @@ typedef WpDblNode WpStr8Node;
 #ifdef WP_PLATFORM_CPP
 #define wpDblList(TYPE)                                                                            \
 	WpDblList{WP_DBL_LIST_MAGIC, 0, sizeof(TYPE), nullptr, nullptr}
-#define _dblListNode(TYPE, ITEM_PTR) ([&]() {                                                      \
+#define dblListNode(TYPE, ITEM_PTR) ([&]() {                                                       \
 	wp_persist WpDblNode node = {                                                                    \
 		WpDblNodeHeader{WP_DBL_NODE_MAGIC, sizeof(TYPE), nullptr, nullptr},                            \
 		ITEM_PTR,                                                                                      \
@@ -93,89 +93,89 @@ typedef WpDblNode WpStr8Node;
 #define wpDblList(TYPE) (                                                                          \
 	(WpDblList){.magic = WP_DBL_LIST_MAGIC, .item_size = sizeof(TYPE)}                               \
 )
-#define _dblListNode(TYPE, ITEM_PTR) (                                                             \
+#define dblListNode(TYPE, ITEM_PTR) (                                                              \
 	&((WpDblNode){.header = {.magic = WP_DBL_NODE_MAGIC, .item_size = sizeof(TYPE)},                 \
 	                .item = ITEM_PTR})                                                               \
 )
 #endif // !WP_PLATFORM_CPP
 
 #define wpDblListAlloc(TYPE, ALLOCATOR)                                                            \
-	(_dblListAlloc(ALLOCATOR, sizeof(TYPE)))
+	(dblListAlloc(ALLOCATOR, sizeof(TYPE)))
 #define wpDblListGet(TYPE, LIST_PTR, ITEM_INDEX)                                                   \
-	((TYPE *)(_dblListGet(LIST_PTR, ITEM_INDEX, sizeof(TYPE))->item))
+	((TYPE *)(dblListGet(LIST_PTR, ITEM_INDEX, sizeof(TYPE))->item))
-#define wpDblListGet_node(TYPE, LIST_PTR, ITEM_INDEX)                                              \
+#define wpDblListGetNode(TYPE, LIST_PTR, ITEM_INDEX)                                               \
-	(_dblListGet(LIST_PTR, ITEM_INDEX, sizeof(TYPE)))
+	(dblListGet(LIST_PTR, ITEM_INDEX, sizeof(TYPE)))
-#define wpDblListGet_node_item(TYPE, NODE_PTR)                                                     \
+#define wpDblListGetNodeItem(TYPE, NODE_PTR)                                                       \
 	((TYPE *)(                                                                                       \
 		(NODE_PTR == NULL) ?                                                                           \
 		NULL :                                                                                         \
 		(NODE_PTR)->item                                                                               \
 	))
-#define wpDblListPush_front(TYPE, LIST_PTR, ITEM_PTR)                                              \
+#define wpDblListPushFront(TYPE, LIST_PTR, ITEM_PTR)                                               \
-	(_dblListPushFront(LIST_PTR, _dblListNode(TYPE, ITEM_PTR), sizeof(TYPE)))
+	(dblListPushFront(LIST_PTR, dblListNode(TYPE, ITEM_PTR), sizeof(TYPE)))
-#define wpDblListPush_back(TYPE, LIST_PTR, ITEM_PTR)                                               \
+#define wpDblListPushBack(TYPE, LIST_PTR, ITEM_PTR)                                                \
-	(_dblListPushBack(LIST_PTR, _dblListNode(TYPE, ITEM_PTR), sizeof(TYPE)))
+	(dblListPushBack(LIST_PTR, dblListNode(TYPE, ITEM_PTR), sizeof(TYPE)))
 #define wpDblListInsert(TYPE, LIST_PTR, ITEM_PTR, ITEM_INDEX)                                      \
-	(_dblListInsert(LIST_PTR, _dblListNode(TYPE, ITEM_PTR),                                          \
+	(dblListInsert(LIST_PTR, dblListNode(TYPE, ITEM_PTR),                                            \
 	                  ITEM_INDEX, sizeof(TYPE)))
-#define wpDblListPush_front_alloc(TYPE, ALLOCATOR, LIST_PTR, ITEM_PTR)                             \
+#define wpDblListPushFrontAlloc(TYPE, ALLOCATOR, LIST_PTR, ITEM_PTR)                               \
-	(_dblListPushFront(LIST_PTR, _dblListNodeAlloc(ALLOCATOR, ITEM_PTR, sizeof(TYPE)),               \
+	(dblListPushFront(LIST_PTR, dblListNodeAlloc(ALLOCATOR, ITEM_PTR, sizeof(TYPE)),                 \
 	                      sizeof(TYPE)))
-#define wpDblListPush_back_alloc(TYPE, ALLOCATOR, LIST_PTR, ITEM_PTR)                              \
+#define wpDblListPushBackAlloc(TYPE, ALLOCATOR, LIST_PTR, ITEM_PTR)                                \
-	(_dblListPushBack(LIST_PTR, _dblListNodeAlloc(ALLOCATOR, ITEM_PTR, sizeof(TYPE)),                \
+	(dblListPushBack(LIST_PTR, dblListNodeAlloc(ALLOCATOR, ITEM_PTR, sizeof(TYPE)),                  \
 	                     sizeof(TYPE)))
-#define wpDblListInsert_alloc(TYPE, ALLOCATOR, LIST_PTR, ITEM_PTR, ITEM_INDEX)                     \
+#define wpDblListInsertAlloc(TYPE, ALLOCATOR, LIST_PTR, ITEM_PTR, ITEM_INDEX)                      \
-	(_dblListInsert(LIST_PTR, _dblListNodeAlloc(ALLOCATOR, ITEM_PTR, sizeof(TYPE)),                  \
+	(dblListInsert(LIST_PTR, dblListNodeAlloc(ALLOCATOR, ITEM_PTR, sizeof(TYPE)),                    \
 	                  ITEM_INDEX, sizeof(TYPE)))
-#define wpDblListPop_front(TYPE, LIST_PTR)                                                         \
+#define wpDblListPopFront(TYPE, LIST_PTR)                                                          \
 	((TYPE *)(                                                                                       \
 		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
 		NULL :                                                                                         \
-		_dblListPopFront(LIST_PTR, sizeof(TYPE))->item                                                 \
+		dblListPopFront(LIST_PTR, sizeof(TYPE))->item                                                  \
 	))
-#define wpDblListPop_back(TYPE, LIST_PTR)                                                          \
+#define wpDblListPopBack(TYPE, LIST_PTR)                                                           \
 	((TYPE *)(                                                                                       \
 		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
 		NULL :                                                                                         \
-		_dblListPopBack(LIST_PTR, sizeof(TYPE))->item                                                  \
+		dblListPopBack(LIST_PTR, sizeof(TYPE))->item                                                   \
 	))
 #define wpDblListRemove(TYPE, LIST_PTR, ITEM_INDEX)                                                \
 	((TYPE *)(                                                                                       \
 		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0 || ITEM_INDEX >= (LIST_PTR)->node_count) ?    \
 		NULL :                                                                                         \
-		_dblListRemove(LIST_PTR, ITEM_INDEX, sizeof(TYPE))->item                                       \
+		dblListRemove(LIST_PTR, ITEM_INDEX, sizeof(TYPE))->item                                        \
 	))
-#define wpDblListPop_front_node(TYPE, LIST_PTR)                                                    \
+#define wpDblListPopFrontNode(TYPE, LIST_PTR)                                                      \
 	(                                                                                                \
 		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
 		NULL :                                                                                         \
-		_dblListPopFront(LIST_PTR, sizeof(TYPE))                                                       \
+		dblListPopFront(LIST_PTR, sizeof(TYPE))                                                        \
 	)
-#define wpDblListPop_back_node(TYPE, LIST_PTR)                                                     \
+#define wpDblListPopBackNode(TYPE, LIST_PTR)                                                       \
 	(                                                                                                \
 		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0) ?                                            \
 		NULL :                                                                                         \
-		_dblListPopBack(LIST_PTR, sizeof(TYPE))                                                        \
+		dblListPopBack(LIST_PTR, sizeof(TYPE))                                                         \
 	)
-#define wpDblListRemove_node(TYPE, LIST_PTR, ITEM_INDEX)                                           \
+#define wpDblListRemoveNode(TYPE, LIST_PTR, ITEM_INDEX)                                            \
 	(                                                                                                \
 		(LIST_PTR == NULL || (LIST_PTR)->node_count == 0 || ITEM_INDEX >= (LIST_PTR)->node_count) ?    \
 		NULL :                                                                                         \
-		_dblListRemove(LIST_PTR, ITEM_INDEX, sizeof(TYPE))                                             \
+		dblListRemove(LIST_PTR, ITEM_INDEX, sizeof(TYPE))                                              \
 	)
 #define wpDblListEmpty(TYPE, LIST_PTR)                                                             \
-	(_dblListEmpty(LIST_PTR, sizeof(TYPE)))
+	(dblListEmpty(LIST_PTR, sizeof(TYPE)))
 
-WpDblList *_dblListAlloc(const WpAllocator *allocator, u64 item_size);
+WpDblList *dblListAlloc(const WpAllocator *allocator, u64 item_size);
-WpDblNode *_dblListNodeAlloc(const WpAllocator *allocator, void *item, u64 item_size);
+WpDblNode *dblListNodeAlloc(const WpAllocator *allocator, void *item, u64 item_size);
-WpDblNode *_dblListGet(const WpDblList *list, u64 index, u64 item_size);
+WpDblNode *dblListGet(const WpDblList *list, u64 index, u64 item_size);
-void         _dblListPushFront(WpDblList *list, WpDblNode *node, u64 item_size);
+void       dblListPushFront(WpDblList *list, WpDblNode *node, u64 item_size);
-void         _dblListPushBack(WpDblList *list, WpDblNode *node, u64 item_size);
+void       dblListPushBack(WpDblList *list, WpDblNode *node, u64 item_size);
-void         _dblListInsert(WpDblList *list, WpDblNode *node, u64 index, u64 item_size);
+void       dblListInsert(WpDblList *list, WpDblNode *node, u64 index, u64 item_size);
-WpDblNode *_dblListPopFront(WpDblList *list, u64 item_size);
+WpDblNode *dblListPopFront(WpDblList *list, u64 item_size);
-WpDblNode *_dblListPopBack(WpDblList *list, u64 item_size);
+WpDblNode *dblListPopBack(WpDblList *list, u64 item_size);
-WpDblNode *_dblListRemove(WpDblList *list, u64 index, u64 item_size);
+WpDblNode *dblListRemove(WpDblList *list, u64 index, u64 item_size);
-void         _dblListEmpty(WpDblList *list, u64 item_size);
+void       dblListEmpty(WpDblList *list, u64 item_size);
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

src/base/hash/hasher/hasher.c

@@ -0,0 +1,25 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "hasher.h"
+#include "../../../common/assert/assert.h"
+
+WpHasher wpCustomHasher(WpHashFunc func, void *ctx) {
+	return (WpHasher){
+		.func = func,
+		.ctx  = (WpHasherCtx){
+			.type = WP_HASHER_CTX_USER_DEFINED,
+			.user = ctx,
+		}
+	};
+}
+
+WpU128 wpHasherGetHash128(const WpHasher *hasher, WpU8Stream *stream) {
+	wpDebugAssert(hasher != NULL && stream != NULL, "hasher and stream shouldn't be NULL");
+	return hasher->func(stream, hasher->ctx);
+}
+
+u64 wpHasherGetHash64(const WpHasher *hasher, WpU8Stream *stream) {
+	wpDebugAssert(hasher != NULL && stream != NULL, "hasher and stream shouldn't be NULL");
+	WpU128 result = hasher->func(stream, hasher->ctx);
+	return result.value[0] ^ result.value[1];
+}

src/base/hash/hasher/hasher.h

@@ -0,0 +1,55 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef HASHER_H
+#define HASHER_H
+
+#include "../../stream/stream.h"
+#include "../../../common/aliases/aliases.h"
+
+#ifdef WP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
+
+typedef struct WpU128 {
+	u64 value[2];
+} WpU128;
+
+typedef enum WpHasherCtxType {
+	WP_HASHER_CTX_MURMUR3,
+	WP_HASHER_CTX_SIPHASH,
+	WP_HASHER_CTX_USER_DEFINED,
+
+	COUNT_HASHER_CTX,
+} WpHasherCtxType;
+
+typedef struct WpSiphashCtx {
+	WpU128 key;
+	u64    compression;
+	u64    finalisation;
+} WpSiphashCtx;
+
+typedef struct WpHasherCtx {
+	WpHasherCtxType type;
+	union {
+		WpSiphashCtx siphash;
+		void        *user;
+		u32          murmur3;
+	};
+} WpHasherCtx;
+
+typedef WpU128 (*WpHashFunc)(WpU8Stream *stream, WpHasherCtx ctx);
+
+typedef struct WpHasher {
+	WpHashFunc  func;
+	WpHasherCtx ctx;
+} WpHasher;
+
+WpHasher wpCustomHasher(WpHashFunc func, void *ctx);
+WpU128   wpHasherGetHash128(const WpHasher *hasher, WpU8Stream *stream);
+u64      wpHasherGetHash64(const WpHasher *hasher, WpU8Stream *stream);
+
+#ifdef WP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
+
+#endif // !HASHER_H

src/base/hash/hasher/murmur3.c

@@ -0,0 +1,126 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "murmur3.h"
+#include "hasher.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/assert/assert.h"
+#include "../../../common/misc/misc_utils.h"
+#include "../../../prng/xorshift/xorshift.h"
+
+wp_intern inline void validateMur3HasherCtx(const WpHasherCtx *ctx);
+wp_intern inline u64 fmix64(u64 k);
+
+WpHasher wpX64Mur3Hasher(void) {
+	WpXor256State state = wpPrngXorshiftInit();
+	u32 seed            = (u32)wpPrngXorshift256(&state);
+	return wpX64Mur3HasherWithSeed(seed);
+}
+
+WpHasher wpX64Mur3HasherWithSeed(u32 seed) {
+	return (WpHasher){
+		.func = wpX64Mur3GetHash128,
+		.ctx  = (WpHasherCtx){
+			.type    = WP_HASHER_CTX_MURMUR3,
+			.murmur3 = seed,
+		},
+	};
+}
+
+WpU128 wpX64Mur3GetHash128(WpU8Stream *bytes, WpHasherCtx ctx) {
+	validateMur3HasherCtx(&ctx);
+
+	const i32 nblocks = (bytes->count * bytes->item_size) / 16;
+
+	u64 h1 = ctx.murmur3;
+	u64 h2 = ctx.murmur3;
+
+	const u64 c1 = wpU64Const(0x87c37b91114253d5);
+	const u64 c2 = wpU64Const(0x4cf5ad432745937f);
+
+	//----------
+	// body
+
+	for(int i = 0; i < nblocks; ++i) {
+		u64 k1 = *((u64 *)wpStreamConsumeCount(u8, bytes, sizeof(u64)));
+		u64 k2 = *((u64 *)wpStreamConsumeCount(u8, bytes, sizeof(u64)));
+
+		k1 *= c1;
+		k1  = wpMiscUtilsRotl64(k1, 31);
+		k1 *= c2;
+		h1 ^= k1;
+
+		h1  = wpMiscUtilsRotl64(h1, 27);
+		h1 += h2;
+		h1  = h1 * 5 +0x52dce729;
+
+		k2 *= c2;
+		k2  = wpMiscUtilsRotl64(k2, 33);
+		k2 *= c1;
+		h2 ^= k2;
+
+		h2  = wpMiscUtilsRotl64(h2, 31);
+		h2 += h1;
+		h2  = h2*5+0x38495ab5;
+	}
+
+	//----------
+	// tail
+
+	const u8 *tail = wpStreamConsumeCount(u8, bytes, bytes->count - bytes->position);
+
+	u64 k1 = 0;
+	u64 k2 = 0;
+
+	u64 len = bytes->count * bytes->item_size;
+
+	switch(len & 15) {
+		case 15: k2 ^= ((u64)tail[14]) << 48;
+		case 14: k2 ^= ((u64)tail[13]) << 40;
+		case 13: k2 ^= ((u64)tail[12]) << 32;
+		case 12: k2 ^= ((u64)tail[11]) << 24;
+		case 11: k2 ^= ((u64)tail[10]) << 16;
+		case 10: k2 ^= ((u64)tail[ 9]) << 8;
+		case  9: k2 ^= ((u64)tail[ 8]) << 0;
+		         k2 *= c2; k2  = wpMiscUtilsRotl64(k2,33); k2 *= c1; h2 ^= k2;
+
+		case  8: k1 ^= ((u64)tail[ 7]) << 56;
+		case  7: k1 ^= ((u64)tail[ 6]) << 48;
+		case  6: k1 ^= ((u64)tail[ 5]) << 40;
+		case  5: k1 ^= ((u64)tail[ 4]) << 32;
+		case  4: k1 ^= ((u64)tail[ 3]) << 24;
+		case  3: k1 ^= ((u64)tail[ 2]) << 16;
+		case  2: k1 ^= ((u64)tail[ 1]) << 8;
+		case  1: k1 ^= ((u64)tail[ 0]) << 0;
+		         k1 *= c1; k1  = wpMiscUtilsRotl64(k1,31); k1 *= c2; h1 ^= k1;
+	};
+
+	//----------
+	// finalization
+
+	h1 ^= len; h2 ^= len;
+
+	h1 += h2;
+	h2 += h1;
+
+	h1 = fmix64(h1);
+	h2 = fmix64(h2);
+
+	h1 += h2;
+	h2 += h1;
+
+	return (WpU128){ .value = { [0] = h1, [1] = h2 } };
+}
+
+wp_intern inline void validateMur3HasherCtx(const WpHasherCtx *ctx) {
+	wpRuntimeAssert(ctx->type == WP_HASHER_CTX_MURMUR3, "Invalid Murmur3 hash context");
+}
+
+wp_intern inline u64 fmix64(u64 k) {
+	k ^= k >> 33;
+	k *= wpU64Const(0xff51afd7ed558ccd);
+	k ^= k >> 33;
+	k *= wpU64Const(0xc4ceb9fe1a85ec53);
+	k ^= k >> 33;
+
+	return k;
+}

src/base/hash/hasher/murmur3.h

@@ -0,0 +1,28 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+/**
+ * An implementation of the x64 128-bit variant of the MurmurHash3 algorithm
+ * based on https://github.com/aappleby/smhasher/blob/master/src/MurmurHash3.cpp
+ */
+
+#ifndef MURMUR3_H
+#define MURMUR3_H
+
+#include "hasher.h"
+#include "../../stream/stream.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/platform/platform.h"
+
+#ifdef WP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
+
+WpHasher wpX64Mur3Hasher(void);
+WpHasher wpX64Mur3HasherWithSeed(u32 seed);
+WpU128   wpX64Mur3GetHash128(WpU8Stream *bytes, WpHasherCtx ctx);
+
+#ifdef WP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
+
+#endif // !MURMUR3_H

src/base/hash/hasher/siphash.c

@@ -0,0 +1,190 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "siphash.h"
+#include "hasher.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/assert/assert.h"
+#include "../../../common/misc/misc_utils.h"
+#include "../../../prng/xorshift/xorshift.h"
+
+wp_intern inline void siphash(WpStream *bytes, const WpHasherCtx *ctx, u8 *out, u64 outlen);
+wp_intern inline void validateSipHasherCtx(const WpHasherCtx *ctx);
+wp_intern inline b8 checkRounds(const WpHasherCtx *ctx);
+
+#define _u32To8LE(p, v)                                                                            \
+	(p)[0] = (u8)((v));                                                                              \
+	(p)[1] = (u8)((v) >> 8);                                                                         \
+	(p)[2] = (u8)((v) >> 16);                                                                        \
+	(p)[3] = (u8)((v) >> 24);
+
+#define _u64To8LE(p, v)                                                                            \
+	_u32To8LE((p), (u32)((v)));                                                                      \
+	_u32To8LE((p) + 4, (u32)((v) >> 32));
+
+#define _u8To64LE(p)                                                                               \
+	(((u64)((p)[0])) | ((u64)((p)[1]) << 8) |                                                        \
+	 ((u64)((p)[2]) << 16) | ((u64)((p)[3]) << 24) |                                                 \
+	 ((u64)((p)[4]) << 32) | ((u64)((p)[5]) << 40) |                                                 \
+	 ((u64)((p)[6]) << 48) | ((u64)((p)[7]) << 56))
+
+#define _sipRound                                                                                  \
+	do {                                                                                             \
+		v0 += v1;                                                                                      \
+		v1 = wpMiscUtilsRotl64(v1, 13);                                                                \
+		v1 ^= v0;                                                                                      \
+		v0 = wpMiscUtilsRotl64(v0, 32);                                                                \
+		v2 += v3;                                                                                      \
+		v3 = wpMiscUtilsRotl64(v3, 16);                                                                \
+		v3 ^= v2;                                                                                      \
+		v0 += v3;                                                                                      \
+		v3 = wpMiscUtilsRotl64(v3, 21);                                                                \
+		v3 ^= v0;                                                                                      \
+		v2 += v1;                                                                                      \
+		v1 = wpMiscUtilsRotl64(v1, 17);                                                                \
+		v1 ^= v2;                                                                                      \
+		v2 = wpMiscUtilsRotl64(v2, 32);                                                                \
+	} while (0)
+
+WpHasher wpSip24Hasher(void) {
+	WpXor256State state = wpPrngXorshiftInit();
+	WpU128 key          = { .value = { wpPrngXorshift256(&state), wpPrngXorshift256(&state) } };
+	return wpSip24HasherWithKey(key);
+}
+
+WpHasher wpSip48Hasher(void) {
+	WpXor256State state = wpPrngXorshiftInit();
+	WpU128 key          = { .value = { wpPrngXorshift256(&state), wpPrngXorshift256(&state) } };
+	return wpSip48HasherWithKey(key);
+}
+
+WpHasher wpSip24HasherWithKey(WpU128 key) {
+	return (WpHasher){
+		.func = wpSipGetHash128,
+		.ctx  = (WpHasherCtx){
+			.type    = WP_HASHER_CTX_SIPHASH,
+			.siphash = (WpSiphashCtx){ .key = key, .compression = 2, .finalisation = 4 },
+		},
+	};
+}
+
+WpHasher wpSip48HasherWithKey(WpU128 key) {
+	return (WpHasher){
+		.func = wpSipGetHash128,
+		.ctx  = (WpHasherCtx){
+			.type    = WP_HASHER_CTX_SIPHASH,
+			.siphash = (WpSiphashCtx){ .key = key, .compression = 4, .finalisation = 8 },
+		},
+	};
+}
+
+WpU128 wpSipGetHash128(WpStream *bytes, WpHasherCtx ctx) {
+	validateSipHasherCtx(&ctx);
+	WpU128 output = {0};
+	siphash(bytes, &ctx, (u8 *)&output.value, sizeof(u64) * 2);
+	return output;
+}
+
+/**
+ * Implementation of the 128-variant of the siphash algorithm
+ */
+wp_intern inline void siphash(WpStream *bytes, const WpHasherCtx *ctx, u8 *out, u64 outlen) {
+	const u8 *kk = (const u8 *)&ctx->siphash.key;
+	u64 inlen    = bytes->count * bytes->item_size;
+
+	wpRuntimeAssert(outlen == 16, "outlen should be 16");
+
+	u64 v0 = wpU64Const(0x736f6d6570736575);
+	u64 v1 = wpU64Const(0x646f72616e646f6d);
+	u64 v2 = wpU64Const(0x6c7967656e657261);
+	u64 v3 = wpU64Const(0x7465646279746573);
+	u64 k0 = _u8To64LE(kk);
+	u64 k1 = _u8To64LE(kk + 8);
+	u64 m;
+	u64 i;
+	const i32 left = inlen & 7;
+	u64 b = ((u64)inlen) << 56;
+	v3 ^= k1;
+	v2 ^= k0;
+	v1 ^= k1;
+	v0 ^= k0;
+
+	v1 ^= 0xee;
+
+	u8 *data;
+	while (wpStreamHasCount(bytes, sizeof(u64))) {
+		data = wpStreamConsumeCount(u8, bytes, sizeof(u64));
+		m = _u8To64LE(data);
+		v3 ^= m;
+
+		for (i = 0; i < ctx->siphash.compression; ++i) {
+			_sipRound;
+		}
+
+		v0 ^= m;
+	}
+
+	data = wpStreamConsume(u8, bytes);
+	switch (left) {
+		case 7:
+			b |= ((u64)data[6]) << 48;
+			/* FALLTHRU */
+		case 6:
+			b |= ((u64)data[5]) << 40;
+			/* FALLTHRU */
+		case 5:
+			b |= ((u64)data[4]) << 32;
+			/* FALLTHRU */
+		case 4:
+			b |= ((u64)data[3]) << 24;
+			/* FALLTHRU */
+		case 3:
+			b |= ((u64)data[2]) << 16;
+			/* FALLTHRU */
+		case 2:
+			b |= ((u64)data[1]) << 8;
+			/* FALLTHRU */
+		case 1:
+			b |= ((u64)data[0]);
+			break;
+		case 0:
+			break;
+	}
+
+	v3 ^= b;
+
+	for (i = 0; i < ctx->siphash.compression; ++i) {
+		_sipRound;
+	}
+
+	v0 ^= b;
+
+	v2 ^= 0xee;
+
+	for (i = 0; i < ctx->siphash.finalisation; ++i) {
+		_sipRound;
+	}
+
+	b = v0 ^ v1 ^ v2 ^ v3;
+	_u64To8LE(out, b);
+
+	v1 ^= 0xdd;
+
+	for (i = 0; i < ctx->siphash.finalisation; ++i) {
+		_sipRound;
+	}
+
+	b = v0 ^ v1 ^ v2 ^ v3;
+	_u64To8LE(out + 8, b);
+}
+
+wp_intern inline void validateSipHasherCtx(const WpHasherCtx *ctx) {
+	b8 magic_match = ctx->type == WP_HASHER_CTX_SIPHASH;
+	b8 rounds      = checkRounds(ctx);
+	wpRuntimeAssert(magic_match && rounds, "Invalid Siphash context");
+}
+
+wp_intern inline b8 checkRounds(const WpHasherCtx *ctx) {
+	b8 rounds24 = ctx->siphash.compression == 2 && ctx->siphash.finalisation == 4;
+	b8 rounds48 = ctx->siphash.compression == 4 && ctx->siphash.finalisation == 8;
+	return rounds24 || rounds48;
+}

src/base/hash/hasher/siphash.h

@@ -0,0 +1,29 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+/**
+ * Implementations of the SipHash-2-4-128, SipHash4-8-128 algorithms based on
+ * https://github.com/veorq/SipHash/blob/master/siphash.c
+ */
+
+#ifndef SIPHASH_H
+#define SIPHASH_H
+
+#include "hasher.h"
+#include "../../stream/stream.h"
+#include "../../../common/platform/platform.h"
+
+#ifdef WP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
+
+WpHasher wpSip24Hasher(void);
+WpHasher wpSip48Hasher(void);
+WpHasher wpSip24HasherWithKey(WpU128 key);
+WpHasher wpSip48HasherWithKey(WpU128 key);
+WpU128   wpSipGetHash128(WpU8Stream *bytes, WpHasherCtx ctx);
+
+#ifdef WP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
+
+#endif // !SIPHASH_H

src/base/hash/map/map.c

@@ -0,0 +1,83 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "map.h"
+#include "../table/table.h"
+
+WpHashMap hashMapAlloc(const WpAllocator *allocator, WpU8StreamEncoder encoder, WpKeyEqualTest key_eq,
+                       u64 capacity, u64 key_size, u64 value_size) {
+	return hashMapAllocWithCustomHasher(allocator, WP_HASH_TABLE_DEFAULT_HASHER, encoder, key_eq,
+	                                    capacity, key_size, value_size);
+}
+
+WpHashMap hashMapAllocWithCustomHasher(const WpAllocator *allocator, WpHasher hasher,
+                                       WpU8StreamEncoder encoder, WpKeyEqualTest key_eq,
+                                       u64 capacity, u64 key_size, u64 value_size) {
+	WpHashMap map = {0};
+	hashTableAlloc(allocator, &map, hasher, encoder, key_eq, capacity, key_size, value_size, true);
+	return map;
+}
+
+WpHashLookupResult hashMapFind(WpHashMap *map, void *key, u64 key_size) {
+	u64 hash            = hashTableCalcHash(map, key, key_size);
+	WpHashBucketRef ref = hashTableBucketRef(map, hash);
+	return hashTableLookup(map, key, ref, key_size);
+}
+
+void hashMapUpdate(WpHashMap *map, void *key, void *value, u64 key_size, u64 value_size) {
+	WpHashLookupResult result = hashMapFind(map, key, key_size);
+	if (result.found) {
+		hashTableUpdate(map, value, result.ref, value_size);
+	}
+}
+
+void hashMapInsertCapped(WpHashMap *map, void *key, void *value, u64 key_size, u64 value_size) {
+	WpHashLookupResult result = hashMapFind(map, key, key_size);
+	if (!result.found && map->load_factor < WP_HASH_MAX_LOAD_FACTOR) {
+		hashTableInsert(map, key, value, result.ref, key_size, value_size);
+	}
+}
+
+void hashMapInsertOrUpdateCapped(WpHashMap *map, void *key, void *value, u64 key_size, u64 value_size) {
+	WpHashLookupResult result = hashMapFind(map, key, key_size);
+	if (result.found) {
+		hashTableUpdate(map, value, result.ref, value_size);
+	} else if (map->load_factor < WP_HASH_MAX_LOAD_FACTOR) {
+		hashTableInsert(map, key, value, result.ref, key_size, value_size);
+	}
+}
+
+void hashMapInsertAlloc(const WpAllocator *allocator, WpHashMap *map, void *key, void *value,
+                        u64 key_size, u64 value_size) {
+	WpHashLookupResult result = hashMapFind(map, key, key_size);
+	if (!result.found) {
+		if (map->load_factor >= WP_HASH_MAX_LOAD_FACTOR) {
+			hashTableGrow(allocator, map, key_size, value_size);
+			// Rerun key lookup after growing
+			result = hashMapFind(map, key, key_size);
+		}
+
+		hashTableInsert(map, key, value, result.ref, key_size, value_size);
+	}
+}
+
+void hashMapInsertOrUpdateAlloc(const WpAllocator *allocator, WpHashMap *map, void *key, void *value,
+                                u64 key_size, u64 value_size) {
+	WpHashLookupResult result = hashMapFind(map, key, key_size);
+	if (result.found) {
+		hashTableUpdate(map, value, result.ref, value_size);
+	} else {
+		if (map->load_factor >= WP_HASH_MAX_LOAD_FACTOR) {
+			hashTableGrow(allocator, map, key_size, value_size);
+			// Rerun key lookup after growing
+			result = hashMapFind(map, key, key_size);
+		}
+		hashTableInsert(map, key, value, result.ref, key_size, value_size);
+	}
+}
+
+void hashMapRemove(WpHashMap *map, void *key, u64 key_size, u64 value_size) {
+	WpHashLookupResult result = hashMapFind(map, key, key_size);
+	if (result.found) {
+		hashTableRemove(map, result.ref, key_size, value_size);
+	}
+}

src/base/hash/map/map.h

@@ -0,0 +1,134 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef MAP_H
+#define MAP_H
+
+#include "../table/table.h"
+#include "../../../common/misc/misc_utils.h"
+#include "../../../common/platform/platform.h"
+
+#ifdef WP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
+
+typedef WpHashTable WpHashMap;
+
+#ifdef WP_PLATFORM_CPP
+#define wpHashMap(KEY_TYPE, VALUE_TYPE, U8_STREAM_ENCODER, KEY_EQ_TEST, CAPACITY)                  \
+	(WpHashMap{                                                                                      \
+		WP_HASH_TABLE_DEFAULT_HASHER,                                                                  \
+		U8_STREAM_ENCODER,                                                                             \
+		KEY_EQ_TEST,                                                                                   \
+		wpArrayWithCapacity(KEY_TYPE, wpMiscUtilsU64RoundUpPow2(CAPACITY), WP_ARRAY_INIT_NONE),        \
+		wpArrayWithCapacity(VALUE_TYPE, wpMiscUtilsU64RoundUpPow2(CAPACITY), WP_ARRAY_INIT_NONE),      \
+		wpArrayWithCapacity(WpHashBucket, wpMiscUtilsU64RoundUpPow2(CAPACITY), WP_ARRAY_INIT_FILLED),  \
+		WP_HASH_TABLE_MAGIC,                                                                           \
+		wpMiscUtilsU64RoundUpPow2(CAPACITY) - 1,                                                       \
+		0.0f,                                                                                          \
+		true,                                                                                          \
+	})
+#define wpHashMapCustomHasher(KEY_TYPE, VALUE_TYPE, HASHER, U8_STREAM_ENCODER, KEY_EQ_TEST,        \
+                              CAPACITY)                                                            \
+	(WpHashMap{                                                                                      \
+		HASHER,                                                                                        \
+		U8_STREAM_ENCODER,                                                                             \
+		KEY_EQ_TEST,                                                                                   \
+		wpArrayWithCapacity(KEY_TYPE, wpMiscUtilsU64RoundUpPow2(CAPACITY), WP_ARRAY_INIT_NONE),        \
+		wpArrayWithCapacity(VALUE_TYPE, wpMiscUtilsU64RoundUpPow2(CAPACITY), WP_ARRAY_INIT_NONE),      \
+		wpArrayWithCapacity(WpHashBucket, wpMiscUtilsU64RoundUpPow2(CAPACITY), WP_ARRAY_INIT_FILLED),  \
+		WP_HASH_TABLE_MAGIC,                                                                           \
+		wpMiscUtilsU64RoundUpPow2(CAPACITY) - 1,                                                       \
+		0.0f,                                                                                          \
+		true,                                                                                          \
+	})
+#else
+#define wpHashMap(KEY_TYPE, VALUE_TYPE, U8_STREAM_ENCODER, KEY_EQ_TEST, CAPACITY)                  \
+	((WpHashMap){                                                                                    \
+		.hasher      = WP_HASH_TABLE_DEFAULT_HASHER,                                                   \
+		.encoder     = U8_STREAM_ENCODER,                                                              \
+		.key_eq      = KEY_EQ_TEST,                                                                    \
+		.keys        = wpArrayWithCapacity(KEY_TYPE, wpMiscUtilsU64RoundUpPow2(CAPACITY),              \
+		                                   WP_ARRAY_INIT_NONE),                                        \
+		.values      = wpArrayWithCapacity(VALUE_TYPE, wpMiscUtilsU64RoundUpPow2(CAPACITY),            \
+		                                   WP_ARRAY_INIT_NONE),                                        \
+		.buckets     = wpArrayWithCapacity(WpHashBucket, wpMiscUtilsU64RoundUpPow2(CAPACITY),          \
+		                                   WP_ARRAY_INIT_FILLED),                                      \
+		.magic       = WP_HASH_TABLE_MAGIC,                                                            \
+		.bucket_mask = wpMiscUtilsU64RoundUpPow2(CAPACITY) - 1,                                        \
+		.has_values  = true,                                                                           \
+	})
+#define wpHashMapCustomHasher(KEY_TYPE, VALUE_TYPE, HASHER, U8_STREAM_ENCODER, KEY_EQ_TEST,        \
+                              CAPACITY)                                                            \
+	((WpHashMap){                                                                                    \
+		.hasher      = HASHER,                                                                         \
+		.encoder     = U8_STREAM_ENCODER,                                                              \
+		.key_eq      = KEY_EQ_TEST,                                                                    \
+		.keys        = wpArrayWithCapacity(KEY_TYPE, wpMiscUtilsU64RoundUpPow2(CAPACITY),              \
+		                                   WP_ARRAY_INIT_NONE),                                        \
+		.values      = wpArrayWithCapacity(VALUE_TYPE, wpMiscUtilsU64RoundUpPow2(CAPACITY),            \
+		                                   WP_ARRAY_INIT_NONE),                                        \
+		.buckets     = wpArrayWithCapacity(WpHashBucket, wpMiscUtilsU64RoundUpPow2(CAPACITY),          \
+		                                   WP_ARRAY_INIT_FILLED),                                      \
+		.magic       = WP_HASH_TABLE_MAGIC,                                                            \
+		.bucket_mask = wpMiscUtilsU64RoundUpPow2(CAPACITY) - 1,                                        \
+		.has_values  = true,                                                                           \
+	})
+#endif
+
+#define wpHashMapAlloc(KEY_TYPE, VALUE_TYPE, ALLOCATOR_PTR, U8_STREAM_ENCODER, KEY_EQ_TEST,        \
+                       CAPACITY)                                                                   \
+	hashMapAlloc(ALLOCATOR_PTR, U8_STREAM_ENCODER, KEY_EQ_TEST, CAPACITY, sizeof(KEY_TYPE),          \
+	             sizeof(VALUE_TYPE))
+#define wpHashMapCustomHasherAlloc(KEY_TYPE, VALUE_TYPE, ALLOCATOR_PTR, HASHER, U8_STREAM_ENCODER, \
+                                   KEY_EQ_TEST, CAPACITY)                                          \
+	hashMapAllocWithCustomHasher(ALLOCATOR_PTR, HASHER, U8_STREAM_ENCODER, KEY_EQ_TEST, CAPACITY,    \
+	                             sizeof(KEY_TYPE), sizeof(VALUE_TYPE))
+#define wpHashMapKeys(KEY_TYPE, MAP_PTR) ((KEY_TYPE *)hashTableKeys(MAP_PTR, sizeof(KEY_TYPE)))
+#define wpHashMapValues(VALUE_TYPE, MAP_PTR)                                                       \
+	((VALUE_TYPE *)hashTableValues(MAP_PTR, sizeof(VALUE_TYPE)))
+#define wpHashMapCapacity(MAP_PTR) hashTableCapacity(MAP_PTR)
+#define wpHashMapCount(MAP_PTR) hashTableCount(MAP_PTR)
+#define wpHashMapKeySize(MAP_PTR) hashTableKeySize(MAP_PTR)
+#define wpHashMapValueSize(MAP_PTR) hashTableValueSize(MAP_PTR)
+#define wpHashMapFind(KEY_TYPE, MAP_PTR, KEY_PTR) hashMapFind(MAP_PTR, KEY_PTR, sizeof(KEY_TYPE))
+#define wpHashMapInsertCapped(KEY_TYPE, VALUE_TYPE, MAP_PTR, KEY_PTR, VALUE_PTR)                   \
+	hashMapInsertCapped(MAP_PTR, KEY_PTR, VALUE_PTR, sizeof(KEY_TYPE), sizeof(VALUE_TYPE))
+#define wpHashMapInsertOrUpdateCapped(KEY_TYPE, VALUE_TYPE, MAP_PTR, KEY_PTR, VALUE_PTR)           \
+	hashMapInsertOrUpdateCapped(MAP_PTR, KEY_PTR, VALUE_PTR, sizeof(KEY_TYPE), sizeof(VALUE_TYPE))
+#define wpHashMapUpdate(KEY_TYPE, VALUE_TYPE, MAP_PTR, KEY_PTR, VALUE_PTR)                         \
+	hashMapUpdate(MAP_PTR, KEY_PTR, VALUE_PTR, sizeof(KEY_TYPE), sizeof(VALUE_TYPE))
+#define wpHashMapInsertAlloc(KEY_TYPE, VALUE_TYPE, ALLOCATOR_PTR, MAP_PTR, KEY_PTR, VALUE_PTR)     \
+	hashMapInsertAlloc(ALLOCATOR_PTR, MAP_PTR, KEY_PTR, VALUE_PTR, sizeof(KEY_TYPE),                 \
+	                   sizeof(VALUE_TYPE))
+#define wpHashMapInsertOrUpdateAlloc(KEY_TYPE, VALUE_TYPE, ALLOCATOR_PTR, MAP_PTR, KEY_PTR,        \
+                                     VALUE_PTR)                                                    \
+	hashMapInsertOrUpdateAlloc(ALLOCATOR_PTR, MAP_PTR, KEY_PTR, VALUE_PTR, sizeof(KEY_TYPE),         \
+	                           sizeof(VALUE_TYPE))
+#define wpHashMapRemove(KEY_TYPE, VALUE_TYPE, MAP_PTR, KEY_PTR)                                    \
+	hashMapRemove(MAP_PTR, KEY_PTR, sizeof(KEY_TYPE), sizeof(VALUE_TYPE))
+#define wpHashMapClear(KEY_TYPE, VALUE_TYPE, MAP_PTR)                                              \
+	hashTableClear(MAP_PTR, sizeof(KEY_TYPE), sizeof(VALUE_TYPE))
+#define wpHashMapDealloc(KEY_TYPE, VALUE_TYPE, ALLOCATOR_PTR, MAP_PTR)                             \
+	hashTableDealloc(ALLOCATOR_PTR, MAP_PTR, sizeof(KEY_TYPE), sizeof(VALUE_TYPE))
+
+WpHashMap          hashMapAlloc(const WpAllocator *allocator, WpU8StreamEncoder encoder,
+                                WpKeyEqualTest key_eq, u64 capacity, u64 key_size, u64 value_size);
+WpHashMap          hashMapAllocWithCustomHasher(const WpAllocator *allocator, WpHasher hasher,
+                                                WpU8StreamEncoder encoder, WpKeyEqualTest key_eq,
+                                                u64 capacity, u64 key_size, u64 value_size);
+WpHashLookupResult hashMapFind(WpHashMap *map, void *key, u64 key_size);
+void               hashMapUpdate(WpHashMap *map, void *key, void *value, u64 key_size, u64 value_size);
+void               hashMapInsertCapped(WpHashMap *map, void *key, void *value, u64 key_size, u64 value_size);
+void               hashMapInsertOrUpdateCapped(WpHashMap *map, void *key, void *value, u64 key_size,
+                                               u64 value_size);
+void               hashMapInsertAlloc(const WpAllocator *allocator, WpHashMap *map, void *key,
+                                      void *value, u64 key_size, u64 value_size);
+void               hashMapInsertOrUpdateAlloc(const WpAllocator *allocator, WpHashMap *map, void *key,
+                                              void *value, u64 key_size, u64 value_size);
+void               hashMapRemove(WpHashMap *map, void *key, u64 key_size, u64 value_size);
+
+#ifdef WP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
+
+#endif // !MAP_H

src/base/hash/set/set.c

@@ -0,0 +1,51 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "set.h"
+#include "../table/table.h"
+
+WpHashSet hashSetAlloc(const WpAllocator *allocator, WpU8StreamEncoder encoder, WpKeyEqualTest key_eq,
+                       u64 capacity, u64 key_size) {
+	return hashSetAllocWithCustomHasher(allocator, WP_HASH_TABLE_DEFAULT_HASHER, encoder, key_eq,
+	                                    capacity, key_size);
+}
+
+WpHashSet hashSetAllocWithCustomHasher(const WpAllocator *allocator, WpHasher hasher,
+                                       WpU8StreamEncoder encoder, WpKeyEqualTest key_eq, u64 capacity,
+                                       u64 key_size) {
+	WpHashSet set = {0};
+	hashTableAlloc(allocator, &set, hasher, encoder, key_eq, capacity, key_size, 0, false);
+	return set;
+}
+
+WpHashLookupResult hashSetFind(WpHashSet *set, void *item, u64 item_size) {
+	u64 hash            = hashTableCalcHash(set, item, item_size);
+	WpHashBucketRef ref = hashTableBucketRef(set, hash);
+	return hashTableLookup(set, item, ref, item_size);
+}
+
+void hashSetInsertCapped(WpHashSet *set, void *item, u64 item_size) {
+	WpHashLookupResult result = hashSetFind(set, item, item_size);
+	if (!result.found && set->load_factor < WP_HASH_MAX_LOAD_FACTOR) {
+		hashTableInsert(set, item, NULL, result.ref, item_size, 0);
+	}
+}
+
+void hashSetInsertAlloc(const WpAllocator *allocator, WpHashSet *set, void *item, u64 item_size) {
+	WpHashLookupResult result = hashSetFind(set, item, item_size);
+	if (!result.found) {
+		if (set->load_factor >= WP_HASH_MAX_LOAD_FACTOR) {
+			hashTableGrow(allocator, set, item_size, 0);
+			// Rerun item lookup after growing
+			result = hashSetFind(set, item, item_size);
+		}
+
+		hashTableInsert(set, item, NULL, result.ref, item_size, 0);
+	}
+}
+
+void hashSetRemove(WpHashSet *set, void *item, u64 item_size) {
+	WpHashLookupResult result = hashSetFind(set, item, item_size);
+	if (result.found) {
+		hashTableRemove(set, result.ref, item_size, 0);
+	}
+}

src/base/hash/set/set.h

@@ -0,0 +1,105 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef SET_H
+#define SET_H
+
+#include "../table/table.h"
+#include "../../../common/misc/misc_utils.h"
+#include "../../../common/platform/platform.h"
+
+#ifdef WP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
+
+typedef WpHashTable WpHashSet;
+
+#ifdef WP_PLATFORM_CPP
+#define wpHashSet(TYPE, U8_STREAM_ENCODER, ITEM_EQ_TEST, CAPACITY)                                 \
+	(WpHashSet{                                                                                      \
+		WP_HASH_TABLE_DEFAULT_HASHER,                                                                  \
+		U8_STREAM_ENCODER,                                                                             \
+		ITEM_EQ_TEST,                                                                                  \
+		wpArrayWithCapacity(TYPE, wpMiscUtilsU64RoundUpPow2(CAPACITY), WP_ARRAY_INIT_NONE),            \
+		NULL,                                                                                          \
+		wpArrayWithCapacity(WpHashBucket, wpMiscUtilsU64RoundUpPow2(CAPACITY), WP_ARRAY_INIT_FILLED),  \
+		WP_HASH_TABLE_MAGIC,                                                                           \
+		wpMiscUtilsU64RoundUpPow2(CAPACITY) - 1,                                                       \
+		0.0f,                                                                                          \
+		false,                                                                                         \
+	})
+#define wpHashSetCustomHasher(TYPE, HASHER, U8_STREAM_ENCODER, ITEM_EQ_TEST, CAPACITY)             \
+	(WpHashSet{                                                                                      \
+		HASHER,                                                                                        \
+		U8_STREAM_ENCODER,                                                                             \
+		ITEM_EQ_TEST,                                                                                  \
+		wpArrayWithCapacity(TYPE, wpMiscUtilsU64RoundUpPow2(CAPACITY), WP_ARRAY_INIT_NONE),            \
+		NULL,                                                                                          \
+		wpArrayWithCapacity(WpHashBucket, wpMiscUtilsU64RoundUpPow2(CAPACITY), WP_ARRAY_INIT_FILLED),  \
+		WP_HASH_TABLE_MAGIC,                                                                           \
+		wpMiscUtilsU64RoundUpPow2(CAPACITY) - 1,                                                       \
+		0.0f,                                                                                          \
+		false,                                                                                         \
+	})
+#else
+#define wpHashSet(TYPE, U8_STREAM_ENCODER, ITEM_EQ_TEST, CAPACITY)                                 \
+	((WpHashSet){                                                                                    \
+		.hasher      = WP_HASH_TABLE_DEFAULT_HASHER,                                                   \
+		.encoder     = U8_STREAM_ENCODER,                                                              \
+		.key_eq      = ITEM_EQ_TEST,                                                                   \
+		.keys        = wpArrayWithCapacity(TYPE, wpMiscUtilsU64RoundUpPow2(CAPACITY),                  \
+		                                   WP_ARRAY_INIT_NONE),                                        \
+		.buckets     = wpArrayWithCapacity(WpHashBucket, wpMiscUtilsU64RoundUpPow2(CAPACITY),          \
+		                                   WP_ARRAY_INIT_FILLED),                                      \
+		.magic       = WP_HASH_TABLE_MAGIC,                                                            \
+		.bucket_mask = wpMiscUtilsU64RoundUpPow2(CAPACITY) - 1,                                        \
+	})
+#define wpHashSetCustomHasher(TYPE, HASHER, U8_STREAM_ENCODER, ITEM_EQ_TEST, CAPACITY)             \
+	((WpHashSet){                                                                                    \
+		.hasher      = HASHER,                                                                         \
+		.encoder     = U8_STREAM_ENCODER,                                                              \
+		.key_eq      = ITEM_EQ_TEST,                                                                   \
+		.keys        = wpArrayWithCapacity(TYPE, wpMiscUtilsU64RoundUpPow2(CAPACITY),                  \
+		                                   WP_ARRAY_INIT_NONE),                                        \
+		.buckets     = wpArrayWithCapacity(WpHashBucket, wpMiscUtilsU64RoundUpPow2(CAPACITY),          \
+		                                   WP_ARRAY_INIT_FILLED),                                      \
+		.magic       = WP_HASH_TABLE_MAGIC,                                                            \
+		.bucket_mask = wpMiscUtilsU64RoundUpPow2(CAPACITY) - 1,                                        \
+	})
+#endif
+
+#define wpHashSetAlloc(TYPE, ALLOCATOR_PTR, U8_STREAM_ENCODER, ITEM_EQ_TEST, CAPACITY)             \
+	hashSetAlloc(ALLOCATOR_PTR, U8_STREAM_ENCODER, ITEM_EQ_TEST, CAPACITY, sizeof(TYPE))
+#define wpHashSetCustomHasherAlloc(TYPE, ALLOCATOR_PTR, HASHER, U8_STREAM_ENCODER, ITEM_EQ_TEST,   \
+                                   CAPACITY)                                                       \
+	hashSetAllocWithCustomHasher(ALLOCATOR_PTR, HASHER, U8_STREAM_ENCODER, ITEM_EQ_TEST, CAPACITY,   \
+	                             sizeof(TYPE))
+#define wpHashSetItems(TYPE, SET_PTR) ((TYPE *)hashTableKeys(SET_PTR, sizeof(TYPE)))
+#define wpHashSetCapacity(SET_PTR) hashTableCapacity(SET_PTR)
+#define wpHashSetCount(SET_PTR) hashTableCount(SET_PTR)
+#define wpHashSetItemSize(SET_PTR) hashTableKeySize(SET_PTR)
+#define wpHashSetFind(TYPE, SET_PTR, ITEM_PTR) hashSetFind(SET_PTR, ITEM_PTR, sizeof(TYPE))
+#define wpHashSetInsertCapped(TYPE, SET_PTR, ITEM_PTR)                                             \
+	hashSetInsertCapped(SET_PTR, ITEM_PTR, sizeof(TYPE))
+#define wpHashSetInsertAlloc(TYPE, ALLOCATOR_PTR, SET_PTR, ITEM_PTR)                               \
+	hashSetInsertAlloc(ALLOCATOR_PTR, SET_PTR, ITEM_PTR, sizeof(TYPE))
+#define wpHashSetRemove(TYPE, SET_PTR, ITEM_PTR) hashSetRemove(SET_PTR, ITEM_PTR, sizeof(TYPE))
+#define wpHashSetClear(TYPE, SET_PTR) hashTableClear(SET_PTR, sizeof(TYPE), 0)
+#define wpHashSetDealloc(TYPE, ALLOCATOR_PTR, SET_PTR)                                             \
+	hashTableDealloc(ALLOCATOR_PTR, SET_PTR, sizeof(TYPE), 0)
+
+WpHashSet          hashSetAlloc(const WpAllocator *allocator, WpU8StreamEncoder encoder,
+                                WpKeyEqualTest key_eq, u64 capacity, u64 key_size);
+WpHashSet          hashSetAllocWithCustomHasher(const WpAllocator *allocator, WpHasher hasher,
+                                                WpU8StreamEncoder encoder, WpKeyEqualTest key_eq,
+                                                u64 capacity, u64 key_size);
+WpHashLookupResult hashSetFind(WpHashSet *set, void *item, u64 item_size);
+void               hashSetInsertCapped(WpHashSet *set, void *item, u64 item_size);
+void               hashSetInsertAlloc(const WpAllocator *allocator, WpHashSet *set, void *item,
+                                      u64 item_size);
+void               hashSetRemove(WpHashSet *set, void *item, u64 item_size);
+
+#ifdef WP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
+
+#endif // !SET_H

src/base/hash/table/table.c

@@ -0,0 +1,292 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "table.h"
+#include "../hasher/hasher.h"
+#include "../../mem/allocator/mem_allocator.h"
+#include "../../stream/stream.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/assert/assert.h"
+#include "../../../common/misc/misc_utils.h"
+
+wp_persist inline void *hashTableGetKeyFromBucket(WpHashTable *table, WpHashBucket bucket, u64 key_size);
+wp_persist inline void *hashTableGetValueFromBucket(WpHashTable *table, WpHashBucket bucket, u64 value_size);
+wp_persist inline u64   hashTableGetDist(u64 dist_and_tag);
+wp_persist inline u64   hashTableNextBucket(WpHashTable *table, u64 bucket_index);
+wp_persist inline u64   hashTableDistInc(u64 dist_and_tag);
+wp_persist inline u64   hashTableDistDec(u64 dist_and_tag);
+wp_persist inline void  hashTableValidate(const WpHashTable *table, u64 key_size, u64 value_size);
+
+void hashTableAlloc(const WpAllocator *allocator, WpHashTable *table, WpHasher hasher,
+                    WpU8StreamEncoder encoder, WpKeyEqualTest key_eq, u64 capacity, u64 key_size,
+                    u64 value_size, b8 has_values) {
+	wpDebugAssert(allocator != NULL && table != NULL && encoder != NULL && key_eq != NULL,
+	              "`allocator`, `table`, `encoder` and `key_eq` should not be NULL");
+
+	u64 table_capacity = wpMiscUtilsU64RoundUpPow2(capacity);
+	table->hasher      = hasher;
+	table->encoder     = encoder;
+	table->key_eq      = key_eq;
+	table->keys        = arrayAllocCapacity(allocator, table_capacity, WP_ARRAY_INIT_NONE, key_size);;
+	table->buckets     = wpArrayAllocCapacity(WpHashBucket, allocator, table_capacity, WP_ARRAY_INIT_FILLED);
+	table->magic       = WP_HASH_TABLE_MAGIC;
+	table->bucket_mask = table_capacity - 1;
+	table->load_factor = WP_HASH_MAX_LOAD_FACTOR;
+	table->has_values  = has_values;
+
+	wpRuntimeAssert(table->keys != NULL && table->buckets != NULL, "Failed to allocate keys, buckets or both");
+
+	if (has_values) {
+		table->values = arrayAllocCapacity(allocator, table_capacity, WP_ARRAY_INIT_NONE, value_size);;
+		wpRuntimeAssert(table->values != NULL, "Failed to allocate values");
+	}
+}
+
+u64 hashTableCalcHash(WpHashTable *table, void *key, u64 key_size) {
+	hashTableValidate(table, key_size, 0);
+	wpDebugAssert(key != NULL, "`key` should not be NULL");
+	WpU8Stream stream = table->encoder(key);
+	return wpHasherGetHash64(&table->hasher, &stream);
+}
+
+WpHashBucketRef hashTableBucketRef(WpHashTable *table, u64 hash) {
+	hashTableValidate(table, 0, 0);
+	return (WpHashBucketRef){
+		.dist_and_tag = WP_HASH_DIST_INC | (hash & WP_HASH_TAG_MASK),
+		.bucket_index = hash & table->bucket_mask,
+	};
+}
+
+void *hashTableKeys(WpHashTable *table, u64 key_size) {
+	hashTableValidate(table, key_size, 0);
+	return table->keys;
+}
+
+void *hashTableValues(WpHashTable *table, u64 value_size) {
+	hashTableValidate(table, 0, value_size);
+	return table->values;
+}
+
+void *hashTableGetKeyFromBucketRef(WpHashTable *table, WpHashBucketRef ref, u64 key_size) {
+	return hashTableGetKeyFromBucket(table, table->buckets[ref.bucket_index], key_size);
+}
+
+void *hashTableGetValueFromBucketRef(WpHashTable *table, WpHashBucketRef ref, u64 value_size) {
+	return hashTableGetValueFromBucket(table, table->buckets[ref.bucket_index], value_size);
+}
+
+u64 hashTableCapacity(WpHashTable *table) {
+	hashTableValidate(table, 0, 0);
+	return wpArrayCapacity(table->keys);
+}
+
+u64 hashTableCount(WpHashTable *table) {
+	hashTableValidate(table, 0, 0);
+	return wpArrayCount(table->keys);
+}
+
+u64 hashTableKeySize(WpHashTable *table) {
+	hashTableValidate(table, 0, 0);
+	return wpArrayItemSize(table->keys);
+}
+
+u64 hashTableValueSize(WpHashTable *table) {
+	hashTableValidate(table, 0, 0);
+	return table->has_values ? wpArrayItemSize(table->values) : 0;
+}
+
+void hashTableGrow(const WpAllocator *allocator, WpHashTable *table, u64 key_size, u64 value_size) {
+	hashTableValidate(table, key_size, value_size);
+	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
+
+	u64 capacity              = wpMiscUtilsU64RoundUpPow2(hashTableCapacity(table) * 2); 
+	u64 mask                  = capacity - wpU64Const(1);
+	WpArray keys              = arrayAllocCapacity(allocator, capacity, WP_ARRAY_INIT_NONE, key_size);
+	WpArray values            = NULL;
+	WpHashBucketArray buckets = wpArrayAllocCapacity(WpHashBucket, allocator, capacity, WP_ARRAY_INIT_FILLED);
+
+	wpRuntimeAssert(keys != NULL && buckets != NULL, "Failed to allocate keys, buckets or both");
+
+	if (table->has_values) {
+		values = arrayAllocCapacity(allocator, capacity, WP_ARRAY_INIT_NONE, value_size);
+		wpRuntimeAssert(values != NULL, "Failed to allocate values");
+	}
+
+	WpArray old_keys   = table->keys;
+	WpArray old_values = table->values;
+
+	table->keys        = keys;
+	table->values      = values;
+	table->buckets     = buckets;
+	table->bucket_mask = mask;
+
+	for (u64 i = 0; i < wpArrayCount(old_keys); ++i) {
+		void *key           = arrayGet(old_keys, i, key_size);
+		void *value         = table->has_values ? arrayGet(old_values, i, value_size) : NULL;
+		u64 hash            = hashTableCalcHash(table, key, key_size);
+		WpHashBucketRef ref = hashTableBucketRef(table, hash);
+		hashTableInsert(table, key, value, ref, key_size, value_size);
+	}
+}
+
+WpHashLookupResult hashTableLookup(WpHashTable *table, void *key, WpHashBucketRef ref, u64 key_size) {
+	hashTableValidate(table, key_size, 0);
+	wpDebugAssert(key != NULL, "`key` should not be NULL");
+
+	while (true) {
+		WpHashBucket *bucket = &table->buckets[ref.bucket_index];
+
+		if (ref.dist_and_tag == bucket->dist_and_tag) {
+			b8 key_equal = table->key_eq(key, arrayGet(table->keys, bucket->item_index, key_size));
+			return (WpHashLookupResult){
+				.ref.dist_and_tag = ref.dist_and_tag,
+				.ref.bucket_index = ref.bucket_index,
+				.found            = key_equal,
+			};
+		} else if (hashTableGetDist(ref.dist_and_tag) > hashTableGetDist(bucket->dist_and_tag)) {
+			return (WpHashLookupResult){
+				.ref.dist_and_tag = ref.dist_and_tag,
+				.ref.bucket_index = ref.bucket_index,
+				.found            = false,
+			};
+		}
+
+		ref.dist_and_tag = hashTableDistInc(ref.dist_and_tag);
+		ref.bucket_index = hashTableNextBucket(table, ref.bucket_index);
+	}
+}
+
+void hashTableUpdate(WpHashTable *table, void *value, WpHashBucketRef ref, u64 value_size) {
+	hashTableValidate(table, 0, value_size);
+	if (!(table->has_values)) {
+		wpRuntimeAssert(0, "Attempting to update a hash table that has no values");
+	}
+	wpDebugAssert(value != NULL, "`value` should not be NULL");
+
+	WpHashBucket *bucket = &table->buckets[ref.bucket_index];
+	arraySet(table->values, bucket->item_index, value, value_size);
+}
+
+void hashTableInsert(WpHashTable *table, void *key, void *value, WpHashBucketRef ref, u64 key_size,
+                     u64 value_size) {
+	hashTableValidate(table, key_size, value_size);
+	wpDebugAssert(key != NULL, "`key` should not be NULL");
+
+	u64 index = wpArrayCount(table->keys);
+	while (true) {
+		WpHashBucket *bucket = &table->buckets[ref.bucket_index];
+
+		if (bucket->dist_and_tag == 0) {
+			bucket->dist_and_tag = ref.dist_and_tag;
+			bucket->item_index   = index;
+			break;
+		} else if (hashTableGetDist(ref.dist_and_tag) > hashTableGetDist(bucket->dist_and_tag)) {
+			wpMiscUtilsSwap(u64, &ref.dist_and_tag, &bucket->dist_and_tag);
+			wpMiscUtilsSwap(u64, &index, &bucket->item_index);
+		}
+
+		ref.dist_and_tag = hashTableDistInc(ref.dist_and_tag);
+		ref.bucket_index = hashTableNextBucket(table, ref.bucket_index);
+	}
+
+	arrayAppendCapped(table->keys, key, key_size);
+	if (table->has_values) {
+		arrayAppendCapped(table->values, value, value_size);
+	}
+	table->load_factor = (f32)wpArrayCount(table->keys) / (f32)wpArrayCapacity(table->keys);
+}
+
+void hashTableRemove(WpHashTable *table, WpHashBucketRef ref, u64 key_size, u64 value_size) {
+	hashTableValidate(table, key_size, value_size);
+
+	WpHashBucket *bucket = &table->buckets[ref.bucket_index];
+
+	u64 last_item_index = wpArrayCount(table->keys) - 1;
+
+	if (bucket->item_index < last_item_index) {
+		// Update the bucket for the last item before swapping
+		u64 hash = hashTableCalcHash(table, arrayGet(table->keys, last_item_index, key_size), key_size);
+
+		WpHashLookupResult result = hashTableLookup(table, arrayGet(table->keys, last_item_index, key_size),
+		                                            hashTableBucketRef(table, hash), key_size);
+		wpRuntimeAssert(result.found, "Hash table item should exist but it doesn't");
+
+		table->buckets[result.ref.bucket_index].item_index = bucket->item_index;
+
+		arrayRemoveSwapEnd(table->keys, bucket->item_index, key_size);
+		if (table->has_values) {
+			arrayRemoveSwapEnd(table->values, bucket->item_index, value_size);
+		}
+	}
+
+	while (bucket->dist_and_tag > 0) {
+		u64 next_index     = hashTableNextBucket(table, ref.bucket_index);
+		WpHashBucket *next = &table->buckets[next_index];
+
+		if (hashTableGetDist(next->dist_and_tag) > WP_HASH_DIST_INC) {
+			bucket->dist_and_tag = hashTableDistDec(next->dist_and_tag);
+			bucket->item_index   = next->item_index;
+
+			ref.bucket_index = next_index;
+			bucket           = &table->buckets[ref.bucket_index];
+		} else {
+			bucket->dist_and_tag = 0;
+			bucket->item_index   = 0;
+		}
+	}
+}
+
+void hashTableClear(WpHashTable *table, u64 key_size, u64 value_size) {
+	hashTableValidate(table, key_size, value_size);
+	arrayClear(table->keys, key_size);
+	if (table->has_values) {
+		arrayClear(table->values, value_size);
+	}
+	wpArrayZero(WpHashBucket, table->buckets);
+}
+
+void hashTableDealloc(const WpAllocator *allocator, WpHashTable *table, u64 key_size, u64 value_size) {
+	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
+	hashTableValidate(table, key_size, value_size);
+	arrayDealloc(allocator, table->keys, key_size);
+	wpArrayDealloc(WpHashBucket, allocator, table->buckets);
+	if (table->has_values) {
+		arrayDealloc(allocator, table->values, value_size);
+	}
+}
+
+wp_persist inline void *hashTableGetKeyFromBucket(WpHashTable *table, WpHashBucket bucket, u64 key_size) {
+	hashTableValidate(table, key_size, 0);
+	return arrayGet(table->keys, bucket.item_index, key_size);
+}
+
+wp_persist inline void *hashTableGetValueFromBucket(WpHashTable *table, WpHashBucket bucket, u64 value_size) {
+	hashTableValidate(table, 0, value_size);
+	return table->has_values ? arrayGet(table->values, bucket.item_index, value_size) : NULL;
+}
+
+wp_persist inline u64 hashTableGetDist(u64 dist_and_tag) {
+	return dist_and_tag & (~WP_HASH_TAG_MASK);
+}
+
+wp_persist inline u64 hashTableNextBucket(WpHashTable *table, u64 bucket_index) {
+	return (++bucket_index) & table->bucket_mask;
+}
+
+wp_persist inline u64 hashTableDistInc(u64 dist_and_tag) {
+	return dist_and_tag + WP_HASH_DIST_INC;
+}
+
+wp_persist inline u64 hashTableDistDec(u64 dist_and_tag) {
+	return dist_and_tag - WP_HASH_DIST_INC;
+}
+
+wp_persist inline void hashTableValidate(const WpHashTable *table, u64 key_size, u64 value_size) {
+	wpDebugAssert(table != NULL, "`table` should not be NULL");
+	wpRuntimeAssert(WP_HASH_TABLE_MAGIC == table->magic, "`table` is not a valid wapp hash table");
+	if (key_size > 0) {
+		wpRuntimeAssert(key_size == wpArrayItemSize(table->keys), "Invalid key type provided");
+	}
+	if (value_size > 0) {
+		wpRuntimeAssert(value_size == wpArrayItemSize(table->values), "Invalid value type provided");
+	}
+}

src/base/hash/table/table.h

@@ -0,0 +1,101 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+/**
+ * A hash table implementation with Robin Hood open addressing for collision resolution.
+ *
+ * The implementation is based on a version of this C++ implementation:
+ * https://github.com/martinus/unordered_dense
+ *
+ * Extra references:
+ * - https://faultlore.com/blah/robinhood-part-1/
+ * - https://blog.hieunt.me/blog/robinhood-hashing
+ *
+ * IMPORTANT:
+ * This is the internal hash table implementation and it is not intended to be used directly.
+ * Please check ../map/map.h and ../set/set.h for the public APIs.
+ */
+
+#ifndef TABLE_H
+#define TABLE_H
+
+#include "../hasher/hasher.h"
+#include "../hasher/murmur3.h"
+#include "../../array/array.h"
+#include "../../mem/allocator/mem_allocator.h"
+#include "../../stream/stream.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/platform/platform.h"
+
+#ifdef WP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
+
+#define WP_HASH_TABLE_MAGIC          wpU64Const(0x57504854424c)
+#define WP_HASH_TAG_BITS             wpU64Const(32)
+#define WP_HASH_DIST_INC             (wpU64Const(1) << WP_HASH_TAG_BITS)
+#define WP_HASH_TAG_MASK             (WP_HASH_DIST_INC - wpU64Const(1))
+#define WP_HASH_MAX_LOAD_FACTOR      0.65f
+#define WP_HASH_TABLE_DEFAULT_HASHER wpX64Mur3Hasher()
+
+typedef WpU8Stream (*WpU8StreamEncoder)(void *data);
+typedef b8 (*WpKeyEqualTest)(void *a, void *b);
+
+typedef struct WpHashBucket {
+	u64 dist_and_tag;
+	u64 item_index;
+} WpHashBucket;
+typedef WpHashBucket *WpHashBucketArray;
+
+typedef struct WpHashTable {
+	WpHasher          hasher;
+	WpU8StreamEncoder encoder;
+	WpKeyEqualTest    key_eq;
+	WpArray           keys;
+	WpArray           values;
+	WpHashBucketArray buckets;
+	u64               magic;
+	u64               bucket_mask;
+	f32               load_factor;
+	b8                has_values;
+} WpHashTable;
+
+typedef struct WpHashBucketRef {
+	u64 dist_and_tag;
+	u64 bucket_index;
+} WpHashBucketRef;
+
+typedef struct WpHashLookupResult {
+	WpHashBucketRef ref;
+	b8              found;
+} WpHashLookupResult;
+
+void               hashTableAlloc(const WpAllocator *allocator, WpHashTable *table,
+                                  WpHasher hasher, WpU8StreamEncoder encoder,
+                                  WpKeyEqualTest key_eq, u64 capacity, u64 key_size,
+                                  u64 value_size, b8 has_values);
+u64                hashTableCalcHash(WpHashTable *table, void *key, u64 key_size);
+WpHashBucketRef    hashTableBucketRef(WpHashTable *table, u64 hash);
+void              *hashTableKeys(WpHashTable *table, u64 key_size);
+void              *hashTableValues(WpHashTable *table, u64 value_size);
+void              *hashTableGetKeyFromBucketRef(WpHashTable *table, WpHashBucketRef ref, u64 key_size);
+void              *hashTableGetValueFromBucketRef(WpHashTable *table, WpHashBucketRef ref, u64 value_size);
+u64                hashTableCapacity(WpHashTable *table);
+u64                hashTableCount(WpHashTable *table);
+u64                hashTableKeySize(WpHashTable *table);
+u64                hashTableValueSize(WpHashTable *table);
+void               hashTableGrow(const WpAllocator *allocator, WpHashTable *table, u64 key_size,
+                                 u64 value_size);
+WpHashLookupResult hashTableLookup(WpHashTable *table, void *key, WpHashBucketRef ref, u64 key_size);
+void               hashTableUpdate(WpHashTable *table, void *value, WpHashBucketRef ref, u64 value_size);
+void               hashTableInsert(WpHashTable *table, void *key, void *value, WpHashBucketRef ref,
+                                   u64 key_size, u64 value_size);
+void               hashTableRemove(WpHashTable *table, WpHashBucketRef ref, u64 key_size, u64 value_size);
+void               hashTableClear(WpHashTable *table, u64 key_size, u64 value_size);
+void               hashTableDealloc(const WpAllocator *allocator, WpHashTable *table, u64 key_size,
+                                    u64 value_size);
+
+#ifdef WP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
+
+#endif // !TABLE_H

src/base/mem/allocator/mem_allocator.c

@@ -6,30 +6,73 @@
 #include <stdlib.h>
 
 void *wpMemAllocatorAlloc(const WpAllocator *allocator, u64 size) {
-	wpDebugAssert(allocator != NULL && (allocator->alloc) != NULL, "`allocator` and `allocator->alloc` should not be NULL");
+	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
+
+	if (!wpMemAllocatorOpSupported(allocator, WP_MEM_OP_ALLOC)) {
+		return NULL;
+	}
+
 	return allocator->alloc(size, allocator->obj);
 }
 
 void *wpMemAllocatorAllocAligned(const WpAllocator *allocator, u64 size, u64 alignment) {
-	wpDebugAssert(allocator != NULL && (allocator->alloc_aligned) != NULL, "`allocator` and `allocator->alloc_aligned` should not be NULL");
+	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
+
+	if (!wpMemAllocatorOpSupported(allocator, WP_MEM_OP_ALLOC_ALIGNED)) {
+		return NULL;
+	}
+
 	return allocator->alloc_aligned(size, alignment, allocator->obj);
 }
 
 void *wpMemAllocatorRealloc(const WpAllocator *allocator, void *ptr, u64 old_size, u64 new_size) {
-	wpDebugAssert(allocator != NULL && (allocator->realloc) != NULL, "`allocator` and `allocator->realloc` should not be NULL");
+	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
+
+	if (!wpMemAllocatorOpSupported(allocator, WP_MEM_OP_REALLOC)) {
+		return NULL;
+	}
+
 	return allocator->realloc(ptr, old_size, new_size, allocator->obj);
 }
 
 void *wpMemAllocatorReallocAligned(const WpAllocator *allocator, void *ptr, u64 old_size,
                                          u64 new_size, u64 alignment) {
-	wpDebugAssert(allocator != NULL && (allocator->realloc_aligned) != NULL, "`allocator` and `allocator->realloc_aligned` should not be NULL");
+	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
+
+	if (!wpMemAllocatorOpSupported(allocator, WP_MEM_OP_REALLOC_ALIGNED)) {
+		return NULL;
+	}
+
 	return allocator->realloc_aligned(ptr, old_size, new_size, alignment, allocator->obj);
 }
 
 void wpMemAllocatorFree(const WpAllocator *allocator, void **ptr, u64 size) {
-	if (!allocator || !(allocator->free)) {
+	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
+
+	if (!wpMemAllocatorOpSupported(allocator, WP_MEM_OP_FREE)) {
 		return;
 	}
 
 	allocator->free(ptr, size, allocator->obj);
 }
+
+b8 wpMemAllocatorOpSupported(const WpAllocator *allocator, WpMemOp op) {
+	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
+
+	switch (op) {
+		case WP_MEM_OP_ALLOC:
+			return allocator->alloc != NULL;
+		case WP_MEM_OP_ALLOC_ALIGNED:
+			return allocator->alloc_aligned != NULL;
+		case WP_MEM_OP_REALLOC:
+			return allocator->realloc != NULL;
+		case WP_MEM_OP_REALLOC_ALIGNED:
+			return allocator->realloc_aligned != NULL;
+		case WP_MEM_OP_FREE:
+			return allocator->free != NULL;
+		default:
+			break;
+	}
+
+	return false;
+}

src/base/mem/allocator/mem_allocator.h

@@ -11,6 +11,16 @@
 BEGIN_C_LINKAGE
 #endif // !WP_PLATFORM_CPP
 
+typedef enum WpMemOp {
+	WP_MEM_OP_ALLOC,
+	WP_MEM_OP_ALLOC_ALIGNED,
+	WP_MEM_OP_REALLOC,
+	WP_MEM_OP_REALLOC_ALIGNED,
+	WP_MEM_OP_FREE,
+
+	COUNT_MEM_OPS
+} WpMemOp;
+
 typedef void  *(WpMemAllocFunc)(u64 size, void *alloc_obj);
 typedef void  *(WpMemAllocAlignedFunc)(u64 size, u64 alignment, void *alloc_obj);
 typedef void  *(WpMemReallocFunc)(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
@@ -42,6 +52,7 @@ void *wpMemAllocatorRealloc(const WpAllocator *allocator, void *ptr, u64 old_siz
 void *wpMemAllocatorReallocAligned(const WpAllocator *allocator, void *ptr, u64 old_size,
                                          u64 new_size, u64 alignment);
 void  wpMemAllocatorFree(const WpAllocator *allocator, void **ptr, u64 size);
+b8    wpMemAllocatorOpSupported(const WpAllocator *allocator, WpMemOp op);
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

src/base/queue/queue.c

@@ -6,7 +6,7 @@
 #include "../../common/misc/misc_utils.h"
 #include <string.h>
 
-void _queuePush(WpQueue *queue, void *item, u64 item_size) {
+void queuePush(WpQueue *queue, void *item, u64 item_size) {
 	wpDebugAssert(queue != NULL, "`queue` should not be NULL");
 	wpRuntimeAssert(item_size == wpArrayItemSize(queue->items), "Invalid type");
 
@@ -14,7 +14,7 @@ void _queuePush(WpQueue *queue, void *item, u64 item_size) {
 	if (queue->count >= capacity) { return; }
 
 	u64 index = (queue->back)++;
-	_arraySet(queue->items, index, item, item_size);
+	arraySet(queue->items, index, item, item_size);
 	++(queue->count);
 
 	if (queue->back >= capacity) {
@@ -22,7 +22,7 @@ void _queuePush(WpQueue *queue, void *item, u64 item_size) {
 	}
 }
 
-WpQueue *_queuePushAlloc(const WpAllocator *allocator, WpQueue *queue, void *item, u64 item_size) {
+WpQueue *queuePushAlloc(const WpAllocator *allocator, WpQueue *queue, void *item, u64 item_size) {
 	wpDebugAssert(allocator != NULL && queue != NULL && item != NULL,
 	                  "`allocator`, `queue` and `item` should not be NULL");
 	wpRuntimeAssert(item_size == wpArrayItemSize(queue->items), "Invalid type");
@@ -35,7 +35,7 @@ WpQueue *_queuePushAlloc(const WpAllocator *allocator, WpQueue *queue, void *ite
 	b8 queue_full = queue->count >= capacity;
 	if (queue_full) {
 		u64 new_capacity = wpMiscUtilsU64RoundUpPow2(capacity * 2);
-		u64 array_size   = _arrayCalcAllocSize(new_capacity, item_size);
+		u64 array_size   = arrayCalcAllocSize(new_capacity, item_size);
 		u64 alloc_size   = sizeof(WpQueue) + array_size;
 		void *buffer     = wpMemAllocatorAlloc(allocator, alloc_size);
 		if (!buffer) {
@@ -45,7 +45,7 @@ WpQueue *_queuePushAlloc(const WpAllocator *allocator, WpQueue *queue, void *ite
 		memset((void *)buffer, 0, alloc_size);
 
 		output        = (WpQueue *)buffer;
-		output->items = _arrayFromPreallocatedBuffer((void *)(output + 1), array_size, WP_ARRAY_INIT_FILLED, item_size);
+		output->items = arrayFromPreallocatedBuffer((void *)(output + 1), array_size, WP_ARRAY_INIT_FILLED, item_size);
 
 		// NOTE (Abdelrahman): When the queue is full, the front and back indices should
 		// always be the same
@@ -84,13 +84,13 @@ WpQueue *_queuePushAlloc(const WpAllocator *allocator, WpQueue *queue, void *ite
 		output->count = queue->count;
 	}
 
-	_queuePush(output, item, item_size);
+	queuePush(output, item, item_size);
 
 RETURN_QUEUE_PUSH_ALLOC:
 	return output;
 }
 
-void *_queuePop(WpQueue *queue, u64 item_size) {
+void *queuePop(WpQueue *queue, u64 item_size) {
 	wpDebugAssert(queue != NULL, "`queue` should not be NULL");
 	wpRuntimeAssert(item_size == wpArrayItemSize(queue->items), "Invalid type");
 
@@ -104,5 +104,5 @@ void *_queuePop(WpQueue *queue, u64 item_size) {
 		queue->front = 0;
 	}
 
-	return _arrayGet(queue->items, index, item_size);
+	return arrayGet(queue->items, index, item_size);
 }

src/base/queue/queue.h

@@ -12,7 +12,7 @@
 BEGIN_C_LINKAGE
 #endif // !WP_PLATFORM_CPP
 
-typedef struct {
+typedef struct WpQueue {
 	WpArray items;
 	u64 front;
 	u64 back;
@@ -42,7 +42,7 @@ typedef WpQueue WpStr8Queue;
 
 #ifdef WP_PLATFORM_CPP
 #define wpQueue(TYPE, CAPACITY) ([&]() {                                                           \
-	wp_persist WpArray arr   = wpArrayWithCapacity(TYPE, CAPACITY, WP_ARRAY_INIT_FILLED);     \
+	wp_persist WpArray arr   = wpArrayWithCapacity(TYPE, CAPACITY, WP_ARRAY_INIT_FILLED);            \
 	wp_persist WpQueue queue = {                                                                     \
 		arr,                                                                                           \
 		0,                                                                                             \
@@ -54,7 +54,7 @@ typedef WpQueue WpStr8Queue;
 }())
 #define wpQueueAlloc(TYPE, ALLOCATOR_PTR, CAPACITY) ([&]() {                                       \
 	wp_persist WpQueue queue = {                                                                     \
-		wpArrayAllocCapacity(TYPE, ALLOCATOR_PTR, CAPACITY, WP_ARRAY_INIT_FILLED),                   \
+		wpArrayAllocCapacity(TYPE, ALLOCATOR_PTR, CAPACITY, WP_ARRAY_INIT_FILLED),                     \
 		0,                                                                                             \
 		0,                                                                                             \
 		0,                                                                                             \
@@ -64,13 +64,13 @@ typedef WpQueue WpStr8Queue;
 }())
 #else
 #define wpQueue(TYPE, CAPACITY) ((WpQueue){                                                        \
-	.items = wpArrayWithCapacity(TYPE, CAPACITY, WP_ARRAY_INIT_FILLED),                            \
+	.items = wpArrayWithCapacity(TYPE, CAPACITY, WP_ARRAY_INIT_FILLED),                              \
 	.front = 0,                                                                                      \
 	.back  = 0,                                                                                      \
 	.count = 0,                                                                                      \
 })
 #define wpQueueAlloc(TYPE, ALLOCATOR_PTR, CAPACITY) ((WpQueue){                                    \
-	.items = wpArrayAllocCapacity(TYPE, ALLOCATOR_PTR, CAPACITY, WP_ARRAY_INIT_FILLED),            \
+	.items = wpArrayAllocCapacity(TYPE, ALLOCATOR_PTR, CAPACITY, WP_ARRAY_INIT_FILLED),              \
 	.front = 0,                                                                                      \
 	.back  = 0,                                                                                      \
 	.count = 0,                                                                                      \
@@ -80,18 +80,23 @@ typedef WpQueue WpStr8Queue;
 #define wpQueueCapacity(QUEUE_PTR) (wpArrayCapacity((QUEUE_PTR)->items))
 #define wpQueueItemSize(QUEUE_PTR) (wpArrayItemSize((QUEUE_PTR)->items))
 #define wpQueuePush(TYPE, QUEUE_PTR, VALUE_PTR) (                                                  \
-	_queuePush(QUEUE_PTR, VALUE_PTR, sizeof(TYPE))                                                   \
+	queuePush(QUEUE_PTR, VALUE_PTR, sizeof(TYPE))                                                    \
 )
 #define wpQueuePushAlloc(TYPE, ALLOCATOR_PTR, QUEUE_PTR, VALUE_PTR) (                              \
-	_queuePushAlloc(ALLOCATOR_PTR, QUEUE_PTR, VALUE_PTR, sizeof(TYPE))                               \
+	queuePushAlloc(ALLOCATOR_PTR, QUEUE_PTR, VALUE_PTR, sizeof(TYPE))                                \
 )
 #define wpQueuePop(TYPE, QUEUE_PTR) (                                                              \
-	(TYPE *)_queuePop(QUEUE_PTR, sizeof(TYPE))                                                       \
+	(TYPE *)queuePop(QUEUE_PTR, sizeof(TYPE))                                                        \
 )
+#define wpQueueDealloc(TYPE, ALLOCATOR_PTR, QUEUE_PTR)                                             \
+	(wpArrayDealloc(TYPE, ALLOCATOR_PTR, &((QUEUE_PTR)->items)),                                     \
+	 (QUEUE_PTR)->front = 0,                                                                         \
+	 (QUEUE_PTR)->back  = 0,                                                                         \
+	 (QUEUE_PTR)->count = 0)
 
-void _queuePush(WpQueue *queue, void *item, u64 item_size);
+void     queuePush(WpQueue *queue, void *item, u64 item_size);
-WpQueue *_queuePushAlloc(const WpAllocator *allocator, WpQueue *queue, void *item, u64 item_size);
+WpQueue *queuePushAlloc(const WpAllocator *allocator, WpQueue *queue, void *item, u64 item_size);
-void *_queuePop(WpQueue *queue, u64 item_size);
+void    *queuePop(WpQueue *queue, u64 item_size);
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

src/base/stream/stream.c

@@ -0,0 +1,43 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "stream.h"
+#include "../../common/aliases/aliases.h"
+#include "../../common/assert/assert.h"
+
+void streamValidate(const WpStream *stream, u64 item_size);
+
+b8 wpStreamAtEnd(const WpStream *stream) {
+	return stream->position >= stream->count;
+}
+
+b8 streamHasCount(const WpStream *stream, u64 count) {
+	return stream->position + count <= stream->count;
+}
+
+void *streamPeekWithOffset(const WpStream *stream, u64 offset, u64 item_size) {
+	streamValidate(stream, item_size);
+
+	if (streamHasCount(stream, offset + 1)) {
+		u64 index = (stream->position + offset) * stream->item_size;
+		return (void *)(&((u8 *)(stream->data))[index]);
+	}
+
+	return NULL;
+}
+
+void *streamConsumeCount(WpStream *stream, u64 count, u64 item_size) {
+	streamValidate(stream, item_size);
+
+	if (streamHasCount(stream, count)) {
+		u64 index = stream->position * stream->item_size;
+		stream->position += count;
+		return (void *)(&((u8 *)(stream->data))[index]);
+	}
+
+	return NULL;
+}
+
+void streamValidate(const WpStream *stream, u64 item_size) {
+	wpDebugAssert(stream != NULL, "`stream` should not be NULL");
+	wpRuntimeAssert(stream->item_size == item_size, "Invalid item type provided");
+}

src/base/stream/stream.h

@@ -0,0 +1,80 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef STREAM_H
+#define STREAM_H
+
+#include "../../common/aliases/aliases.h"
+#include "../../common/platform/platform.h"
+
+#ifdef WP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
+
+typedef struct WpStream {
+	void *data;
+	u64 count;
+	u64 position;
+	u64 item_size;
+} WpStream;
+
+// NOTE (Abdelrahman): WpStream typedefs for readability
+typedef WpStream WpVoidPtrStream;
+typedef WpStream WpC8Stream;
+typedef WpStream WpC16Stream;
+typedef WpStream WpC32Stream;
+typedef WpStream WpU8Stream;
+typedef WpStream WpU16Stream;
+typedef WpStream WpU32Stream;
+typedef WpStream WpU64Stream;
+typedef WpStream WpB8Stream;
+typedef WpStream WpI8Stream;
+typedef WpStream WpI16Stream;
+typedef WpStream WpI32Stream;
+typedef WpStream WpI64Stream;
+typedef WpStream WpF32Stream;
+typedef WpStream WpF64Stream;
+typedef WpStream WpF128Stream;
+typedef WpStream WpUptrStream;
+typedef WpStream WpIptrStream;
+typedef WpStream WpStr8Stream;
+
+#ifdef WP_PLATFORM_CPP
+#define wpStream(TYPE, DATA, SIZE) ([&]() {                                                        \
+	return WpStream{                                                                                 \
+		DATA,                                                                                          \
+		SIZE / sizeof(TYPE),                                                                           \
+		0,                                                                                             \
+		sizeof(TYPE)                                                                                   \
+	};                                                                                               \
+}())
+#else
+#define wpStream(TYPE, DATA, SIZE) (                                                               \
+	(WpStream){                                                                                      \
+		.data      = DATA,                                                                             \
+		.count     = SIZE / sizeof(TYPE),                                                              \
+		.position  = 0,                                                                                \
+		.item_size = sizeof(TYPE)                                                                      \
+	}                                                                                                \
+)
+#endif
+
+#define wpStreamHasNext(STREAM) streamHasCount(STREAM, 1)
+#define wpStreamHasCount(STREAM, COUNT) streamHasCount(STREAM, COUNT)
+#define wpStreamPeek(TYPE, STREAM) ((TYPE *)streamPeekWithOffset(STREAM, 0, sizeof(TYPE)))
+#define wpStreamPeekWithOffset(TYPE, STREAM, OFFSET) \
+	((TYPE *)streamPeekWithOffset(STREAM, OFFSET, sizeof(TYPE)))
+#define wpStreamConsume(TYPE, STREAM) ((TYPE *)streamConsumeCount(STREAM, 1, sizeof(TYPE)))
+#define wpStreamConsumeCount(TYPE, STREAM, COUNT) \
+	((TYPE *)streamConsumeCount(STREAM, COUNT, sizeof(TYPE)))
+
+b8 wpStreamAtEnd(const WpStream *stream);
+
+b8    streamHasCount(const WpStream *stream, u64 count);
+void *streamPeekWithOffset(const WpStream *stream, u64 offset, u64 item_size);
+void *streamConsumeCount(WpStream *stream, u64 count, u64 item_size);
+
+#ifdef WP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
+
+#endif // !STREAM_H

src/base/strings/str8/str8.c

@@ -115,6 +115,11 @@ void wpStr8Set(WpStr8 *str, u64 index, c8 c) {
 	str->buf[index] = c;
 }
 
+void wpStr8Clear(WpStr8 *str) {
+	memset(str->buf, 0, str->capacity);
+	str->size = 0;
+}
+
 void wpStr8PushBack(WpStr8 *str, c8 c) {
 	if (!(str->size < str->capacity)) {
 		return;
@@ -338,7 +343,7 @@ WpStr8List *wpStr8SplitWithMax(const WpAllocator *allocator, WpStr8RO *str, WpSt
 	if (delimiter->size > str->size) {
 		WpStr8 *full = wpStr8AllocStr8(allocator, str);
 		if (full) {
-			wpDblListPush_back_alloc(WpStr8, allocator, output, full);
+			wpDblListPushBackAlloc(WpStr8, allocator, output, full);
 		}
 
 		goto RETURN_STR8_SPLIT;
@@ -357,7 +362,7 @@ WpStr8List *wpStr8SplitWithMax(const WpAllocator *allocator, WpStr8RO *str, WpSt
 
 		before_str = wpStr8AllocSubstr(allocator, str, start, start + end);
 		if (before_str) {
-			wpDblListPush_back_alloc(WpStr8, allocator, output, before_str);
+			wpDblListPushBackAlloc(WpStr8, allocator, output, before_str);
 		}
 
 		wpMemAllocatorFree(allocator, (void **)&rest, sizeof(WpStr8));
@@ -370,7 +375,7 @@ WpStr8List *wpStr8SplitWithMax(const WpAllocator *allocator, WpStr8RO *str, WpSt
 	// Ensure the last part of the string after the delimiter is added to the list
 	rest = wpStr8AllocSubstr(allocator, str, start, str->size);
 	if (rest) {
-		wpDblListPush_back_alloc(WpStr8, allocator, output, rest);
+		wpDblListPushBackAlloc(WpStr8, allocator, output, rest);
 	}
 
 RETURN_STR8_SPLIT:
@@ -385,7 +390,7 @@ WpStr8List *wpStr8RsplitWithMax(const WpAllocator *allocator, WpStr8RO *str, WpS
 	if (delimiter->size > str->size) {
 		WpStr8 *full = wpStr8AllocStr8(allocator, str);
 		if (full) {
-			wpDblListPush_back_alloc(WpStr8, allocator, output, full);
+			wpDblListPushBackAlloc(WpStr8, allocator, output, full);
 		}
 
 		goto RETURN_STR8_SPLIT;
@@ -403,7 +408,7 @@ WpStr8List *wpStr8RsplitWithMax(const WpAllocator *allocator, WpStr8RO *str, WpS
 
 		after_str = wpStr8AllocSubstr(allocator, rest, end + delimiter->size, str->size);
 		if (after_str) {
-			wpDblListPush_front_alloc(WpStr8, allocator, output, after_str);
+			wpDblListPushFrontAlloc(WpStr8, allocator, output, after_str);
 		}
 
 		wpMemAllocatorFree(allocator, (void **)&rest, sizeof(WpStr8));
@@ -414,7 +419,7 @@ WpStr8List *wpStr8RsplitWithMax(const WpAllocator *allocator, WpStr8RO *str, WpS
 
 	rest = wpStr8AllocSubstr(allocator, str, 0, rest->size);
 	if (rest) {
-		wpDblListPush_front_alloc(WpStr8, allocator, output, rest);
+		wpDblListPushFrontAlloc(WpStr8, allocator, output, rest);
 	}
 
 RETURN_STR8_SPLIT:

src/base/strings/str8/str8.h

@@ -27,7 +27,7 @@ typedef const WpStr8 WpStr8RO;
 /**
  * Utilities to be used with printf functions
  */
-#define WP_STR8_SPEC "%.*s"
+#define WP_STR8_SPEC ".*s"
 #define wpStr8Varg(STRING) (int)((STRING).size), (STRING).buf
 
 /**
@@ -57,19 +57,19 @@ typedef const WpStr8 WpStr8RO;
 // Utilises the fact that memcpy returns pointer to dest buffer and that getting
 // address of compound literals is valid in C to create a string on the stack
 #define wpStr8Lit(STRING) ((WpStr8){.capacity  = (sizeof(STRING) - 1) * 2,                         \
-                                      .size      = sizeof(STRING) - 1,                             \
+                                    .size      = sizeof(STRING) - 1,                               \
-                                      .buf       = memcpy(&((c8 [sizeof(STRING) * 2]){0}),         \
+                                    .buf       = memcpy(&((c8 [sizeof(STRING) * 2]){0}),           \
-                                                          STRING,                                  \
+                                                        STRING,                                    \
-                                                          sizeof(STRING))})
+                                                        sizeof(STRING))})
 #define wpStr8LitRo(STRING) ((WpStr8RO){.capacity  = sizeof(STRING) - 1,                           \
-                                           .size      = sizeof(STRING) - 1,                        \
+                                        .size      = sizeof(STRING) - 1,                           \
-                                           .buf       = (c8 *)STRING})
+                                        .buf       = (c8 *)STRING})
 // To be used only when initialising a static storage variable in compilers that don't support
 // initialisers with the syntax of wpStr8LitRo (e.g. gcc). Should only be used when necessary
 // and only be assigned to a WpStr8RO variable to avoid any attempt at modifying the string
 #define wpStr8LitRoInitialiserList(STRING) {.capacity  = sizeof(STRING) - 1,                       \
-                                                   .size      = sizeof(STRING) - 1,                \
+                                            .size      = sizeof(STRING) - 1,                       \
-                                                   .buf       = (c8 *)STRING}
+                                            .buf       = (c8 *)STRING}
 #endif // !WP_PLATFORM_CPP
 
 /**
@@ -88,20 +88,21 @@ void wpStr8DeallocBuf(const WpAllocator *allocator, WpStr8 **str);
 /**
  * WpStr8 utilities
  */
-c8   wpStr8Get(WpStr8RO *str, u64 index);
+c8     wpStr8Get(WpStr8RO *str, u64 index);
-void wpStr8Set(WpStr8 *str, u64 index, c8 c);
+void   wpStr8Set(WpStr8 *str, u64 index, c8 c);
-void wpStr8PushBack(WpStr8 *str, c8 c);
+void   wpStr8Clear(WpStr8 *str);
-b8   wpStr8Equal(WpStr8RO *s1, WpStr8RO *s2);
+void   wpStr8PushBack(WpStr8 *str, c8 c);
-b8   wpStr8EqualToCount(WpStr8RO* s1, WpStr8RO* s2, u64 count);
+b8     wpStr8Equal(WpStr8RO *s1, WpStr8RO *s2);
+b8     wpStr8EqualToCount(WpStr8RO* s1, WpStr8RO* s2, u64 count);
 WpStr8 wpStr8Slice(WpStr8RO *str, u64 start, u64 end);
-void wpStr8ConcatCapped(WpStr8 *dst, WpStr8RO *src);
+void   wpStr8ConcatCapped(WpStr8 *dst, WpStr8RO *src);
-void wpStr8CopyCstrCapped(WpStr8 *dst, const char *src);
+void   wpStr8CopyCstrCapped(WpStr8 *dst, const char *src);
-void wpStr8CopyStr8Capped(WpStr8 *dst, WpStr8RO *src);
+void   wpStr8CopyStr8Capped(WpStr8 *dst, WpStr8RO *src);
-void wpStr8CopyToCstr(char *dst, WpStr8RO *src, u64 dst_capacity);
+void   wpStr8CopyToCstr(char *dst, WpStr8RO *src, u64 dst_capacity);
-void wpStr8Format(WpStr8 *dst, const char *format, ...);
+void   wpStr8Format(WpStr8 *dst, const char *format, ...);
-void wpStr8ToLower(WpStr8 *dst, WpStr8RO *src);
+void   wpStr8ToLower(WpStr8 *dst, WpStr8RO *src);
-void wpStr8ToUpper(WpStr8 *dst, WpStr8RO *src);
+void   wpStr8ToUpper(WpStr8 *dst, WpStr8RO *src);
-void wpStr8FromBytes(WpStr8 *dst, const WpU8Array src);
+void   wpStr8FromBytes(WpStr8 *dst, const WpU8Array src);
 
 /**
  * WpStr8 find functions

src/base/wapp_base.c

@@ -6,7 +6,14 @@
 #include "wapp_base.h"
 #include "array/array.c"
 #include "dbl_list/dbl_list.c"
+#include "hash/hasher/hasher.c"
+#include "hash/hasher/murmur3.c"
+#include "hash/hasher/siphash.c"
+#include "hash/table/table.c"
+#include "hash/set/set.c"
+#include "hash/map/map.c"
 #include "queue/queue.c"
+#include "stream/stream.c"
 #include "mem/allocator/mem_allocator.c"
 #include "mem/utils/mem_utils.c"
 #include "strings/str8/str8.c"

src/base/wapp_base.h

@@ -5,7 +5,14 @@
 
 #include "array/array.h"
 #include "dbl_list/dbl_list.h"
+#include "hash/hasher/hasher.h"
+#include "hash/hasher/murmur3.h"
+#include "hash/hasher/siphash.h"
+#include "hash/table/table.h"
+#include "hash/set/set.h"
+#include "hash/map/map.h"
 #include "queue/queue.h"
+#include "stream/stream.h"
 #include "mem/allocator/mem_allocator.h"
 #include "mem/utils/mem_utils.h"
 #include "strings/str8/str8.h"

src/common/aliases/aliases.h

@@ -28,6 +28,11 @@ typedef uint16_t u16;
 typedef uint32_t u32;
 typedef uint64_t u64;
 
+#define wpU8Const UINT8_C
+#define wpU16Const UINT16_C
+#define wpU32Const UINT32_C
+#define wpU64Const UINT64_C
+
 typedef uint8_t b8;
 
 #ifndef WP_PLATFORM_CPP
@@ -47,6 +52,11 @@ typedef int16_t i16;
 typedef int32_t i32;
 typedef int64_t i64;
 
+#define wpI8Const INT8_C
+#define wpI16Const INT16_C
+#define wpI32Const INT32_C
+#define wpI64Const INT64_C
+
 typedef float f32;
 typedef double f64;
 typedef long double f128;

src/common/assert/assert.h

@@ -16,7 +16,7 @@ BEGIN_C_LINKAGE
 #define wpStaticAssert(EXPR, MSG) wp_extern char ASSERTION_FAILED[EXPR ? 1 : -1]
 
 #ifndef WP_NO_RUNTIME_ASSERT
-	#define wpRuntimeAssert(EXPR, MSG) _runtimeAssert(EXPR, MSG)
+	#define wpRuntimeAssert(EXPR, MSG) runtimeAssert(EXPR, MSG)
 #else
 	#define wpRuntimeAssert(EXPR, MSG)
 #endif
@@ -28,23 +28,23 @@ BEGIN_C_LINKAGE
 #endif
 
 #ifdef WP_PLATFORM_WINDOWS
-#define _runtimeAssert(EXPR, MSG) do {                                              \
+#define runtimeAssert(EXPR, MSG) do {                                               \
 	__pragma(warning(push))                                                           \
 	__pragma(warning(disable:4127))                                                   \
 	if (!(EXPR)) {                                                                    \
 	__pragma(warning(pop))                                                            \
-		_runtimeAssertFailed(EXPR, MSG);                                                \
+		runtimeAssertFailed(EXPR, MSG);                                                 \
 	}                                                                                 \
 } while(false)
 #else
-#define _runtimeAssert(EXPR, MSG) do {                                              \
+#define runtimeAssert(EXPR, MSG) do {                                               \
 	if (!(EXPR)) {                                                                    \
-		_runtimeAssertFailed(EXPR, MSG);                                                \
+		runtimeAssertFailed(EXPR, MSG);                                                 \
 	}                                                                                 \
 } while(false)
 #endif // !WP_PLATFORM_WINDOWS
 
-#define _runtimeAssertFailed(EXPR, MSG) do {                                        \
+#define runtimeAssertFailed(EXPR, MSG) do {                                         \
 	fprintf(                                                                          \
 		stderr,                                                                         \
 		"%s:%d (In function `%s`): Assertion failed (%" PRIu32 ")\nDiagnostic: %s\n\n", \

src/common/misc/misc_utils.h

@@ -29,26 +29,35 @@ BEGIN_C_LINKAGE
 #define U64_RSHIFT_OR_2(X)  (((u64)X) | (((u64)X) >> 2))
 #define U64_RSHIFT_OR_4(X)  (((u64)X) | (((u64)X) >> 4))
 #define U64_RSHIFT_OR_8(X)  (((u64)X) | (((u64)X) >> 8))
-#define U64_RSHIFT_OR_16(X)  (((u64)X) | (((u64)X) >> 16))
+#define U64_RSHIFT_OR_16(X) (((u64)X) | (((u64)X) >> 16))
-#define U64_RSHIFT_OR_32(X)  (((u64)X) | (((u64)X) >> 32))
+#define U64_RSHIFT_OR_32(X) (((u64)X) | (((u64)X) >> 32))
-#define wpMiscUtilsU64RoundUpPow2(X) (         \
+#define wpMiscUtilsU64RoundUpPow2(X) (                                                             \
-	(                                            \
+	(                                                                                                \
-		U64_RSHIFT_OR_32(                          \
+		U64_RSHIFT_OR_32(                                                                              \
-			U64_RSHIFT_OR_16(                        \
+			U64_RSHIFT_OR_16(                                                                            \
-				U64_RSHIFT_OR_8(                       \
+				U64_RSHIFT_OR_8(                                                                           \
-					U64_RSHIFT_OR_4(                     \
+					U64_RSHIFT_OR_4(                                                                         \
-						U64_RSHIFT_OR_2(                   \
+						U64_RSHIFT_OR_2(                                                                       \
-							U64_RSHIFT_OR_1(X - 1)           \
+							U64_RSHIFT_OR_1(X - 1)                                                               \
-						)                                  \
+						)                                                                                      \
-					)                                    \
+					)                                                                                        \
-				)                                      \
+				)                                                                                          \
-			)                                        \
+			)                                                                                            \
-		)                                          \
+		)                                                                                              \
-	) + 1                                        \
+	) + 1                                                                                            \
 )
 
 #define wpMiscUtilsIsPowerOfTwo(NUM) ((NUM & (NUM - 1)) == 0)
 #define wpMiscUtilsOffsetPointer(PTR, OFFSET) ((void *)((uptr)(PTR) + (OFFSET)))
+#define wpMiscUtilsSwap(TYPE, A_PTR, B_PTR) do {                                                   \
+	TYPE tmp = *(A_PTR);                                                                             \
+	*(A_PTR) = *(B_PTR);                                                                             \
+	*(B_PTR) = tmp;                                                                                  \
+} while(0)
+
+wp_intern inline u64 wpMiscUtilsRotl64(u64 x, i8 rotation) {
+  return (x << rotation) | (x >> (64 - rotation));
+}
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

src/common/platform/platform.h

@@ -3,6 +3,7 @@
 #ifndef PLATFORM_H
 #define PLATFORM_H
 
+// Operating system
 #if defined(__ANDROID__)
 	#define WP_PLATFORM_ANDROID
 	#define WP_PLATFORM_POSIX
@@ -60,6 +61,39 @@
 	#error "Unrecognised platform"
 #endif
 
+// Compiler
+#if defined(__clang__)
+	#define WP_PLATFORM_CLANG
+
+	#if defined(__GNUG__)
+		#define WP_PLATFORM_CLANGPP
+	#endif
+
+	#define WP_PLATFORM_CLANG_MAJOR __clang_major__
+	#define WP_PLATFORM_CLANG_MINOR __clang_minor__
+	#define WP_PLATFORM_CLANG_PATCH __clang_patchlevel__
+#elif defined(__GNUC__) || defined(__GNUG__)
+	#define WP_PLATFORM_GCC
+
+	#if defined(__GNUG__)
+		#define WP_PLATFORM_GPP
+	#endif
+
+	#define WP_PLATFORM_GCC_MAJOR __GNUC__
+	#define WP_PLATFORM_GCC_MINOR __GNUC_MINOR__
+
+	#if defined(__GNUC_PATCHLEVEL__)
+		#define WP_PLATFORM_GCC_PATCH __GNUC_PATCHLEVEL__
+	#endif
+#elif defined(_MSC_VER)
+	#define WP_PLATFORM_MSVC
+	#define WP_PLATFORM_MSVC_FULL_VERSION _MSC_FULL_VER
+	#define WP_PLATFORM_MSVC_VERSION _MSC_VER
+#else
+	#error "Unrecognised compiler"
+#endif
+
+// Language
 #ifdef __cplusplus
 	#define WP_PLATFORM_CPP
 	#define WP_PLATFORM_CPP_VERSION __cplusplus

src/log/log.c

@@ -15,12 +15,12 @@ wp_intern WpStr8RO L_BRACKET         = wpStr8LitRo("[");
 wp_intern WpStr8RO R_BRACKET_SPACE   = wpStr8LitRo("] ");
 wp_intern WpStr8RO R_BRACKET_NEWLINE = wpStr8LitRo("]\n");
 
-typedef struct {
+typedef struct LogConfig {
-	WFile *outlog;
+	WpFile *outlog;
-	WFile *errlog;
+	WpFile *errlog;
 	WpLogLevel level;
 
-	wpMiscUtilsReservePadding(2 * sizeof(WFile *) + sizeof(WpLogLevel));
+	wpMiscUtilsReservePadding(2 * sizeof(WpFile *) + sizeof(WpLogLevel));
 } LogConfig;
 
 wp_intern LogConfig LOG_CONFIG = {
@@ -35,14 +35,14 @@ wp_intern WpStr8RO LOG_LEVEL_STRINGS[COUNT_LOG_LEVEL] = {
 	[WP_LOG_LEVEL_DEBUG]    = wpStr8LitRoInitialiserList("debug    "),
 };
 
-wp_intern void _get_current_time_string(WpStr8 *dst);
+wp_intern void getCurrentTimeString(WpStr8 *dst);
-wp_intern void _write_log_line(WFile *fp, const WpLogger *logger, WpStr8 msg, WpLogLevel level);
+wp_intern void writeLogLine(WpFile *fp, const WpLogger *logger, WpStr8 msg, WpLogLevel level);
 
 void wpLogSetLevel(WpLogLevel level) {
 	LOG_CONFIG.level = level;
 }
 
-void wpLogConfigure(WFile *outlog, WFile *errlog, WpLogLevel level) {
+void wpLogConfigure(WpFile *outlog, WpFile *errlog, WpLogLevel level) {
 	LOG_CONFIG.outlog = outlog;
 	LOG_CONFIG.errlog = errlog;
 	LOG_CONFIG.level  = level;
@@ -56,51 +56,51 @@ void wpLogDebug(const WpLogger *logger, WpStr8 msg) {
 	wpDebugAssert(logger != NULL, "`logger` should not be NULL");
 	if (LOG_CONFIG.level < WP_LOG_LEVEL_DEBUG) { return; }
 
-	WFile *fp = LOG_CONFIG.outlog != NULL ? LOG_CONFIG.outlog : wapp_file_stdout();
+	WpFile *fp = LOG_CONFIG.outlog != NULL ? LOG_CONFIG.outlog : wpFileStdout();
-	_write_log_line(fp, logger, msg, WP_LOG_LEVEL_DEBUG);
+	writeLogLine(fp, logger, msg, WP_LOG_LEVEL_DEBUG);
 }
 
 void wpLogInfo(const WpLogger *logger, WpStr8 msg) {
 	wpDebugAssert(logger != NULL, "`logger` should not be NULL");
 	if (LOG_CONFIG.level < WP_LOG_LEVEL_INFO) { return; }
 
-	WFile *fp = LOG_CONFIG.outlog != NULL ? LOG_CONFIG.outlog : wapp_file_stdout();
+	WpFile *fp = LOG_CONFIG.outlog != NULL ? LOG_CONFIG.outlog : wpFileStdout();
-	_write_log_line(fp, logger, msg, WP_LOG_LEVEL_INFO);
+	writeLogLine(fp, logger, msg, WP_LOG_LEVEL_INFO);
 }
 
 void wpLogWarning(const WpLogger *logger, WpStr8 msg) {
 	wpDebugAssert(logger != NULL, "`logger` should not be NULL");
 	if (LOG_CONFIG.level < WP_LOG_LEVEL_WARNING) { return; }
 
-	WFile *fp = LOG_CONFIG.outlog != NULL ? LOG_CONFIG.outlog : wapp_file_stdout();
+	WpFile *fp = LOG_CONFIG.outlog != NULL ? LOG_CONFIG.outlog : wpFileStdout();
-	_write_log_line(fp, logger, msg, WP_LOG_LEVEL_WARNING);
+	writeLogLine(fp, logger, msg, WP_LOG_LEVEL_WARNING);
 }
 
 void wpLogError(const WpLogger *logger, WpStr8 msg) {
 	wpDebugAssert(logger != NULL, "`logger` should not be NULL");
 	if (LOG_CONFIG.level < WP_LOG_LEVEL_ERROR) { return; }
 
-	WFile *fp = LOG_CONFIG.errlog != NULL ? LOG_CONFIG.errlog : wapp_file_stderr();
+	WpFile *fp = LOG_CONFIG.errlog != NULL ? LOG_CONFIG.errlog : wpFileStderr();
-	_write_log_line(fp, logger, msg, WP_LOG_LEVEL_ERROR);
+	writeLogLine(fp, logger, msg, WP_LOG_LEVEL_ERROR);
 }
 
 void wpLogCritical(const WpLogger *logger, WpStr8 msg) {
 	wpDebugAssert(logger != NULL, "`logger` should not be NULL");
 	if (LOG_CONFIG.level < WP_LOG_LEVEL_CRITICAL) { return; }
 
-	WFile *fp = LOG_CONFIG.errlog != NULL ? LOG_CONFIG.errlog : wapp_file_stderr();
+	WpFile *fp = LOG_CONFIG.errlog != NULL ? LOG_CONFIG.errlog : wpFileStderr();
-	_write_log_line(fp, logger, msg, WP_LOG_LEVEL_CRITICAL);
+	writeLogLine(fp, logger, msg, WP_LOG_LEVEL_CRITICAL);
 }
 
 void wpLogFatal(const WpLogger *logger, WpStr8 msg) {
 	wpDebugAssert(logger != NULL, "`logger` should not be NULL");
 	if (LOG_CONFIG.level < WP_LOG_LEVEL_FATAL) { return; }
 
-	WFile *fp = LOG_CONFIG.errlog != NULL ? LOG_CONFIG.errlog : wapp_file_stderr();
+	WpFile *fp = LOG_CONFIG.errlog != NULL ? LOG_CONFIG.errlog : wpFileStderr();
-	_write_log_line(fp, logger, msg, WP_LOG_LEVEL_FATAL);
+	writeLogLine(fp, logger, msg, WP_LOG_LEVEL_FATAL);
 }
 
-wp_intern void _get_current_time_string(WpStr8 *dst) {
+wp_intern void getCurrentTimeString(WpStr8 *dst) {
 	// TODO (Abdelrahman): Replace with proper date/time utilities
 	char buf[TIME_BUF_CAPACITY];
 	time_t now = time(NULL);
@@ -110,15 +110,15 @@ wp_intern void _get_current_time_string(WpStr8 *dst) {
 	wpStr8CopyCstrCapped(dst, buf);
 }
 
-wp_intern void _write_log_line(WFile *fp, const WpLogger *logger, WpStr8 msg, WpLogLevel level) {
+wp_intern void writeLogLine(WpFile *fp, const WpLogger *logger, WpStr8 msg, WpLogLevel level) {
 	WpStr8 padding     = wpStr8Buf(MIN_LOG_MSG_LENGTH);
 	u32 padding_size = msg.size < MIN_LOG_MSG_LENGTH ? MIN_LOG_MSG_LENGTH - msg.size + 1 : 0;
 	wpStr8Format(&padding, "%-*s", padding_size, " ");
 
 	WpStr8 time_str = wpStr8Buf(TIME_BUF_CAPACITY);
-	_get_current_time_string(&time_str);
+	getCurrentTimeString(&time_str);
 
-	WpStr8RO **strings = wapp_array(
+	WpStr8RO **strings = wpArray(
 		WpStr8RO *,
 		&time_str,
 		&L_BRACKET,
@@ -131,7 +131,7 @@ wp_intern void _write_log_line(WFile *fp, const WpLogger *logger, WpStr8 msg, Wp
 		&R_BRACKET_NEWLINE
 	);
 
-	for (u64 i = 0; i < wapp_array_count(strings); ++i) {
+	for (u64 i = 0; i < wpArrayCount(strings); ++i) {
-		wapp_file_write_str8(strings[i], fp);
+		wpFileWriteStr8(strings[i], fp);
 	}
 }

src/log/log.h

@@ -6,7 +6,11 @@
 #include "../os/file/file.h"
 #include "../base/strings/str8/str8.h"
 
-typedef enum {
+#ifdef WP_PLATFORM_CPP
+BEGIN_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
+
+typedef enum WpLogLevel {
 	WP_LOG_LEVEL_FATAL,
 	WP_LOG_LEVEL_CRITICAL,
 	WP_LOG_LEVEL_ERROR,
@@ -17,18 +21,22 @@ typedef enum {
 	COUNT_LOG_LEVEL,
 } WpLogLevel;
 
-typedef struct {
+typedef struct WpLogger {
 	WpStr8 name;
 } WpLogger;
 
-void wpLogSetLevel(WpLogLevel level);
+void     wpLogSetLevel(WpLogLevel level);
-void wpLogConfigure(WFile *outlog, WFile *errlog, WpLogLevel level);
+void     wpLogConfigure(WpFile *outlog, WpFile *errlog, WpLogLevel level);
 WpLogger wpLogMakeLogger(WpStr8 name);
-void wpLogDebug(const WpLogger *logger, WpStr8 msg);
+void     wpLogDebug(const WpLogger *logger, WpStr8 msg);
-void wpLogInfo(const WpLogger *logger, WpStr8 msg);
+void     wpLogInfo(const WpLogger *logger, WpStr8 msg);
-void wpLogWarning(const WpLogger *logger, WpStr8 msg);
+void     wpLogWarning(const WpLogger *logger, WpStr8 msg);
-void wpLogError(const WpLogger *logger, WpStr8 msg);
+void     wpLogError(const WpLogger *logger, WpStr8 msg);
-void wpLogCritical(const WpLogger *logger, WpStr8 msg);
+void     wpLogCritical(const WpLogger *logger, WpStr8 msg);
-void wpLogFatal(const WpLogger *logger, WpStr8 msg);
+void     wpLogFatal(const WpLogger *logger, WpStr8 msg);
+
+#ifdef WP_PLATFORM_CPP
+END_C_LINKAGE
+#endif // !WP_PLATFORM_CPP
 
 #endif // !LOG_H

src/oldnames.h

@@ -0,0 +1,615 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+//
+// oldnames.h — backward-compatible #define mappings for renames in the
+// wizapp-stdlib naming-conventions branch.
+//
+// Every public API symbol that was renamed is mapped from its old name to
+// its new name so that existing code continues to compile without changes.
+//
+// Rename patterns applied across all modules:
+//   wapp_xxx()  →  wpXxx()
+//   WAPP_XXX    →  WP_XXX
+//   GenericXxx  →  WpXxx
+//   SHELL_XXX   →  WP_SHELL_XXX
+//   _xxx_yyy()  →  _xxxYyy()
+//
+// Sections: Constants → Types → Functions
+
+#ifndef OLDNAMES_H
+#define OLDNAMES_H
+
+// ============================================================================
+// ===== Constants =====
+// ============================================================================
+
+// --- Aliases ---
+
+#define WAPP_PLATFORM_CPP    WP_PLATFORM_CPP
+#define WAPP_PLATFORM_C      WP_PLATFORM_C
+
+// --- Arena ---
+
+#define WAPP_MEM_ALLOC_RESERVE WP_MEM_ALLOC_RESERVE
+#define WAPP_MEM_ALLOC_COMMIT  WP_MEM_ALLOC_COMMIT
+
+// --- Array ---
+
+#define WAPP_ARRAY_MAGIC     WP_ARRAY_MAGIC
+#define ARRAY_INIT_NONE      WP_ARRAY_INIT_NONE
+#define ARRAY_INIT_FILLED    WP_ARRAY_INIT_FILLED
+
+// --- Assert ---
+
+#define WAPP_NO_RUNTIME_ASSERT  WP_NO_RUNTIME_ASSERT
+#define WAPP_DEBUG_ASSERT       WP_DEBUG_ASSERT
+
+// --- CPath ---
+
+#define WAPP_PATH_SEP WP_PATH_SEP
+#define WAPP_PATH_MAX WP_PATH_MAX
+
+#define CPATH_JOIN_SUCCESS                    WP_CPATH_JOIN_RESULT_SUCCESS
+#define CPATH_JOIN_INVALID_ARGS               WP_CPATH_JOIN_RESULT_INVALID_ARGS
+#define CPATH_JOIN_EMPTY_PARTS                WP_CPATH_JOIN_RESULT_EMPTY_PARTS
+#define CPATH_JOIN_INSUFFICIENT_DST_CAPACITY  WP_CPATH_JOIN_RESULT_INSUFFICIENT_DST_CAPACITY
+
+// --- DblList ---
+
+#define WAPP_DBL_LIST_MAGIC WP_DBL_LIST_MAGIC
+#define WAPP_DBL_NODE_MAGIC WP_DBL_NODE_MAGIC
+
+// --- File ---
+
+#define WAPP_ACCESS_READ                    WP_ACCESS_READ
+#define WAPP_ACCESS_WRITE                   WP_ACCESS_WRITE
+#define WAPP_ACCESS_APPEND                  WP_ACCESS_APPEND
+#define WAPP_ACCESS_READ_EX                 WP_ACCESS_READ_EX
+#define WAPP_ACCESS_WRITE_EX                WP_ACCESS_WRITE_EX
+#define WAPP_ACCESS_APPEND_EX               WP_ACCESS_APPEND_EX
+#define WAPP_ACCESS_WRITE_FAIL_ON_EXIST     WP_ACCESS_WRITE_FAIL_ON_EXIST
+#define WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX  WP_ACCESS_WRITE_FAIL_ON_EXIST_EX
+#define WAPP_SEEK_START                     WP_SEEK_START
+#define WAPP_SEEK_CURRENT                   WP_SEEK_CURRENT
+#define WAPP_SEEK_END                       WP_SEEK_END
+#define END_OF_LINE                         WP_END_OF_LINE
+
+// --- Log ---
+
+#define WAPP_LOG_FATAL     WP_LOG_LEVEL_FATAL
+#define WAPP_LOG_CRITICAL  WP_LOG_LEVEL_CRITICAL
+#define WAPP_LOG_ERROR     WP_LOG_LEVEL_ERROR
+#define WAPP_LOG_WARNING   WP_LOG_LEVEL_WARNING
+#define WAPP_LOG_INFO      WP_LOG_LEVEL_INFO
+#define WAPP_LOG_DEBUG     WP_LOG_LEVEL_DEBUG
+
+// --- Mem Os ---
+
+#define WAPP_MEM_ACCESS_NONE             WP_MEM_ACCESS_NONE
+#define WAPP_MEM_ACCESS_READ_ONLY        WP_MEM_ACCESS_READ_ONLY
+#define WAPP_MEM_ACCESS_EXEC_ONLY        WP_MEM_ACCESS_EXEC_ONLY
+#define WAPP_MEM_ACCESS_READ_WRITE       WP_MEM_ACCESS_READ_WRITE
+#define WAPP_MEM_ACCESS_READ_EXEC        WP_MEM_ACCESS_READ_EXEC
+#define WAPP_MEM_ACCESS_READ_WRITE_EXEC  WP_MEM_ACCESS_READ_WRITE_EXEC
+#define WAPP_MEM_INIT_UNINITIALISED      WP_MEM_INIT_UNINITIALISED
+#define WAPP_MEM_INIT_INITIALISED        WP_MEM_INIT_INITIALISED
+
+// --- Platform ---
+
+#define WAPP_PLATFORM_ANDROID        WP_PLATFORM_ANDROID
+#define WAPP_PLATFORM_FREE_BSD       WP_PLATFORM_FREE_BSD
+#define WAPP_PLATFORM_NET_BSD        WP_PLATFORM_NET_BSD
+#define WAPP_PLATFORM_OPEN_BSD       WP_PLATFORM_OPEN_BSD
+#define WAPP_PLATFORM_DRAGON_FLY     WP_PLATFORM_DRAGON_FLY
+#define WAPP_PLATFORM_BSD            WP_PLATFORM_BSD
+#define WAPP_PLATFORM_POSIX          WP_PLATFORM_POSIX
+#define WAPP_PLATFORM_LINUX          WP_PLATFORM_LINUX
+#define WAPP_PLATFORM_GNU            WP_PLATFORM_GNU
+#define WAPP_PLATFORM_IOS            WP_PLATFORM_IOS
+#define WAPP_PLATFORM_APPLE          WP_PLATFORM_APPLE
+#define WAPP_PLATFORM_MACOS          WP_PLATFORM_MACOS
+#define WAPP_PLATFORM_WINDOWS64      WP_PLATFORM_WINDOWS64
+#define WAPP_PLATFORM_WINDOWS32      WP_PLATFORM_WINDOWS32
+#define WAPP_PLATFORM_WINDOWS        WP_PLATFORM_WINDOWS
+#define WAPP_PLATFORM_CYGWIN         WP_PLATFORM_CYGWIN
+#define WAPP_PLATFORM_UNIX           WP_PLATFORM_UNIX
+#define WAPP_PLATFORM_CPP_VERSION    WP_PLATFORM_CPP_VERSION
+#define WAPP_PLATFORM_CPP98_VERSION  WP_PLATFORM_CPP98_VERSION
+#define WAPP_PLATFORM_CPP11_VERSION  WP_PLATFORM_CPP11_VERSION
+#define WAPP_PLATFORM_CPP14_VERSION  WP_PLATFORM_CPP14_VERSION
+#define WAPP_PLATFORM_CPP17_VERSION  WP_PLATFORM_CPP17_VERSION
+#define WAPP_PLATFORM_CPP20_VERSION  WP_PLATFORM_CPP20_VERSION
+#define WAPP_PLATFORM_CPP23_VERSION  WP_PLATFORM_CPP23_VERSION
+#define WAPP_PLATFORM_CPP98          WP_PLATFORM_CPP98
+#define WAPP_PLATFORM_CPP11          WP_PLATFORM_CPP11
+#define WAPP_PLATFORM_CPP14          WP_PLATFORM_CPP14
+#define WAPP_PLATFORM_CPP17          WP_PLATFORM_CPP17
+#define WAPP_PLATFORM_CPP20          WP_PLATFORM_CPP20
+#define WAPP_PLATFORM_CPP23          WP_PLATFORM_CPP23
+#define WAPP_PLATFORM_C_VERSION      WP_PLATFORM_C_VERSION
+#define WAPP_PLATFORM_C99_VERSION    WP_PLATFORM_C99_VERSION
+#define WAPP_PLATFORM_C11_VERSION    WP_PLATFORM_C11_VERSION
+#define WAPP_PLATFORM_C17_VERSION    WP_PLATFORM_C17_VERSION
+#define WAPP_PLATFORM_C23_VERSION    WP_PLATFORM_C23_VERSION
+#define WAPP_PLATFORM_C99            WP_PLATFORM_C99
+#define WAPP_PLATFORM_C11            WP_PLATFORM_C11
+#define WAPP_PLATFORM_C17            WP_PLATFORM_C17
+#define WAPP_PLATFORM_C23            WP_PLATFORM_C23
+#define WAPP_PLATFORM_C89            WP_PLATFORM_C89
+
+// --- Shell Commander ---
+
+#define SHELL_OUTPUT_DISCARD       WP_SHELL_OUTPUT_DISCARD
+#define SHELL_OUTPUT_PRINT         WP_SHELL_OUTPUT_PRINT
+#define SHELL_OUTPUT_CAPTURE       WP_SHELL_OUTPUT_CAPTURE
+#define SHELL_ERR_NO_ERROR         WP_SHELL_ERR_NO_ERROR
+#define SHELL_ERR_INVALID_ARGS     WP_SHELL_ERR_INVALID_ARGS
+#define SHELL_ERR_ALLOCATION_FAIL  WP_SHELL_ERR_ALLOCATION_FAIL
+#define SHELL_ERR_PROC_START_FAIL  WP_SHELL_ERR_PROC_START_FAIL
+#define SHELL_ERR_OUT_BUF_FULL     WP_SHELL_ERR_OUT_BUF_FULL
+#define SHELL_ERR_PROC_EXIT_FAIL   WP_SHELL_ERR_PROC_EXIT_FAIL
+
+// --- Shell Termcolour ---
+
+#define WAPP_TERM_COLOUR_FG_BLACK       WP_TERM_COLOUR_FG_BLACK
+#define WAPP_TERM_COLOUR_FG_RED         WP_TERM_COLOUR_FG_RED
+#define WAPP_TERM_COLOUR_FG_GREEN       WP_TERM_COLOUR_FG_GREEN
+#define WAPP_TERM_COLOUR_FG_BLUE        WP_TERM_COLOUR_FG_BLUE
+#define WAPP_TERM_COLOUR_FG_CYAN        WP_TERM_COLOUR_FG_CYAN
+#define WAPP_TERM_COLOUR_FG_MAGENTA     WP_TERM_COLOUR_FG_MAGENTA
+#define WAPP_TERM_COLOUR_FG_YELLOW      WP_TERM_COLOUR_FG_YELLOW
+#define WAPP_TERM_COLOUR_FG_WHITE       WP_TERM_COLOUR_FG_WHITE
+#define WAPP_TERM_COLOUR_FG_BR_BLACK    WP_TERM_COLOUR_FG_BR_BLACK
+#define WAPP_TERM_COLOUR_FG_BR_RED      WP_TERM_COLOUR_FG_BR_RED
+#define WAPP_TERM_COLOUR_FG_BR_GREEN    WP_TERM_COLOUR_FG_BR_GREEN
+#define WAPP_TERM_COLOUR_FG_BR_BLUE     WP_TERM_COLOUR_FG_BR_BLUE
+#define WAPP_TERM_COLOUR_FG_BR_CYAN     WP_TERM_COLOUR_FG_BR_CYAN
+#define WAPP_TERM_COLOUR_FG_BR_MAGENTA  WP_TERM_COLOUR_FG_BR_MAGENTA
+#define WAPP_TERM_COLOUR_FG_BR_YELLOW   WP_TERM_COLOUR_FG_BR_YELLOW
+#define WAPP_TERM_COLOUR_FG_BR_WHITE    WP_TERM_COLOUR_FG_BR_WHITE
+#define WAPP_TERM_COLOUR_CLEAR          WP_TERM_COLOUR_CLEAR
+
+// --- Str8 ---
+
+#define WAPP_STR8_SPEC WP_STR8_SPEC
+
+// --- UUID ---
+
+#define UUID_BUF_LENGTH WP_UUID_BUF_LENGTH
+#define WAPP_UUID_SPEC  WP_UUID_SPEC
+
+// ============================================================================
+// ===== Types =====
+// ============================================================================
+
+// --- Aliases ---
+
+#define wapp_extern    wp_extern
+#define wapp_intern    wp_intern
+#define wapp_persist   wp_persist
+#define wapp_class_mem wp_class_mem
+
+// --- Arena ---
+
+#define Arena WpArena
+
+// --- Array ---
+
+#define GenericArray    WpArray
+#define VoidPtrArray    WpVoidPtrArray
+#define C8Array         WpC8Array
+#define C16Array        WpC16Array
+#define C32Array        WpC32Array
+#define U8Array         WpU8Array
+#define U16Array        WpU16Array
+#define U32Array        WpU32Array
+#define U64Array        WpU64Array
+#define B8Array         WpB8Array
+#define I8Array         WpI8Array
+#define I16Array        WpI16Array
+#define I32Array        WpI32Array
+#define I64Array        WpI64Array
+#define F32Array        WpF32Array
+#define F64Array        WpF64Array
+#define F128Array       WpF128Array
+#define UptrArray       WpUptrArray
+#define IptrArray       WpIptrArray
+#define Str8Array       WpStr8Array
+#define ArrayHeader     WpArrayHeader
+#define ArrayInitFlags  WpArrayInitFlags
+
+// --- DblList ---
+
+#define GenericNode      WpDblNode
+#define NodeHeader       WpDblNodeHeader
+#define GenericList      WpDblList
+#define VoidPtrList      WpVoidPtrList
+#define C8List           WpC8List
+#define C16List          WpC16List
+#define C32List          WpC32List
+#define U8List           WpU8List
+#define U16List          WpU16List
+#define U32List          WpU32List
+#define U64List          WpU64List
+#define B8List           WpB8List
+#define I8List           WpI8List
+#define I16List          WpI16List
+#define I32List          WpI32List
+#define I64List          WpI64List
+#define F32List          WpF32List
+#define F64List          WpF64List
+#define F128List         WpF128List
+#define UptrList         WpUptrList
+#define IptrList         WpIptrList
+#define Str8List         WpStr8List
+#define VoidPtrNode      WpVoidPtrNode
+#define C8Node           WpC8Node
+#define C16Node          WpC16Node
+#define C32Node          WpC32Node
+#define U8Node           WpU8Node
+#define U16Node          WpU16Node
+#define U32Node          WpU32Node
+#define U64Node          WpU64Node
+#define B8Node           WpB8Node
+#define I8Node           WpI8Node
+#define I16Node          WpI16Node
+#define I32Node          WpI32Node
+#define I64Node          WpI64Node
+#define F32Node          WpF32Node
+#define F64Node          WpF64Node
+#define F128Node         WpF128Node
+#define UptrNode         WpUptrNode
+#define IptrNode         WpIptrNode
+#define Str8Node         WpStr8Node
+
+// --- File ---
+
+#define WFile           WpFile
+#define FileAccessMode  WpFileAccessMode
+#define FileSeekOrigin  WpFileSeekOrigin
+
+// --- Log ---
+
+#define LogLevel WpLogLevel
+#define Logger   WpLogger
+
+// --- Mem Allocator ---
+
+#define Allocator              WpAllocator
+#define MemAllocFunc           WpMemAllocFunc
+#define MemAllocAlignedFunc    WpMemAllocAlignedFunc
+#define MemReallocFunc         WpMemReallocFunc
+#define MemReallocAlignedFunc  WpMemReallocAlignedFunc
+#define MemFreeFunc            WpMemFreeFunc
+
+// --- Mem Os ---
+
+#define MemAccess      WpMemAccess
+#define MemInitType    WpMemInitType
+#define MemAllocFlags  WpMemAllocFlags
+
+// --- PRNG Xorshift ---
+
+#define XOR256State WpXor256State
+
+// --- Queue ---
+
+#define GenericQueue   WpQueue
+#define VoidPtrQueue   WpVoidPtrQueue
+#define C8Queue        WpC8Queue
+#define C16Queue       WpC16Queue
+#define C32Queue       WpC32Queue
+#define U8Queue        WpU8Queue
+#define U16Queue       WpU16Queue
+#define U32Queue       WpU32Queue
+#define U64Queue       WpU64Queue
+#define B8Queue        WpB8Queue
+#define I8Queue        WpI8Queue
+#define I16Queue       WpI16Queue
+#define I32Queue       WpI32Queue
+#define I64Queue       WpI64Queue
+#define F32Queue       WpF32Queue
+#define F64Queue       WpF64Queue
+#define F128Queue      WpF128Queue
+#define UptrQueue      WpUptrQueue
+#define IptrQueue      WpIptrQueue
+#define Str8Queue      WpStr8Queue
+
+// --- Shell Commander ---
+
+#define CMDResult        WpCmdResult
+#define CMDOutHandling   WpCmdOutHandling
+#define CMDError         WpCmdError
+
+// --- Shell Termcolour ---
+
+#define TerminalColour WpTerminalColour
+
+// --- Str8 ---
+
+#define Str8   WpStr8
+#define Str8RO WpStr8RO
+
+// --- Tester ---
+
+#define TestFuncResult WpTestFuncResult
+#define TestFunc       WpTestFunc
+
+// --- UUID ---
+
+#define WUUID WpUuid
+
+// ============================================================================
+// ===== Functions =====
+// ============================================================================
+
+// --- Arena ---
+
+#define wapp_mem_arena_init_allocated                  wpMemArenaInitAllocated
+#define wapp_mem_arena_init_allocated_commit           wpMemArenaInitAllocatedCommit
+#define wapp_mem_arena_init_allocated_zero             wpMemArenaInitAllocatedZero
+#define wapp_mem_arena_init_allocated_commit_and_zero  wpMemArenaInitAllocatedCommitAndZero
+#define wapp_mem_arena_init_allocated_custom           wpMemArenaInitAllocatedCustom
+#define wapp_mem_arena_init_buffer                     wpMemArenaInitBuffer
+#define wapp_mem_arena_alloc                           wpMemArenaAlloc
+#define wapp_mem_arena_alloc_aligned                   wpMemArenaAllocAligned
+#define wapp_mem_arena_realloc                         wpMemArenaRealloc
+#define wapp_mem_arena_realloc_aligned                 wpMemArenaReallocAligned
+#define wapp_mem_arena_temp_begin                      wpMemArenaTempBegin
+#define wapp_mem_arena_temp_end                        wpMemArenaTempEnd
+#define wapp_mem_arena_clear                           wpMemArenaClear
+#define wapp_mem_arena_destroy                         wpMemArenaDestroy
+
+#define wapp_mem_arena_allocator_init                  wpMemArenaAllocatorInit
+#define wapp_mem_arena_allocator_init_commit           wpMemArenaAllocatorInitCommit
+#define wapp_mem_arena_allocator_init_zero             wpMemArenaAllocatorInitZero
+#define wapp_mem_arena_allocator_init_commit_and_zero  wpMemArenaAllocatorInitCommitAndZero
+#define wapp_mem_arena_allocator_init_custom           wpMemArenaAllocatorInitCustom
+#define wapp_mem_arena_allocator_init_with_buffer      wpMemArenaAllocatorInitWithBuffer
+#define wapp_mem_arena_allocator_temp_begin            wpMemArenaAllocatorTempBegin
+#define wapp_mem_arena_allocator_temp_end              wpMemArenaAllocatorTempEnd
+#define wapp_mem_arena_allocator_clear                 wpMemArenaAllocatorClear
+#define wapp_mem_arena_allocator_destroy               wpMemArenaAllocatorDestroy
+
+// --- Array ---
+
+#define wapp_array                          wpArray
+#define wapp_array_with_capacity            wpArrayWithCapacity
+#define wapp_array_pop                      wpArrayPop
+#define wapp_array_count                    wpArrayCount
+#define wapp_array_capacity                 wpArrayCapacity
+#define wapp_array_item_size                wpArrayItemSize
+#define wapp_array_set_count                wpArraySetCount
+#define wapp_array_get                      wpArrayGet
+#define wapp_array_set                      wpArraySet
+#define wapp_array_append_capped            wpArrayAppendCapped
+#define wapp_array_extend_capped            wpArrayExtendCapped
+#define wapp_array_copy_capped              wpArrayCopyCapped
+#define wapp_array_append_alloc             wpArrayAppendAlloc
+#define wapp_array_extend_alloc             wpArrayExtendAlloc
+#define wapp_array_copy_alloc               wpArrayCopyAlloc
+#define wapp_array_clear                    wpArrayClear
+#define wapp_array_calc_alloc_size          wpArrayCalcAllocSize
+#define wapp_array_alloc_capacity           wpArrayAllocCapacity
+#define wapp_array_from_preallcated_buffer  wpArrayFromPreallcatedBuffer
+
+#define _array_count                        arrayCount
+#define _array_capacity                     arrayCapacity
+#define _array_item_size                    arrayItemSize
+#define _array_set_count                    arraySetCount
+#define _array_get                          arrayGet
+#define _array_set                          arraySet
+#define _array_append_capped                arrayAppendCapped
+#define _array_extend_capped                arrayExtendCappend
+#define _array_copy_capped                  arrayCopyCapped
+#define _array_append_alloc                 arrayAppendAlloc
+#define _array_extend_alloc                 arrayExtendAlloc
+#define _array_copy_alloc                   arrayCopyAlloc
+#define _array_pop                          arrayPop
+#define _array_clear                        arrayClear
+#define _array_calc_alloc_size              arrayCalcAllocSize
+#define _array_alloc_capacity               arrayAllocCapacity
+#define _array_from_preallocated_buffer     arrayFromPreallocatedBuffer
+
+// --- Assert ---
+
+#define wapp_static_assert   wpStaticAssert
+#define wapp_runtime_assert  wpRuntimeAssert
+#define wapp_debug_assert    wpDebugAssert
+
+// --- CPath ---
+
+#define wapp_cpath_dirname    wpCpathDirname
+#define wapp_cpath_dirup      wpCpathDirup
+#define wapp_cpath_join_path  wpCpathJoinPath
+#define dirup                 dirUp
+
+// --- DblList ---
+
+#define wapp_dbl_list                   wpDblList
+#define wapp_dbl_list_alloc             wpDblListAlloc
+#define wapp_dbl_list_get               wpDblListGet
+#define wapp_dbl_list_get_node          wpDblListGetNode
+#define wapp_dbl_list_get_node_item     wpDblListGetNodeItem
+#define wapp_dbl_list_push_front        wpDblListPushFront
+#define wapp_dbl_list_push_back         wpDblListPushBack
+#define wapp_dbl_list_insert            wpDblListInsert
+#define wapp_dbl_list_push_front_alloc  wpDblListPushFrontAlloc
+#define wapp_dbl_list_push_back_alloc   wpDblListPushBackAlloc
+#define wapp_dbl_list_insert_alloc      wpDblListInsertAlloc
+#define wapp_dbl_list_pop_front         wpDblListPopFront
+#define wapp_dbl_list_pop_back          wpDblListPopBack
+#define wapp_dbl_list_remove            wpDblListRemove
+#define wapp_dbl_list_pop_front_node    wpDblListPopFrontNode
+#define wapp_dbl_list_pop_back_node     wpDblListPopBackNode
+#define wapp_dbl_list_remove_node       wpDblListRemoveNode
+#define wapp_dbl_list_empty             wpDblListEmpty
+
+#define _dbl_list_alloc       dblListAlloc
+#define _dbl_list_node_alloc  dblListNodeAlloc
+#define _dbl_list_get         dblListGet
+#define _dbl_list_push_front  dblListPushFront
+#define _dbl_list_push_back   dblListPushBack
+#define _dbl_list_insert      dblListInsert
+#define _dbl_list_pop_front   dblListPopFront
+#define _dbl_list_pop_back    dblListPopBack
+#define _dbl_list_remove      dblListRemove
+#define _dbl_list_empty       dblListEmpty
+
+// --- File ---
+
+#define wapp_file_stdin                 wpFileStdin
+#define wapp_file_stdout                wpFileStdout
+#define wapp_file_stderr                wpFileStderr
+#define wapp_file_open                  wpFileOpen
+#define wapp_file_get_current_position  wpFileGetCurrentPosition
+#define wapp_file_seek                  wpFileSeek
+#define wapp_file_get_length            wpFileGetLength
+#define wapp_file_read                  wpFileRead
+#define wapp_file_write                 wpFileWrite
+#define wapp_file_read_str8             wpFileReadStr8
+#define wapp_file_write_str8            wpFileWriteStr8
+#define wapp_file_read_array            wpFileReadArray
+#define wapp_file_write_array           wpFileWriteArray
+#define wapp_file_flush                 wpFileFlush
+#define wapp_file_close                 wpFileClose
+#define wapp_file_rename                wpFileRename
+#define wapp_file_remove                wpFileRemove
+
+#define _file_open    fileOpen
+#define _file_seek    fileSeek
+#define _file_read    fileRead
+#define _file_write   fileWrite
+#define _file_flush   fileFlush
+#define _file_close   fileClose
+#define _file_rename  fileRename
+#define _file_remove  fileRemove
+
+// --- Log ---
+
+#define wapp_log_set_level    wpLogSetLevel
+#define wapp_log_configure    wpLogConfigure
+#define wapp_log_make_logger  wpLogMakeLogger
+#define wapp_log_debug        wpLogDebug
+#define wapp_log_info         wpLogInfo
+#define wapp_log_warning      wpLogWarning
+#define wapp_log_error        wpLogError
+#define wapp_log_critical     wpLogCritical
+#define wapp_log_fatal        wpLogFatal
+
+// --- Mem Allocator ---
+
+#define wapp_mem_allocator_invalid          wpMemAllocatorInvalid
+#define wapp_mem_allocator_alloc            wpMemAllocatorAlloc
+#define wapp_mem_allocator_alloc_aligned    wpMemAllocatorAllocAligned
+#define wapp_mem_allocator_realloc          wpMemAllocatorRealloc
+#define wapp_mem_allocator_realloc_aligned  wpMemAllocatorReallocAligned
+#define wapp_mem_allocator_free             wpMemAllocatorFree
+
+// --- Mem Os ---
+
+#define wapp_os_mem_alloc  wpOsMemAlloc
+#define wapp_os_mem_free   wpOsMemFree
+#define os_mem_allocate    osMemAllocate
+#define os_mem_free        osMemFree
+
+// --- Mem Utils ---
+
+#define wapp_mem_util_align_forward wpMemUtilAlignForward
+
+// --- Misc Utils ---
+
+#define wapp_misc_utils_reserve_padding    wpMiscUtilsReservePadding
+#define wapp_misc_utils_u64_round_up_pow2  wpMiscUtilsU64RoundUpPow2
+#define wapp_is_power_of_two               wpMiscUtilsIsPowerOfTwo
+#define wapp_pointer_offset                wpMiscUtilsOffsetPointer
+#define wapp_misc_utils_va_args_count      wpMiscUtilsVaArgsCount
+
+// --- PRNG Xorshift ---
+
+#define wapp_prng_xorshift_init_state  wpPrngXorshiftInit
+#define wapp_prng_xorshift_256         wpPrngXorshift256
+#define wapp_prng_xorshift_256ss       wpPrngXorshift256ss
+#define wapp_prng_xorshift_256p        wpPrngXorshift256p
+
+// --- Queue ---
+
+#define wapp_queue                   wpQueue
+#define wapp_queue_alloc             wpQueueAlloc
+#define wapp_queue_capacity          wpQueueCapacity
+#define wapp_queue_item_size         wpQueueItemSize
+#define wapp_queue_push              wpQueuePush
+#define wapp_queue_push_alloc        wpQueuePushAlloc
+#define wapp_queue_pop               wpQueuePop
+
+#define _queue_push        queuePush
+#define _queue_push_alloc  queuePushAlloc
+#define _queue_pop         queuePop
+
+// --- Shell Commander ---
+
+#define CMD_NO_EXIT                   wpCmdNoExit
+#define wapp_shell_commander_execute  wpShellCommanderExecute
+#define get_output_status             getOutputStatus
+
+// --- Shell Termcolour ---
+
+#define wapp_shell_termcolour_print_text    wpShellTermcolourPrintText
+#define wapp_shell_termcolour_clear_colour  wpShellTermcolourClearColour
+#define print_coloured_text                 printColouredText
+
+// --- Shell Utils ---
+
+#define wapp_shell_utils_popen   wpShellUtilsPopen
+#define wapp_shell_utils_pclose  wpShellUtilsPclose
+
+// --- Str8 ---
+
+#define wapp_str8_varg                        wpStr8Varg
+#define wapp_str8_buf                         wpStr8Buf
+#define wapp_str8_lit                         wpStr8Lit
+#define wapp_str8_lit_ro                      wpStr8LitRo
+#define wapp_str8_lit_ro_initialiser_list     wpStr8LitRoInitialiserList
+#define wapp_str8_alloc_buf                   wpStr8AllocBuf
+#define wapp_str8_alloc_and_fill_buf          wpStr8AllocAndFillBuf
+#define wapp_str8_alloc_cstr                  wpStr8AllocCstr
+#define wapp_str8_alloc_str8                  wpStr8AllocStr8
+#define wapp_str8_alloc_substr                wpStr8AllocSubstr
+#define wapp_str8_alloc_concat                wpStr8AllocConcat
+#define wapp_str8_dealloc_buf                 wpStr8DeallocBuf
+#define wapp_str8_get                         wpStr8Get
+#define wapp_str8_set                         wpStr8Set
+#define wapp_str8_push_back                   wpStr8PushBack
+#define wapp_str8_equal                       wpStr8Equal
+#define wapp_str8_equal_to_count              wpStr8EqualToCount
+#define wapp_str8_slice                       wpStr8Slice
+#define wapp_str8_concat_capped               wpStr8ConcatCapped
+#define wapp_str8_copy_cstr_capped            wpStr8CopyCstrCapped
+#define wapp_str8_copy_str8_capped            wpStr8CopyStr8Capped
+#define wapp_str8_copy_to_cstr                wpStr8CopyToCstr
+#define wapp_str8_format                      wpStr8Format
+#define wapp_str8_to_lower                    wpStr8ToLower
+#define wapp_str8_to_upper                    wpStr8ToUpper
+#define wapp_str8_from_bytes                  wpStr8FromBytes
+#define wapp_str8_find                        wpStr8Find
+#define wapp_str8_rfind                       wpStr8Rfind
+#define wapp_str8_split                       wpStr8Split
+#define wapp_str8_rsplit                      wpStr8Rsplit
+#define wapp_str8_split_with_max              wpStr8SplitWithMax
+#define wapp_str8_rsplit_with_max             wpStr8RsplitWithMax
+#define wapp_str8_join                        wpStr8Join
+#define wapp_str8_list_total_size             wpStr8ListTotalSize
+
+// --- Tester ---
+
+#define wapp_tester_result  wpTesterResult
+#define wapp_tester_run     wpTesterRun
+#define run_tests           runTests
+
+// --- UUID ---
+
+#define wapp_uuid_varg        wpUuidVarg
+#define wapp_uuid_gen_uuid4   wpUuidGenUuid4
+#define wapp_uuid_create      wpUuidCreate
+#define wapp_uuid_init_uuid4  wpUuidInitUuid4
+
+#endif // !OLDNAMES_H

src/os/allocators/arena/mem_arena.c

@@ -16,12 +16,12 @@
 
 #define ARENA_MINIMUM_CAPACITY KiB(16) // Allocate minimum of 4 pages
 
-typedef enum {
+typedef enum ArenaStorageType {
 	ARENA_STORAGE_TYPE_ALLOCATED,
 	ARENA_STORAGE_TYPE_BUFFER,
 } ArenaStorageType;
 
-struct Arena {
+struct WpArena {
 	u8 *buf;
 	u8 *offset;
 	u8 *prev_offset;
@@ -32,63 +32,63 @@ struct Arena {
 	wpMiscUtilsReservePadding(sizeof(u8 *) * 3 + sizeof(u64) + sizeof(ArenaStorageType) + sizeof(b8));
 };
 
-b8 wapp_mem_arena_init_buffer(Arena **arena, u8 *buffer, u64 buffer_size) {
+b8 wpMemArenaInitBuffer(WpArena **arena, u8 *buffer, u64 buffer_size) {
-	if (!arena || *arena || buffer_size < sizeof(Arena)) {
+	if (!arena || *arena || buffer_size < sizeof(WpArena)) {
 		return false;
 	}
 
-	*arena           = (Arena *)buffer;
+	*arena           = (WpArena *)buffer;
-	Arena *arena_ptr = *arena;
+	WpArena *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->capacity    = buffer_size - sizeof(WpArena);
 	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) {
+b8 wpMemArenaInitAllocatedCustom(WpArena **arena, u64 base_capacity, WpMemAllocFlags 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 size       = sizeof(WpArena) + (base_capacity >= ARENA_MINIMUM_CAPACITY ? base_capacity : ARENA_MINIMUM_CAPACITY);
 	u64 alloc_size = wpMiscUtilsU64RoundUpPow2(size);
-	u8 *allocated  = (u8 *)wapp_os_mem_alloc(NULL, alloc_size, WAPP_MEM_ACCESS_READ_WRITE, flags,
+	u8 *allocated  = (u8 *)wpOsMemAlloc(NULL, alloc_size, WP_MEM_ACCESS_READ_WRITE, flags,
-	                                         zero_buffer ? WAPP_MEM_INIT_INITIALISED : WAPP_MEM_INIT_UNINITIALISED);
+	                                         zero_buffer ? WP_MEM_INIT_INITIALISED : WP_MEM_INIT_UNINITIALISED);
 	if (!allocated) {
 		return false;
 	}
 
-	b8 committed = (flags & WAPP_MEM_ALLOC_COMMIT) == WAPP_MEM_ALLOC_COMMIT;
+	b8 committed = (flags & WP_MEM_ALLOC_COMMIT) == WP_MEM_ALLOC_COMMIT;
 
 #ifdef WP_PLATFORM_WINDOWS
 	if (!committed) {
-		wapp_os_mem_alloc(allocated, sizeof(Arena), WAPP_MEM_ACCESS_READ_WRITE, WAPP_MEM_ALLOC_COMMIT,
+		wpOsMemAlloc(allocated, sizeof(WpArena), WP_MEM_ACCESS_READ_WRITE, WP_MEM_ALLOC_COMMIT,
-		                  WAPP_MEM_INIT_INITIALISED);
+		                  WP_MEM_INIT_INITIALISED);
 	}
 #endif // ifdef WP_PLATFORM_WINDOWS
 
-	if (!wapp_mem_arena_init_buffer(arena, allocated, alloc_size)) {
+	if (!wpMemArenaInitBuffer(arena, allocated, alloc_size)) {
-		wapp_mem_arena_destroy(arena);
+		wpMemArenaDestroy(arena);
 		return false;
 	}
 
-	Arena *arena_ptr     = *arena;
+	WpArena *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) {
+void *wpMemArenaAlloc(WpArena *arena, u64 size) {
-	return wapp_mem_arena_alloc_aligned(arena, size, DEFAULT_ALIGNMENT);
+	return wpMemArenaAllocAligned(arena, size, DEFAULT_ALIGNMENT);
 }
 
-void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) {
+void *wpMemArenaAllocAligned(WpArena *arena, u64 size, u64 alignment) {
 	wpDebugAssert(arena != NULL, "`arena` should not be NULL");
 
 	u8 *alloc_start = arena->offset;
@@ -102,9 +102,9 @@ void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) {
 
 #ifdef WP_PLATFORM_WINDOWS
 	if (arena->type == ARENA_STORAGE_TYPE_ALLOCATED && !(arena->committed)) {
-		wapp_os_mem_alloc(alloc_start, (uptr)(arena->offset) - (uptr)(alloc_start),
+		wpOsMemAlloc(alloc_start, (uptr)(arena->offset) - (uptr)(alloc_start),
-		                  WAPP_MEM_ACCESS_READ_WRITE, WAPP_MEM_ALLOC_COMMIT,
+		                  WP_MEM_ACCESS_READ_WRITE, WP_MEM_ALLOC_COMMIT,
-		                  WAPP_MEM_INIT_UNINITIALISED);
+		                  WP_MEM_INIT_UNINITIALISED);
 	}
 #endif // ifdef WP_PLATFORM_WINDOWS
 
@@ -113,7 +113,7 @@ void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) {
 	return (void *)output;
 }
 
-void *wapp_mem_arena_realloc(Arena *arena, void *ptr, u64 old_size, u64 new_size) {
+void *wpMemArenaRealloc(WpArena *arena, void *ptr, u64 old_size, u64 new_size) {
 	wpDebugAssert(arena != NULL, "`arena` should not be NULL");
 
 	if ((u8*)ptr < arena->buf || (u8*)ptr > arena->offset ||
@@ -121,7 +121,7 @@ void *wapp_mem_arena_realloc(Arena *arena, void *ptr, u64 old_size, u64 new_size
 		return NULL;
 	}
 
-	void *new_ptr = wapp_mem_arena_alloc(arena, new_size);
+	void *new_ptr = wpMemArenaAlloc(arena, new_size);
 	if (!new_ptr) {
 		return NULL;
 	}
@@ -132,7 +132,7 @@ void *wapp_mem_arena_realloc(Arena *arena, void *ptr, u64 old_size, u64 new_size
 	return new_ptr;
 }
 
-void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64 new_size, u64 alignment) {
+void *wpMemArenaReallocAligned(WpArena *arena, void *ptr, u64 old_size, u64 new_size, u64 alignment) {
 	wpDebugAssert(arena != NULL, "`arena` should not be NULL");
 
 	if ((u8*)ptr < arena->buf || (u8*)ptr > arena->offset ||
@@ -140,7 +140,7 @@ void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64
 		return NULL;
 	}
 
-	void *new_ptr = wapp_mem_arena_alloc_aligned(arena, new_size, alignment);
+	void *new_ptr = wpMemArenaAllocAligned(arena, new_size, alignment);
 	if (!new_ptr) {
 		return NULL;
 	}
@@ -151,7 +151,7 @@ void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64
 	return new_ptr;
 }
 
-void wapp_mem_arena_temp_begin(Arena *arena) {
+void wpMemArenaTempBegin(WpArena *arena) {
 	wpDebugAssert(arena != NULL, "`arena` should not be NULL");
 
 	if (arena->prev_offset != NULL) {
@@ -161,7 +161,7 @@ void wapp_mem_arena_temp_begin(Arena *arena) {
 	arena->prev_offset = arena->offset;
 }
 
-void wapp_mem_arena_temp_end(Arena *arena) {
+void wpMemArenaTempEnd(WpArena *arena) {
 	wpDebugAssert(arena != NULL, "`arena` should not be NULL");
 
 	if (arena->prev_offset == NULL) {
@@ -172,20 +172,20 @@ void wapp_mem_arena_temp_end(Arena *arena) {
 	arena->prev_offset = NULL;
 }
 
-void wapp_mem_arena_clear(Arena *arena) {
+void wpMemArenaClear(WpArena *arena) {
 	wpDebugAssert(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) {
+void wpMemArenaDestroy(WpArena **arena) {
 	wpDebugAssert(arena != NULL && (*arena) != NULL, "`arena` double pointer is not valid");
 
-	Arena *arena_ptr = *arena;
+	WpArena *arena_ptr = *arena;
 
 	if (arena_ptr->type == ARENA_STORAGE_TYPE_ALLOCATED) {
-		wapp_os_mem_free(*arena, sizeof(Arena) + arena_ptr->capacity);
+		wpOsMemFree(*arena, sizeof(WpArena) + arena_ptr->capacity);
 	}
 
 	*arena = NULL;

src/os/allocators/arena/mem_arena.h

@@ -11,32 +11,32 @@
 BEGIN_C_LINKAGE
 #endif // !WP_PLATFORM_CPP
 
-typedef struct Arena Arena;
+typedef struct WpArena WpArena;
 
-#define wapp_mem_arena_init_allocated(arena_dptr, base_capacity)                                                           \
+#define wpMemArenaInitAllocated(arena_dptr, base_capacity)                                                      \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, false))
+	(wpMemArenaInitAllocatedCustom(arena_dptr, base_capacity, WP_MEM_ALLOC_RESERVE, false))
-#define wapp_mem_arena_init_allocated_commit(arena_dptr, base_capacity)                                                    \
+#define wpMemArenaInitAllocatedCommit(arena_dptr, base_capacity)                                                \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, false))
+	(wpMemArenaInitAllocatedCustom(arena_dptr, base_capacity, WP_MEM_ALLOC_RESERVE | WP_MEM_ALLOC_COMMIT, false))
-#define wapp_mem_arena_init_allocated_zero(arena_dptr, base_capacity)                                                      \
+#define wpMemArenaInitAllocatedZero(arena_dptr, base_capacity)                                                  \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, true))
+	(wpMemArenaInitAllocatedCustom(arena_dptr, base_capacity, WP_MEM_ALLOC_RESERVE, true))
-#define wapp_mem_arena_init_allocated_commit_and_zero(arena_dptr, base_capacity)                                           \
+#define wpMemArenaInitAllocatedCommitAndZero(arena_dptr, base_capacity)                                         \
-	(wapp_mem_arena_init_allocated_custom(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, true))
+	(wpMemArenaInitAllocatedCustom(arena_dptr, base_capacity, WP_MEM_ALLOC_RESERVE | WP_MEM_ALLOC_COMMIT, true))
 
 /**
- * Arena initialisation function. `wapp_mem_arena_init_allocated_custom` provides the most
+ * WpArena initialisation function. `wpMemArenaInitAllocatedCustom` provides the most
- * control over how the Arena is initialised. Wrapper macros are provided for
+ * control over how the WpArena 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    wpMemArenaInitAllocatedCustom(WpArena **arena, u64 base_capacity, WpMemAllocFlags flags, b8 zero_buffer);
-b8    wapp_mem_arena_init_buffer(Arena **arena, u8 *buffer, u64 buffer_size);
+b8    wpMemArenaInitBuffer(WpArena **arena, u8 *buffer, u64 buffer_size);
-void *wapp_mem_arena_alloc(Arena *arena, u64 size);
+void *wpMemArenaAlloc(WpArena *arena, u64 size);
-void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment);
+void *wpMemArenaAllocAligned(WpArena *arena, u64 size, u64 alignment);
-void *wapp_mem_arena_realloc(Arena *arena, void *ptr, u64 old_size, u64 new_size);
+void *wpMemArenaRealloc(WpArena *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 *wpMemArenaReallocAligned(WpArena *arena, void *ptr, u64 old_size, u64 new_size, u64 alignment);
-void  wapp_mem_arena_temp_begin(Arena *arena);
+void  wpMemArenaTempBegin(WpArena *arena);
-void  wapp_mem_arena_temp_end(Arena *arena);
+void  wpMemArenaTempEnd(WpArena *arena);
-void  wapp_mem_arena_clear(Arena *arena);
+void  wpMemArenaClear(WpArena *arena);
-void  wapp_mem_arena_destroy(Arena **arena);
+void  wpMemArenaDestroy(WpArena **arena);
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

src/os/allocators/arena/mem_arena_allocator.c

@@ -6,82 +6,82 @@
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/assert/assert.h"
 
-wp_intern void initialise_arena_allocator(WpAllocator *allocator);
+wp_intern void initialiseArenaAllocator(WpAllocator *allocator);
-wp_intern void *mem_arena_alloc(u64 size, void *alloc_obj);
+wp_intern void *memArenaAlloc(u64 size, void *alloc_obj);
-wp_intern void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj);
+wp_intern void *memArenaAllocAligned(u64 size, u64 alignment, void *alloc_obj);
-wp_intern void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
+wp_intern void *memArenaRealloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
-wp_intern void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
+wp_intern void *memArenaReallocAligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
                                             void *alloc_obj);
 
-WpAllocator wapp_mem_arena_allocator_init_with_buffer(u8 *buffer, u64 buffer_size) {
+WpAllocator wpMemArenaAllocatorInitWithBuffer(u8 *buffer, u64 buffer_size) {
 	WpAllocator allocator = {0};
-	b8 initialised = wapp_mem_arena_init_buffer((Arena **)(&allocator.obj), buffer, buffer_size);
+	b8 initialised = wpMemArenaInitBuffer((WpArena **)(&allocator.obj), buffer, buffer_size);
 	if (!initialised) {
 		return allocator;
 	}
 
-	initialise_arena_allocator(&allocator);
+	initialiseArenaAllocator(&allocator);
 
 	return allocator;
 }
 
-WpAllocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, b8 zero_buffer) {
+WpAllocator wpMemArenaAllocatorInitCustom(u64 base_capacity, WpMemAllocFlags flags, b8 zero_buffer) {
 	WpAllocator allocator = {0};
-	b8 initialised = wapp_mem_arena_init_allocated_custom((Arena **)(&allocator.obj), base_capacity, flags, zero_buffer);
+	b8 initialised = wpMemArenaInitAllocatedCustom((WpArena **)(&allocator.obj), base_capacity, flags, zero_buffer);
 	if (!initialised) {
 		return allocator;
 	}
 
-	initialise_arena_allocator(&allocator);
+	initialiseArenaAllocator(&allocator);
 
 	return allocator;
 }
 
-void wapp_mem_arena_allocator_temp_begin(const WpAllocator *allocator) {
+void wpMemArenaAllocatorTempBegin(const WpAllocator *allocator) {
 	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
-	wapp_mem_arena_temp_begin((Arena *)(allocator->obj));
+	wpMemArenaTempBegin((WpArena *)(allocator->obj));
 }
 
-void wapp_mem_arena_allocator_temp_end(const WpAllocator *allocator) {
+void wpMemArenaAllocatorTempEnd(const WpAllocator *allocator) {
 	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
-	wapp_mem_arena_temp_end((Arena *)(allocator->obj));
+	wpMemArenaTempEnd((WpArena *)(allocator->obj));
 }
 
-void wapp_mem_arena_allocator_clear(WpAllocator *allocator) {
+void wpMemArenaAllocatorClear(WpAllocator *allocator) {
 	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
-	wapp_mem_arena_clear((Arena *)(allocator->obj));
+	wpMemArenaClear((WpArena *)(allocator->obj));
 }
 
-void wapp_mem_arena_allocator_destroy(WpAllocator *allocator) {
+void wpMemArenaAllocatorDestroy(WpAllocator *allocator) {
 	wpDebugAssert(allocator != NULL, "`allocator` should not be NULL");
-	wapp_mem_arena_destroy((Arena **)(&(allocator->obj)));
+	wpMemArenaDestroy((WpArena **)(&(allocator->obj)));
 	*allocator = (WpAllocator){0};
 }
 
-wp_intern void initialise_arena_allocator(WpAllocator *allocator) {
+wp_intern void initialiseArenaAllocator(WpAllocator *allocator) {
-	allocator->alloc           = mem_arena_alloc;
+	allocator->alloc           = memArenaAlloc;
-	allocator->alloc_aligned   = mem_arena_alloc_aligned;
+	allocator->alloc_aligned   = memArenaAllocAligned;
-	allocator->realloc         = mem_arena_realloc;
+	allocator->realloc         = memArenaRealloc;
-	allocator->realloc_aligned = mem_arena_realloc_aligned;
+	allocator->realloc_aligned = memArenaReallocAligned;
 }
 
-wp_intern void *mem_arena_alloc(u64 size, void *alloc_obj) {
+wp_intern void *memArenaAlloc(u64 size, void *alloc_obj) {
-	Arena *arena = (Arena *)alloc_obj;
+	WpArena *arena = (WpArena *)alloc_obj;
-	return wapp_mem_arena_alloc(arena, size);
+	return wpMemArenaAlloc(arena, size);
 }
 
-wp_intern void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj) {
+wp_intern void *memArenaAllocAligned(u64 size, u64 alignment, void *alloc_obj) {
-	Arena *arena = (Arena *)alloc_obj;
+	WpArena *arena = (WpArena *)alloc_obj;
-	return wapp_mem_arena_alloc_aligned(arena, size, alignment);
+	return wpMemArenaAllocAligned(arena, size, alignment);
 }
 
-wp_intern void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj) {
+wp_intern void *memArenaRealloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj) {
-	Arena *arena = (Arena *)alloc_obj;
+	WpArena *arena = (WpArena *)alloc_obj;
-	return wapp_mem_arena_realloc(arena, ptr, old_size, new_size);
+	return wpMemArenaRealloc(arena, ptr, old_size, new_size);
 }
 
-wp_intern void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
+wp_intern void *memArenaReallocAligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
                                             void *alloc_obj) {
-	Arena *arena = (Arena *)alloc_obj;
+	WpArena *arena = (WpArena *)alloc_obj;
-	return wapp_mem_arena_realloc_aligned(arena, ptr, old_size, new_size, alignment);
+	return wpMemArenaReallocAligned(arena, ptr, old_size, new_size, alignment);
 }

src/os/allocators/arena/mem_arena_allocator.h

@@ -12,32 +12,32 @@
 BEGIN_C_LINKAGE
 #endif // !WP_PLATFORM_CPP
 
-#define wapp_mem_arena_allocator_init(base_capacity)                                                           \
+#define wpMemArenaAllocatorInit(base_capacity)                                                     \
-	(wapp_mem_arena_allocator_init_custom(base_capacity, WAPP_MEM_ALLOC_RESERVE, false))
+	(wpMemArenaAllocatorInitCustom(base_capacity, WP_MEM_ALLOC_RESERVE, false))
-#define wapp_mem_arena_allocator_init_commit(base_capacity)                                                    \
+#define wpMemArenaAllocatorInitCommit(base_capacity)                                               \
-	(wapp_mem_arena_allocator_init_custom(base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, false))
+	(wpMemArenaAllocatorInitCustom(base_capacity, WP_MEM_ALLOC_RESERVE | WP_MEM_ALLOC_COMMIT, false))
-#define wapp_mem_arena_allocator_init_zero(base_capacity)                                                      \
+#define wpMemArenaAllocatorInitZero(base_capacity)                                                 \
-	(wapp_mem_arena_allocator_init_custom(base_capacity, WAPP_MEM_ALLOC_RESERVE, true))
+	(wpMemArenaAllocatorInitCustom(base_capacity, WP_MEM_ALLOC_RESERVE, true))
-#define wapp_mem_arena_allocator_init_commit_and_zero(base_capacity)                                           \
+#define wpMemArenaAllocatorInitCommitAndZero(base_capacity)                                        \
-	(wapp_mem_arena_allocator_init_custom(base_capacity, WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, true))
+	(wpMemArenaAllocatorInitCustom(base_capacity, WP_MEM_ALLOC_RESERVE | WP_MEM_ALLOC_COMMIT, true))
 
 /**
- * Wraps an Arena in an WpAllocator object. It attempts to initialise the Arena
+ * Wraps a WpArena in a WpAllocator object. It attempts to initialise the WpArena
  * and, if successful, defines the operations supported by it to be used by the
  * WpAllocator.
  *
- * An Arena allocator only supports normal allocation and aligned allocation.
+ * An WpArena allocator only supports normal allocation and aligned allocation.
  * Reallocation, aligned reallocation and freeing aren't implemented.
  *
- * The `wapp_mem_arena_allocator_init_custom` provides the most control over how
+ * The `wpMemArenaAllocatorInitCustom` provides the most control over how
- * the Arena is initialised. Wrapper macros are provided for easier use.
+ * the WpArena is initialised. Wrapper macros are provided for easier use.
  */
-WpAllocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, b8 zero_buffer);
+WpAllocator wpMemArenaAllocatorInitCustom(u64 base_capacity, WpMemAllocFlags flags, b8 zero_buffer);
-WpAllocator wapp_mem_arena_allocator_init_with_buffer(u8 *buffer, u64 buffer_size);
+WpAllocator wpMemArenaAllocatorInitWithBuffer(u8 *buffer, u64 buffer_size);
-void      wapp_mem_arena_allocator_temp_begin(const WpAllocator *allocator);
+void        wpMemArenaAllocatorTempBegin(const WpAllocator *allocator);
-void      wapp_mem_arena_allocator_temp_end(const WpAllocator *allocator);
+void        wpMemArenaAllocatorTempEnd(const WpAllocator *allocator);
-void      wapp_mem_arena_allocator_clear(WpAllocator *allocator);
+void        wpMemArenaAllocatorClear(WpAllocator *allocator);
-void      wapp_mem_arena_allocator_destroy(WpAllocator *allocator);
+void        wpMemArenaAllocatorDestroy(WpAllocator *allocator);
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

src/os/cpath/cpath.c

@@ -8,28 +8,26 @@
 #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(WpStr8 *dst, const WpStr8List *parts) {
+u32 wpCpathJoinPath(WpStr8 *dst, const WpStr8List *parts) {
 	if (!dst || !parts) {
-		return CPATH_JOIN_INVALID_ARGS;
+		return WP_CPATH_JOIN_RESULT_INVALID_ARGS;
 	}
 
 	if (parts->node_count == 0) {
-		return CPATH_JOIN_EMPTY_PARTS;
+		return WP_CPATH_JOIN_RESULT_EMPTY_PARTS;
 	}
 
 	WpStr8 separator = wpStr8Buf(4);
-	wpStr8PushBack(&separator, WAPP_PATH_SEP);
+	wpStr8PushBack(&separator, WP_PATH_SEP);
 
 	u64 required_capacity = parts->node_count * separator.size + wpStr8ListTotalSize(parts);
 	if (dst->capacity < required_capacity) {
-		return CPATH_JOIN_INSUFFICIENT_DST_CAPACITY;
+		return WP_CPATH_JOIN_RESULT_INSUFFICIENT_DST_CAPACITY;
 	}
 
 	// Handle first node
-	WpStr8 *first_node = wapp_dbl_list_get(WpStr8, parts, 0);
+	WpStr8 *first_node = wpDblListGet(WpStr8, parts, 0);
 	wpStr8CopyStr8Capped(dst, first_node);
 
 	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
@@ -38,7 +36,7 @@ u32 wapp_cpath_join_path(WpStr8 *dst, const WpStr8List *parts) {
 	u64 node_index   = 1;
 	b8 running       = node_index < parts->node_count;
 	while (running) {
-		node = wapp_dbl_list_get(WpStr8, parts, node_index);
+		node = wpDblListGet(WpStr8, parts, node_index);
 		if (node->size == 0) {
 			goto CPATH_JOIN_LOOP_END;
 		}
@@ -46,7 +44,7 @@ u32 wapp_cpath_join_path(WpStr8 *dst, const WpStr8List *parts) {
 		if (dst->size > 0) {
 			char dst_last   = wpStr8Get(dst, dst->size - 1);
 			char node_start = wpStr8Get(node, 0);
-			b8 add_path_sep = dst_last != WAPP_PATH_SEP && node_start != WAPP_PATH_SEP;
+			b8 add_path_sep = dst_last != WP_PATH_SEP && node_start != WP_PATH_SEP;
 
 			if (add_path_sep) {
 				wpStr8ConcatCapped(dst, &separator);
@@ -60,18 +58,18 @@ CPATH_JOIN_LOOP_END:
 		running = node_index < parts->node_count;
 	}
 
-	return CPATH_JOIN_SUCCESS;
+	return WP_CPATH_JOIN_RESULT_SUCCESS;
 }
 
-WpStr8 *dirup(const WpAllocator *allocator, WpStr8RO *path, u64 levels) {
+WpStr8 *dirUp(const WpAllocator *allocator, WpStr8RO *path, u64 levels) {
 	WpStr8 *output = NULL;
 	if (!allocator || !path) {
 		goto RETURN_DIRUP;
 	}
 
-	b8 absolute    = wpStr8Get(path, 0) == WAPP_PATH_SEP;
+	b8 absolute    = wpStr8Get(path, 0) == WP_PATH_SEP;
 	WpStr8 separator = wpStr8Buf(4);
-	wpStr8PushBack(&separator, WAPP_PATH_SEP);
+	wpStr8PushBack(&separator, WP_PATH_SEP);
 
 	if (path->size == 0) {
 		output = wpStr8AllocBuf(allocator, 16);
@@ -79,7 +77,7 @@ WpStr8 *dirup(const WpAllocator *allocator, WpStr8RO *path, u64 levels) {
 			goto RETURN_DIRUP;
 		}
 
-		wpStr8PushBack(output, absolute ? WAPP_PATH_SEP : '.');
+		wpStr8PushBack(output, absolute ? WP_PATH_SEP : '.');
 		goto RETURN_DIRUP;
 	}
 
@@ -88,7 +86,7 @@ WpStr8 *dirup(const WpAllocator *allocator, WpStr8RO *path, u64 levels) {
 		goto RETURN_DIRUP;
 	}
 
-	WpAllocator tmp_arena = wapp_mem_arena_allocator_init(MiB(8));
+	WpAllocator tmp_arena = wpMemArenaAllocatorInit(MiB(8));
 	if (wpMemAllocatorInvalid(&tmp_arena)) {
 		goto RETURN_DIRUP;
 	}
@@ -104,10 +102,10 @@ WpStr8 *dirup(const WpAllocator *allocator, WpStr8RO *path, u64 levels) {
 			goto LIST_CLEANUP_DIRUP;
 		}
 
-		wpStr8PushBack(output, absolute ? WAPP_PATH_SEP : '.');
+		wpStr8PushBack(output, absolute ? WP_PATH_SEP : '.');
 	} else {
 		for (u64 i = 0; i < levels; ++i) {
-			wapp_dbl_list_pop_back(WpStr8, parts);
+			wpDblListPopBack(WpStr8, parts);
 		}
 		
 		u64 alignment  = sizeof(void *) * 2;
@@ -118,7 +116,7 @@ WpStr8 *dirup(const WpAllocator *allocator, WpStr8RO *path, u64 levels) {
 		output = wpStr8AllocBuf(allocator, alloc_size);
 		if (output) {
 			if (absolute) {
-				wpStr8PushBack(output, WAPP_PATH_SEP);
+				wpStr8PushBack(output, WP_PATH_SEP);
 			}
 
 			WpStr8 *joined = wpStr8Join(&tmp_arena, parts, &separator);
@@ -129,7 +127,7 @@ WpStr8 *dirup(const WpAllocator *allocator, WpStr8RO *path, u64 levels) {
 	}
 
 LIST_CLEANUP_DIRUP:
-	wapp_mem_arena_allocator_destroy(&tmp_arena);
+	wpMemArenaAllocatorDestroy(&tmp_arena);
 
 RETURN_DIRUP:
 	return output;

src/os/cpath/cpath.h

@@ -14,29 +14,29 @@ BEGIN_C_LINKAGE
 
 #ifdef WP_PLATFORM_POSIX
 #include <limits.h>
-#define WAPP_PATH_SEP '/'
+#define WP_PATH_SEP '/'
-#define WAPP_PATH_MAX PATH_MAX
+#define WP_PATH_MAX PATH_MAX
 #elif defined(WP_PLATFORM_WINDOWS)
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
-#define WAPP_PATH_SEP '\\'
+#define WP_PATH_SEP '\\'
-#define WAPP_PATH_MAX MAX_PATH
+#define WP_PATH_MAX MAX_PATH
 #else
 #error "Unrecognised platform"
 #endif
 
-#define wapp_cpath_dirname(ALLOCATOR, PATH) dirup(ALLOCATOR, PATH, 1)
+#define wpCpathDirname(ALLOCATOR, PATH) dirUp(ALLOCATOR, PATH, 1)
-#define wapp_cpath_dirup(ALLOCATOR, PATH, COUNT) dirup(ALLOCATOR, PATH, COUNT)
+#define wpCpathDirUp(ALLOCATOR, PATH, COUNT) dirUp(ALLOCATOR, PATH, COUNT)
 
-enum {
+typedef enum WpCpathJoinResult {
-	CPATH_JOIN_SUCCESS = 0,
+	WP_CPATH_JOIN_RESULT_SUCCESS = 0,
-	CPATH_JOIN_INVALID_ARGS,
+	WP_CPATH_JOIN_RESULT_INVALID_ARGS,
-	CPATH_JOIN_EMPTY_PARTS,
+	WP_CPATH_JOIN_RESULT_EMPTY_PARTS,
-	CPATH_JOIN_INSUFFICIENT_DST_CAPACITY,
+	WP_CPATH_JOIN_RESULT_INSUFFICIENT_DST_CAPACITY,
-};
+} WpCpathJoinResult;
 
-u32   wapp_cpath_join_path(WpStr8 *dst, const WpStr8List *parts);
+WpCpathJoinResult wpCpathJoinPath(WpStr8 *dst, const WpStr8List *parts);
-WpStr8 *dirup(const WpAllocator *allocator, WpStr8RO *path, u64 levels);
+WpStr8           *dirUp(const WpAllocator *allocator, WpStr8RO *path, u64 levels);
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

src/os/file/file.c

@@ -7,77 +7,77 @@
 #include "../../base/array/array.h"
 #include "../../base/strings/str8/str8.h"
 
-WFile *wapp_file_open(const WpAllocator *allocator, WpStr8RO *filepath, FileAccessMode mode) {
+WpFile *wpFileOpen(const WpAllocator *allocator, WpStr8RO *filepath, WpFileAccessMode mode) {
 	wpDebugAssert(allocator != NULL && filepath != NULL, "`allocator` and `filepath` should not be NULL");
-	wpDebugAssert(filepath->size < WAPP_PATH_MAX, "`filepath` exceeds max path limit.");
+	wpDebugAssert(filepath->size < WP_PATH_MAX, "`filepath` exceeds max path limit.");
-	return _file_open(allocator, filepath, mode);
+	return fileOpen(allocator, filepath, mode);
 }
 
-i64 wapp_file_get_current_position(WFile *file) {
+i64 wpFileGetCurrentPosition(WpFile *file) {
 	wpDebugAssert(file != NULL, "`file` should not be NULL.");
-	return _file_seek(file, 0, WAPP_SEEK_CURRENT);
+	return fileSeek(file, 0, WP_SEEK_CURRENT);
 }
 
-i64 wapp_file_seek(WFile *file, i64 offset, FileSeekOrigin origin) {
+i64 wpFileSeek(WpFile *file, i64 offset, WpFileSeekOrigin origin) {
 	wpDebugAssert(file != NULL, "`file` should not be NULL.");
-	return _file_seek(file, offset, origin);
+	return fileSeek(file, offset, origin);
 }
 
-i64 wapp_file_get_length(WFile *file) {
+i64 wpFileGetLength(WpFile *file) {
 	wpDebugAssert(file != NULL, "`file` should not be NULL.");
 
-	i64 current = wapp_file_get_current_position(file);
+	i64 current = wpFileGetCurrentPosition(file);
 
-	_file_seek(file, 0, WAPP_SEEK_END);
+	fileSeek(file, 0, WP_SEEK_END);
 
-	i64 output = wapp_file_get_current_position(file);
+	i64 output = wpFileGetCurrentPosition(file);
 
 	// Restore position
-	_file_seek(file, current, WAPP_SEEK_START);
+	fileSeek(file, current, WP_SEEK_START);
 
 	return output;
 }
 
-u64 wapp_file_read(void *dst_buf, WFile *file, u64 byte_count) {
+u64 wpFileRead(void *dst_buf, WpFile *file, u64 byte_count) {
 	wpDebugAssert(dst_buf != NULL && file != NULL,
 	                  "`dst_buf` and `file` should not be NULL.");
 
-	i64 file_length = wapp_file_get_length(file);
+	i64 file_length = wpFileGetLength(file);
 	if (file_length < 0) {
 		return 0;
 	}
 
-	return _file_read(dst_buf, byte_count, file, file_length);
+	return fileRead(dst_buf, byte_count, file, file_length);
 }
 
-i64 wapp_file_write(const void *src_buf, WFile *file, u64 byte_count) {
+i64 wpFileWrite(const void *src_buf, WpFile *file, u64 byte_count) {
 	wpDebugAssert(src_buf != NULL && file != NULL,
 	                  "`src_buf` and `file` should not be NULL.");
-	return _file_write(src_buf, file, byte_count);
+	return fileWrite(src_buf, file, byte_count);
 }
 
-u64 wapp_file_read_str8(WpStr8 *str, WFile *file) {
+u64 wpFileReadStr8(WpStr8 *str, WpFile *file) {
 	wpDebugAssert(str != NULL, "`str` should not be NULL.");
-	return wapp_file_read((void *)(str->buf), file, str->size);
+	return wpFileRead((void *)(str->buf), file, str->size);
 }
 
-i64 wapp_file_write_str8(WpStr8RO *str, WFile *file) {
+i64 wpFileWriteStr8(WpStr8RO *str, WpFile *file) {
 	wpDebugAssert(str != NULL, "`str` should not be NULL.");
-	return wapp_file_write((void *)(str->buf), file, str->size);
+	return wpFileWrite((void *)(str->buf), file, str->size);
 }
 
-u64 wapp_file_read_array(GenericArray dst_buf, WFile *file, u64 item_count) {
+u64 wpFileReadArray(WpArray dst_buf, WpFile *file, u64 item_count) {
 	wpDebugAssert(dst_buf != NULL && file != NULL,
 	                  "`dst_buf` and `file` should not be NULL.");
 
-	i64 _file_length = wapp_file_get_length(file);
+	i64 _file_length = wpFileGetLength(file);
 	if (_file_length < 0) {
 		return 0;
 	}
 
 	u64 file_length       = (u64)_file_length;
-	u64 item_size         = wapp_array_item_size(dst_buf);
+	u64 item_size         = wpArrayItemSize(dst_buf);
-	u64 dst_byte_capacity = wapp_array_capacity(dst_buf) * item_size;
+	u64 dst_byte_capacity = wpArrayCapacity(dst_buf) * item_size;
 	u64 req_byte_count    = item_count * item_size;
 	u64 copy_byte_count   = 0;
 
@@ -87,26 +87,26 @@ u64 wapp_file_read_array(GenericArray dst_buf, WFile *file, u64 item_count) {
 		copy_byte_count = file_length <= dst_byte_capacity ? file_length : dst_byte_capacity;
 	}
 
-	u64 byte_count = _file_read(dst_buf, copy_byte_count, file, file_length);
+	u64 byte_count = fileRead(dst_buf, copy_byte_count, file, file_length);
 	if (byte_count == 0) {
 		return 0;
 	}
 
-	wapp_array_set_count(dst_buf, byte_count / item_size);
+	wpArraySetCount(dst_buf, byte_count / item_size);
 
-	return wapp_array_count(dst_buf);
+	return wpArrayCount(dst_buf);
 }
 
-i64 wapp_file_write_array(const GenericArray src_buf, WFile *file, u64 item_count) {
+i64 wpFileWriteArray(const WpArray src_buf, WpFile *file, u64 item_count) {
 	wpDebugAssert(src_buf != NULL && file != NULL,
 	                  "`src_buf` and `file` should not be NULL.");
 
-	u64 item_size      = wapp_array_item_size(src_buf);
+	u64 item_size      = wpArrayItemSize(src_buf);
-	u64 src_byte_count = wapp_array_count(src_buf) * item_size;
+	u64 src_byte_count = wpArrayCount(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);
+	i64 bytes_written = fileWrite(src_buf, file, to_copy);
 	if (bytes_written < 0) {
 		return 0;
 	}
@@ -114,26 +114,26 @@ i64 wapp_file_write_array(const GenericArray src_buf, WFile *file, u64 item_coun
 	return (u64)bytes_written / item_size;
 }
 
-i32 wapp_file_flush(WFile *file) {
+i32 wpFileFlush(WpFile *file) {
 	wpDebugAssert(file != NULL, "`file` should not be NULL.");
-	return _file_flush(file);
+	return fileFlush(file);
 }
 
-i32 wapp_file_close(WFile *file) {
+i32 wpFileClose(WpFile *file) {
 	wpDebugAssert(file != NULL, "`file` should not be NULL.");
-	return _file_close(file);
+	return fileClose(file);
 }
 
-i32 wapp_file_rename(WpStr8RO *old_filepath, WpStr8RO *new_filepath) {
+i32 wpFileRename(WpStr8RO *old_filepath, WpStr8RO *new_filepath) {
 	wpDebugAssert(old_filepath != NULL && new_filepath != NULL,
 	                  "`old_filepath` and `new_filepath` should not be NULL");
-	wpDebugAssert(old_filepath->size < WAPP_PATH_MAX, "`old_filepath` exceeds max path limit.");
+	wpDebugAssert(old_filepath->size < WP_PATH_MAX, "`old_filepath` exceeds max path limit.");
-	wpDebugAssert(new_filepath->size < WAPP_PATH_MAX, "`new_filepath` exceeds max path limit.");
+	wpDebugAssert(new_filepath->size < WP_PATH_MAX, "`new_filepath` exceeds max path limit.");
-	return _file_rename(old_filepath, new_filepath);
+	return fileRename(old_filepath, new_filepath);
 }
 
-i32 wapp_file_remove(WpStr8RO *filepath) {
+i32 wpFileRemove(WpStr8RO *filepath) {
 	wpDebugAssert(filepath != NULL, "`filepath` should not be NULL");
-	wpDebugAssert(filepath->size < WAPP_PATH_MAX, "`filepath` exceeds max path limit.");
+	wpDebugAssert(filepath->size < WP_PATH_MAX, "`filepath` exceeds max path limit.");
-	return _file_remove(filepath);
+	return fileRemove(filepath);
 }

src/os/file/file.h

@@ -11,64 +11,64 @@
 BEGIN_C_LINKAGE
 #endif // !WP_PLATFORM_CPP
 
-typedef struct WFile WFile;
+typedef struct WpFile WpFile;
 
-typedef enum {
+typedef enum WpFileAccessMode {
-	WAPP_ACCESS_READ,                       // Equivalent to r
+	WP_ACCESS_READ,                       // Equivalent to r
-	WAPP_ACCESS_WRITE,                      // Equivalent to w
+	WP_ACCESS_WRITE,                      // Equivalent to w
-	WAPP_ACCESS_APPEND,                     // Equivalent to a
+	WP_ACCESS_APPEND,                     // Equivalent to a
-	WAPP_ACCESS_READ_EX,                    // Equivalent to r+
+	WP_ACCESS_READ_EX,                    // Equivalent to r+
-	WAPP_ACCESS_WRITE_EX,                   // Equivalent to w+
+	WP_ACCESS_WRITE_EX,                   // Equivalent to w+
-	WAPP_ACCESS_APPEND_EX,                  // Equivalent to a+
+	WP_ACCESS_APPEND_EX,                  // Equivalent to a+
-	WAPP_ACCESS_WRITE_FAIL_ON_EXIST,        // Equivalent to wx
+	WP_ACCESS_WRITE_FAIL_ON_EXIST,        // Equivalent to wx
-	WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX,     // Equivalent to wx+
+	WP_ACCESS_WRITE_FAIL_ON_EXIST_EX,     // Equivalent to wx+
 
-	FILE_ACCESS_MODE_COUNT,
+	COUNT_FILE_ACCESS_MODE,
-} FileAccessMode;
+} WpFileAccessMode;
 
-typedef enum {
+typedef enum WpFileSeekOrigin {
-	WAPP_SEEK_START,
+	WP_SEEK_START,
-	WAPP_SEEK_CURRENT,
+	WP_SEEK_CURRENT,
-	WAPP_SEEK_END,
+	WP_SEEK_END,
 
-	FILE_SEEK_ORIGIN_COUNT,
+	COUNT_FILE_SEEK_ORIGIN,
-} FileSeekOrigin;
+} WpFileSeekOrigin;
 
 // Return value should not be cached as it's not guaranteed to remain the same. Always call
-// wapp_file_stdin to get the standard input stream
+// wpFileStdin to get the standard input stream
-wp_extern WFile *wapp_file_stdin(void);
+wp_extern WpFile *wpFileStdin(void);
 
 // Return value should not be cached as it's not guaranteed to remain the same. Always call
-// wapp_file_stdout to get the standard output stream
+// wpFileStdout to get the standard output stream
-wp_extern WFile *wapp_file_stdout(void);
+wp_extern WpFile *wpFileStdout(void);
 
 // Return value should not be cached as it's not guaranteed to remain the same. Always call
-// wapp_file_stderr to get the standard error stream
+// wpFileStderr to get the standard error stream
-wp_extern WFile *wapp_file_stderr(void);
+wp_extern WpFile *wpFileStderr(void);
 
-WFile *wapp_file_open(const WpAllocator *allocator, WpStr8RO *filepath, FileAccessMode mode);
+WpFile *wpFileOpen(const WpAllocator *allocator, WpStr8RO *filepath, WpFileAccessMode mode);
-i64    wapp_file_get_current_position(WFile *file);
+i64     wpFileGetCurrentPosition(WpFile *file);
-i64    wapp_file_seek(WFile *file, i64 offset, FileSeekOrigin origin);
+i64     wpFileSeek(WpFile *file, i64 offset, WpFileSeekOrigin origin);
-i64    wapp_file_get_length(WFile *file);
+i64     wpFileGetLength(WpFile *file);
-u64    wapp_file_read(void *dst_buf, WFile *file, u64 byte_count);
+u64     wpFileRead(void *dst_buf, WpFile *file, u64 byte_count);
-i64    wapp_file_write(const void *src_buf, WFile *file, u64 byte_count);
+i64     wpFileWrite(const void *src_buf, WpFile *file, u64 byte_count);
-u64    wapp_file_read_str8(WpStr8 *str, WFile *file);
+u64     wpFileReadStr8(WpStr8 *str, WpFile *file);
-i64    wapp_file_write_str8(WpStr8RO *str, WFile *file);
+i64     wpFileWriteStr8(WpStr8RO *str, WpFile *file);
-u64    wapp_file_read_array(GenericArray dst_buf, WFile *file, u64 item_count);
+u64     wpFileReadArray(WpArray dst_buf, WpFile *file, u64 item_count);
-i64    wapp_file_write_array(const GenericArray src_buf, WFile *file, u64 item_count);
+i64     wpFileWriteArray(const WpArray src_buf, WpFile *file, u64 item_count);
-i32    wapp_file_flush(WFile *file);
+i32     wpFileFlush(WpFile *file);
-i32    wapp_file_close(WFile *file);
+i32     wpFileClose(WpFile *file);
-i32    wapp_file_rename(WpStr8RO *old_filepath, WpStr8RO *new_filepath);
+i32     wpFileRename(WpStr8RO *old_filepath, WpStr8RO *new_filepath);
-i32    wapp_file_remove(WpStr8RO *filepath);
+i32     wpFileRemove(WpStr8RO *filepath);
 
-wp_extern WFile *_file_open(const WpAllocator *allocator, WpStr8RO *filepath, FileAccessMode mode);
+wp_extern WpFile *fileOpen(const WpAllocator *allocator, WpStr8RO *filepath, WpFileAccessMode mode);
-wp_extern i64    _file_seek(WFile *file, i64 offset, FileSeekOrigin origin);
+wp_extern i64     fileSeek(WpFile *file, i64 offset, WpFileSeekOrigin origin);
-wp_extern u64    _file_read(void *dst_buf, u64 byte_count, WFile *file, u64 file_length);
+wp_extern u64     fileRead(void *dst_buf, u64 byte_count, WpFile *file, u64 file_length);
-wp_extern i64    _file_write(const void *src_buf, WFile *file, u64 byte_count);
+wp_extern i64     fileWrite(const void *src_buf, WpFile *file, u64 byte_count);
-wp_extern i32    _file_flush(WFile *file);
+wp_extern i32     fileFlush(WpFile *file);
-wp_extern i32    _file_close(WFile *file);
+wp_extern i32     fileClose(WpFile *file);
-wp_extern i32    _file_rename(WpStr8RO *old_filepath, WpStr8RO *new_filepath);
+wp_extern i32     fileRename(WpStr8RO *old_filepath, WpStr8RO *new_filepath);
-wp_extern i32    _file_remove(WpStr8RO *filepath);
+wp_extern i32     fileRemove(WpStr8RO *filepath);
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

src/os/file/posix/file_posix.c

@@ -21,52 +21,52 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-wp_intern i32 file_flags[FILE_ACCESS_MODE_COUNT] = {
+wp_intern i32 file_flags[COUNT_FILE_ACCESS_MODE] = {
-	[WAPP_ACCESS_READ]                       = O_RDONLY,
+	[WP_ACCESS_READ]                       = O_RDONLY,
-	[WAPP_ACCESS_WRITE]                      = O_WRONLY | O_CREAT,
+	[WP_ACCESS_WRITE]                      = O_WRONLY | O_CREAT,
-	[WAPP_ACCESS_APPEND]                     = O_WRONLY | O_APPEND | O_CREAT,
+	[WP_ACCESS_APPEND]                     = O_WRONLY | O_APPEND | O_CREAT,
-	[WAPP_ACCESS_READ_EX]                    = O_RDWR,
+	[WP_ACCESS_READ_EX]                    = O_RDWR,
-	[WAPP_ACCESS_WRITE_EX]                   = O_RDWR | O_CREAT,
+	[WP_ACCESS_WRITE_EX]                   = O_RDWR | O_CREAT,
-	[WAPP_ACCESS_APPEND_EX]                  = O_RDWR | O_APPEND | O_CREAT,
+	[WP_ACCESS_APPEND_EX]                  = O_RDWR | O_APPEND | O_CREAT,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST]        = O_WRONLY | O_CREAT | O_EXCL,
+	[WP_ACCESS_WRITE_FAIL_ON_EXIST]        = O_WRONLY | O_CREAT | O_EXCL,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = O_RDWR | O_CREAT | O_EXCL,
+	[WP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = O_RDWR | O_CREAT | O_EXCL,
 };
 
-wp_intern mode_t file_modes[FILE_ACCESS_MODE_COUNT] = {
+wp_intern mode_t file_modes[COUNT_FILE_ACCESS_MODE] = {
-	[WAPP_ACCESS_READ]                       = 0,
+	[WP_ACCESS_READ]                       = 0,
-	[WAPP_ACCESS_WRITE]                      = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
+	[WP_ACCESS_WRITE]                      = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-	[WAPP_ACCESS_APPEND]                     = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
+	[WP_ACCESS_APPEND]                     = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-	[WAPP_ACCESS_READ_EX]                    = 0,
+	[WP_ACCESS_READ_EX]                    = 0,
-	[WAPP_ACCESS_WRITE_EX]                   = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
+	[WP_ACCESS_WRITE_EX]                   = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
-	[WAPP_ACCESS_APPEND_EX]                  = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
+	[WP_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,
+	[WP_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,
+	[WP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
 };
 
-wp_intern i32 file_seek_origins[FILE_SEEK_ORIGIN_COUNT] = {
+wp_intern i32 file_seek_origins[COUNT_FILE_SEEK_ORIGIN] = {
-	[WAPP_SEEK_START]   = SEEK_SET,
+	[WP_SEEK_START]   = SEEK_SET,
-	[WAPP_SEEK_CURRENT] = SEEK_CUR,
+	[WP_SEEK_CURRENT] = SEEK_CUR,
-	[WAPP_SEEK_END]     = SEEK_END,
+	[WP_SEEK_END]     = SEEK_END,
 };
 
-WFile *wapp_file_stdin(void) {
+WpFile *wpFileStdin(void) {
-	wp_persist WFile _stdin  = { .fd = STDIN_FILENO };
+	wp_persist WpFile _stdin  = { .fd = STDIN_FILENO };
 	return &_stdin;
 }
 
-WFile *wapp_file_stdout(void) {
+WpFile *wpFileStdout(void) {
-	wp_persist WFile _stdout = { .fd = STDOUT_FILENO };
+	wp_persist WpFile _stdout = { .fd = STDOUT_FILENO };
 	return &_stdout;
 }
 
-WFile *wapp_file_stderr(void) {
+WpFile *wpFileStderr(void) {
-	wp_persist WFile _stderr = { .fd = STDERR_FILENO };
+	wp_persist WpFile _stderr = { .fd = STDERR_FILENO };
 	return &_stderr;
 }
 
-WFile *_file_open(const WpAllocator *allocator, WpStr8RO *filepath, FileAccessMode mode) {
+WpFile *fileOpen(const WpAllocator *allocator, WpStr8RO *filepath, WpFileAccessMode mode) {
-	wp_persist c8 tmp[WAPP_PATH_MAX] = {0};
+	wp_persist c8 tmp[WP_PATH_MAX] = {0};
-	memset(tmp, 0, WAPP_PATH_MAX);
+	memset(tmp, 0, WP_PATH_MAX);
 	memcpy(tmp, filepath->buf, filepath->size);
 
 	i32 fd = open((const char *)tmp, file_flags[mode], file_modes[mode]);
@@ -74,7 +74,7 @@ WFile *_file_open(const WpAllocator *allocator, WpStr8RO *filepath, FileAccessMo
 		return NULL;
 	}
 
-	WFile *output = wpMemAllocatorAlloc(allocator, sizeof(WFile));
+	WpFile *output = wpMemAllocatorAlloc(allocator, sizeof(WpFile));
 	if (output) {
 		output->fd = fd;
 	}
@@ -82,11 +82,11 @@ WFile *_file_open(const WpAllocator *allocator, WpStr8RO *filepath, FileAccessMo
 	return output;
 }
 
-i64 _file_seek(WFile *file, i64 offset, FileSeekOrigin origin) {
+i64 fileSeek(WpFile *file, i64 offset, WpFileSeekOrigin 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 fileRead(void *dst_buf, u64 byte_count, WpFile *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);
@@ -95,37 +95,37 @@ u64 _file_read(void *dst_buf, u64 byte_count, WFile *file, u64 file_length) {
 	return count;
 }
 
-i64 _file_write(const void *src_buf, WFile *file, u64 byte_count) {
+i64 fileWrite(const void *src_buf, WpFile *file, u64 byte_count) {
 	return write(file->fd, src_buf, byte_count);
 }
 
-i32 _file_flush(WFile *file) {
+i32 fileFlush(WpFile *file) {
 	return fsync(file->fd);
 }
 
-i32 _file_close(WFile *file) {
+i32 fileClose(WpFile *file) {
 	return close(file->fd);
 }
 
-i32 _file_rename(WpStr8RO *old_filepath, WpStr8RO *new_filepath) {
+i32 fileRename(WpStr8RO *old_filepath, WpStr8RO *new_filepath) {
-	wp_persist c8 old_tmp[WAPP_PATH_MAX] = {0};
+	wp_persist c8 old_tmp[WP_PATH_MAX] = {0};
-	wp_persist c8 new_tmp[WAPP_PATH_MAX] = {0};
+	wp_persist c8 new_tmp[WP_PATH_MAX] = {0};
-	memset(old_tmp, 0, WAPP_PATH_MAX);
+	memset(old_tmp, 0, WP_PATH_MAX);
 	memcpy(old_tmp, old_filepath->buf, old_filepath->size);
-	memset(new_tmp, 0, WAPP_PATH_MAX);
+	memset(new_tmp, 0, WP_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);
+		fileRemove(old_filepath);
 	}
 
 	return link_result;
 }
 
-i32 _file_remove(WpStr8RO *filepath) {
+i32 fileRemove(WpStr8RO *filepath) {
-	wp_persist c8 tmp[WAPP_PATH_MAX] = {0};
+	wp_persist c8 tmp[WP_PATH_MAX] = {0};
-	memset(tmp, 0, WAPP_PATH_MAX);
+	memset(tmp, 0, WP_PATH_MAX);
 	memcpy(tmp, filepath->buf, filepath->size);
 
 	return unlink((const char *)tmp);

src/os/file/posix/file_posix.h

@@ -12,9 +12,9 @@ BEGIN_C_LINKAGE
 
 #ifdef WP_PLATFORM_POSIX
 
-#define END_OF_LINE "\n"
+#define WP_END_OF_LINE "\n"
 
-struct WFile {
+struct WpFile {
 	i32 fd;
 };
 

src/os/file/win/file_win.c

@@ -15,66 +15,66 @@
 #include <fileapi.h>
 #include <intsafe.h>
 
-wp_intern DWORD file_accesses[FILE_ACCESS_MODE_COUNT] = {
+wp_intern DWORD file_accesses[COUNT_FILE_ACCESS_MODE] = {
-	[WAPP_ACCESS_READ]                       = FILE_READ_DATA,
+	[WP_ACCESS_READ]                       = FILE_READ_DATA,
-	[WAPP_ACCESS_WRITE]                      = FILE_WRITE_DATA,
+	[WP_ACCESS_WRITE]                      = FILE_WRITE_DATA,
-	[WAPP_ACCESS_APPEND]                     = FILE_APPEND_DATA,
+	[WP_ACCESS_APPEND]                     = FILE_APPEND_DATA,
-	[WAPP_ACCESS_READ_EX]                    = FILE_READ_DATA | FILE_WRITE_DATA,
+	[WP_ACCESS_READ_EX]                    = FILE_READ_DATA | FILE_WRITE_DATA,
-	[WAPP_ACCESS_WRITE_EX]                   = FILE_READ_DATA | FILE_WRITE_DATA,
+	[WP_ACCESS_WRITE_EX]                   = FILE_READ_DATA | FILE_WRITE_DATA,
-	[WAPP_ACCESS_APPEND_EX]                  = FILE_READ_DATA | FILE_APPEND_DATA,
+	[WP_ACCESS_APPEND_EX]                  = FILE_READ_DATA | FILE_APPEND_DATA,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST]        = FILE_WRITE_DATA,
+	[WP_ACCESS_WRITE_FAIL_ON_EXIST]        = FILE_WRITE_DATA,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = FILE_READ_DATA | FILE_WRITE_DATA,
+	[WP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = FILE_READ_DATA | FILE_WRITE_DATA,
 };
 
-wp_intern DWORD creation_dispositions[FILE_ACCESS_MODE_COUNT] = {
+wp_intern DWORD creation_dispositions[COUNT_FILE_ACCESS_MODE] = {
-	[WAPP_ACCESS_READ]                       = OPEN_EXISTING,
+	[WP_ACCESS_READ]                       = OPEN_EXISTING,
-	[WAPP_ACCESS_WRITE]                      = CREATE_ALWAYS,
+	[WP_ACCESS_WRITE]                      = CREATE_ALWAYS,
-	[WAPP_ACCESS_APPEND]                     = OPEN_ALWAYS,
+	[WP_ACCESS_APPEND]                     = OPEN_ALWAYS,
-	[WAPP_ACCESS_READ_EX]                    = OPEN_EXISTING,
+	[WP_ACCESS_READ_EX]                    = OPEN_EXISTING,
-	[WAPP_ACCESS_WRITE_EX]                   = CREATE_ALWAYS,
+	[WP_ACCESS_WRITE_EX]                   = CREATE_ALWAYS,
-	[WAPP_ACCESS_APPEND_EX]                  = OPEN_ALWAYS,
+	[WP_ACCESS_APPEND_EX]                  = OPEN_ALWAYS,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST]        = CREATE_NEW,
+	[WP_ACCESS_WRITE_FAIL_ON_EXIST]        = CREATE_NEW,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = CREATE_NEW,
+	[WP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = CREATE_NEW,
 };
 
-wp_intern DWORD sharing_modes[FILE_ACCESS_MODE_COUNT] = {
+wp_intern DWORD sharing_modes[COUNT_FILE_ACCESS_MODE] = {
-	[WAPP_ACCESS_READ]                       = FILE_SHARE_READ | FILE_SHARE_WRITE,
+	[WP_ACCESS_READ]                       = FILE_SHARE_READ | FILE_SHARE_WRITE,
-	[WAPP_ACCESS_WRITE]                      = FILE_SHARE_READ,
+	[WP_ACCESS_WRITE]                      = FILE_SHARE_READ,
-	[WAPP_ACCESS_APPEND]                     = FILE_SHARE_READ,
+	[WP_ACCESS_APPEND]                     = FILE_SHARE_READ,
-	[WAPP_ACCESS_READ_EX]                    = FILE_SHARE_READ | FILE_SHARE_WRITE,
+	[WP_ACCESS_READ_EX]                    = FILE_SHARE_READ | FILE_SHARE_WRITE,
-	[WAPP_ACCESS_WRITE_EX]                   = FILE_SHARE_READ,
+	[WP_ACCESS_WRITE_EX]                   = FILE_SHARE_READ,
-	[WAPP_ACCESS_APPEND_EX]                  = FILE_SHARE_READ,
+	[WP_ACCESS_APPEND_EX]                  = FILE_SHARE_READ,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST]        = FILE_SHARE_READ,
+	[WP_ACCESS_WRITE_FAIL_ON_EXIST]        = FILE_SHARE_READ,
-	[WAPP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = FILE_SHARE_READ,
+	[WP_ACCESS_WRITE_FAIL_ON_EXIST_EX]     = FILE_SHARE_READ,
 };
 
-wp_intern DWORD file_seek_origins[FILE_SEEK_ORIGIN_COUNT] = {
+wp_intern DWORD file_seek_origins[COUNT_FILE_SEEK_ORIGIN] = {
-	[WAPP_SEEK_START]   = FILE_BEGIN,
+	[WP_SEEK_START]   = FILE_BEGIN,
-	[WAPP_SEEK_CURRENT] = FILE_CURRENT,
+	[WP_SEEK_CURRENT] = FILE_CURRENT,
-	[WAPP_SEEK_END]     = FILE_END,
+	[WP_SEEK_END]     = FILE_END,
 };
 
-WFile *wapp_file_stdin(void) {
+WpFile *wpFileStdin(void) {
-	wp_persist WFile _stdin  = { .fh = INVALID_HANDLE_VALUE };
+	wp_persist WpFile _stdin  = { .fh = INVALID_HANDLE_VALUE };
 	_stdin.fh = GetStdHandle(STD_INPUT_HANDLE);
 	return &_stdin;
 }
 
-WFile *wapp_file_stdout(void) {
+WpFile *wpFileStdout(void) {
-	wp_persist WFile _stdout = { .fh = INVALID_HANDLE_VALUE };
+	wp_persist WpFile _stdout = { .fh = INVALID_HANDLE_VALUE };
 	_stdout.fh = GetStdHandle(STD_OUTPUT_HANDLE);
 	return &_stdout;
 }
 
-WFile *wapp_file_stderr(void) {
+WpFile *wpFileStderr(void) {
-	wp_persist WFile _stderr = { .fh = INVALID_HANDLE_VALUE };
+	wp_persist WpFile _stderr = { .fh = INVALID_HANDLE_VALUE };
 	_stderr.fh = GetStdHandle(STD_ERROR_HANDLE);
 	return &_stderr;
 }
 
-WFile *_file_open(const WpAllocator *allocator, WpStr8RO *filepath, FileAccessMode mode) {
+WpFile *fileOpen(const WpAllocator *allocator, WpStr8RO *filepath, WpFileAccessMode mode) {
-	wp_persist c8 tmp[WAPP_PATH_MAX] = {0};
+	wp_persist c8 tmp[WP_PATH_MAX] = {0};
-	memset(tmp, 0, WAPP_PATH_MAX);
+	memset(tmp, 0, WP_PATH_MAX);
 	memcpy(tmp, filepath->buf, filepath->size);
 
 	HANDLE fh = CreateFileA((LPCSTR)tmp,
@@ -88,7 +88,7 @@ WFile *_file_open(const WpAllocator *allocator, WpStr8RO *filepath, FileAccessMo
 		return NULL;
 	}
 
-	WFile *output = wpMemAllocatorAlloc(allocator, sizeof(WFile));
+	WpFile *output = wpMemAllocatorAlloc(allocator, sizeof(WpFile));
 	if (output) {
 		output->fh = fh;
 	}
@@ -96,7 +96,7 @@ WFile *_file_open(const WpAllocator *allocator, WpStr8RO *filepath, FileAccessMo
 	return output;
 }
 
-i64 _file_seek(WFile *file, i64 offset, FileSeekOrigin origin) {
+i64 fileSeek(WpFile *file, i64 offset, WpFileSeekOrigin origin) {
 	LARGE_INTEGER distance = {0};
 	LARGE_INTEGER output   = {0};
 
@@ -109,7 +109,7 @@ i64 _file_seek(WFile *file, i64 offset, FileSeekOrigin origin) {
 	return output.QuadPart;
 }
 
-u64 _file_read(void* dst_buf, u64 byte_count, WFile* file, u64 file_length) {
+u64 fileRead(void* dst_buf, u64 byte_count, WpFile* file, u64 file_length) {
 	u64 copy_byte_count = file_length <= byte_count ? file_length : byte_count;
 	wpDebugAssert(copy_byte_count <= DWORD_MAX, "Attempting to read large number of bytes at once");
 
@@ -121,7 +121,7 @@ u64 _file_read(void* dst_buf, u64 byte_count, WFile* file, u64 file_length) {
 	return (u64)read_count;
 }
 
-i64 _file_write(const void *src_buf, WFile *file, u64 byte_count) {
+i64 fileWrite(const void *src_buf, WpFile *file, u64 byte_count) {
 	wpDebugAssert(byte_count <= DWORD_MAX, "Attempting to write large number of bytes at once");
 
 	DWORD write_count = 0;
@@ -131,7 +131,7 @@ i64 _file_write(const void *src_buf, WFile *file, u64 byte_count) {
 	return (i64)write_count;
 }
 
-i32 _file_flush(WFile *file) {
+i32 fileFlush(WpFile *file) {
 	if (!FlushFileBuffers(file->fh)) {
 		return -1;
 	}
@@ -139,7 +139,7 @@ i32 _file_flush(WFile *file) {
 	return 0;
 }
 
-i32 _file_close(WFile *file) {
+i32 fileClose(WpFile *file) {
 	if (!CloseHandle(file->fh)) {
 		return -1;
 	}
@@ -147,12 +147,12 @@ i32 _file_close(WFile *file) {
 	return 0;
 }
 
-i32 _file_rename(WpStr8RO *old_filepath, WpStr8RO *new_filepath) {
+i32 fileRename(WpStr8RO *old_filepath, WpStr8RO *new_filepath) {
-	wp_persist c8 old_tmp[WAPP_PATH_MAX] = {0};
+	wp_persist c8 old_tmp[WP_PATH_MAX] = {0};
-	wp_persist c8 new_tmp[WAPP_PATH_MAX] = {0};
+	wp_persist c8 new_tmp[WP_PATH_MAX] = {0};
-	memset(old_tmp, 0, WAPP_PATH_MAX);
+	memset(old_tmp, 0, WP_PATH_MAX);
 	memcpy(old_tmp, old_filepath->buf, old_filepath->size);
-	memset(new_tmp, 0, WAPP_PATH_MAX);
+	memset(new_tmp, 0, WP_PATH_MAX);
 	memcpy(new_tmp, new_filepath->buf, new_filepath->size);
 
 	if (!MoveFile((LPCSTR)old_tmp, (LPCSTR)new_tmp)) {
@@ -162,9 +162,9 @@ i32 _file_rename(WpStr8RO *old_filepath, WpStr8RO *new_filepath) {
 	return 0;
 }
 
-i32 _file_remove(WpStr8RO *filepath) {
+i32 fileRemove(WpStr8RO *filepath) {
-	wp_persist c8 tmp[WAPP_PATH_MAX] = {0};
+	wp_persist c8 tmp[WP_PATH_MAX] = {0};
-	memset(tmp, 0, WAPP_PATH_MAX);
+	memset(tmp, 0, WP_PATH_MAX);
 	memcpy(tmp, filepath->buf, filepath->size);
 
 	if (!DeleteFile((LPCSTR)tmp)) {

src/os/file/win/file_win.h

@@ -12,13 +12,13 @@ BEGIN_C_LINKAGE
 
 #ifdef WP_PLATFORM_WINDOWS
 
-#define END_OF_LINE "\r\n"
+#define WP_END_OF_LINE "\r\n"
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <fileapi.h>
 
-struct WFile {
+struct WpFile {
 	HANDLE fh;
 };
 

src/os/mem/mem_os.c

@@ -15,16 +15,16 @@
 #error "Unrecognised platform"
 #endif
 
-void *wapp_os_mem_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
+void *wpOsMemAlloc(void *addr, u64 size, WpMemAccess access, WpMemAllocFlags flags, WpMemInitType type) {
-	void *output = os_mem_allocate(addr, size, access, flags, type);
+	void *output = osMemAllocate(addr, size, access, flags, type);
 
-	if (type == WAPP_MEM_INIT_INITIALISED) {
+	if (type == WP_MEM_INIT_INITIALISED) {
 		memset(output, 0, size);
 	}
 
 	return output;
 }
 
-void wapp_os_mem_free(void *ptr, u64 size) {
+void wpOsMemFree(void *ptr, u64 size) {
-	os_mem_free(ptr, size);
+	osMemFree(ptr, size);
 }

src/os/mem/mem_os.h

@@ -20,11 +20,11 @@ BEGIN_C_LINKAGE
 #error "Unrecognised platform"
 #endif
 
-void *wapp_os_mem_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
+void *wpOsMemAlloc(void *addr, u64 size, WpMemAccess access, WpMemAllocFlags flags, WpMemInitType type);
-void wapp_os_mem_free(void *ptr, u64 size);
+void wpOsMemFree(void *ptr, u64 size);
 
-wp_extern void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
+wp_extern void *osMemAllocate(void *addr, u64 size, WpMemAccess access, WpMemAllocFlags flags, WpMemInitType type);
-wp_extern void os_mem_free(void *ptr, u64 size);
+wp_extern void  osMemFree(void *ptr, u64 size);
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

src/os/mem/mem_os_ops.h

@@ -9,19 +9,19 @@
 BEGIN_C_LINKAGE
 #endif // !WP_PLATFORM_CPP
 
-typedef enum mem_access {
+typedef enum WpMemAccess {
-	WAPP_MEM_ACCESS_NONE,
+	WP_MEM_ACCESS_NONE,
-	WAPP_MEM_ACCESS_READ_ONLY,
+	WP_MEM_ACCESS_READ_ONLY,
-	WAPP_MEM_ACCESS_EXEC_ONLY,
+	WP_MEM_ACCESS_EXEC_ONLY,
-	WAPP_MEM_ACCESS_READ_WRITE,
+	WP_MEM_ACCESS_READ_WRITE,
-	WAPP_MEM_ACCESS_READ_EXEC,
+	WP_MEM_ACCESS_READ_EXEC,
-	WAPP_MEM_ACCESS_READ_WRITE_EXEC,
+	WP_MEM_ACCESS_READ_WRITE_EXEC,
-} MemAccess;
+} WpMemAccess;
 
-typedef enum mem_init_type {
+typedef enum WpMemInitType {
-	WAPP_MEM_INIT_UNINITIALISED,
+	WP_MEM_INIT_UNINITIALISED,
-	WAPP_MEM_INIT_INITIALISED,
+	WP_MEM_INIT_INITIALISED,
-} MemInitType;
+} WpMemInitType;
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

src/os/mem/posix/mem_os_posix.c

@@ -10,15 +10,15 @@
 #include <sys/mman.h>
 
 wp_intern const i32 access_types[] = {
-	[WAPP_MEM_ACCESS_NONE]            = PROT_NONE,
+	[WP_MEM_ACCESS_NONE]            = PROT_NONE,
-	[WAPP_MEM_ACCESS_READ_ONLY]       = PROT_READ,
+	[WP_MEM_ACCESS_READ_ONLY]       = PROT_READ,
-	[WAPP_MEM_ACCESS_EXEC_ONLY]       = PROT_EXEC,
+	[WP_MEM_ACCESS_EXEC_ONLY]       = PROT_EXEC,
-	[WAPP_MEM_ACCESS_READ_WRITE]      = PROT_READ | PROT_WRITE,
+	[WP_MEM_ACCESS_READ_WRITE]      = PROT_READ | PROT_WRITE,
-	[WAPP_MEM_ACCESS_READ_EXEC]       = PROT_READ | PROT_EXEC,
+	[WP_MEM_ACCESS_READ_EXEC]       = PROT_READ | PROT_EXEC,
-	[WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PROT_READ | PROT_WRITE | PROT_EXEC,
+	[WP_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 *osMemAllocate(void *addr, u64 size, WpMemAccess access, WpMemAllocFlags flags, WpMemInitType type) {
 	(void)type;
 	i32 alloc_flags = flags | MAP_ANON | MAP_PRIVATE;
 
@@ -29,7 +29,7 @@ void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flag
 	return mmap(addr, size, access_types[access], alloc_flags, -1, 0);
 }
 
-void os_mem_free(void *ptr, u64 size) {
+void osMemFree(void *ptr, u64 size) {
 	munmap(ptr, size);
 }
 

src/os/mem/posix/mem_os_posix.h

@@ -13,18 +13,18 @@ BEGIN_C_LINKAGE
 
 #include <sys/mman.h>
 
-typedef enum mem_alloc_flags {
+typedef enum WpMemAllocFlags {
 #if defined(WP_PLATFORM_LINUX) || defined(WP_PLATFORM_GNU)
-	WAPP_MEM_ALLOC_RESERVE = 0,
+	WP_MEM_ALLOC_RESERVE = 0,
-	WAPP_MEM_ALLOC_COMMIT  = MAP_POPULATE,
+	WP_MEM_ALLOC_COMMIT  = MAP_POPULATE,
 #elif defined(WP_PLATFORM_FREE_BSD)
-	WAPP_MEM_ALLOC_RESERVE = 0,
+	WP_MEM_ALLOC_RESERVE = 0,
-	WAPP_MEM_ALLOC_COMMIT  = MAP_PREFAULT_READ,
+	WP_MEM_ALLOC_COMMIT  = MAP_PREFAULT_READ,
 #elif defined(WP_PLATFORM_BSD) || defined(WP_PLATFORM_UNIX) || defined(WP_PLATFORM_APPLE)
-	WAPP_MEM_ALLOC_RESERVE = 0,
+	WP_MEM_ALLOC_RESERVE = 0,
-	WAPP_MEM_ALLOC_COMMIT  = 0,
+	WP_MEM_ALLOC_COMMIT  = 0,
 #endif
-} MemAllocFlags;
+} WpMemAllocFlags;
 
 #endif // !WP_PLATFORM_POSIX
 

src/os/mem/win/mem_os_win.c

@@ -13,24 +13,24 @@
 #include <memoryapi.h>
 
 wp_intern const i32 access_types[] = {
-	[WAPP_MEM_ACCESS_NONE]            = PAGE_NOACCESS,
+	[WP_MEM_ACCESS_NONE]            = PAGE_NOACCESS,
-	[WAPP_MEM_ACCESS_READ_ONLY]       = PAGE_READONLY,
+	[WP_MEM_ACCESS_READ_ONLY]       = PAGE_READONLY,
-	[WAPP_MEM_ACCESS_EXEC_ONLY]       = PAGE_EXECUTE,
+	[WP_MEM_ACCESS_EXEC_ONLY]       = PAGE_EXECUTE,
-	[WAPP_MEM_ACCESS_READ_WRITE]      = PAGE_READWRITE,
+	[WP_MEM_ACCESS_READ_WRITE]      = PAGE_READWRITE,
-	[WAPP_MEM_ACCESS_READ_EXEC]       = PAGE_EXECUTE_READ,
+	[WP_MEM_ACCESS_READ_EXEC]       = PAGE_EXECUTE_READ,
-	[WAPP_MEM_ACCESS_READ_WRITE_EXEC] = PAGE_EXECUTE_READWRITE,
+	[WP_MEM_ACCESS_READ_WRITE_EXEC] = PAGE_EXECUTE_READWRITE,
 };
 
-void *os_mem_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
+void *osMemAllocate(void *addr, u64 size, WpMemAccess access, WpMemAllocFlags flags, WpMemInitType type) {
 	// Ensure memory is committed if it's meant to be initialised
-	if (type == WAPP_MEM_INIT_INITIALISED) {
+	if (type == WP_MEM_INIT_INITIALISED) {
-		flags |= WAPP_MEM_ALLOC_COMMIT;
+		flags |= WP_MEM_ALLOC_COMMIT;
 	}
 
 	return VirtualAlloc(addr, (SIZE_T)size, flags, access_types[access]);
 }
 
-void os_mem_free(void *ptr, u64 size) {
+void osMemFree(void *ptr, u64 size) {
 	VirtualFree(ptr, size, MEM_RELEASE);
 }
 

src/os/mem/win/mem_os_win.h

@@ -15,10 +15,10 @@ BEGIN_C_LINKAGE
 #include <Windows.h>
 #include <memoryapi.h>
 
-typedef enum mem_alloc_flags {
+typedef enum WpMemAllocFlags {
-	WAPP_MEM_ALLOC_RESERVE = MEM_RESERVE,
+	WP_MEM_ALLOC_RESERVE = MEM_RESERVE,
-	WAPP_MEM_ALLOC_COMMIT  = MEM_COMMIT,
+	WP_MEM_ALLOC_COMMIT  = MEM_COMMIT,
-} MemAllocFlags;
+} WpMemAllocFlags;
 
 #endif // !WP_PLATFORM_WINDOWS
 

src/os/shell/commander/commander.c

@@ -17,85 +17,85 @@
 #define CMD_BUF_LEN 8192
 #define OUT_BUF_LEN 4096
 
-wp_intern CMDResult execute_command(WpStr8RO *cmd, CMDOutHandling out_handling, WpStr8 *out_buf);
+wp_intern WpCmdResult executeCommand(WpStr8RO *cmd, WpCmdOutHandling out_handling, WpStr8 *out_buf);
-wp_intern CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, WpStr8 *out_buf);
+wp_intern WpCmdError getCommandOutput(FILE *fp, WpCmdOutHandling out_handling, WpStr8 *out_buf);
 
-CMDResult wapp_shell_commander_execute(CMDOutHandling out_handling, WpStr8 *out_buf, const WpStr8List *cmd) {
+WpCmdResult wpShellCommanderExecute(WpCmdOutHandling out_handling, WpStr8 *out_buf, const WpStr8List *cmd) {
 	if (!cmd) {
-		return CMD_NO_EXIT(SHELL_ERR_INVALID_ARGS);
+		return wpCmdNoExit(WP_SHELL_ERR_INVALID_ARGS);
 	}
 
-	WpAllocator arena = wapp_mem_arena_allocator_init(KiB(500));
+	WpAllocator arena = wpMemArenaAllocatorInit(KiB(500));
 
 	WpStr8 *cmd_str = wpStr8Join(&arena, cmd, &wpStr8LitRo(" "));
 	if (!cmd_str) {
-		wapp_mem_arena_allocator_destroy(&arena);
+		wpMemArenaAllocatorDestroy(&arena);
-		return CMD_NO_EXIT(SHELL_ERR_ALLOCATION_FAIL);
+		return wpCmdNoExit(WP_SHELL_ERR_ALLOCATION_FAIL);
 	}
 
 	// Redirect output
 	cmd_str = wpStr8AllocConcat(&arena, cmd_str, &wpStr8LitRo(" 2>&1"));
 
-	CMDResult output = execute_command(cmd_str, out_handling, out_buf);
+	WpCmdResult output = executeCommand(cmd_str, out_handling, out_buf);
 
-	wapp_mem_arena_allocator_destroy(&arena);
+	wpMemArenaAllocatorDestroy(&arena);
 
 	return output;
 }
 
-wp_intern CMDResult execute_command(WpStr8RO *cmd, CMDOutHandling out_handling, WpStr8 *out_buf) {
+wp_intern WpCmdResult executeCommand(WpStr8RO *cmd, WpCmdOutHandling out_handling, WpStr8 *out_buf) {
 	char cmd_buf[CMD_BUF_LEN] = {0};
 	wpStr8CopyToCstr(cmd_buf, cmd, CMD_BUF_LEN);
 
-	FILE *fp = wapp_shell_utils_popen(cmd_buf, "r");
+	FILE *fp = wpShellUtilsPopen(cmd_buf, "r");
 	if (!fp) {
-		return CMD_NO_EXIT(SHELL_ERR_PROC_START_FAIL);
+		return wpCmdNoExit(WP_SHELL_ERR_PROC_START_FAIL);
 	}
 
-	CMDResult output;
+	WpCmdResult output;
 
-	CMDError err = get_command_output(fp, out_handling, out_buf);
+	WpCmdError err = getCommandOutput(fp, out_handling, out_buf);
-	if (err > SHELL_ERR_NO_ERROR) {
+	if (err > WP_SHELL_ERR_NO_ERROR) {
-		output = CMD_NO_EXIT(err);
+		output = wpCmdNoExit(err);
-		goto EXECUTE_COMMAND_CLOSE;
+		goto executeCommand_CLOSE;
 	}
 
 	i32 st = EXIT_SUCCESS;
-	err = get_output_status(fp, &st);
+	err = getOutputStatus(fp, &st);
-	if (err > SHELL_ERR_NO_ERROR) {
+	if (err > WP_SHELL_ERR_NO_ERROR) {
-		output = CMD_NO_EXIT(err);
+		output = wpCmdNoExit(err);
-		goto EXECUTE_COMMAND_CLOSE;
+		goto executeCommand_CLOSE;
 	}
 
-	// Process is already closed in get_output_status
+	// Process is already closed in _getOutputStatus
 	fp = NULL;
 
-	output = (CMDResult){
+	output = (WpCmdResult){
 		.exited    = true,
 		.exit_code = st,
-		.error     = SHELL_ERR_NO_ERROR,
+		.error     = WP_SHELL_ERR_NO_ERROR,
 	};
 
-EXECUTE_COMMAND_CLOSE:
+executeCommand_CLOSE:
 	if (fp) {
-		wapp_shell_utils_pclose(fp);
+		wpShellUtilsPclose(fp);
 	}
 	return output;
 }
 
-wp_intern CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, WpStr8 *out_buf) {
+wp_intern WpCmdError getCommandOutput(FILE *fp, WpCmdOutHandling out_handling, WpStr8 *out_buf) {
 	WpStr8 out = wpStr8Buf(OUT_BUF_LEN);
 
 	out.size = fread((void *)out.buf, sizeof(c8), out.capacity, fp);
-	if (out_handling == SHELL_OUTPUT_CAPTURE && out_buf != NULL) {
+	if (out_handling == WP_SHELL_OUTPUT_CAPTURE && out_buf != NULL) {
 		if (out.size >= out_buf->capacity) {
-			return SHELL_ERR_OUT_BUF_FULL;
+			return WP_SHELL_ERR_OUT_BUF_FULL;
 		}
 
 		wpStr8ConcatCapped(out_buf, &out);
-	} else if (out_handling == SHELL_OUTPUT_PRINT) {
+	} else if (out_handling == WP_SHELL_OUTPUT_PRINT) {
-		printf(WP_STR8_SPEC, wpStr8Varg(out));
+		printf("%" WP_STR8_SPEC, wpStr8Varg(out));
 	}
 
-	return SHELL_ERR_NO_ERROR;
+	return WP_SHELL_ERR_NO_ERROR;
 }

src/os/shell/commander/commander.h

@@ -16,11 +16,11 @@
 BEGIN_C_LINKAGE
 #endif // !WP_PLATFORM_CPP
 
-#define CMD_NO_EXIT(ERR) ((CMDResult){.exited = false, .exit_code = EXIT_FAILURE, .error = ERR})
+#define wpCmdNoExit(ERR) ((WpCmdResult){.exited = false, .exit_code = EXIT_FAILURE, .error = ERR})
 
-CMDResult wapp_shell_commander_execute(CMDOutHandling out_handling, WpStr8 *out_buf, const WpStr8List *cmd);
+WpCmdResult wpShellCommanderExecute(WpCmdOutHandling out_handling, WpStr8 *out_buf, const WpStr8List *cmd);
 
-wp_extern CMDError get_output_status(FILE *fp, i32 *status_out);
+wp_extern WpCmdError getOutputStatus(FILE *fp, i32 *status_out);
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

src/os/shell/commander/commander_output.h

@@ -11,28 +11,28 @@
 BEGIN_C_LINKAGE
 #endif // !WP_PLATFORM_CPP
 
-typedef enum {
+typedef enum WpCmdOutHandling {
-	SHELL_OUTPUT_DISCARD,
+	WP_SHELL_OUTPUT_DISCARD,
-	SHELL_OUTPUT_PRINT,
+	WP_SHELL_OUTPUT_PRINT,
-	SHELL_OUTPUT_CAPTURE,
+	WP_SHELL_OUTPUT_CAPTURE,
-} CMDOutHandling;
+} WpCmdOutHandling;
 
-typedef enum {
+typedef enum WpCmdError {
-	SHELL_ERR_NO_ERROR,
+	WP_SHELL_ERR_NO_ERROR,
-	SHELL_ERR_INVALID_ARGS,
+	WP_SHELL_ERR_INVALID_ARGS,
-	SHELL_ERR_ALLOCATION_FAIL,
+	WP_SHELL_ERR_ALLOCATION_FAIL,
-	SHELL_ERR_PROC_START_FAIL,
+	WP_SHELL_ERR_PROC_START_FAIL,
-	SHELL_ERR_OUT_BUF_FULL,
+	WP_SHELL_ERR_OUT_BUF_FULL,
-	SHELL_ERR_PROC_EXIT_FAIL,
+	WP_SHELL_ERR_PROC_EXIT_FAIL,
-} CMDError;
+} WpCmdError;
 
-typedef struct CMDResult CMDResult;
+typedef struct WpCmdResult WpCmdResult;
-struct CMDResult {
+struct WpCmdResult {
 	i32 exit_code;
-	CMDError error;
+	WpCmdError error;
 	b8 exited;
 
-	wpMiscUtilsReservePadding(sizeof(b8) + sizeof(i32) + sizeof(CMDError));
+	wpMiscUtilsReservePadding(sizeof(b8) + sizeof(i32) + sizeof(WpCmdError));
 };
 
 #ifdef WP_PLATFORM_CPP

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

@@ -10,16 +10,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-CMDError get_output_status(FILE *fp, i32 *status_out) {
+WpCmdError getOutputStatus(FILE *fp, i32 *status_out) {
-	*status_out = wapp_shell_utils_pclose(fp);
+	*status_out = wpShellUtilsPclose(fp);
 
 	if (!WIFEXITED(*status_out)) {
-		return SHELL_ERR_PROC_EXIT_FAIL;
+		return WP_SHELL_ERR_PROC_EXIT_FAIL;
 	}
 
 	*status_out = WEXITSTATUS(*status_out);
 
-	return SHELL_ERR_NO_ERROR;
+	return WP_SHELL_ERR_NO_ERROR;
 }
 
 #endif // !WP_PLATFORM_POSIX

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

@@ -9,16 +9,16 @@
 #include "../../utils/shell_utils.h"
 #include <stdio.h>
 
-CMDError get_output_status(FILE *fp, i32 *status_out) {
+WpCmdError getOutputStatus(FILE *fp, i32 *status_out) {
 	if (!feof(fp)) {
 		// Ensure process is closed on failure
-		wapp_shell_utils_pclose(fp);
+		wpShellUtilsPclose(fp);
-		return SHELL_ERR_PROC_EXIT_FAIL;
+		return WP_SHELL_ERR_PROC_EXIT_FAIL;
 	}
 
-	*status_out = wapp_shell_utils_pclose(fp);
+	*status_out = wpShellUtilsPclose(fp);
 
-	return SHELL_ERR_NO_ERROR;
+	return WP_SHELL_ERR_NO_ERROR;
 }
 
 #endif // !WP_PLATFORM_WINDOWS

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

@@ -10,27 +10,27 @@
 #include <stdio.h>
 
 wp_intern WpStr8RO colours[COUNT_TERM_COLOUR] = {
-	[WAPP_TERM_COLOUR_FG_BLACK]      = wpStr8LitRoInitialiserList("\033[30m"),
+	[WP_TERM_COLOUR_FG_BLACK]      = wpStr8LitRoInitialiserList("\033[30m"),
-	[WAPP_TERM_COLOUR_FG_RED]        = wpStr8LitRoInitialiserList("\033[31m"),
+	[WP_TERM_COLOUR_FG_RED]        = wpStr8LitRoInitialiserList("\033[31m"),
-	[WAPP_TERM_COLOUR_FG_GREEN]      = wpStr8LitRoInitialiserList("\033[32m"),
+	[WP_TERM_COLOUR_FG_GREEN]      = wpStr8LitRoInitialiserList("\033[32m"),
-	[WAPP_TERM_COLOUR_FG_BLUE]       = wpStr8LitRoInitialiserList("\033[34m"),
+	[WP_TERM_COLOUR_FG_BLUE]       = wpStr8LitRoInitialiserList("\033[34m"),
-	[WAPP_TERM_COLOUR_FG_CYAN]       = wpStr8LitRoInitialiserList("\033[36m"),
+	[WP_TERM_COLOUR_FG_CYAN]       = wpStr8LitRoInitialiserList("\033[36m"),
-	[WAPP_TERM_COLOUR_FG_MAGENTA]    = wpStr8LitRoInitialiserList("\033[35m"),
+	[WP_TERM_COLOUR_FG_MAGENTA]    = wpStr8LitRoInitialiserList("\033[35m"),
-	[WAPP_TERM_COLOUR_FG_YELLOW]     = wpStr8LitRoInitialiserList("\033[33m"),
+	[WP_TERM_COLOUR_FG_YELLOW]     = wpStr8LitRoInitialiserList("\033[33m"),
-	[WAPP_TERM_COLOUR_FG_WHITE]      = wpStr8LitRoInitialiserList("\033[37m"),
+	[WP_TERM_COLOUR_FG_WHITE]      = wpStr8LitRoInitialiserList("\033[37m"),
-	[WAPP_TERM_COLOUR_FG_BR_BLACK]   = wpStr8LitRoInitialiserList("\033[90m"),
+	[WP_TERM_COLOUR_FG_BR_BLACK]   = wpStr8LitRoInitialiserList("\033[90m"),
-	[WAPP_TERM_COLOUR_FG_BR_RED]     = wpStr8LitRoInitialiserList("\033[91m"),
+	[WP_TERM_COLOUR_FG_BR_RED]     = wpStr8LitRoInitialiserList("\033[91m"),
-	[WAPP_TERM_COLOUR_FG_BR_GREEN]   = wpStr8LitRoInitialiserList("\033[92m"),
+	[WP_TERM_COLOUR_FG_BR_GREEN]   = wpStr8LitRoInitialiserList("\033[92m"),
-	[WAPP_TERM_COLOUR_FG_BR_BLUE]    = wpStr8LitRoInitialiserList("\033[94m"),
+	[WP_TERM_COLOUR_FG_BR_BLUE]    = wpStr8LitRoInitialiserList("\033[94m"),
-	[WAPP_TERM_COLOUR_FG_BR_CYAN]    = wpStr8LitRoInitialiserList("\033[96m"),
+	[WP_TERM_COLOUR_FG_BR_CYAN]    = wpStr8LitRoInitialiserList("\033[96m"),
-	[WAPP_TERM_COLOUR_FG_BR_MAGENTA] = wpStr8LitRoInitialiserList("\033[95m"),
+	[WP_TERM_COLOUR_FG_BR_MAGENTA] = wpStr8LitRoInitialiserList("\033[95m"),
-	[WAPP_TERM_COLOUR_FG_BR_YELLOW]  = wpStr8LitRoInitialiserList("\033[93m"),
+	[WP_TERM_COLOUR_FG_BR_YELLOW]  = wpStr8LitRoInitialiserList("\033[93m"),
-	[WAPP_TERM_COLOUR_FG_BR_WHITE]   = wpStr8LitRoInitialiserList("\033[97m"),
+	[WP_TERM_COLOUR_FG_BR_WHITE]   = wpStr8LitRoInitialiserList("\033[97m"),
-	[WAPP_TERM_COLOUR_CLEAR]         = wpStr8LitRoInitialiserList("\033[0m"),
+	[WP_TERM_COLOUR_CLEAR]         = wpStr8LitRoInitialiserList("\033[0m"),
 };
 
-void print_coloured_text(WpStr8RO *text, TerminalColour colour) {
+void printColouredText(WpStr8RO *text, WpTerminalColour colour) {
-	printf(WP_STR8_SPEC WP_STR8_SPEC, wpStr8Varg(colours[colour]), wpStr8Varg((*text)));
+	printf("%" WP_STR8_SPEC "%" WP_STR8_SPEC, wpStr8Varg(colours[colour]), wpStr8Varg((*text)));
 }
 
 #endif // !WP_PLATFORM_POSIX

src/os/shell/termcolour/termcolour.c

@@ -4,15 +4,15 @@
 #include "terminal_colours.h"
 #include "../../../base/strings/str8/str8.h"
 
-void wapp_shell_termcolour_print_text(WpStr8RO *text, TerminalColour colour) {
+void wpShellTermcolourPrintText(WpStr8RO *text, WpTerminalColour colour) {
-	if (colour < WAPP_TERM_COLOUR_FG_BLACK || colour > WAPP_TERM_COLOUR_FG_BR_WHITE) {
+	if (colour < WP_TERM_COLOUR_FG_BLACK || colour > WP_TERM_COLOUR_FG_BR_WHITE) {
 		return;
 	}
 
-	print_coloured_text(text, colour);
+	printColouredText(text, colour);
 }
 
-void wapp_shell_termcolour_clear_colour(void) {
+void wpShellTermcolourClearColour(void) {
 	WpStr8RO empty = wpStr8LitRo("");
-	print_coloured_text(&empty, WAPP_TERM_COLOUR_CLEAR);
+	printColouredText(&empty, WP_TERM_COLOUR_CLEAR);
 }

src/os/shell/termcolour/termcolour.h

@@ -14,10 +14,10 @@ BEGIN_C_LINKAGE
 
 // TODO (Abdelrahman): Look into moving away from stdio in the implementation
 
-void wapp_shell_termcolour_print_text(WpStr8RO *text, TerminalColour colour);
+void wpShellTermcolourPrintText(WpStr8RO *text, WpTerminalColour colour);
-void wapp_shell_termcolour_clear_colour(void);
+void wpShellTermcolourClearColour(void);
 
-wp_extern void print_coloured_text(WpStr8RO *text, TerminalColour colour);
+wp_extern void printColouredText(WpStr8RO *text, WpTerminalColour colour);
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

src/os/shell/termcolour/terminal_colours.h

@@ -10,27 +10,27 @@
 BEGIN_C_LINKAGE
 #endif // !WP_PLATFORM_CPP
 
-typedef enum {
+typedef enum WpTerminalColour {
-	WAPP_TERM_COLOUR_FG_BLACK,
+	WP_TERM_COLOUR_FG_BLACK,
-	WAPP_TERM_COLOUR_FG_RED,
+	WP_TERM_COLOUR_FG_RED,
-	WAPP_TERM_COLOUR_FG_GREEN,
+	WP_TERM_COLOUR_FG_GREEN,
-	WAPP_TERM_COLOUR_FG_BLUE,
+	WP_TERM_COLOUR_FG_BLUE,
-	WAPP_TERM_COLOUR_FG_CYAN,
+	WP_TERM_COLOUR_FG_CYAN,
-	WAPP_TERM_COLOUR_FG_MAGENTA,
+	WP_TERM_COLOUR_FG_MAGENTA,
-	WAPP_TERM_COLOUR_FG_YELLOW,
+	WP_TERM_COLOUR_FG_YELLOW,
-	WAPP_TERM_COLOUR_FG_WHITE,
+	WP_TERM_COLOUR_FG_WHITE,
-	WAPP_TERM_COLOUR_FG_BR_BLACK,
+	WP_TERM_COLOUR_FG_BR_BLACK,
-	WAPP_TERM_COLOUR_FG_BR_RED,
+	WP_TERM_COLOUR_FG_BR_RED,
-	WAPP_TERM_COLOUR_FG_BR_GREEN,
+	WP_TERM_COLOUR_FG_BR_GREEN,
-	WAPP_TERM_COLOUR_FG_BR_BLUE,
+	WP_TERM_COLOUR_FG_BR_BLUE,
-	WAPP_TERM_COLOUR_FG_BR_CYAN,
+	WP_TERM_COLOUR_FG_BR_CYAN,
-	WAPP_TERM_COLOUR_FG_BR_MAGENTA,
+	WP_TERM_COLOUR_FG_BR_MAGENTA,
-	WAPP_TERM_COLOUR_FG_BR_YELLOW,
+	WP_TERM_COLOUR_FG_BR_YELLOW,
-	WAPP_TERM_COLOUR_FG_BR_WHITE,
+	WP_TERM_COLOUR_FG_BR_WHITE,
-	WAPP_TERM_COLOUR_CLEAR,
+	WP_TERM_COLOUR_CLEAR,
 
 	COUNT_TERM_COLOUR,
-} TerminalColour;
+} WpTerminalColour;
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

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

@@ -22,44 +22,44 @@ struct TermcolourData {
 	wpMiscUtilsReservePadding(sizeof(HANDLE) + sizeof(WORD) + sizeof(WORD));
 };
 
-wp_intern void init_data(TermcolourData *data);
+wp_intern void initData(TermcolourData *data);
 
 wp_intern WORD colours[COUNT_TERM_COLOUR] = {
-	[WAPP_TERM_COLOUR_FG_BLACK]      = 0,
+	[WP_TERM_COLOUR_FG_BLACK]      = 0,
-	[WAPP_TERM_COLOUR_FG_RED]        = FOREGROUND_RED,
+	[WP_TERM_COLOUR_FG_RED]        = FOREGROUND_RED,
-	[WAPP_TERM_COLOUR_FG_GREEN]      = FOREGROUND_GREEN,
+	[WP_TERM_COLOUR_FG_GREEN]      = FOREGROUND_GREEN,
-	[WAPP_TERM_COLOUR_FG_BLUE]       = FOREGROUND_BLUE,
+	[WP_TERM_COLOUR_FG_BLUE]       = FOREGROUND_BLUE,
-	[WAPP_TERM_COLOUR_FG_CYAN]       = FOREGROUND_GREEN | FOREGROUND_BLUE,
+	[WP_TERM_COLOUR_FG_CYAN]       = FOREGROUND_GREEN | FOREGROUND_BLUE,
-	[WAPP_TERM_COLOUR_FG_MAGENTA]    = FOREGROUND_RED | FOREGROUND_BLUE,
+	[WP_TERM_COLOUR_FG_MAGENTA]    = FOREGROUND_RED | FOREGROUND_BLUE,
-	[WAPP_TERM_COLOUR_FG_YELLOW]     = FOREGROUND_RED | FOREGROUND_GREEN,
+	[WP_TERM_COLOUR_FG_YELLOW]     = FOREGROUND_RED | FOREGROUND_GREEN,
-	[WAPP_TERM_COLOUR_FG_WHITE]      = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,
+	[WP_TERM_COLOUR_FG_WHITE]      = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,
-	[WAPP_TERM_COLOUR_FG_BR_BLACK]   = FOREGROUND_INTENSITY,
+	[WP_TERM_COLOUR_FG_BR_BLACK]   = FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_RED]     = FOREGROUND_RED | FOREGROUND_INTENSITY,
+	[WP_TERM_COLOUR_FG_BR_RED]     = FOREGROUND_RED | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_GREEN]   = FOREGROUND_GREEN | FOREGROUND_INTENSITY,
+	[WP_TERM_COLOUR_FG_BR_GREEN]   = FOREGROUND_GREEN | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_BLUE]    = FOREGROUND_BLUE | FOREGROUND_INTENSITY,
+	[WP_TERM_COLOUR_FG_BR_BLUE]    = FOREGROUND_BLUE | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_CYAN]    = FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
+	[WP_TERM_COLOUR_FG_BR_CYAN]    = FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_MAGENTA] = FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
+	[WP_TERM_COLOUR_FG_BR_MAGENTA] = FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
-	[WAPP_TERM_COLOUR_FG_BR_YELLOW]  = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY,
+	[WP_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,
+	[WP_TERM_COLOUR_FG_BR_WHITE]   = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
 };
 
-void print_coloured_text(WpStr8RO *text, TerminalColour colour) {
+void printColouredText(WpStr8RO *text, WpTerminalColour colour) {
 	wp_persist TermcolourData data = {0};
 	if (data.handle == 0) {
-		init_data(&data);
+		initData(&data);
 	}
 
-	if (colour == WAPP_TERM_COLOUR_CLEAR) {
+	if (colour == WP_TERM_COLOUR_CLEAR) {
 		data.current_colour = data.default_colour;
 	} else {
 		data.current_colour = colours[colour];
 	}
 
 	SetConsoleTextAttribute(data.handle, data.current_colour);
-	printf(WP_STR8_SPEC, wpStr8Varg((*text)));
+	printf("%" WP_STR8_SPEC, wpStr8Varg((*text)));
 }
 
-wp_intern void init_data(TermcolourData *data) {
+wp_intern void initData(TermcolourData *data) {
 	// create handle
 	data->handle = GetStdHandle(STD_OUTPUT_HANDLE);
 

src/os/shell/utils/shell_utils.h

@@ -12,11 +12,11 @@ BEGIN_C_LINKAGE
 #endif // !WP_PLATFORM_CPP
 
 #ifdef WP_PLATFORM_WINDOWS
-	#define wapp_shell_utils_popen  _popen
+	#define wpShellUtilsPopen  _popen
-	#define wapp_shell_utils_pclose _pclose
+	#define wpShellUtilsPclose _pclose
 #else
-	#define wapp_shell_utils_popen  popen
+	#define wpShellUtilsPopen  popen
-	#define wapp_shell_utils_pclose pclose
+	#define wpShellUtilsPclose pclose
 #endif /* ifdef WP_PLATFORM_WINDOWS */
 
 #ifdef WP_PLATFORM_CPP

src/prng/splitmix64/splitmix64.c

@@ -0,0 +1,97 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "splitmix64.h"
+#include "../../common/aliases/aliases.h"
+#include "../../common/assert/assert.h"
+#include "../../common/platform/platform.h"
+#include <stdlib.h>
+#include <time.h>
+
+wp_intern void seedOsGenerator(u64 seed);
+wp_intern u64 genRandomNumber(void);
+
+WpSplitmix64State wpPrngSplitmix64Init(void) {
+	wp_persist b8 seeded = false;
+	if (!seeded) {
+		seeded = true;
+		seedOsGenerator(0);
+	}
+
+	return (WpSplitmix64State){ .seed = genRandomNumber() };
+}
+
+WpSplitmix64State wpPrngSplitmix64InitWithSeed(u64 seed) {
+	return (WpSplitmix64State){ .seed = seed };
+}
+
+u64 wpPrngSplitmix64(WpSplitmix64State *state) {
+	state->seed += 0x9E3779B97f4A7C15;
+
+	u64 result = state->seed;
+	result = (result ^ (result >> 30)) * 0xBF58476D1CE4E5B9;
+	result = (result ^ (result >> 27)) * 0x94D049BB133111EB;
+
+	return result ^ (result >> 31);
+}
+
+u64 wpPrngSplitmix64InRange(WpSplitmix64State *state, u64 start, u64 end) {
+	return wpPrngSplitmix64(state) % (end - start) + start;
+}
+
+u64 wpPrngSplitmix64Choice(WpSplitmix64State *state, u64 available_choices) {
+	return wpPrngSplitmix64(state) % available_choices;
+}
+
+#if defined(WP_PLATFORM_C) && WP_PLATFORM_C_VERSION >= WP_PLATFORM_C11_VERSION
+#ifdef WP_PLATFORM_POSIX
+wp_intern void seedOsGenerator(u64 seed) {
+	if (seed == 0) {
+		struct timespec ts = {0};
+		int result = clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
+		wpRuntimeAssert(result == 0, "Invalid seed value");
+		seed = (u64)ts.tv_nsec;
+	}
+
+	srand48(seed);
+}
+
+wp_intern u64 genRandomNumber(void) {
+	return lrand48();
+}
+#else
+wp_intern void seedOsGenerator(u64 seed) {
+	if (seed == 0) {
+		struct timespec ts = {0};
+		int result = timespec_get(&ts, TIME_UTC);
+		wpRuntimeAssert(result != 0, "Invalid seed value");
+		seed = (u64)ts.tv_nsec;
+	}
+
+	srand(seed);
+}
+
+wp_intern u64 genRandomNumber(void) {
+	i32 n1 = rand();
+	i32 n2 = rand();
+
+	return (((u64)n1) << 32 | (u64)n2);
+}
+#endif // !WP_PLATFORM_POSIX
+#else
+wp_intern void seedOsGenerator(u64 seed) {
+	if (seed == 0) {
+		time_t result = time(NULL);
+		wpRuntimeAssert(result != (time_t)(-1), "Invalid seed value");
+		seed = (u64)result;
+	}
+
+	srand(seed);
+}
+
+wp_intern u64 genRandomNumber(void) {
+	i32 n1 = rand();
+	i32 n2 = rand();
+
+	return (((u64)n1) << 32 | (u64)n2);
+}
+#endif // !WP_PLATFORM_C

src/prng/splitmix64/splitmix64.h

@@ -0,0 +1,18 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef SPLITMIX64_H
+#define SPLITMIX64_H
+
+#include "../../common/aliases/aliases.h"
+
+typedef struct WpSplitmix64State {
+	u64 seed;
+} WpSplitmix64State;
+
+WpSplitmix64State wpPrngSplitmix64Init(void);
+WpSplitmix64State wpPrngSplitmix64InitWithSeed(u64 seed);
+u64               wpPrngSplitmix64(WpSplitmix64State *state);
+u64               wpPrngSplitmix64InRange(WpSplitmix64State *state, u64 start, u64 end);
+u64               wpPrngSplitmix64Choice(WpSplitmix64State *state, u64 available_choices);
+
+#endif // !SPLITMIX64_H

src/prng/wapp_prng.c

@@ -3,6 +3,7 @@
 #ifndef WAPP_PRNG_C
 #define WAPP_PRNG_C
 
+#include "splitmix64/splitmix64.c"
 #include "xorshift/xorshift.c"
 
 #endif // !WAPP_PRNG_C

src/prng/wapp_prng.h

@@ -3,6 +3,7 @@
 #ifndef WAPP_PRNG_H
 #define WAPP_PRNG_H
 
+#include "splitmix64/splitmix64.h"
 #include "xorshift/xorshift.h"
 #include "../common/wapp_common.h"
 

src/prng/xorshift/xorshift.c

@@ -1,36 +1,29 @@
 // vim:fileencoding=utf-8:foldmethod=marker
 
 #include "xorshift.h"
+#include "../splitmix64/splitmix64.h"
 #include "../../common/aliases/aliases.h"
-#include "../../common/assert/assert.h"
+#include "../../common/misc/misc_utils.h"
-#include "../../common/platform/platform.h"
 #include <stdlib.h>
 #include <time.h>
 
-typedef struct SplitMix64State SplitMix64State;
-struct SplitMix64State {
-	u64 seed;
-};
-
-wp_intern u64 rol64(u64 x, u64 bits);
-wp_intern u64 split_mix_64(SplitMix64State *state);
-wp_intern void seed_os_generator(void);
-wp_intern u64 generate_random_number(void);
-
 WpXor256State wpPrngXorshiftInit(void) {
-	wp_persist b8 seeded = false;
+	return wpPrngXorshiftInitWithSeed(0);
-	if (!seeded) {
+}
-		seeded = true;
+
-		seed_os_generator();
+WpXor256State wpPrngXorshiftInitWithSeed(u64 seed) {
+	WpSplitmix64State sm64;
+	if (seed > 0) {
+		sm64 = wpPrngSplitmix64InitWithSeed(seed);
+	} else {
+		sm64 = wpPrngSplitmix64Init();
 	}
 
-	SplitMix64State sm64 = {.seed = generate_random_number()};
-
 	return (WpXor256State){
-		.x = split_mix_64(&sm64),
+		.x = wpPrngSplitmix64(&sm64),
-		.y = split_mix_64(&sm64),
+		.y = wpPrngSplitmix64(&sm64),
-		.z = split_mix_64(&sm64),
+		.z = wpPrngSplitmix64(&sm64),
-		.w = split_mix_64(&sm64),
+		.w = wpPrngSplitmix64(&sm64),
 	};
 }
 
@@ -46,7 +39,7 @@ u64 wpPrngXorshift256(WpXor256State *state) {
 }
 
 u64 wpPrngXorshift256ss(WpXor256State *state) {
-	const u64 result = rol64(state->z * 5, 7) * 9;
+	const u64 result = wpMiscUtilsRotl64(state->z * 5, 7) * 9;
 	const u64 t = state->z << 17;
 
 	state->y ^= state->w;
@@ -55,7 +48,7 @@ u64 wpPrngXorshift256ss(WpXor256State *state) {
 	state->w ^= state->x;
 
 	state->y ^= t;
-	state->x = rol64(state->x, 45);
+	state->x = wpMiscUtilsRotl64(state->x, 45);
 
 	return result;
 }
@@ -70,66 +63,31 @@ u64 wpPrngXorshift256p(WpXor256State *state) {
 	state->w ^= state->x;
 
 	state->y ^= t;
-	state->x  = rol64(state->x, 45);
+	state->x  = wpMiscUtilsRotl64(state->x, 45);
 
 	return result;
 }
 
-wp_intern u64 rol64(u64 x, u64 bits) {
+u64 wpPrngXorshift256InRange(WpXor256State *state, u64 start, u64 end) {
-	return (x << bits) | (x >> (64 - bits));
+	return wpPrngXorshift256(state) % (end - start) + start;
 }
 
-wp_intern u64 split_mix_64(SplitMix64State *state) {
+u64 wpPrngXorshift256ssInRange(WpXor256State *state, u64 start, u64 end) {
-	state->seed += 0x9E3779B97f4A7C15;
+	return wpPrngXorshift256ss(state) % (end - start) + start;
-
-	u64 result = state->seed;
-	result = (result ^ (result >> 30)) * 0xBF58476D1CE4E5B9;
-	result = (result ^ (result >> 27)) * 0x94D049BB133111EB;
-
-	return result ^ (result >> 31);
 }
 
-#if defined(WP_PLATFORM_C) && WP_PLATFORM_C_VERSION >= WP_PLATFORM_C11_VERSION
+u64 wpPrngXorshift256pInRange(WpXor256State *state, u64 start, u64 end) {
-#ifdef WP_PLATFORM_POSIX
+	return wpPrngXorshift256p(state) % (end - start) + start;
-wp_intern void seed_os_generator(void) {
-	struct timespec ts = {0};
-	int result = clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
-	wpRuntimeAssert(result == 0, "Invalid seed value");
-
-	srand48(ts.tv_nsec);
 }
 
-wp_intern u64 generate_random_number(void) {
+u64 wpPrngXorshift256Choice(WpXor256State *state, u64 available_choices) {
-	return lrand48();
+	return wpPrngXorshift256(state) % available_choices;
-}
-#else
-wp_intern void seed_os_generator(void) {
-	struct timespec ts = {0};
-	int result = timespec_get(&ts, TIME_UTC);
-	wpRuntimeAssert(result != 0, "Invalid seed value");
-
-	srand(ts.tv_nsec);
 }
 
-wp_intern u64 generate_random_number(void) {
+u64 wpPrngXorshift256ssChoice(WpXor256State *state, u64 available_choices) {
-	i32 n1 = rand();
+	return wpPrngXorshift256ss(state) % available_choices;
-	i32 n2 = rand();
-
-	return (((u64)n1) << 32 | (u64)n2);
-}
-#endif // !WP_PLATFORM_POSIX
-#else
-wp_intern void seed_os_generator(void) {
-	time_t result = time(NULL);
-	wpRuntimeAssert(result != (time_t)(-1), "Invalid seed value");
-
-	srand(result);
 }
 
-wp_intern u64 generate_random_number(void) {
+u64 wpPrngXorshift256pChoice(WpXor256State *state, u64 available_choices) {
-	i32 n1 = rand();
+	return wpPrngXorshift256p(state) % available_choices;
-	i32 n2 = rand();
-
-	return (((u64)n1) << 32 | (u64)n2);
 }
-#endif // !WP_PLATFORM_C

src/prng/xorshift/xorshift.h

@@ -19,9 +19,16 @@ struct WpXor256State {
 };
 
 WpXor256State wpPrngXorshiftInit(void);
-u64 wpPrngXorshift256(WpXor256State *state);
+WpXor256State wpPrngXorshiftInitWithSeed(u64 seed);
-u64 wpPrngXorshift256ss(WpXor256State *state);
+u64           wpPrngXorshift256(WpXor256State *state);
-u64 wpPrngXorshift256p(WpXor256State *state);
+u64           wpPrngXorshift256ss(WpXor256State *state);
+u64           wpPrngXorshift256p(WpXor256State *state);
+u64           wpPrngXorshift256InRange(WpXor256State *state, u64 start, u64 end);
+u64           wpPrngXorshift256ssInRange(WpXor256State *state, u64 start, u64 end);
+u64           wpPrngXorshift256pInRange(WpXor256State *state, u64 start, u64 end);
+u64           wpPrngXorshift256Choice(WpXor256State *state, u64 available_choices);
+u64           wpPrngXorshift256ssChoice(WpXor256State *state, u64 available_choices);
+u64           wpPrngXorshift256pChoice(WpXor256State *state, u64 available_choices);
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

src/testing/tester/tester.c

@@ -10,7 +10,7 @@
 
 wp_intern void handleTestResult(WpTestFuncResult result);
 
-void _runTests(WpTestFunc *func1, ...) {
+void runTests(WpTestFunc *func1, ...) {
 	printf("\n");
 
 	handleTestResult(func1());
@@ -33,21 +33,21 @@ void _runTests(WpTestFunc *func1, ...) {
 }
 
 wp_intern void handleTestResult(WpTestFuncResult result) {
-	TerminalColour colour;
+	WpTerminalColour colour;
 	WpStr8 result_text = wpStr8Buf(64);
 
 	if (result.passed) {
-		colour = WAPP_TERM_COLOUR_FG_BR_GREEN;
+		colour = WP_TERM_COLOUR_FG_BR_GREEN;
 		wpStr8CopyCstrCapped(&result_text, "PASSED");
 	} else {
-		colour = WAPP_TERM_COLOUR_FG_BR_RED;
+		colour = WP_TERM_COLOUR_FG_BR_RED;
 		wpStr8CopyCstrCapped(&result_text, "FAILED");
 	}
 
 	printf("[");
-	wapp_shell_termcolour_print_text(&result_text, colour);
+	wpShellTermcolourPrintText(&result_text, colour);
-	wapp_shell_termcolour_clear_colour();
+	wpShellTermcolourClearColour();
-	printf("] " WP_STR8_SPEC "\n", wpStr8Varg(result.name));
+	printf("] %" WP_STR8_SPEC "\n", wpStr8Varg(result.name));
 
 	if (!result.passed) {
 		exit(EXIT_FAILURE);

src/testing/tester/tester.h

@@ -15,7 +15,7 @@ BEGIN_C_LINKAGE
 #define wpTesterResult(PASSED) ((WpTestFuncResult){.name = wpStr8LitRo(__func__), .passed = PASSED})
 #endif // !WP_PLATFORM_CPP
 
-#define wpTesterRun(...) _runTests(__VA_ARGS__, NULL)
+#define wpTesterRun(...) runTests(__VA_ARGS__, NULL)
 
 typedef struct WpTestFuncResult WpTestFuncResult;
 struct WpTestFuncResult {
@@ -27,7 +27,7 @@ struct WpTestFuncResult {
 
 typedef WpTestFuncResult(WpTestFunc)(void);
 
-void _runTests(WpTestFunc *func1, ...);
+void runTests(WpTestFunc *func1, ...);
 
 #ifdef WP_PLATFORM_CPP
 END_C_LINKAGE

src/uuid/uuid.c

@@ -15,19 +15,19 @@ struct UUID4 {
 	u64 low;
 };
 
-wp_intern UUID4 generate_uuid4(void);
+wp_intern UUID4 genUuid4(void);
-wp_intern void  uuid4_to_uuid(const UUID4* uuid4, WpUuid *uuid);
+wp_intern void  uuid4ToUuid(const UUID4* uuid4, WpUuid *uuid);
 
 WpUuid *wpUuidInitUuid4(WpUuid *uuid) {
 	wpDebugAssert(uuid != NULL, "`uuid` should not be NULL");
 
-	UUID4 uuid4 = generate_uuid4();
+	UUID4 uuid4 = genUuid4();
-	uuid4_to_uuid(&uuid4, uuid);
+	uuid4ToUuid(&uuid4, uuid);
 
 	return uuid;
 }
 
-wp_intern UUID4 generate_uuid4(void) {
+wp_intern UUID4 genUuid4(void) {
 	wp_persist WpXor256State state = {0};
 	wp_persist b8 initialised = false;
 
@@ -47,7 +47,7 @@ wp_intern UUID4 generate_uuid4(void) {
 	return uuid;
 }
 
-wp_intern void uuid4_to_uuid(const UUID4* uuid4, WpUuid *uuid) {
+wp_intern void uuid4ToUuid(const UUID4* uuid4, WpUuid *uuid) {
 	u64 group1 = uuid4->high >> 32;
 	u64 group2 = (uuid4->high << 32) >> 48;
 	u64 group3 = (uuid4->high << 48) >> 48;

tests/allocator/test_allocator.c

@@ -10,7 +10,7 @@ wp_intern u8 temp_buf[TEMP_BUF_SIZE] = {0};
 wp_intern WpAllocator temp_allocator   = {0};
 
 WpTestFuncResult test_arena_allocator(void) {
-	WpAllocator allocator = wapp_mem_arena_allocator_init(4096);
+	WpAllocator allocator = wpMemArenaAllocatorInit(4096);
 	b8 result           = allocator.obj != NULL && allocator.alloc != NULL &&
 	                      allocator.alloc_aligned != NULL &&
 	                      allocator.realloc != NULL && allocator.realloc_aligned != NULL &&
@@ -18,7 +18,7 @@ WpTestFuncResult test_arena_allocator(void) {
 	void *ptr           = wpMemAllocatorAlloc(&allocator, 20);
 	result              = result && (ptr != NULL);
 
-	wapp_mem_arena_allocator_destroy(&allocator);
+	wpMemArenaAllocatorDestroy(&allocator);
 
 	return wpTesterResult(result);
 }
@@ -26,7 +26,7 @@ WpTestFuncResult test_arena_allocator(void) {
 WpTestFuncResult test_arena_allocator_with_buffer(void) {
 	u8 buffer[KiB(4)] = {0};
 
-	WpAllocator allocator = wapp_mem_arena_allocator_init_with_buffer(buffer, KiB(4));
+	WpAllocator allocator = wpMemArenaAllocatorInitWithBuffer(buffer, KiB(4));
 	b8 result           = allocator.obj != NULL && allocator.alloc != NULL &&
 	                      allocator.alloc_aligned != NULL &&
 	                      allocator.realloc != NULL && allocator.realloc_aligned != NULL &&
@@ -34,18 +34,18 @@ WpTestFuncResult test_arena_allocator_with_buffer(void) {
 	void *ptr           = wpMemAllocatorAlloc(&allocator, 20);
 	result              = result && (ptr != NULL);
 
-	wapp_mem_arena_allocator_destroy(&allocator);
+	wpMemArenaAllocatorDestroy(&allocator);
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_arena_allocator_temp_begin(void) {
-	temp_allocator = wapp_mem_arena_allocator_init_with_buffer(temp_buf, TEMP_BUF_SIZE);
+	temp_allocator = wpMemArenaAllocatorInitWithBuffer(temp_buf, TEMP_BUF_SIZE);
 
 	i32 *num1 = (i32 *)wpMemAllocatorAlloc(&temp_allocator, sizeof(i32));
 	b8 result = num1 != NULL;
 
-	wapp_mem_arena_allocator_temp_begin(&temp_allocator);
+	wpMemArenaAllocatorTempBegin(&temp_allocator);
 	i32 *num2 = (i32 *)wpMemAllocatorAlloc(&temp_allocator, sizeof(i32));
 	result    = result && num2 != NULL;
 	i32 *num3 = (i32 *)wpMemAllocatorAlloc(&temp_allocator, sizeof(i32));
@@ -55,13 +55,13 @@ WpTestFuncResult test_arena_allocator_temp_begin(void) {
 }
 
 WpTestFuncResult test_arena_allocator_temp_end(void) {
-	wapp_mem_arena_allocator_temp_end(&temp_allocator);
+	wpMemArenaAllocatorTempEnd(&temp_allocator);
 	i32 *num1 = (i32 *)wpMemAllocatorAlloc(&temp_allocator, sizeof(i32));
 	b8 result = num1 != NULL;
 	i32 *num2 = (i32 *)wpMemAllocatorAlloc(&temp_allocator, sizeof(i32));
 	result    = result && num2 == NULL;
 
-	wapp_mem_arena_allocator_destroy(&temp_allocator);
+	wpMemArenaAllocatorDestroy(&temp_allocator);
 
 	return wpTesterResult(result);
 }

tests/allocator/test_allocator.cc

@@ -10,7 +10,7 @@ wp_intern u8 temp_buf[TEMP_BUF_SIZE] = {};
 wp_intern WpAllocator temp_allocator   = {};
 
 WpTestFuncResult test_arena_allocator(void) {
-	WpAllocator allocator = wapp_mem_arena_allocator_init(4096);
+	WpAllocator allocator = wpMemArenaAllocatorInit(4096);
 	b8 result           = allocator.obj != nullptr && allocator.alloc != nullptr &&
 	                      allocator.alloc_aligned != nullptr &&
 	                      allocator.realloc != nullptr && allocator.realloc_aligned != nullptr &&
@@ -18,7 +18,7 @@ WpTestFuncResult test_arena_allocator(void) {
 	void *ptr           = wpMemAllocatorAlloc(&allocator, 20);
 	result              = result && (ptr != nullptr);
 
-	wapp_mem_arena_allocator_destroy(&allocator);
+	wpMemArenaAllocatorDestroy(&allocator);
 
 	return wpTesterResult(result);
 }
@@ -26,7 +26,7 @@ WpTestFuncResult test_arena_allocator(void) {
 WpTestFuncResult test_arena_allocator_with_buffer(void) {
 	u8 buffer[KiB(4)] = {0};
 
-	WpAllocator allocator = wapp_mem_arena_allocator_init_with_buffer(buffer, KiB(4));
+	WpAllocator allocator = wpMemArenaAllocatorInitWithBuffer(buffer, KiB(4));
 	b8 result           = allocator.obj != NULL && allocator.alloc != NULL &&
 	                      allocator.alloc_aligned != NULL &&
 	                      allocator.realloc != NULL && allocator.realloc_aligned != NULL &&
@@ -34,18 +34,18 @@ WpTestFuncResult test_arena_allocator_with_buffer(void) {
 	void *ptr           = wpMemAllocatorAlloc(&allocator, 20);
 	result              = result && (ptr != NULL);
 
-	wapp_mem_arena_allocator_destroy(&allocator);
+	wpMemArenaAllocatorDestroy(&allocator);
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_arena_allocator_temp_begin(void) {
-	temp_allocator = wapp_mem_arena_allocator_init_with_buffer(temp_buf, TEMP_BUF_SIZE);
+	temp_allocator = wpMemArenaAllocatorInitWithBuffer(temp_buf, TEMP_BUF_SIZE);
 
 	i32 *num1 = (i32 *)wpMemAllocatorAlloc(&temp_allocator, sizeof(i32));
 	b8 result = num1 != NULL;
 
-	wapp_mem_arena_allocator_temp_begin(&temp_allocator);
+	wpMemArenaAllocatorTempBegin(&temp_allocator);
 	i32 *num2 = (i32 *)wpMemAllocatorAlloc(&temp_allocator, sizeof(i32));
 	result    = result && num2 != NULL;
 	i32 *num3 = (i32 *)wpMemAllocatorAlloc(&temp_allocator, sizeof(i32));
@@ -55,13 +55,13 @@ WpTestFuncResult test_arena_allocator_temp_begin(void) {
 }
 
 WpTestFuncResult test_arena_allocator_temp_end(void) {
-	wapp_mem_arena_allocator_temp_end(&temp_allocator);
+	wpMemArenaAllocatorTempEnd(&temp_allocator);
 	i32 *num1 = (i32 *)wpMemAllocatorAlloc(&temp_allocator, sizeof(i32));
 	b8 result = num1 != NULL;
 	i32 *num2 = (i32 *)wpMemAllocatorAlloc(&temp_allocator, sizeof(i32));
 	result    = result && num2 == NULL;
 
-	wapp_mem_arena_allocator_destroy(&temp_allocator);
+	wpMemArenaAllocatorDestroy(&temp_allocator);
 
 	return wpTesterResult(result);
 }

tests/arena/test_arena.c

@@ -4,42 +4,42 @@
 
 #define ARENA_CAPACITY KiB(16)
 #define ARENA_BUF_SIZE KiB(4)
-// NOTE (Abdelrahman): Cannot query size of Arena here so it's hardcoded. Similarly, since arena
+// NOTE (Abdelrahman): Cannot query size of WpArena here so it's hardcoded. Similarly, since arena
 // allocation are aligned to power of 2 boundaries, the number of i32 values needed is hardcoded.
 #define TEMP_BUF_SIZE (40 + sizeof(i32) * 8)
 
-wp_intern Arena *arena               = NULL;
+wp_intern WpArena *arena               = NULL;
 wp_intern i32 count                  = 20;
 wp_intern i32 *array                 = NULL;
-wp_intern Arena *buf_arena           = NULL;
+wp_intern WpArena *buf_arena           = NULL;
 wp_intern u8 buf[ARENA_BUF_SIZE]     = {0};
-wp_intern Arena *temp_arena          = NULL;
+wp_intern WpArena *temp_arena          = NULL;
 wp_intern u8 temp_buf[TEMP_BUF_SIZE] = {0};
 
 WpTestFuncResult test_arena_init_buffer(void) {
-	b8 result = wapp_mem_arena_init_buffer(&buf_arena, buf, ARENA_BUF_SIZE);
+	b8 result = wpMemArenaInitBuffer(&buf_arena, buf, ARENA_BUF_SIZE);
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_arena_init_allocated(void) {
-	b8 result = wapp_mem_arena_init_allocated(&arena, ARENA_CAPACITY);
+	b8 result = wpMemArenaInitAllocated(&arena, ARENA_CAPACITY);
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {
-	Arena *large_arena = NULL;
+	WpArena *large_arena = NULL;
 	u64 capacity       = GiB(512);
-	b8 result          = wapp_mem_arena_init_allocated(&large_arena, capacity);
+	b8 result          = wpMemArenaInitAllocated(&large_arena, capacity);
 	if (result) {
-		wapp_mem_arena_destroy(&large_arena);
+		wpMemArenaDestroy(&large_arena);
 	}
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_arena_alloc_with_buffer(void) {
-	i32 *arr  = (i32 *)wapp_mem_arena_alloc(arena, count * sizeof(i32));
+	i32 *arr  = (i32 *)wpMemArenaAlloc(arena, count * sizeof(i32));
 	b8 result = arr != NULL;
 
 	for (i32 i = 0; i < count; ++i) {
@@ -50,7 +50,7 @@ WpTestFuncResult test_arena_alloc_with_buffer(void) {
 }
 
 WpTestFuncResult test_arena_alloc_succeeds_when_within_capacity(void) {
-	array     = wapp_mem_arena_alloc(arena, count * sizeof(i32));
+	array     = wpMemArenaAlloc(arena, count * sizeof(i32));
 	b8 result = array != NULL;
 
 	for (i32 i = 0; i < count; ++i) {
@@ -61,7 +61,7 @@ WpTestFuncResult test_arena_alloc_succeeds_when_within_capacity(void) {
 }
 
 WpTestFuncResult test_arena_alloc_fails_when_over_capacity(void) {
-	u8 *bytes = wapp_mem_arena_alloc(arena, ARENA_CAPACITY * 2);
+	u8 *bytes = wpMemArenaAlloc(arena, ARENA_CAPACITY * 2);
 	b8 result = bytes == NULL;
 
 	return wpTesterResult(result);
@@ -70,13 +70,13 @@ WpTestFuncResult test_arena_alloc_fails_when_over_capacity(void) {
 WpTestFuncResult test_arena_realloc_bigger_size(void) {
 	u64 old_count = 10;
 	u64 new_count = 20;
-	i32 *bytes    = wapp_mem_arena_alloc(arena, old_count * sizeof(i32));
+	i32 *bytes    = wpMemArenaAlloc(arena, old_count * sizeof(i32));
 
 	for (u64 i = 0; i < old_count; ++i) {
 		bytes[i] = (i32)i;
 	}
 
-	i32 *new_bytes = wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
+	i32 *new_bytes = wpMemArenaRealloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
 	if (!new_bytes) {
 		return wpTesterResult(false);
 	}
@@ -93,13 +93,13 @@ WpTestFuncResult test_arena_realloc_bigger_size(void) {
 WpTestFuncResult test_arena_realloc_smaller_size(void) {
 	u64 old_count = 10;
 	u64 new_count = 5;
-	i32 *bytes    = wapp_mem_arena_alloc(arena, old_count * sizeof(i32));
+	i32 *bytes    = wpMemArenaAlloc(arena, old_count * sizeof(i32));
 
 	for (u64 i = 0; i < old_count; ++i) {
 		bytes[i] = (i32)i;
 	}
 
-	i32 *new_bytes = wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
+	i32 *new_bytes = wpMemArenaRealloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
 	if (!new_bytes) {
 		return wpTesterResult(false);
 	}
@@ -114,33 +114,33 @@ WpTestFuncResult test_arena_realloc_smaller_size(void) {
 }
 
 WpTestFuncResult test_arena_temp_begin(void) {
-	b8 result = wapp_mem_arena_init_buffer(&temp_arena, temp_buf, TEMP_BUF_SIZE);
+	b8 result = wpMemArenaInitBuffer(&temp_arena, temp_buf, TEMP_BUF_SIZE);
-	i32 *num1 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
+	i32 *num1 = (i32 *)wpMemArenaAlloc(temp_arena, sizeof(i32));
 	result    = result && num1 != NULL;
 
-	wapp_mem_arena_temp_begin(temp_arena);
+	wpMemArenaTempBegin(temp_arena);
-	i32 *num2 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
+	i32 *num2 = (i32 *)wpMemArenaAlloc(temp_arena, sizeof(i32));
 	result    = result && num2 != NULL;
-	i32 *num3 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
+	i32 *num3 = (i32 *)wpMemArenaAlloc(temp_arena, sizeof(i32));
 	result    = result && num3 == NULL;
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_arena_temp_end(void) {
-	wapp_mem_arena_temp_end(temp_arena);
+	wpMemArenaTempEnd(temp_arena);
-	i32 *num1 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
+	i32 *num1 = (i32 *)wpMemArenaAlloc(temp_arena, sizeof(i32));
 	b8 result = num1 != NULL;
-	i32 *num2 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
+	i32 *num2 = (i32 *)wpMemArenaAlloc(temp_arena, sizeof(i32));
 	result    = result && num2 == NULL;
 
-	wapp_mem_arena_destroy(&temp_arena);
+	wpMemArenaDestroy(&temp_arena);
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_arena_clear(void) {
-	wapp_mem_arena_clear(arena);
+	wpMemArenaClear(arena);
 	b8 result = true;
 
 	for (i32 i = 0; i < count; ++i) {
@@ -154,14 +154,14 @@ WpTestFuncResult test_arena_clear(void) {
 }
 
 WpTestFuncResult test_arena_destroy_buffer(void) {
-	wapp_mem_arena_destroy(&buf_arena);
+	wpMemArenaDestroy(&buf_arena);
 	b8 result = buf_arena == NULL;
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_arena_destroy_allocated(void) {
-	wapp_mem_arena_destroy(&arena);
+	wpMemArenaDestroy(&arena);
 	b8 result = arena == NULL;
 
 	return wpTesterResult(result);

tests/arena/test_arena.cc

@@ -4,42 +4,42 @@
 
 #define ARENA_CAPACITY KiB(16)
 #define ARENA_BUF_SIZE KiB(4)
-// NOTE (Abdelrahman): Cannot query size of Arena here so it's hardcoded. Similarly, since arena
+// NOTE (Abdelrahman): Cannot query size of WpArena here so it's hardcoded. Similarly, since arena
 // allocation are aligned to power of 2 boundaries, the number of i32 values needed is hardcoded.
 #define TEMP_BUF_SIZE (40 + sizeof(i32) * 8)
 
-wp_intern Arena *arena               = NULL;
+wp_intern WpArena *arena               = NULL;
 wp_intern i32 count                  = 20;
 wp_intern i32 *array                 = NULL;
-wp_intern Arena *buf_arena           = NULL;
+wp_intern WpArena *buf_arena           = NULL;
 wp_intern u8 buf[ARENA_BUF_SIZE]     = {};
-wp_intern Arena *temp_arena          = NULL;
+wp_intern WpArena *temp_arena          = NULL;
 wp_intern u8 temp_buf[TEMP_BUF_SIZE] = {};
 
 WpTestFuncResult test_arena_init_buffer(void) {
-	b8 result = wapp_mem_arena_init_buffer(&buf_arena, buf, ARENA_BUF_SIZE);
+	b8 result = wpMemArenaInitBuffer(&buf_arena, buf, ARENA_BUF_SIZE);
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_arena_init_allocated(void) {
-	b8 result = wapp_mem_arena_init_allocated(&arena, ARENA_CAPACITY);
+	b8 result = wpMemArenaInitAllocated(&arena, ARENA_CAPACITY);
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {
-	Arena *large_arena = nullptr;
+	WpArena *large_arena = nullptr;
 	u64 capacity       = GiB(512);
-	b8 result          = wapp_mem_arena_init_allocated(&large_arena, capacity);
+	b8 result          = wpMemArenaInitAllocated(&large_arena, capacity);
 	if (result) {
-		wapp_mem_arena_destroy(&large_arena);
+		wpMemArenaDestroy(&large_arena);
 	}
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_arena_alloc_with_buffer(void) {
-	i32 *arr  = (i32 *)wapp_mem_arena_alloc(arena, count * sizeof(i32));
+	i32 *arr  = (i32 *)wpMemArenaAlloc(arena, count * sizeof(i32));
 	b8 result = arr != NULL;
 
 	for (i32 i = 0; i < count; ++i) {
@@ -50,7 +50,7 @@ WpTestFuncResult test_arena_alloc_with_buffer(void) {
 }
 
 WpTestFuncResult test_arena_alloc_succeeds_when_within_capacity(void) {
-	array     = (i32 *)wapp_mem_arena_alloc(arena, count * sizeof(i32));
+	array     = (i32 *)wpMemArenaAlloc(arena, count * sizeof(i32));
 	b8 result = array != nullptr;
 
 	for (i32 i = 0; i < count; ++i) {
@@ -61,7 +61,7 @@ WpTestFuncResult test_arena_alloc_succeeds_when_within_capacity(void) {
 }
 
 WpTestFuncResult test_arena_alloc_fails_when_over_capacity(void) {
-	u8 *bytes = (u8 *)wapp_mem_arena_alloc(arena, ARENA_CAPACITY * 2);
+	u8 *bytes = (u8 *)wpMemArenaAlloc(arena, ARENA_CAPACITY * 2);
 	b8 result = bytes == nullptr;
 
 	return wpTesterResult(result);
@@ -70,13 +70,13 @@ WpTestFuncResult test_arena_alloc_fails_when_over_capacity(void) {
 WpTestFuncResult test_arena_realloc_bigger_size(void) {
 	u64 old_count = 10;
 	u64 new_count = 20;
-	i32 *bytes    = (i32 *)wapp_mem_arena_alloc(arena, old_count * sizeof(i32));
+	i32 *bytes    = (i32 *)wpMemArenaAlloc(arena, old_count * sizeof(i32));
 
 	for (u64 i = 0; i < old_count; ++i) {
 		bytes[i] = (i32)i;
 	}
 
-	i32 *new_bytes = (i32 *)wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
+	i32 *new_bytes = (i32 *)wpMemArenaRealloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
 	if (!new_bytes) {
 		return wpTesterResult(false);
 	}
@@ -93,13 +93,13 @@ WpTestFuncResult test_arena_realloc_bigger_size(void) {
 WpTestFuncResult test_arena_realloc_smaller_size(void) {
 	u64 old_count = 10;
 	u64 new_count = 5;
-	i32 *bytes    = (i32 *)wapp_mem_arena_alloc(arena, old_count * sizeof(i32));
+	i32 *bytes    = (i32 *)wpMemArenaAlloc(arena, old_count * sizeof(i32));
 
 	for (u64 i = 0; i < old_count; ++i) {
 		bytes[i] = (i32)i;
 	}
 
-	i32 *new_bytes = (i32 *)wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
+	i32 *new_bytes = (i32 *)wpMemArenaRealloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
 	if (!new_bytes) {
 		return wpTesterResult(false);
 	}
@@ -114,33 +114,33 @@ WpTestFuncResult test_arena_realloc_smaller_size(void) {
 }
 
 WpTestFuncResult test_arena_temp_begin(void) {
-	b8 result = wapp_mem_arena_init_buffer(&temp_arena, temp_buf, TEMP_BUF_SIZE);
+	b8 result = wpMemArenaInitBuffer(&temp_arena, temp_buf, TEMP_BUF_SIZE);
-	i32 *num1 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
+	i32 *num1 = (i32 *)wpMemArenaAlloc(temp_arena, sizeof(i32));
 	result    = result && num1 != NULL;
 
-	wapp_mem_arena_temp_begin(temp_arena);
+	wpMemArenaTempBegin(temp_arena);
-	i32 *num2 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
+	i32 *num2 = (i32 *)wpMemArenaAlloc(temp_arena, sizeof(i32));
 	result    = result && num2 != NULL;
-	i32 *num3 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
+	i32 *num3 = (i32 *)wpMemArenaAlloc(temp_arena, sizeof(i32));
 	result    = result && num3 == NULL;
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_arena_temp_end(void) {
-	wapp_mem_arena_temp_end(temp_arena);
+	wpMemArenaTempEnd(temp_arena);
-	i32 *num1 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
+	i32 *num1 = (i32 *)wpMemArenaAlloc(temp_arena, sizeof(i32));
 	b8 result = num1 != NULL;
-	i32 *num2 = (i32 *)wapp_mem_arena_alloc(temp_arena, sizeof(i32));
+	i32 *num2 = (i32 *)wpMemArenaAlloc(temp_arena, sizeof(i32));
 	result    = result && num2 == NULL;
 
-	wapp_mem_arena_destroy(&temp_arena);
+	wpMemArenaDestroy(&temp_arena);
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_arena_clear(void) {
-	wapp_mem_arena_clear(arena);
+	wpMemArenaClear(arena);
 	b8 result = true;
 
 	for (i32 i = 0; i < count; ++i) {
@@ -154,14 +154,14 @@ WpTestFuncResult test_arena_clear(void) {
 }
 
 WpTestFuncResult test_arena_destroy_buffer(void) {
-	wapp_mem_arena_destroy(&buf_arena);
+	wpMemArenaDestroy(&buf_arena);
 	b8 result = buf_arena == NULL;
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_arena_destroy_allocated(void) {
-	wapp_mem_arena_destroy(&arena);
+	wpMemArenaDestroy(&arena);
 	b8 result = arena == nullptr;
 
 	return wpTesterResult(result);

tests/array/test_i32_array.c

@@ -245,6 +245,19 @@ WpTestFuncResult test_i32_array_copy_alloc(void) {
 	return wpTesterResult(result);
 }
 
+WpTestFuncResult test_i32_array_remove_swap_end(void) {
+	b8 result;
+
+	WpI32Array array = wpArray(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+	result = wpArrayCount(array) == 9 && array[4] == 4;
+
+	wpArrayRemoveSwapEnd(i32, array, 4);
+
+	result = result && wpArrayCount(array) == 8 && array[4] == 8;
+
+	return wpTesterResult(result);
+}
+
 WpTestFuncResult test_i32_array_pop(void) {
 	b8 result;
 

tests/array/test_i32_array.cc

@@ -261,6 +261,19 @@ WpTestFuncResult test_i32_array_clear(void) {
 	return wpTesterResult(result);
 }
 
+WpTestFuncResult test_i32_array_remove_swap_end(void) {
+	b8 result;
+
+	WpI32Array array = wpArray(i32, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+	result = wpArrayCount(array) == 9 && array[4] == 4;
+
+	wpArrayRemoveSwapEnd(i32, array, 4);
+
+	result = result && wpArrayCount(array) == 8 && array[4] == 8;
+
+	return wpTesterResult(result);
+}
+
 WpTestFuncResult test_i32_array_pop(void) {
 	b8 result;
 

tests/array/test_i32_array.h

@@ -14,6 +14,7 @@ WpTestFuncResult test_i32_array_alloc_capacity(void);
 WpTestFuncResult test_i32_array_append_alloc(void);
 WpTestFuncResult test_i32_array_extend_alloc(void);
 WpTestFuncResult test_i32_array_copy_alloc(void);
+WpTestFuncResult test_i32_array_remove_swap_end(void);
 WpTestFuncResult test_i32_array_pop(void);
 WpTestFuncResult test_i32_array_clear(void);
 

tests/cpath/test_cpath.c

@@ -13,75 +13,75 @@ WpTestFuncResult test_cpath_join_path(void) {
 	WpStr8 out      = wpStr8Buf(MAIN_BUF_SIZE);
 	WpStr8 tmp      = wpStr8Buf(TMP_BUF_SIZE);
 
-	wpStr8Format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%chome%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP, WP_PATH_SEP);
-	wpStr8Format(&tmp, "%c", WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%c", WP_PATH_SEP);
 
-	WpStr8List parts = wapp_dbl_list(WpStr8);
+	WpStr8List parts = wpDblList(WpStr8);
-	wapp_dbl_list_push_back(WpStr8, &parts, &tmp);
+	wpDblListPushBack(WpStr8, &parts, &tmp);
-	wapp_dbl_list_push_back(WpStr8, &parts, &wpStr8Lit("home"));
+	wpDblListPushBack(WpStr8, &parts, &wpStr8Lit("home"));
-	wapp_dbl_list_push_back(WpStr8, &parts, &wpStr8Lit("abdelrahman"));
+	wpDblListPushBack(WpStr8, &parts, &wpStr8Lit("abdelrahman"));
-	wapp_dbl_list_push_back(WpStr8, &parts, &wpStr8Lit("Documents"));
+	wpDblListPushBack(WpStr8, &parts, &wpStr8Lit("Documents"));
 
-	wapp_cpath_join_path(&out, &parts);
+	wpCpathJoinPath(&out, &parts);
 	result = wpStr8Equal(&out, &expected);
 
-	wapp_dbl_list_pop_front(WpStr8, &parts);
+	wpDblListPopFront(WpStr8, &parts);
 
-	wpStr8Format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&expected, "home%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP);
 
-	wapp_cpath_join_path(&out, &parts);
+	wpCpathJoinPath(&out, &parts);
 	result = result && wpStr8Equal(&out, &expected);
 
 	wpStr8ConcatCapped(&tmp, &wpStr8LitRo("home"));
-	wapp_dbl_list_pop_front(WpStr8, &parts);
+	wpDblListPopFront(WpStr8, &parts);
-	wapp_dbl_list_push_front(WpStr8, &parts, &tmp);
+	wpDblListPushFront(WpStr8, &parts, &tmp);
 
-	wpStr8Format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%chome%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP, WP_PATH_SEP);
 
-	wapp_cpath_join_path(&out, &parts);
+	wpCpathJoinPath(&out, &parts);
 	result = result && wpStr8Equal(&out, &expected);
 
-	wpStr8Format(&tmp, "home%c", WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "home%c", WP_PATH_SEP);
-	wapp_dbl_list_pop_front(WpStr8, &parts);
+	wpDblListPopFront(WpStr8, &parts);
-	wapp_dbl_list_push_front(WpStr8, &parts, &wpStr8Lit("home"));
+	wpDblListPushFront(WpStr8, &parts, &wpStr8Lit("home"));
 
-	wpStr8Format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&expected, "home%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP);
 
-	wapp_cpath_join_path(&out, &parts);
+	wpCpathJoinPath(&out, &parts);
 	result = result && wpStr8Equal(&out, &expected);
 
-	wapp_dbl_list_empty(WpStr8, &parts);
+	wpDblListEmpty(WpStr8, &parts);
 
-	wpStr8Format(&tmp, "%chome", WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%chome", WP_PATH_SEP);
-	wapp_dbl_list_push_back(WpStr8, &parts, &tmp);
+	wpDblListPushBack(WpStr8, &parts, &tmp);
-	wapp_dbl_list_push_back(WpStr8, &parts, &wpStr8Lit(""));
+	wpDblListPushBack(WpStr8, &parts, &wpStr8Lit(""));
 
-	wpStr8Format(&expected, "%chome", WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%chome", WP_PATH_SEP);
 
-	wapp_cpath_join_path(&out, &parts);
+	wpCpathJoinPath(&out, &parts);
 	result = result && wpStr8Equal(&out, &expected);
 
-	wapp_dbl_list_pop_front(WpStr8, &parts);
+	wpDblListPopFront(WpStr8, &parts);
-	wapp_dbl_list_push_back(WpStr8, &parts, &wpStr8Lit(""));
+	wpDblListPushBack(WpStr8, &parts, &wpStr8Lit(""));
 
 	wpStr8Format(&expected, "%s", "");
 
-	wapp_cpath_join_path(&out, &parts);
+	wpCpathJoinPath(&out, &parts);
 	result = result && wpStr8Equal(&out, &expected);
 
-	wapp_dbl_list_pop_back(WpStr8, &parts);
+	wpDblListPopBack(WpStr8, &parts);
-	wapp_dbl_list_push_back(WpStr8, &parts, &wpStr8Lit("home"));
+	wpDblListPushBack(WpStr8, &parts, &wpStr8Lit("home"));
 
 	wpStr8CopyCstrCapped(&expected, "home");
 
-	wapp_cpath_join_path(&out, &parts);
+	wpCpathJoinPath(&out, &parts);
 	result = result && wpStr8Equal(&out, &expected);
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_cpath_dirname(void) {
-	WpAllocator arena = wapp_mem_arena_allocator_init(MiB(8));
+	WpAllocator arena = wpMemArenaAllocatorInit(MiB(8));
 	if (wpMemAllocatorInvalid(&arena)) {
 		return wpTesterResult(false);
 	}
@@ -93,43 +93,43 @@ WpTestFuncResult test_cpath_dirname(void) {
 	WpStr8 tmp      = wpStr8Buf(TMP_BUF_SIZE);
 
 	// CASE 1
-	wpStr8Format(&tmp, "%c", WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%c", WP_PATH_SEP);
-	wpStr8Format(&expected, "%c", WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%c", WP_PATH_SEP);
 
-	output = wapp_cpath_dirname(&arena, &tmp);
+	output = wpCpathDirname(&arena, &tmp);
 	result = output != NULL && wpStr8Equal(output, &expected);
 
 	// CASE 2
 	wpStr8Format(&expected, "%s", ".");
 
-	output = wapp_cpath_dirname(&arena, &wpStr8Lit("home"));
+	output = wpCpathDirname(&arena, &wpStr8Lit("home"));
 	result = result && output != NULL && wpStr8Equal(output, &expected);
 
 	// CASE 3
-	output = wapp_cpath_dirname(&arena, &wpStr8Lit(""));
+	output = wpCpathDirname(&arena, &wpStr8Lit(""));
 	result = result && output != NULL && wpStr8Equal(output, &expected);
 
 	// CASE 4
-	wpStr8Format(&tmp, "%chome%ctest", WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%chome%ctest", WP_PATH_SEP, WP_PATH_SEP);
-	wpStr8Format(&expected, "%chome", WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%chome", WP_PATH_SEP);
 
-	output = wapp_cpath_dirname(&arena, &tmp);
+	output = wpCpathDirname(&arena, &tmp);
 	result = result && output != NULL && wpStr8Equal(output, &expected);
 
 	// CASE 5
-	wpStr8Format(&tmp, "%chome%ctest%c", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%chome%ctest%c", WP_PATH_SEP, WP_PATH_SEP, WP_PATH_SEP);
-	wpStr8Format(&expected, "%chome", WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%chome", WP_PATH_SEP);
 
-	output = wapp_cpath_dirname(&arena, &tmp);
+	output = wpCpathDirname(&arena, &tmp);
 	result = result && output != NULL && wpStr8Equal(output, &expected);
 
-	wapp_mem_arena_allocator_destroy(&arena);
+	wpMemArenaAllocatorDestroy(&arena);
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_cpath_dirup(void) {
-	WpAllocator arena = wapp_mem_arena_allocator_init(MiB(8));
+	WpAllocator arena = wpMemArenaAllocatorInit(MiB(8));
 	if (wpMemAllocatorInvalid(&arena)) {
 		return wpTesterResult(false);
 	}
@@ -141,41 +141,41 @@ WpTestFuncResult test_cpath_dirup(void) {
 	WpStr8 tmp      = wpStr8Buf(TMP_BUF_SIZE);
 
 	// CASE 1
-	wpStr8Format(&tmp, "%c", WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%c", WP_PATH_SEP);
-	wpStr8Format(&expected, "%c", WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%c", WP_PATH_SEP);
 
-	output = wapp_cpath_dirup(&arena, &tmp, 3);
+	output = wpCpathDirUp(&arena, &tmp, 3);
 	result = output != NULL && wpStr8Equal(output, &expected);
 
 	// CASE 2
-	wpStr8Format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%chome%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP, WP_PATH_SEP);
-	wpStr8Format(&expected, "%c", WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%c", WP_PATH_SEP);
 
-	output = wapp_cpath_dirup(&arena, &tmp, 3);
+	output = wpCpathDirUp(&arena, &tmp, 3);
 	result = result && output != NULL && wpStr8Equal(output, &expected);
 
 	// CASE 3
-	wpStr8Format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "home%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP);
 	wpStr8CopyCstrCapped(&expected, ".");
 
-	output = wapp_cpath_dirup(&arena, &tmp, 3);
+	output = wpCpathDirUp(&arena, &tmp, 3);
 	result = result && output != NULL && wpStr8Equal(output, &expected);
 
 	// CASE 4
-	wpStr8Format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%chome%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP, WP_PATH_SEP);
-	wpStr8Format(&expected, "%chome", WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%chome", WP_PATH_SEP);
 
-	output = wapp_cpath_dirup(&arena, &tmp, 2);
+	output = wpCpathDirUp(&arena, &tmp, 2);
 	result = result && output != NULL && wpStr8Equal(output, &expected);
 
 	// CASE 5
-	wpStr8Format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "home%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP);
 	wpStr8CopyCstrCapped(&expected, "home");
 
-	output = wapp_cpath_dirup(&arena, &tmp, 2);
+	output = wpCpathDirUp(&arena, &tmp, 2);
 	result = result && output != NULL && wpStr8Equal(output, &expected);
 
-	wapp_mem_arena_allocator_destroy(&arena);
+	wpMemArenaAllocatorDestroy(&arena);
 
 	return wpTesterResult(result);
 }

tests/cpath/test_cpath.cc

@@ -13,93 +13,93 @@ WpTestFuncResult test_cpath_join_path(void) {
 	WpStr8 out      = wpStr8Buf(MAIN_BUF_SIZE);
 	WpStr8 tmp      = wpStr8Buf(TMP_BUF_SIZE);
 
-	wpStr8Format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%chome%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP, WP_PATH_SEP);
-	wpStr8Format(&tmp, "%c", WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%c", WP_PATH_SEP);
 
-	WpStr8List parts = wapp_dbl_list(WpStr8);
+	WpStr8List parts = wpDblList(WpStr8);
 
-	wapp_dbl_list_push_back(WpStr8, &parts, &tmp);
+	wpDblListPushBack(WpStr8, &parts, &tmp);
 
 	WpStr8 home = wpStr8Lit("home");
-	wapp_dbl_list_push_back(WpStr8, &parts, &home);
+	wpDblListPushBack(WpStr8, &parts, &home);
 
 	WpStr8 user = wpStr8Lit("abdelrahman");
-	wapp_dbl_list_push_back(WpStr8, &parts, &user);
+	wpDblListPushBack(WpStr8, &parts, &user);
 
 	WpStr8 docs = wpStr8Lit("Documents");
-	wapp_dbl_list_push_back(WpStr8, &parts, &docs);
+	wpDblListPushBack(WpStr8, &parts, &docs);
 
-	wapp_cpath_join_path(&out, &parts);
+	wpCpathJoinPath(&out, &parts);
 	result = wpStr8Equal(&out, &expected);
 
-	wapp_dbl_list_pop_front(WpStr8, &parts);
+	wpDblListPopFront(WpStr8, &parts);
 
-	wpStr8Format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&expected, "home%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP);
 
-	wapp_cpath_join_path(&out, &parts);
+	wpCpathJoinPath(&out, &parts);
 	result = result && wpStr8Equal(&out, &expected);
 
 	WpStr8RO str = wpStr8LitRo("home");
 	wpStr8ConcatCapped(&tmp, &str);
-	wapp_dbl_list_pop_front(WpStr8, &parts);
+	wpDblListPopFront(WpStr8, &parts);
 
-	wapp_dbl_list_push_front(WpStr8, &parts, &tmp);
+	wpDblListPushFront(WpStr8, &parts, &tmp);
 
-	wpStr8Format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%chome%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP, WP_PATH_SEP);
 
-	wapp_cpath_join_path(&out, &parts);
+	wpCpathJoinPath(&out, &parts);
 	result = result && wpStr8Equal(&out, &expected);
 
-	wpStr8Format(&tmp, "home%c", WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "home%c", WP_PATH_SEP);
-	wapp_dbl_list_pop_front(WpStr8, &parts);
+	wpDblListPopFront(WpStr8, &parts);
 
 	WpStr8 home_2 = wpStr8Lit("home");
-	wapp_dbl_list_push_front(WpStr8, &parts, &home_2);
+	wpDblListPushFront(WpStr8, &parts, &home_2);
 
-	wpStr8Format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&expected, "home%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP);
 
-	wapp_cpath_join_path(&out, &parts);
+	wpCpathJoinPath(&out, &parts);
 	result = result && wpStr8Equal(&out, &expected);
 
-	wapp_dbl_list_empty(WpStr8, &parts);
+	wpDblListEmpty(WpStr8, &parts);
 
-	wpStr8Format(&tmp, "%chome", WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%chome", WP_PATH_SEP);
 
-	wapp_dbl_list_push_back(WpStr8, &parts, &tmp);
+	wpDblListPushBack(WpStr8, &parts, &tmp);
 
 	WpStr8 empty = wpStr8Lit("");
-	wapp_dbl_list_push_back(WpStr8, &parts, &empty);
+	wpDblListPushBack(WpStr8, &parts, &empty);
 
-	wpStr8Format(&expected, "%chome", WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%chome", WP_PATH_SEP);
 
-	wapp_cpath_join_path(&out, &parts);
+	wpCpathJoinPath(&out, &parts);
 	result = result && wpStr8Equal(&out, &expected);
 
-	wapp_dbl_list_pop_front(WpStr8, &parts);
+	wpDblListPopFront(WpStr8, &parts);
 
 	WpStr8 empty_2 = wpStr8Lit("");
-	wapp_dbl_list_push_back(WpStr8, &parts, &empty_2);
+	wpDblListPushBack(WpStr8, &parts, &empty_2);
 
 	wpStr8Format(&expected, "%s", "");
 
-	wapp_cpath_join_path(&out, &parts);
+	wpCpathJoinPath(&out, &parts);
 	result = result && wpStr8Equal(&out, &expected);
 
-	wapp_dbl_list_pop_back(WpStr8, &parts);
+	wpDblListPopBack(WpStr8, &parts);
 
 	WpStr8 home_3 = wpStr8Lit("home");
-	wapp_dbl_list_push_back(WpStr8, &parts, &home_3);
+	wpDblListPushBack(WpStr8, &parts, &home_3);
 
 	wpStr8CopyCstrCapped(&expected, "home");
 
-	wapp_cpath_join_path(&out, &parts);
+	wpCpathJoinPath(&out, &parts);
 	result = result && wpStr8Equal(&out, &expected);
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_cpath_dirname(void) {
-	WpAllocator arena = wapp_mem_arena_allocator_init(MiB(8));
+	WpAllocator arena = wpMemArenaAllocatorInit(MiB(8));
 	if (wpMemAllocatorInvalid(&arena)) {
 		return wpTesterResult(false);
 	}
@@ -111,45 +111,45 @@ WpTestFuncResult test_cpath_dirname(void) {
 	WpStr8 tmp      = wpStr8Buf(TMP_BUF_SIZE);
 
 	// CASE 1
-	wpStr8Format(&tmp, "%c", WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%c", WP_PATH_SEP);
-	wpStr8Format(&expected, "%c", WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%c", WP_PATH_SEP);
 
-	output = wapp_cpath_dirname(&arena, &tmp);
+	output = wpCpathDirname(&arena, &tmp);
 	result = output != nullptr && wpStr8Equal(output, &expected);
 
 	// CASE 2
 	wpStr8Format(&expected, "%s", ".");
 
 	WpStr8 path = wpStr8Lit("home");
-	output    = wapp_cpath_dirname(&arena, &path);
+	output    = wpCpathDirname(&arena, &path);
 	result    = result && output != nullptr && wpStr8Equal(output, &expected);
 
 	// CASE 3
 	path   = wpStr8Lit("");
-	output = wapp_cpath_dirname(&arena, &path);
+	output = wpCpathDirname(&arena, &path);
 	result = result && output != nullptr && wpStr8Equal(output, &expected);
 
 	// CASE 4
-	wpStr8Format(&tmp, "%chome%ctest", WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%chome%ctest", WP_PATH_SEP, WP_PATH_SEP);
-	wpStr8Format(&expected, "%chome", WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%chome", WP_PATH_SEP);
 
-	output = wapp_cpath_dirname(&arena, &tmp);
+	output = wpCpathDirname(&arena, &tmp);
 	result = result && output != nullptr && wpStr8Equal(output, &expected);
 
 	// CASE 5
-	wpStr8Format(&tmp, "%chome%ctest%c", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%chome%ctest%c", WP_PATH_SEP, WP_PATH_SEP, WP_PATH_SEP);
-	wpStr8Format(&expected, "%chome", WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%chome", WP_PATH_SEP);
 
-	output = wapp_cpath_dirname(&arena, &tmp);
+	output = wpCpathDirname(&arena, &tmp);
 	result = result && output != nullptr && wpStr8Equal(output, &expected);
 
-	wapp_mem_arena_allocator_destroy(&arena);
+	wpMemArenaAllocatorDestroy(&arena);
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_cpath_dirup(void) {
-	WpAllocator arena = wapp_mem_arena_allocator_init(MiB(8));
+	WpAllocator arena = wpMemArenaAllocatorInit(MiB(8));
 	if (wpMemAllocatorInvalid(&arena)) {
 		return wpTesterResult(false);
 	}
@@ -161,41 +161,41 @@ WpTestFuncResult test_cpath_dirup(void) {
 	WpStr8 tmp      = wpStr8Buf(TMP_BUF_SIZE);
 
 	// CASE 1
-	wpStr8Format(&tmp, "%c", WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%c", WP_PATH_SEP);
-	wpStr8Format(&expected, "%c", WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%c", WP_PATH_SEP);
 
-	output = wapp_cpath_dirup(&arena, &tmp, 3);
+	output = wpCpathDirUp(&arena, &tmp, 3);
 	result = output != nullptr && wpStr8Equal(output, &expected);
 
 	// CASE 2
-	wpStr8Format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%chome%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP, WP_PATH_SEP);
-	wpStr8Format(&expected, "%c", WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%c", WP_PATH_SEP);
 
-	output = wapp_cpath_dirup(&arena, &tmp, 3);
+	output = wpCpathDirUp(&arena, &tmp, 3);
 	result = result && output != nullptr && wpStr8Equal(output, &expected);
 
 	// CASE 3
-	wpStr8Format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "home%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP);
 	wpStr8CopyCstrCapped(&expected, ".");
 
-	output = wapp_cpath_dirup(&arena, &tmp, 3);
+	output = wpCpathDirUp(&arena, &tmp, 3);
 	result = result && output != nullptr && wpStr8Equal(output, &expected);
 
 	// CASE 4
-	wpStr8Format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "%chome%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP, WP_PATH_SEP);
-	wpStr8Format(&expected, "%chome", WAPP_PATH_SEP);
+	wpStr8Format(&expected, "%chome", WP_PATH_SEP);
 
-	output = wapp_cpath_dirup(&arena, &tmp, 2);
+	output = wpCpathDirUp(&arena, &tmp, 2);
 	result = result && output != nullptr && wpStr8Equal(output, &expected);
 
 	// CASE 5
-	wpStr8Format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+	wpStr8Format(&tmp, "home%cabdelrahman%cDocuments", WP_PATH_SEP, WP_PATH_SEP);
 	wpStr8CopyCstrCapped(&expected, "home");
 
-	output = wapp_cpath_dirup(&arena, &tmp, 2);
+	output = wpCpathDirUp(&arena, &tmp, 2);
 	result = result && output != nullptr && wpStr8Equal(output, &expected);
 
-	wapp_mem_arena_allocator_destroy(&arena);
+	wpMemArenaAllocatorDestroy(&arena);
 
 	return wpTesterResult(result);
 }

tests/file/test_file.c

@@ -6,45 +6,45 @@
 wp_intern WpAllocator arena           = {0};
 wp_intern WpStr8RO test_filename      = wpStr8LitRoInitialiserList("wapptest.bin");
 wp_intern WpStr8RO new_filename       = wpStr8LitRoInitialiserList("wapptest2.bin");
-wp_intern WFile *test_fp            = NULL;
+wp_intern WpFile *test_fp            = NULL;
-wp_intern I32Array src_array1       = wapp_array(i32,  0,  1,  2,  3,  4);
+wp_intern WpI32Array src_array1       = wpArray(i32,  0,  1,  2,  3,  4);
-wp_intern I32Array src_array2       = wapp_array(i32,  5,  6,  7,  8,  9);
+wp_intern WpI32Array src_array2       = wpArray(i32,  5,  6,  7,  8,  9);
-wp_intern I32Array src_array3       = wapp_array(i32, 10, 11, 12, 13, 14);
+wp_intern WpI32Array src_array3       = wpArray(i32, 10, 11, 12, 13, 14);
-wp_intern I32Array dst_array        = wapp_array_with_capacity(i32, DST_CAPACITY, false);
+wp_intern WpI32Array dst_array        = wpArrayWithCapacity(i32, DST_CAPACITY, false);
 wp_intern i32 dst_buf[DST_CAPACITY] = {0};
 
 WpTestFuncResult test_wapp_file_open(void) {
-	arena   = wapp_mem_arena_allocator_init(KiB(16));
+	arena   = wpMemArenaAllocatorInit(KiB(16));
-	test_fp = wapp_file_open(&arena, &test_filename, WAPP_ACCESS_WRITE_EX);
+	test_fp = wpFileOpen(&arena, &test_filename, WP_ACCESS_WRITE_EX);
 	return wpTesterResult(test_fp != NULL);
 }
 
 WpTestFuncResult test_wapp_file_get_current_position(void) {
-	i64 pos = wapp_file_get_current_position(test_fp);
+	i64 pos = wpFileGetCurrentPosition(test_fp);
 	return wpTesterResult(pos == 0);
 }
 
 WpTestFuncResult test_wapp_file_seek(void) {
-	wapp_file_write_array((GenericArray)src_array1, test_fp, wapp_array_count(src_array1));
+	wpFileWriteArray((WpArray)src_array1, test_fp, wpArrayCount(src_array1));
 
-	i64 seek_result = wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
+	i64 seek_result = wpFileSeek(test_fp, 0, WP_SEEK_END);
-	b8 result       = seek_result == (i64)(wapp_array_count(src_array1) * wapp_array_item_size(src_array1));
+	b8 result       = seek_result == (i64)(wpArrayCount(src_array1) * wpArrayItemSize(src_array1));
 
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
+	wpFileSeek(test_fp, 0, WP_SEEK_START);
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_wapp_file_get_length(void) {
-	i64 length = wapp_file_get_length(test_fp);
+	i64 length = wpFileGetLength(test_fp);
-	return wpTesterResult(length == (i64)(wapp_array_count(src_array1) * wapp_array_item_size(src_array1)));
+	return wpTesterResult(length == (i64)(wpArrayCount(src_array1) * wpArrayItemSize(src_array1)));
 }
 
 WpTestFuncResult test_wapp_file_read(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
+	wpFileSeek(test_fp, 0, WP_SEEK_START);
 
 	u64 byte_count = DST_CAPACITY * sizeof(i32);
-	u64 count      = wapp_file_read((void *)dst_buf, test_fp, byte_count);
+	u64 count      = wpFileRead((void *)dst_buf, test_fp, byte_count);
 	b8 result      = count == byte_count;
 
 	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
@@ -52,7 +52,7 @@ WpTestFuncResult test_wapp_file_read(void) {
 	u64 index  = 0;
 	b8 running = true;
 	while (running) {
-		result = result && (dst_buf[index] == *wapp_array_get(i32, src_array1, index));
+		result = result && (dst_buf[index] == *wpArrayGet(i32, src_array1, index));
 		++index;
 		running = index < DST_CAPACITY;
 	}
@@ -61,58 +61,58 @@ WpTestFuncResult test_wapp_file_read(void) {
 }
 
 WpTestFuncResult test_wapp_file_write(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
+	wpFileSeek(test_fp, 0, WP_SEEK_END);
 
-	u64 expected_count = wapp_array_count(src_array2) * wapp_array_item_size(src_array2);
+	u64 expected_count = wpArrayCount(src_array2) * wpArrayItemSize(src_array2);
-	i64 count = wapp_file_write((void *)src_array2, test_fp, expected_count);
+	i64 count = wpFileWrite((void *)src_array2, test_fp, expected_count);
 
 	return wpTesterResult(count >= 0 && (u64)count == expected_count);
 }
 
 WpTestFuncResult test_wapp_file_read_array(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
+	wpFileSeek(test_fp, 0, WP_SEEK_START);
 
-	u64 count = wapp_file_read_array((GenericArray)dst_array, test_fp, wapp_array_count(src_array1));
+	u64 count = wpFileReadArray((WpArray)dst_array, test_fp, wpArrayCount(src_array1));
-	b8 result = count == wapp_array_count(src_array1) &&
+	b8 result = count == wpArrayCount(src_array1) &&
-	            wapp_array_count(dst_array) == wapp_array_count(src_array1);
+	            wpArrayCount(dst_array) == wpArrayCount(src_array1);
 
 	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
 	// MSVC Spectre mitigation warnings
 	u64 index  = 0;
 	b8 running = true;
 	while (running) {
-		result = result && (*wapp_array_get(i32, dst_array, index) == *wapp_array_get(i32, src_array1, index));
+		result = result && (*wpArrayGet(i32, dst_array, index) == *wpArrayGet(i32, src_array1, index));
 		++index;
-		running = index < wapp_array_count(dst_array);
+		running = index < wpArrayCount(dst_array);
 	}
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_wapp_file_write_array(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
+	wpFileSeek(test_fp, 0, WP_SEEK_END);
 
-	i64 count = wapp_file_write_array((GenericArray)src_array3, test_fp, wapp_array_count(src_array3));
+	i64 count = wpFileWriteArray((WpArray)src_array3, test_fp, wpArrayCount(src_array3));
 
-	return wpTesterResult(count >= 0 && (u64)count == wapp_array_count(src_array3));
+	return wpTesterResult(count >= 0 && (u64)count == wpArrayCount(src_array3));
 }
 
 WpTestFuncResult test_wapp_file_flush(void) {
-	i32 flush_result = wapp_file_flush(test_fp);
+	i32 flush_result = wpFileFlush(test_fp);
 	return wpTesterResult(flush_result == 0);
 }
 
 WpTestFuncResult test_wapp_file_close(void) {
-	i32 close_result = wapp_file_close(test_fp);
+	i32 close_result = wpFileClose(test_fp);
 	return wpTesterResult(close_result == 0);
 }
 
 WpTestFuncResult test_wapp_file_rename(void) {
-	i32 rename_result = wapp_file_rename(&test_filename, &new_filename);
+	i32 rename_result = wpFileRename(&test_filename, &new_filename);
 	return wpTesterResult(rename_result == 0);
 }
 
 WpTestFuncResult test_wapp_file_remove(void) {
-	i32 remove_result = wapp_file_remove(&new_filename);
+	i32 remove_result = wpFileRemove(&new_filename);
 	return wpTesterResult(remove_result == 0);
 }

tests/file/test_file.cc

@@ -6,49 +6,49 @@
 wp_intern WpAllocator arena           = {};
 wp_intern WpStr8RO test_filename      = wpStr8LitRoInitialiserList("wapptest.bin");
 wp_intern WpStr8RO new_filename       = wpStr8LitRoInitialiserList("wapptest2.bin");
-wp_intern WFile *test_fp            = NULL;
+wp_intern WpFile *test_fp            = NULL;
 wp_intern i32 dst_buf[DST_CAPACITY] = {0};
-wp_intern I32Array src_array1;
+wp_intern WpI32Array src_array1;
-wp_intern I32Array src_array2;
+wp_intern WpI32Array src_array2;
-wp_intern I32Array src_array3;
+wp_intern WpI32Array src_array3;
-wp_intern I32Array dst_array ;
+wp_intern WpI32Array dst_array ;
 
 WpTestFuncResult test_wapp_file_open(void) {
-	arena      = wapp_mem_arena_allocator_init(KiB(16));
+	arena      = wpMemArenaAllocatorInit(KiB(16));
-	src_array1 = wapp_array(i32,  0,  1,  2,  3,  4);
+	src_array1 = wpArray(i32,  0,  1,  2,  3,  4);
-	src_array2 = wapp_array(i32,  5,  6,  7,  8,  9);
+	src_array2 = wpArray(i32,  5,  6,  7,  8,  9);
-	src_array3 = wapp_array(i32, 10, 11, 12, 13, 14);
+	src_array3 = wpArray(i32, 10, 11, 12, 13, 14);
-	dst_array  = wapp_array_with_capacity(i32, DST_CAPACITY, false);
+	dst_array  = wpArrayWithCapacity(i32, DST_CAPACITY, false);
-	test_fp    = wapp_file_open(&arena, &test_filename, WAPP_ACCESS_WRITE_EX);
+	test_fp    = wpFileOpen(&arena, &test_filename, WP_ACCESS_WRITE_EX);
 	return wpTesterResult(test_fp != NULL);
 }
 
 WpTestFuncResult test_wapp_file_get_current_position(void) {
-	i64 pos = wapp_file_get_current_position(test_fp);
+	i64 pos = wpFileGetCurrentPosition(test_fp);
 	return wpTesterResult(pos == 0);
 }
 
 WpTestFuncResult test_wapp_file_seek(void) {
-	wapp_file_write_array((GenericArray)src_array1, test_fp, wapp_array_count(src_array1));
+	wpFileWriteArray((WpArray)src_array1, test_fp, wpArrayCount(src_array1));
 
-	i64 seek_result = wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
+	i64 seek_result = wpFileSeek(test_fp, 0, WP_SEEK_END);
-	b8 result       = seek_result == (i64)(wapp_array_count(src_array1) * wapp_array_item_size(src_array1));
+	b8 result       = seek_result == (i64)(wpArrayCount(src_array1) * wpArrayItemSize(src_array1));
 
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
+	wpFileSeek(test_fp, 0, WP_SEEK_START);
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_wapp_file_get_length(void) {
-	i64 length = wapp_file_get_length(test_fp);
+	i64 length = wpFileGetLength(test_fp);
-	return wpTesterResult(length == (i64)(wapp_array_count(src_array1) * wapp_array_item_size(src_array1)));
+	return wpTesterResult(length == (i64)(wpArrayCount(src_array1) * wpArrayItemSize(src_array1)));
 }
 
 WpTestFuncResult test_wapp_file_read(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
+	wpFileSeek(test_fp, 0, WP_SEEK_START);
 
 	u64 byte_count = DST_CAPACITY * sizeof(i32);
-	u64 count      = wapp_file_read((void *)dst_buf, test_fp, byte_count);
+	u64 count      = wpFileRead((void *)dst_buf, test_fp, byte_count);
 	b8 result      = count == byte_count;
 
 	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
@@ -56,7 +56,7 @@ WpTestFuncResult test_wapp_file_read(void) {
 	u64 index  = 0;
 	b8 running = true;
 	while (running) {
-		result = result && (dst_buf[index] == *wapp_array_get(i32, src_array1, index));
+		result = result && (dst_buf[index] == *wpArrayGet(i32, src_array1, index));
 		++index;
 		running = index < DST_CAPACITY;
 	}
@@ -65,58 +65,58 @@ WpTestFuncResult test_wapp_file_read(void) {
 }
 
 WpTestFuncResult test_wapp_file_write(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
+	wpFileSeek(test_fp, 0, WP_SEEK_END);
 
-	u64 expected_count = wapp_array_count(src_array2) * wapp_array_item_size(src_array2);
+	u64 expected_count = wpArrayCount(src_array2) * wpArrayItemSize(src_array2);
-	i64 count = wapp_file_write((void *)src_array2, test_fp, expected_count);
+	i64 count = wpFileWrite((void *)src_array2, test_fp, expected_count);
 
 	return wpTesterResult(count >= 0 && (u64)count == expected_count);
 }
 
 WpTestFuncResult test_wapp_file_read_array(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_START);
+	wpFileSeek(test_fp, 0, WP_SEEK_START);
 
-	u64 count = wapp_file_read_array((GenericArray)dst_array, test_fp, wapp_array_count(src_array1));
+	u64 count = wpFileReadArray((WpArray)dst_array, test_fp, wpArrayCount(src_array1));
-	b8 result = count == wapp_array_count(src_array1) &&
+	b8 result = count == wpArrayCount(src_array1) &&
-	            wapp_array_count(dst_array) == wapp_array_count(src_array1);
+	            wpArrayCount(dst_array) == wpArrayCount(src_array1);
 
 	// NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
 	// MSVC Spectre mitigation warnings
 	u64 index  = 0;
 	b8 running = true;
 	while (running) {
-		result = result && (*wapp_array_get(i32, dst_array, index) == *wapp_array_get(i32, src_array1, index));
+		result = result && (*wpArrayGet(i32, dst_array, index) == *wpArrayGet(i32, src_array1, index));
 		++index;
-		running = index < wapp_array_count(dst_array);
+		running = index < wpArrayCount(dst_array);
 	}
 
 	return wpTesterResult(result);
 }
 
 WpTestFuncResult test_wapp_file_write_array(void) {
-	wapp_file_seek(test_fp, 0, WAPP_SEEK_END);
+	wpFileSeek(test_fp, 0, WP_SEEK_END);
 
-	i64 count = wapp_file_write_array((GenericArray)src_array3, test_fp, wapp_array_count(src_array3));
+	i64 count = wpFileWriteArray((WpArray)src_array3, test_fp, wpArrayCount(src_array3));
 
-	return wpTesterResult(count >= 0 && (u64)count == wapp_array_count(src_array3));
+	return wpTesterResult(count >= 0 && (u64)count == wpArrayCount(src_array3));
 }
 
 WpTestFuncResult test_wapp_file_flush(void) {
-	i32 flush_result = wapp_file_flush(test_fp);
+	i32 flush_result = wpFileFlush(test_fp);
 	return wpTesterResult(flush_result == 0);
 }
 
 WpTestFuncResult test_wapp_file_close(void) {
-	i32 close_result = wapp_file_close(test_fp);
+	i32 close_result = wpFileClose(test_fp);
 	return wpTesterResult(close_result == 0);
 }
 
 WpTestFuncResult test_wapp_file_rename(void) {
-	i32 rename_result = wapp_file_rename(&test_filename, &new_filename);
+	i32 rename_result = wpFileRename(&test_filename, &new_filename);
 	return wpTesterResult(rename_result == 0);
 }
 
 WpTestFuncResult test_wapp_file_remove(void) {
-	i32 remove_result = wapp_file_remove(&new_filename);
+	i32 remove_result = wpFileRemove(&new_filename);
 	return wpTesterResult(remove_result == 0);
 }

tests/hasher/MurmurHash3.c

@@ -0,0 +1,335 @@
+//-----------------------------------------------------------------------------
+// MurmurHash3 was written by Austin Appleby, and is placed in the public
+// domain. The author hereby disclaims copyright to this source code.
+
+// Note - The x86 and x64 versions do _not_ produce the same results, as the
+// algorithms are optimized for their respective platforms. You can still
+// compile and run any of them on any platform, but your performance with the
+// non-native version will be less than optimal.
+
+#include "MurmurHash3.h"
+
+//-----------------------------------------------------------------------------
+// Platform-specific functions and macros
+
+// Microsoft Visual Studio
+
+#if defined(_MSC_VER)
+
+#define FORCE_INLINE	__forceinline
+
+#include <stdlib.h>
+
+#define ROTL32(x,y)	_rotl(x,y)
+#define ROTL64(x,y)	_rotl64(x,y)
+
+#define BIG_CONSTANT(x) (x)
+
+// Other compilers
+
+#else	// defined(_MSC_VER)
+
+#define	FORCE_INLINE inline __attribute__((always_inline))
+
+static inline uint32_t rotl32 ( uint32_t x, int8_t r )
+{
+  return (x << r) | (x >> (32 - r));
+}
+
+static inline uint64_t rotl64 ( uint64_t x, int8_t r )
+{
+  return (x << r) | (x >> (64 - r));
+}
+
+#define	ROTL32(x,y)	rotl32(x,y)
+#define ROTL64(x,y)	rotl64(x,y)
+
+#define BIG_CONSTANT(x) (x##LLU)
+
+#endif // !defined(_MSC_VER)
+
+//-----------------------------------------------------------------------------
+// Block read - if your platform needs to do endian-swapping or can only
+// handle aligned reads, do the conversion here
+
+FORCE_INLINE uint32_t getblock32 ( const uint32_t * p, int i )
+{
+  return p[i];
+}
+
+FORCE_INLINE uint64_t getblock64 ( const uint64_t * p, int i )
+{
+  return p[i];
+}
+
+//-----------------------------------------------------------------------------
+// Finalization mix - force all bits of a hash block to avalanche
+
+FORCE_INLINE uint32_t fmix32 ( uint32_t h )
+{
+  h ^= h >> 16;
+  h *= 0x85ebca6b;
+  h ^= h >> 13;
+  h *= 0xc2b2ae35;
+  h ^= h >> 16;
+
+  return h;
+}
+
+//----------
+
+FORCE_INLINE uint64_t fmix64 ( uint64_t k )
+{
+  k ^= k >> 33;
+  k *= BIG_CONSTANT(0xff51afd7ed558ccd);
+  k ^= k >> 33;
+  k *= BIG_CONSTANT(0xc4ceb9fe1a85ec53);
+  k ^= k >> 33;
+
+  return k;
+}
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x86_32 ( const void * key, int len,
+                          uint32_t seed, void * out )
+{
+  const uint8_t * data = (const uint8_t*)key;
+  const int nblocks = len / 4;
+
+  uint32_t h1 = seed;
+
+  const uint32_t c1 = 0xcc9e2d51;
+  const uint32_t c2 = 0x1b873593;
+
+  //----------
+  // body
+
+  const uint32_t * blocks = (const uint32_t *)(data + nblocks*4);
+
+  for(int i = -nblocks; i; i++)
+  {
+    uint32_t k1 = getblock32(blocks,i);
+
+    k1 *= c1;
+    k1 = ROTL32(k1,15);
+    k1 *= c2;
+    
+    h1 ^= k1;
+    h1 = ROTL32(h1,13); 
+    h1 = h1*5+0xe6546b64;
+  }
+
+  //----------
+  // tail
+
+  const uint8_t * tail = (const uint8_t*)(data + nblocks*4);
+
+  uint32_t k1 = 0;
+
+  switch(len & 3)
+  {
+  case 3: k1 ^= tail[2] << 16;
+  case 2: k1 ^= tail[1] << 8;
+  case 1: k1 ^= tail[0];
+          k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
+  };
+
+  //----------
+  // finalization
+
+  h1 ^= len;
+
+  h1 = fmix32(h1);
+
+  *(uint32_t*)out = h1;
+} 
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x86_128 ( const void * key, const int len,
+                           uint32_t seed, void * out )
+{
+  const uint8_t * data = (const uint8_t*)key;
+  const int nblocks = len / 16;
+
+  uint32_t h1 = seed;
+  uint32_t h2 = seed;
+  uint32_t h3 = seed;
+  uint32_t h4 = seed;
+
+  const uint32_t c1 = 0x239b961b; 
+  const uint32_t c2 = 0xab0e9789;
+  const uint32_t c3 = 0x38b34ae5; 
+  const uint32_t c4 = 0xa1e38b93;
+
+  //----------
+  // body
+
+  const uint32_t * blocks = (const uint32_t *)(data + nblocks*16);
+
+  for(int i = -nblocks; i; i++)
+  {
+    uint32_t k1 = getblock32(blocks,i*4+0);
+    uint32_t k2 = getblock32(blocks,i*4+1);
+    uint32_t k3 = getblock32(blocks,i*4+2);
+    uint32_t k4 = getblock32(blocks,i*4+3);
+
+    k1 *= c1; k1  = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
+
+    h1 = ROTL32(h1,19); h1 += h2; h1 = h1*5+0x561ccd1b;
+
+    k2 *= c2; k2  = ROTL32(k2,16); k2 *= c3; h2 ^= k2;
+
+    h2 = ROTL32(h2,17); h2 += h3; h2 = h2*5+0x0bcaa747;
+
+    k3 *= c3; k3  = ROTL32(k3,17); k3 *= c4; h3 ^= k3;
+
+    h3 = ROTL32(h3,15); h3 += h4; h3 = h3*5+0x96cd1c35;
+
+    k4 *= c4; k4  = ROTL32(k4,18); k4 *= c1; h4 ^= k4;
+
+    h4 = ROTL32(h4,13); h4 += h1; h4 = h4*5+0x32ac3b17;
+  }
+
+  //----------
+  // tail
+
+  const uint8_t * tail = (const uint8_t*)(data + nblocks*16);
+
+  uint32_t k1 = 0;
+  uint32_t k2 = 0;
+  uint32_t k3 = 0;
+  uint32_t k4 = 0;
+
+  switch(len & 15)
+  {
+  case 15: k4 ^= tail[14] << 16;
+  case 14: k4 ^= tail[13] << 8;
+  case 13: k4 ^= tail[12] << 0;
+           k4 *= c4; k4  = ROTL32(k4,18); k4 *= c1; h4 ^= k4;
+
+  case 12: k3 ^= tail[11] << 24;
+  case 11: k3 ^= tail[10] << 16;
+  case 10: k3 ^= tail[ 9] << 8;
+  case  9: k3 ^= tail[ 8] << 0;
+           k3 *= c3; k3  = ROTL32(k3,17); k3 *= c4; h3 ^= k3;
+
+  case  8: k2 ^= tail[ 7] << 24;
+  case  7: k2 ^= tail[ 6] << 16;
+  case  6: k2 ^= tail[ 5] << 8;
+  case  5: k2 ^= tail[ 4] << 0;
+           k2 *= c2; k2  = ROTL32(k2,16); k2 *= c3; h2 ^= k2;
+
+  case  4: k1 ^= tail[ 3] << 24;
+  case  3: k1 ^= tail[ 2] << 16;
+  case  2: k1 ^= tail[ 1] << 8;
+  case  1: k1 ^= tail[ 0] << 0;
+           k1 *= c1; k1  = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
+  };
+
+  //----------
+  // finalization
+
+  h1 ^= len; h2 ^= len; h3 ^= len; h4 ^= len;
+
+  h1 += h2; h1 += h3; h1 += h4;
+  h2 += h1; h3 += h1; h4 += h1;
+
+  h1 = fmix32(h1);
+  h2 = fmix32(h2);
+  h3 = fmix32(h3);
+  h4 = fmix32(h4);
+
+  h1 += h2; h1 += h3; h1 += h4;
+  h2 += h1; h3 += h1; h4 += h1;
+
+  ((uint32_t*)out)[0] = h1;
+  ((uint32_t*)out)[1] = h2;
+  ((uint32_t*)out)[2] = h3;
+  ((uint32_t*)out)[3] = h4;
+}
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x64_128 ( const void * key, const int len,
+                           const uint32_t seed, void * out )
+{
+  const uint8_t * data = (const uint8_t*)key;
+  const int nblocks = len / 16;
+
+  uint64_t h1 = seed;
+  uint64_t h2 = seed;
+
+  const uint64_t c1 = BIG_CONSTANT(0x87c37b91114253d5);
+  const uint64_t c2 = BIG_CONSTANT(0x4cf5ad432745937f);
+
+  //----------
+  // body
+
+  const uint64_t * blocks = (const uint64_t *)(data);
+
+  for(int i = 0; i < nblocks; i++)
+  {
+    uint64_t k1 = getblock64(blocks,i*2+0);
+    uint64_t k2 = getblock64(blocks,i*2+1);
+
+    k1 *= c1; k1  = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
+
+    h1 = ROTL64(h1,27); h1 += h2; h1 = h1*5+0x52dce729;
+
+    k2 *= c2; k2  = ROTL64(k2,33); k2 *= c1; h2 ^= k2;
+
+    h2 = ROTL64(h2,31); h2 += h1; h2 = h2*5+0x38495ab5;
+  }
+
+  //----------
+  // tail
+
+  const uint8_t * tail = (const uint8_t*)(data + nblocks*16);
+
+  uint64_t k1 = 0;
+  uint64_t k2 = 0;
+
+  switch(len & 15)
+  {
+  case 15: k2 ^= ((uint64_t)tail[14]) << 48;
+  case 14: k2 ^= ((uint64_t)tail[13]) << 40;
+  case 13: k2 ^= ((uint64_t)tail[12]) << 32;
+  case 12: k2 ^= ((uint64_t)tail[11]) << 24;
+  case 11: k2 ^= ((uint64_t)tail[10]) << 16;
+  case 10: k2 ^= ((uint64_t)tail[ 9]) << 8;
+  case  9: k2 ^= ((uint64_t)tail[ 8]) << 0;
+           k2 *= c2; k2  = ROTL64(k2,33); k2 *= c1; h2 ^= k2;
+
+  case  8: k1 ^= ((uint64_t)tail[ 7]) << 56;
+  case  7: k1 ^= ((uint64_t)tail[ 6]) << 48;
+  case  6: k1 ^= ((uint64_t)tail[ 5]) << 40;
+  case  5: k1 ^= ((uint64_t)tail[ 4]) << 32;
+  case  4: k1 ^= ((uint64_t)tail[ 3]) << 24;
+  case  3: k1 ^= ((uint64_t)tail[ 2]) << 16;
+  case  2: k1 ^= ((uint64_t)tail[ 1]) << 8;
+  case  1: k1 ^= ((uint64_t)tail[ 0]) << 0;
+           k1 *= c1; k1  = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
+  };
+
+  //----------
+  // finalization
+
+  h1 ^= len; h2 ^= len;
+
+  h1 += h2;
+  h2 += h1;
+
+  h1 = fmix64(h1);
+  h2 = fmix64(h2);
+
+  h1 += h2;
+  h2 += h1;
+
+  ((uint64_t*)out)[0] = h1;
+  ((uint64_t*)out)[1] = h2;
+}
+
+//-----------------------------------------------------------------------------
+

tests/hasher/MurmurHash3.cc

@@ -0,0 +1,335 @@
+//-----------------------------------------------------------------------------
+// MurmurHash3 was written by Austin Appleby, and is placed in the public
+// domain. The author hereby disclaims copyright to this source code.
+
+// Note - The x86 and x64 versions do _not_ produce the same results, as the
+// algorithms are optimized for their respective platforms. You can still
+// compile and run any of them on any platform, but your performance with the
+// non-native version will be less than optimal.
+
+#include "MurmurHash3.h"
+
+//-----------------------------------------------------------------------------
+// Platform-specific functions and macros
+
+// Microsoft Visual Studio
+
+#if defined(_MSC_VER)
+
+#define FORCE_INLINE	__forceinline
+
+#include <stdlib.h>
+
+#define ROTL32(x,y)	_rotl(x,y)
+#define ROTL64(x,y)	_rotl64(x,y)
+
+#define BIG_CONSTANT(x) (x)
+
+// Other compilers
+
+#else	// defined(_MSC_VER)
+
+#define	FORCE_INLINE inline __attribute__((always_inline))
+
+inline uint32_t rotl32 ( uint32_t x, int8_t r )
+{
+  return (x << r) | (x >> (32 - r));
+}
+
+inline uint64_t rotl64 ( uint64_t x, int8_t r )
+{
+  return (x << r) | (x >> (64 - r));
+}
+
+#define	ROTL32(x,y)	rotl32(x,y)
+#define ROTL64(x,y)	rotl64(x,y)
+
+#define BIG_CONSTANT(x) (x##LLU)
+
+#endif // !defined(_MSC_VER)
+
+//-----------------------------------------------------------------------------
+// Block read - if your platform needs to do endian-swapping or can only
+// handle aligned reads, do the conversion here
+
+FORCE_INLINE uint32_t getblock32 ( const uint32_t * p, int i )
+{
+  return p[i];
+}
+
+FORCE_INLINE uint64_t getblock64 ( const uint64_t * p, int i )
+{
+  return p[i];
+}
+
+//-----------------------------------------------------------------------------
+// Finalization mix - force all bits of a hash block to avalanche
+
+FORCE_INLINE uint32_t fmix32 ( uint32_t h )
+{
+  h ^= h >> 16;
+  h *= 0x85ebca6b;
+  h ^= h >> 13;
+  h *= 0xc2b2ae35;
+  h ^= h >> 16;
+
+  return h;
+}
+
+//----------
+
+FORCE_INLINE uint64_t fmix64 ( uint64_t k )
+{
+  k ^= k >> 33;
+  k *= BIG_CONSTANT(0xff51afd7ed558ccd);
+  k ^= k >> 33;
+  k *= BIG_CONSTANT(0xc4ceb9fe1a85ec53);
+  k ^= k >> 33;
+
+  return k;
+}
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x86_32 ( const void * key, int len,
+                          uint32_t seed, void * out )
+{
+  const uint8_t * data = (const uint8_t*)key;
+  const int nblocks = len / 4;
+
+  uint32_t h1 = seed;
+
+  const uint32_t c1 = 0xcc9e2d51;
+  const uint32_t c2 = 0x1b873593;
+
+  //----------
+  // body
+
+  const uint32_t * blocks = (const uint32_t *)(data + nblocks*4);
+
+  for(int i = -nblocks; i; i++)
+  {
+    uint32_t k1 = getblock32(blocks,i);
+
+    k1 *= c1;
+    k1 = ROTL32(k1,15);
+    k1 *= c2;
+    
+    h1 ^= k1;
+    h1 = ROTL32(h1,13); 
+    h1 = h1*5+0xe6546b64;
+  }
+
+  //----------
+  // tail
+
+  const uint8_t * tail = (const uint8_t*)(data + nblocks*4);
+
+  uint32_t k1 = 0;
+
+  switch(len & 3)
+  {
+  case 3: k1 ^= tail[2] << 16;
+  case 2: k1 ^= tail[1] << 8;
+  case 1: k1 ^= tail[0];
+          k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
+  };
+
+  //----------
+  // finalization
+
+  h1 ^= len;
+
+  h1 = fmix32(h1);
+
+  *(uint32_t*)out = h1;
+} 
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x86_128 ( const void * key, const int len,
+                           uint32_t seed, void * out )
+{
+  const uint8_t * data = (const uint8_t*)key;
+  const int nblocks = len / 16;
+
+  uint32_t h1 = seed;
+  uint32_t h2 = seed;
+  uint32_t h3 = seed;
+  uint32_t h4 = seed;
+
+  const uint32_t c1 = 0x239b961b; 
+  const uint32_t c2 = 0xab0e9789;
+  const uint32_t c3 = 0x38b34ae5; 
+  const uint32_t c4 = 0xa1e38b93;
+
+  //----------
+  // body
+
+  const uint32_t * blocks = (const uint32_t *)(data + nblocks*16);
+
+  for(int i = -nblocks; i; i++)
+  {
+    uint32_t k1 = getblock32(blocks,i*4+0);
+    uint32_t k2 = getblock32(blocks,i*4+1);
+    uint32_t k3 = getblock32(blocks,i*4+2);
+    uint32_t k4 = getblock32(blocks,i*4+3);
+
+    k1 *= c1; k1  = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
+
+    h1 = ROTL32(h1,19); h1 += h2; h1 = h1*5+0x561ccd1b;
+
+    k2 *= c2; k2  = ROTL32(k2,16); k2 *= c3; h2 ^= k2;
+
+    h2 = ROTL32(h2,17); h2 += h3; h2 = h2*5+0x0bcaa747;
+
+    k3 *= c3; k3  = ROTL32(k3,17); k3 *= c4; h3 ^= k3;
+
+    h3 = ROTL32(h3,15); h3 += h4; h3 = h3*5+0x96cd1c35;
+
+    k4 *= c4; k4  = ROTL32(k4,18); k4 *= c1; h4 ^= k4;
+
+    h4 = ROTL32(h4,13); h4 += h1; h4 = h4*5+0x32ac3b17;
+  }
+
+  //----------
+  // tail
+
+  const uint8_t * tail = (const uint8_t*)(data + nblocks*16);
+
+  uint32_t k1 = 0;
+  uint32_t k2 = 0;
+  uint32_t k3 = 0;
+  uint32_t k4 = 0;
+
+  switch(len & 15)
+  {
+  case 15: k4 ^= tail[14] << 16;
+  case 14: k4 ^= tail[13] << 8;
+  case 13: k4 ^= tail[12] << 0;
+           k4 *= c4; k4  = ROTL32(k4,18); k4 *= c1; h4 ^= k4;
+
+  case 12: k3 ^= tail[11] << 24;
+  case 11: k3 ^= tail[10] << 16;
+  case 10: k3 ^= tail[ 9] << 8;
+  case  9: k3 ^= tail[ 8] << 0;
+           k3 *= c3; k3  = ROTL32(k3,17); k3 *= c4; h3 ^= k3;
+
+  case  8: k2 ^= tail[ 7] << 24;
+  case  7: k2 ^= tail[ 6] << 16;
+  case  6: k2 ^= tail[ 5] << 8;
+  case  5: k2 ^= tail[ 4] << 0;
+           k2 *= c2; k2  = ROTL32(k2,16); k2 *= c3; h2 ^= k2;
+
+  case  4: k1 ^= tail[ 3] << 24;
+  case  3: k1 ^= tail[ 2] << 16;
+  case  2: k1 ^= tail[ 1] << 8;
+  case  1: k1 ^= tail[ 0] << 0;
+           k1 *= c1; k1  = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
+  };
+
+  //----------
+  // finalization
+
+  h1 ^= len; h2 ^= len; h3 ^= len; h4 ^= len;
+
+  h1 += h2; h1 += h3; h1 += h4;
+  h2 += h1; h3 += h1; h4 += h1;
+
+  h1 = fmix32(h1);
+  h2 = fmix32(h2);
+  h3 = fmix32(h3);
+  h4 = fmix32(h4);
+
+  h1 += h2; h1 += h3; h1 += h4;
+  h2 += h1; h3 += h1; h4 += h1;
+
+  ((uint32_t*)out)[0] = h1;
+  ((uint32_t*)out)[1] = h2;
+  ((uint32_t*)out)[2] = h3;
+  ((uint32_t*)out)[3] = h4;
+}
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x64_128 ( const void * key, const int len,
+                           const uint32_t seed, void * out )
+{
+  const uint8_t * data = (const uint8_t*)key;
+  const int nblocks = len / 16;
+
+  uint64_t h1 = seed;
+  uint64_t h2 = seed;
+
+  const uint64_t c1 = BIG_CONSTANT(0x87c37b91114253d5);
+  const uint64_t c2 = BIG_CONSTANT(0x4cf5ad432745937f);
+
+  //----------
+  // body
+
+  const uint64_t * blocks = (const uint64_t *)(data);
+
+  for(int i = 0; i < nblocks; i++)
+  {
+    uint64_t k1 = getblock64(blocks,i*2+0);
+    uint64_t k2 = getblock64(blocks,i*2+1);
+
+    k1 *= c1; k1  = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
+
+    h1 = ROTL64(h1,27); h1 += h2; h1 = h1*5+0x52dce729;
+
+    k2 *= c2; k2  = ROTL64(k2,33); k2 *= c1; h2 ^= k2;
+
+    h2 = ROTL64(h2,31); h2 += h1; h2 = h2*5+0x38495ab5;
+  }
+
+  //----------
+  // tail
+
+  const uint8_t * tail = (const uint8_t*)(data + nblocks*16);
+
+  uint64_t k1 = 0;
+  uint64_t k2 = 0;
+
+  switch(len & 15)
+  {
+  case 15: k2 ^= ((uint64_t)tail[14]) << 48;
+  case 14: k2 ^= ((uint64_t)tail[13]) << 40;
+  case 13: k2 ^= ((uint64_t)tail[12]) << 32;
+  case 12: k2 ^= ((uint64_t)tail[11]) << 24;
+  case 11: k2 ^= ((uint64_t)tail[10]) << 16;
+  case 10: k2 ^= ((uint64_t)tail[ 9]) << 8;
+  case  9: k2 ^= ((uint64_t)tail[ 8]) << 0;
+           k2 *= c2; k2  = ROTL64(k2,33); k2 *= c1; h2 ^= k2;
+
+  case  8: k1 ^= ((uint64_t)tail[ 7]) << 56;
+  case  7: k1 ^= ((uint64_t)tail[ 6]) << 48;
+  case  6: k1 ^= ((uint64_t)tail[ 5]) << 40;
+  case  5: k1 ^= ((uint64_t)tail[ 4]) << 32;
+  case  4: k1 ^= ((uint64_t)tail[ 3]) << 24;
+  case  3: k1 ^= ((uint64_t)tail[ 2]) << 16;
+  case  2: k1 ^= ((uint64_t)tail[ 1]) << 8;
+  case  1: k1 ^= ((uint64_t)tail[ 0]) << 0;
+           k1 *= c1; k1  = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
+  };
+
+  //----------
+  // finalization
+
+  h1 ^= len; h2 ^= len;
+
+  h1 += h2;
+  h2 += h1;
+
+  h1 = fmix64(h1);
+  h2 = fmix64(h2);
+
+  h1 += h2;
+  h2 += h1;
+
+  ((uint64_t*)out)[0] = h1;
+  ((uint64_t*)out)[1] = h2;
+}
+
+//-----------------------------------------------------------------------------
+

tests/hasher/MurmurHash3.h

@@ -0,0 +1,37 @@
+//-----------------------------------------------------------------------------
+// MurmurHash3 was written by Austin Appleby, and is placed in the public
+// domain. The author hereby disclaims copyright to this source code.
+
+#ifndef _MURMURHASH3_H_
+#define _MURMURHASH3_H_
+
+//-----------------------------------------------------------------------------
+// Platform-specific functions and macros
+
+// Microsoft Visual Studio
+
+#if defined(_MSC_VER) && (_MSC_VER < 1600)
+
+typedef unsigned char uint8_t;
+typedef unsigned int uint32_t;
+typedef unsigned __int64 uint64_t;
+
+// Other compilers
+
+#else	// defined(_MSC_VER)
+
+#include <stdint.h>
+
+#endif // !defined(_MSC_VER)
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x86_32  ( const void * key, int len, uint32_t seed, void * out );
+
+void MurmurHash3_x86_128 ( const void * key, int len, uint32_t seed, void * out );
+
+void MurmurHash3_x64_128 ( const void * key, int len, uint32_t seed, void * out );
+
+//-----------------------------------------------------------------------------
+
+#endif // _MURMURHASH3_H_

tests/hasher/siphash.c

@@ -0,0 +1,185 @@
+/*
+   SipHash reference C implementation
+
+   Copyright (c) 2012-2022 Jean-Philippe Aumasson
+   <jeanphilippe.aumasson@gmail.com>
+   Copyright (c) 2012-2014 Daniel J. Bernstein <djb@cr.yp.to>
+
+   To the extent possible under law, the author(s) have dedicated all copyright
+   and related and neighboring rights to this software to the public domain
+   worldwide. This software is distributed without any warranty.
+
+   You should have received a copy of the CC0 Public Domain Dedication along
+   with
+   this software. If not, see
+   <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+
+#include "siphash.h"
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+
+/* default: SipHash-2-4 */
+#ifndef cROUNDS
+#define cROUNDS 2
+#endif
+#ifndef dROUNDS
+#define dROUNDS 4
+#endif
+
+#define ROTL(x, b) (uint64_t)(((x) << (b)) | ((x) >> (64 - (b))))
+
+#define U32TO8_LE(p, v)                                                        \
+    (p)[0] = (uint8_t)((v));                                                   \
+    (p)[1] = (uint8_t)((v) >> 8);                                              \
+    (p)[2] = (uint8_t)((v) >> 16);                                             \
+    (p)[3] = (uint8_t)((v) >> 24);
+
+#define U64TO8_LE(p, v)                                                        \
+    U32TO8_LE((p), (uint32_t)((v)));                                           \
+    U32TO8_LE((p) + 4, (uint32_t)((v) >> 32));
+
+#define U8TO64_LE(p)                                                           \
+    (((uint64_t)((p)[0])) | ((uint64_t)((p)[1]) << 8) |                        \
+     ((uint64_t)((p)[2]) << 16) | ((uint64_t)((p)[3]) << 24) |                 \
+     ((uint64_t)((p)[4]) << 32) | ((uint64_t)((p)[5]) << 40) |                 \
+     ((uint64_t)((p)[6]) << 48) | ((uint64_t)((p)[7]) << 56))
+
+#define SIPROUND                                                               \
+    do {                                                                       \
+        v0 += v1;                                                              \
+        v1 = ROTL(v1, 13);                                                     \
+        v1 ^= v0;                                                              \
+        v0 = ROTL(v0, 32);                                                     \
+        v2 += v3;                                                              \
+        v3 = ROTL(v3, 16);                                                     \
+        v3 ^= v2;                                                              \
+        v0 += v3;                                                              \
+        v3 = ROTL(v3, 21);                                                     \
+        v3 ^= v0;                                                              \
+        v2 += v1;                                                              \
+        v1 = ROTL(v1, 17);                                                     \
+        v1 ^= v2;                                                              \
+        v2 = ROTL(v2, 32);                                                     \
+    } while (0)
+
+#ifdef DEBUG_SIPHASH
+#include <stdio.h>
+
+#define TRACE                                                                  \
+    do {                                                                       \
+        printf("(%3zu) v0 %016" PRIx64 "\n", inlen, v0);                       \
+        printf("(%3zu) v1 %016" PRIx64 "\n", inlen, v1);                       \
+        printf("(%3zu) v2 %016" PRIx64 "\n", inlen, v2);                       \
+        printf("(%3zu) v3 %016" PRIx64 "\n", inlen, v3);                       \
+    } while (0)
+#else
+#define TRACE
+#endif
+
+/*
+    Computes a SipHash value
+    *in: pointer to input data (read-only)
+    inlen: input data length in bytes (any size_t value)
+    *k: pointer to the key data (read-only), must be 16 bytes 
+    *out: pointer to output data (write-only), outlen bytes must be allocated
+    outlen: length of the output in bytes, must be 8 or 16
+*/
+int siphash(const void *in, const size_t inlen, const void *k, uint8_t *out,
+            const size_t outlen) {
+
+    const unsigned char *ni = (const unsigned char *)in;
+    const unsigned char *kk = (const unsigned char *)k;
+
+    assert((outlen == 8) || (outlen == 16));
+    uint64_t v0 = UINT64_C(0x736f6d6570736575);
+    uint64_t v1 = UINT64_C(0x646f72616e646f6d);
+    uint64_t v2 = UINT64_C(0x6c7967656e657261);
+    uint64_t v3 = UINT64_C(0x7465646279746573);
+    uint64_t k0 = U8TO64_LE(kk);
+    uint64_t k1 = U8TO64_LE(kk + 8);
+    uint64_t m;
+    int i;
+    const unsigned char *end = ni + inlen - (inlen % sizeof(uint64_t));
+    const int left = inlen & 7;
+    uint64_t b = ((uint64_t)inlen) << 56;
+    v3 ^= k1;
+    v2 ^= k0;
+    v1 ^= k1;
+    v0 ^= k0;
+
+    if (outlen == 16)
+        v1 ^= 0xee;
+
+    for (; ni != end; ni += 8) {
+        m = U8TO64_LE(ni);
+        v3 ^= m;
+
+        TRACE;
+        for (i = 0; i < cROUNDS; ++i)
+            SIPROUND;
+
+        v0 ^= m;
+    }
+
+    switch (left) {
+    case 7:
+        b |= ((uint64_t)ni[6]) << 48;
+        /* FALLTHRU */
+    case 6:
+        b |= ((uint64_t)ni[5]) << 40;
+        /* FALLTHRU */
+    case 5:
+        b |= ((uint64_t)ni[4]) << 32;
+        /* FALLTHRU */
+    case 4:
+        b |= ((uint64_t)ni[3]) << 24;
+        /* FALLTHRU */
+    case 3:
+        b |= ((uint64_t)ni[2]) << 16;
+        /* FALLTHRU */
+    case 2:
+        b |= ((uint64_t)ni[1]) << 8;
+        /* FALLTHRU */
+    case 1:
+        b |= ((uint64_t)ni[0]);
+        break;
+    case 0:
+        break;
+    }
+
+    v3 ^= b;
+
+    TRACE;
+    for (i = 0; i < cROUNDS; ++i)
+        SIPROUND;
+
+    v0 ^= b;
+
+    if (outlen == 16)
+        v2 ^= 0xee;
+    else
+        v2 ^= 0xff;
+
+    TRACE;
+    for (i = 0; i < dROUNDS; ++i)
+        SIPROUND;
+
+    b = v0 ^ v1 ^ v2 ^ v3;
+    U64TO8_LE(out, b);
+
+    if (outlen == 8)
+        return 0;
+
+    v1 ^= 0xdd;
+
+    TRACE;
+    for (i = 0; i < dROUNDS; ++i)
+        SIPROUND;
+
+    b = v0 ^ v1 ^ v2 ^ v3;
+    U64TO8_LE(out + 8, b);
+
+    return 0;
+}

tests/hasher/siphash.cc

@@ -0,0 +1,185 @@
+/*
+   SipHash reference C implementation
+
+   Copyright (c) 2012-2022 Jean-Philippe Aumasson
+   <jeanphilippe.aumasson@gmail.com>
+   Copyright (c) 2012-2014 Daniel J. Bernstein <djb@cr.yp.to>
+
+   To the extent possible under law, the author(s) have dedicated all copyright
+   and related and neighboring rights to this software to the public domain
+   worldwide. This software is distributed without any warranty.
+
+   You should have received a copy of the CC0 Public Domain Dedication along
+   with
+   this software. If not, see
+   <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+
+#include "siphash.h"
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+
+/* default: SipHash-2-4 */
+#ifndef cROUNDS
+#define cROUNDS 2
+#endif
+#ifndef dROUNDS
+#define dROUNDS 4
+#endif
+
+#define ROTL(x, b) (uint64_t)(((x) << (b)) | ((x) >> (64 - (b))))
+
+#define U32TO8_LE(p, v)                                                        \
+    (p)[0] = (uint8_t)((v));                                                   \
+    (p)[1] = (uint8_t)((v) >> 8);                                              \
+    (p)[2] = (uint8_t)((v) >> 16);                                             \
+    (p)[3] = (uint8_t)((v) >> 24);
+
+#define U64TO8_LE(p, v)                                                        \
+    U32TO8_LE((p), (uint32_t)((v)));                                           \
+    U32TO8_LE((p) + 4, (uint32_t)((v) >> 32));
+
+#define U8TO64_LE(p)                                                           \
+    (((uint64_t)((p)[0])) | ((uint64_t)((p)[1]) << 8) |                        \
+     ((uint64_t)((p)[2]) << 16) | ((uint64_t)((p)[3]) << 24) |                 \
+     ((uint64_t)((p)[4]) << 32) | ((uint64_t)((p)[5]) << 40) |                 \
+     ((uint64_t)((p)[6]) << 48) | ((uint64_t)((p)[7]) << 56))
+
+#define SIPROUND                                                               \
+    do {                                                                       \
+        v0 += v1;                                                              \
+        v1 = ROTL(v1, 13);                                                     \
+        v1 ^= v0;                                                              \
+        v0 = ROTL(v0, 32);                                                     \
+        v2 += v3;                                                              \
+        v3 = ROTL(v3, 16);                                                     \
+        v3 ^= v2;                                                              \
+        v0 += v3;                                                              \
+        v3 = ROTL(v3, 21);                                                     \
+        v3 ^= v0;                                                              \
+        v2 += v1;                                                              \
+        v1 = ROTL(v1, 17);                                                     \
+        v1 ^= v2;                                                              \
+        v2 = ROTL(v2, 32);                                                     \
+    } while (0)
+
+#ifdef DEBUG_SIPHASH
+#include <stdio.h>
+
+#define TRACE                                                                  \
+    do {                                                                       \
+        printf("(%3zu) v0 %016" PRIx64 "\n", inlen, v0);                       \
+        printf("(%3zu) v1 %016" PRIx64 "\n", inlen, v1);                       \
+        printf("(%3zu) v2 %016" PRIx64 "\n", inlen, v2);                       \
+        printf("(%3zu) v3 %016" PRIx64 "\n", inlen, v3);                       \
+    } while (0)
+#else
+#define TRACE
+#endif
+
+/*
+    Computes a SipHash value
+    *in: pointer to input data (read-only)
+    inlen: input data length in bytes (any size_t value)
+    *k: pointer to the key data (read-only), must be 16 bytes 
+    *out: pointer to output data (write-only), outlen bytes must be allocated
+    outlen: length of the output in bytes, must be 8 or 16
+*/
+int siphash(const void *in, const size_t inlen, const void *k, uint8_t *out,
+            const size_t outlen) {
+
+    const unsigned char *ni = (const unsigned char *)in;
+    const unsigned char *kk = (const unsigned char *)k;
+
+    assert((outlen == 8) || (outlen == 16));
+    uint64_t v0 = UINT64_C(0x736f6d6570736575);
+    uint64_t v1 = UINT64_C(0x646f72616e646f6d);
+    uint64_t v2 = UINT64_C(0x6c7967656e657261);
+    uint64_t v3 = UINT64_C(0x7465646279746573);
+    uint64_t k0 = U8TO64_LE(kk);
+    uint64_t k1 = U8TO64_LE(kk + 8);
+    uint64_t m;
+    int i;
+    const unsigned char *end = ni + inlen - (inlen % sizeof(uint64_t));
+    const int left = inlen & 7;
+    uint64_t b = ((uint64_t)inlen) << 56;
+    v3 ^= k1;
+    v2 ^= k0;
+    v1 ^= k1;
+    v0 ^= k0;
+
+    if (outlen == 16)
+        v1 ^= 0xee;
+
+    for (; ni != end; ni += 8) {
+        m = U8TO64_LE(ni);
+        v3 ^= m;
+
+        TRACE;
+        for (i = 0; i < cROUNDS; ++i)
+            SIPROUND;
+
+        v0 ^= m;
+    }
+
+    switch (left) {
+    case 7:
+        b |= ((uint64_t)ni[6]) << 48;
+        /* FALLTHRU */
+    case 6:
+        b |= ((uint64_t)ni[5]) << 40;
+        /* FALLTHRU */
+    case 5:
+        b |= ((uint64_t)ni[4]) << 32;
+        /* FALLTHRU */
+    case 4:
+        b |= ((uint64_t)ni[3]) << 24;
+        /* FALLTHRU */
+    case 3:
+        b |= ((uint64_t)ni[2]) << 16;
+        /* FALLTHRU */
+    case 2:
+        b |= ((uint64_t)ni[1]) << 8;
+        /* FALLTHRU */
+    case 1:
+        b |= ((uint64_t)ni[0]);
+        break;
+    case 0:
+        break;
+    }
+
+    v3 ^= b;
+
+    TRACE;
+    for (i = 0; i < cROUNDS; ++i)
+        SIPROUND;
+
+    v0 ^= b;
+
+    if (outlen == 16)
+        v2 ^= 0xee;
+    else
+        v2 ^= 0xff;
+
+    TRACE;
+    for (i = 0; i < dROUNDS; ++i)
+        SIPROUND;
+
+    b = v0 ^ v1 ^ v2 ^ v3;
+    U64TO8_LE(out, b);
+
+    if (outlen == 8)
+        return 0;
+
+    v1 ^= 0xdd;
+
+    TRACE;
+    for (i = 0; i < dROUNDS; ++i)
+        SIPROUND;
+
+    b = v0 ^ v1 ^ v2 ^ v3;
+    U64TO8_LE(out + 8, b);
+
+    return 0;
+}

tests/hasher/siphash.h

@@ -0,0 +1,22 @@
+/*
+   SipHash reference C implementation
+
+   Copyright (c) 2012-2021 Jean-Philippe Aumasson
+   <jeanphilippe.aumasson@gmail.com>
+   Copyright (c) 2012-2014 Daniel J. Bernstein <djb@cr.yp.to>
+
+   To the extent possible under law, the author(s) have dedicated all copyright
+   and related and neighboring rights to this software to the public domain
+   worldwide. This software is distributed without any warranty.
+
+   You should have received a copy of the CC0 Public Domain Dedication along
+   with
+   this software. If not, see
+   <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+
+#include <inttypes.h>
+#include <string.h>
+
+int siphash(const void *in, const size_t inlen, const void *k, uint8_t *out,
+            const size_t outlen);

tests/hasher/test_hasher.c

@@ -0,0 +1,82 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "test_hasher.h"
+#include "MurmurHash3.h"
+#include "siphash.h"
+#include "wapp.h"
+
+WpTestFuncResult test_murmur3(void) {
+	b8 result = true;
+
+	WpStr8 str     = wpStr8Lit("Hello world");
+	WpI32Array arr = wpArray(i32, 1, 2, 3, 4, 5);
+	u64 num        = 287324;
+
+	WpHasher hasher = wpX64Mur3HasherWithSeed(873923);
+
+	WpU8Stream str_bytes = wpStream(u8, str.buf, str.size);
+	WpU8Stream arr_bytes = wpStream(u8, (u8 *)arr, wpArrayCount(arr) * wpArrayItemSize(arr));
+	WpU8Stream num_bytes = wpStream(u8, (u8 *)&num, sizeof(u64));
+
+	u64 hash[2] = {0};
+
+	// Sring hash
+	WpU128 mur_hash = hasher.func(&str_bytes, hasher.ctx);
+	MurmurHash3_x64_128(str_bytes.data, str_bytes.count * str_bytes.item_size, hasher.ctx.murmur3, (void *)hash);
+
+	result = result && mur_hash.value[0] == hash[0] && mur_hash.value[1] == hash[1];
+
+	// Array hash
+	mur_hash = hasher.func(&arr_bytes, hasher.ctx);
+	MurmurHash3_x64_128(arr_bytes.data, arr_bytes.count * arr_bytes.item_size, hasher.ctx.murmur3, (void *)hash);
+
+	result = result && mur_hash.value[0] == hash[0] && mur_hash.value[1] == hash[1];
+
+	// Number hash
+	mur_hash = hasher.func(&num_bytes, hasher.ctx);
+	MurmurHash3_x64_128(num_bytes.data, num_bytes.count * num_bytes.item_size, hasher.ctx.murmur3, (void *)hash);
+
+	result = result && mur_hash.value[0] == hash[0] && mur_hash.value[1] == hash[1];
+
+	return wpTesterResult(result);
+}
+
+WpTestFuncResult test_siphash_128(void) {
+	b8 result = true;
+
+	WpStr8 str     = wpStr8Lit("Hello world");
+	WpI32Array arr = wpArray(i32, 1, 2, 3, 4, 5);
+	u64 num        = 287324;
+
+	WpU128 key      = { .value = { 238742, 671734 } };
+	WpHasher hasher = wpSip24HasherWithKey(key);
+
+	WpU8Stream str_bytes = wpStream(u8, str.buf, str.size);
+	WpU8Stream arr_bytes = wpStream(u8, (u8 *)arr, wpArrayCount(arr) * wpArrayItemSize(arr));
+	WpU8Stream num_bytes = wpStream(u8, (u8 *)&num, sizeof(u64));
+
+	u64 hash[2] = {0};
+
+	// Sring hash
+	WpU128 sip_hash = hasher.func(&str_bytes, hasher.ctx);
+	siphash(str_bytes.data, str_bytes.count * str_bytes.item_size, (void *)&hasher.ctx.siphash.key,
+	        (u8 *)hash, sizeof(u64) * 2);
+
+	result = result && sip_hash.value[0] == hash[0] && sip_hash.value[1] == hash[1];
+
+	// Array hash
+	sip_hash = hasher.func(&arr_bytes, hasher.ctx);
+	siphash(arr_bytes.data, arr_bytes.count * arr_bytes.item_size, (void *)&hasher.ctx.siphash.key,
+	        (u8 *)hash, sizeof(u64) * 2);
+
+	result = result && sip_hash.value[0] == hash[0] && sip_hash.value[1] == hash[1];
+
+	// Number hash
+	sip_hash = hasher.func(&num_bytes, hasher.ctx);
+	siphash(num_bytes.data, num_bytes.count * num_bytes.item_size, (void *)&hasher.ctx.siphash.key,
+	        (u8 *)hash, sizeof(u64) * 2);
+
+	result = result && sip_hash.value[0] == hash[0] && sip_hash.value[1] == hash[1];
+
+	return wpTesterResult(result);
+}

tests/hasher/test_hasher.cc

@@ -0,0 +1,82 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "test_hasher.h"
+#include "MurmurHash3.h"
+#include "siphash.h"
+#include "wapp.h"
+
+WpTestFuncResult test_murmur3(void) {
+	b8 result = true;
+
+	WpStr8 str     = wpStr8Lit("Hello world");
+	WpI32Array arr = wpArray(i32, 1, 2, 3, 4, 5);
+	u64 num        = 287324;
+
+	WpHasher hasher = wpX64Mur3HasherWithSeed(873923);
+
+	WpU8Stream str_bytes = wpStream(u8, str.buf, str.size);
+	WpU8Stream arr_bytes = wpStream(u8, (u8 *)arr, wpArrayCount(arr) * wpArrayItemSize(arr));
+	WpU8Stream num_bytes = wpStream(u8, (u8 *)&num, sizeof(u64));
+
+	u64 hash[2] = {0};
+
+	// Sring hash
+	WpU128 mur_hash = hasher.func(&str_bytes, hasher.ctx);
+	MurmurHash3_x64_128(str_bytes.data, str_bytes.count * str_bytes.item_size, hasher.ctx.murmur3, (void *)hash);
+
+	result = result && mur_hash.value[0] == hash[0] && mur_hash.value[1] == hash[1];
+
+	// Array hash
+	mur_hash = hasher.func(&arr_bytes, hasher.ctx);
+	MurmurHash3_x64_128(arr_bytes.data, arr_bytes.count * arr_bytes.item_size, hasher.ctx.murmur3, (void *)hash);
+
+	result = result && mur_hash.value[0] == hash[0] && mur_hash.value[1] == hash[1];
+
+	// Number hash
+	mur_hash = hasher.func(&num_bytes, hasher.ctx);
+	MurmurHash3_x64_128(num_bytes.data, num_bytes.count * num_bytes.item_size, hasher.ctx.murmur3, (void *)hash);
+
+	result = result && mur_hash.value[0] == hash[0] && mur_hash.value[1] == hash[1];
+
+	return wpTesterResult(result);
+}
+
+WpTestFuncResult test_siphash_128(void) {
+	b8 result = true;
+
+	WpStr8 str     = wpStr8Lit("Hello world");
+	WpI32Array arr = wpArray(i32, 1, 2, 3, 4, 5);
+	u64 num        = 287324;
+
+	WpU128 key      = { { 238742, 671734 } };
+	WpHasher hasher = wpSip24HasherWithKey(key);
+
+	WpU8Stream str_bytes = wpStream(u8, str.buf, str.size);
+	WpU8Stream arr_bytes = wpStream(u8, (u8 *)arr, wpArrayCount(arr) * wpArrayItemSize(arr));
+	WpU8Stream num_bytes = wpStream(u8, (u8 *)&num, sizeof(u64));
+
+	u64 hash[2] = {0};
+
+	// Sring hash
+	WpU128 sip_hash = hasher.func(&str_bytes, hasher.ctx);
+	siphash(str_bytes.data, str_bytes.count * str_bytes.item_size, (void *)&hasher.ctx.siphash.key,
+	        (u8 *)hash, sizeof(u64) * 2);
+
+	result = result && sip_hash.value[0] == hash[0] && sip_hash.value[1] == hash[1];
+
+	// Array hash
+	sip_hash = hasher.func(&arr_bytes, hasher.ctx);
+	siphash(arr_bytes.data, arr_bytes.count * arr_bytes.item_size, (void *)&hasher.ctx.siphash.key,
+	        (u8 *)hash, sizeof(u64) * 2);
+
+	result = result && sip_hash.value[0] == hash[0] && sip_hash.value[1] == hash[1];
+
+	// Number hash
+	sip_hash = hasher.func(&num_bytes, hasher.ctx);
+	siphash(num_bytes.data, num_bytes.count * num_bytes.item_size, (void *)&hasher.ctx.siphash.key,
+	        (u8 *)hash, sizeof(u64) * 2);
+
+	result = result && sip_hash.value[0] == hash[0] && sip_hash.value[1] == hash[1];
+
+	return wpTesterResult(result);
+}

tests/hasher/test_hasher.h

@@ -0,0 +1,14 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef TEST_HASHER_H
+#define TEST_HASHER_H
+
+#include "wapp.h"
+
+// Test Murmur3 hash implementation against the reference implementation
+WpTestFuncResult test_murmur3(void);
+
+// Test Sip hash implementation against the reference implementation
+WpTestFuncResult test_siphash_128(void);
+
+#endif // !TEST_HASHER_H