[nostalgia/studio] Set version to 2024.05.0

Remove UTF-8 parsing. It is a rare enough need that it should have a specialized call when needed.
Better to have a more optimal length fetch for typical case.

.clang-tidy

@@ -0,0 +1,66 @@
+# Generated from CLion Inspection settings
+---
+Checks: '-*,
+cppcoreguidelines-interfaces-global-init,
+cppcoreguidelines-narrowing-conversions,
+cppcoreguidelines-pro-type-member-init,
+-cppcoreguidelines-pro-type-static-cast-downcast,
+cppcoreguidelines-slicing,
+google-default-arguments,
+google-runtime-operator,
+hicpp-exception-baseclass,
+hicpp-multiway-paths-covered,
+mpi-buffer-deref,
+mpi-type-mismatch,
+openmp-use-default-none,
+performance-faster-string-find,
+performance-for-range-copy,
+performance-implicit-conversion-in-loop,
+performance-inefficient-algorithm,
+performance-inefficient-string-concatenation,
+performance-inefficient-vector-operation,
+performance-move-const-arg,
+performance-move-constructor-init,
+performance-no-automatic-move,
+performance-noexcept-move-constructor,
+performance-trivially-destructible,
+performance-type-promotion-in-math-fn,
+performance-unnecessary-copy-initialization,
+performance-unnecessary-value-param,
+readability-avoid-const-params-in-decls,
+readability-const-return-type,
+readability-container-size-empty,
+readability-convert-member-functions-to-static,
+readability-delete-null-pointer,
+readability-deleted-default,
+readability-inconsistent-declaration-parameter-name,
+readability-make-member-function-const,
+readability-misleading-indentation,
+readability-misplaced-array-index,
+readability-non-const-parameter,
+readability-redundant-control-flow,
+readability-redundant-declaration,
+readability-redundant-function-ptr-dereference,
+readability-redundant-smartptr-get,
+readability-redundant-string-cstr,
+readability-redundant-string-init,
+readability-simplify-subscript-expr,
+readability-static-accessed-through-instance,
+readability-static-definition-in-anonymous-namespace,
+readability-string-compare,
+readability-uniqueptr-delete-release,
+readability-use-anyofallof,
+cert-*,
+misc-*,
+-misc-include-cleaner
+-misc-use-anonymous-namespace,
+readability-duplicate-include,
+-misc-non-private-member-variables-in-classes,
+-misc-no-recursion,
+-misc-include-cleaner,
+bugprone-*,
+clang-analyzer-*,
+modernize-*,
+portability-*,
+-modernize-use-trailing-return-type,
+-bugprone-easily-swappable-parameters'

.gitea/workflows/build.yaml

@@ -0,0 +1,19 @@
+name: Build
+run-name: ${{ gitea.actor }} build and test
+on: [push]
+
+jobs:
+  build:
+    runs-on: nostalgia
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - run: make purge configure-debug
+      - run: make build
+      - run: make test
+      - run: make purge configure-asan
+      - run: make build
+      - run: make test
+      - run: make purge configure-release
+      - run: make build
+      - run: make test

.gitignore

@@ -2,9 +2,12 @@
 .clangd
 .current_build
 .conanbuild
+.idea
 .mypy_cache
 .stfolder
+.stignore
 scripts/__pycache__
+pyenv
 CMakeLists.txt.user
 ROM.oxfs
 Session.vim
@@ -13,8 +16,7 @@ compile_commands.json
 dist
 graph_info.json
 imgui.ini
-nostalgia.gba
+*.gba
-nostalgia.sav
+*.sav
-nostalgia_media.oxfs
 studio_state.json
 tags

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/

.idea/codeStyles/Project.xml

@@ -1,22 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <Objective-C>
-      <option name="INDENT_NAMESPACE_MEMBERS" value="0" />
-      <option name="INDENT_CLASS_MEMBERS" value="8" />
-      <option name="INDENT_VISIBILITY_KEYWORDS" value="4" />
-    </Objective-C>
-    <Objective-C-extensions>
-      <extensions>
-        <pair source="cpp" header="hpp" fileNamingConvention="LOWERCASE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-        <pair source="cu" header="cuh" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
-    <codeStyleSettings language="ObjectiveC">
-      <indentOptions>
-        <option name="USE_TAB_CHARACTER" value="true" />
-        <option name="SMART_TABS" value="true" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="DrinkingTea" />
-  </state>
-</component>

.idea/fileTemplates/internal/C++ Class Header.h

@@ -1,17 +0,0 @@
-/*
- * Copyright 2016 - 2021 gary@drinkingtea.net
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
- 
-#[[#pragma]]# once
-
-${NAMESPACES_OPEN}
-
-class ${NAME} {
-
-};
-
-${NAMESPACES_CLOSE}

.idea/fileTemplates/internal/C++ Class.cc

@@ -1,13 +0,0 @@
-/*
- * Copyright 2016 - 2021 gary@drinkingtea.net
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
- 
-#[[#include]]# "${HEADER_FILENAME}"
-
-${NAMESPACES_OPEN}
-
-${NAMESPACES_CLOSE}

.idea/inspectionProfiles/Project_Default.xml

@@ -1,24 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="ClangTidy" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="clangTidyChecks" value="-*,cppcoreguidelines-interfaces-global-init,cppcoreguidelines-narrowing-conversions,cppcoreguidelines-pro-type-member-init,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-default-arguments,google-explicit-constructor,google-runtime-operator,hicpp-exception-baseclass,hicpp-multiway-paths-covered,mpi-buffer-deref,mpi-type-mismatch,openmp-use-default-none,performance-faster-string-find,performance-for-range-copy,performance-implicit-conversion-in-loop,performance-inefficient-algorithm,performance-inefficient-string-concatenation,performance-inefficient-vector-operation,performance-move-const-arg,performance-move-constructor-init,performance-no-automatic-move,performance-noexcept-move-constructor,performance-trivially-destructible,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-avoid-const-params-in-decls,readability-const-return-type,readability-container-size-empty,readability-convert-member-functions-to-static,readability-delete-null-pointer,readability-deleted-default,readability-inconsistent-declaration-parameter-name,readability-make-member-function-const,readability-misleading-indentation,readability-misplaced-array-index,readability-non-const-parameter,readability-redundant-control-flow,readability-redundant-declaration,readability-redundant-function-ptr-dereference,readability-redundant-smartptr-get,readability-redundant-string-cstr,readability-redundant-string-init,readability-simplify-subscript-expr,readability-static-accessed-through-instance,readability-static-definition-in-anonymous-namespace,readability-string-compare,readability-uniqueptr-delete-release,readability-use-anyofallof,cert-*,misc-*,readability-duplicate-include,-misc-non-private-member-variables-in-classes,-misc-no-recursion,bugprone-*,clang-analyzer-*,modernize-*,portability-*,-modernize-use-trailing-return-type,-bugprone-easily-swappable-parameters" />
-    </inspection_tool>
-    <inspection_tool class="Clazy" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="ConstantConditionsOC" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="ConstantFunctionResult" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="ConstantParameter" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="DanglingPointers" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="EndlessLoop" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="InfiniteRecursion" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="LocalValueEscapesScope" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="LoopDoesntUseConditionVariable" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="NullDereference" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="NullDereferences" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="UnreachableCallsOfFunction" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="UnreachableCode" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="UnusedLocalVariable" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="UnusedParameter" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="UnusedValue" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>

.idea/misc.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompDBSettings">
-    <option name="linkedExternalProjectsSettings">
-      <CompDBProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-      </CompDBProjectSettings>
-    </option>
-  </component>
-  <component name="CompDBWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-</project>

.idea/nostalgia.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="Python" name="Python facet">
-      <configuration sdkName="Python 3.8" />
-    </facet>
-  </component>
-</module>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

.liccor.yml

@@ -2,4 +2,4 @@
 source:
 - src
 copyright_notice: |-
-  Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved.
+  Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.

.lldbinit

@@ -0,0 +1 @@
+type summary add --summary-string "${var.m_buff.m_items}" ox::String

.tracy.json

@@ -1,16 +0,0 @@
-{
-	"init_functions": [
-		{
-			"bin_path": "dist/linux-x86_64-debug/lib/ox/libOxTraceHook.so",
-			"function": "oxTraceInitHook",
-			"ignore_frames": 3
-		}
-	],
-	"log_functions": [
-		{
-			"bin_path": "dist/linux-x86_64-debug/lib/ox/libOxTraceHook.so",
-			"function": "oxTraceHook",
-			"ignore_frames": 3
-		}
-	]
-}

CMakeLists.txt

@@ -11,54 +11,49 @@ endif()
 
 include(deps/buildcore/base.cmake)
 
-set(NOSTALGIA_BUILD_PLAYER ON CACHE BOOL "Build Player")
-set(NOSTALGIA_BUILD_STUDIO ON CACHE BOOL "Build Studio")
 set(OX_ENABLE_TRACEHOOK OFF CACHE BOOL "Generate OxTraceHook shared library for uprobes")
 
 if(BUILDCORE_TARGET STREQUAL "gba")
-	set(NOSTALGIA_BUILD_STUDIO OFF)
-	set(NOSTALGIA_BUILD_TYPE "GBA")
 	include(deps/gbabuildcore/base.cmake)
 else()
-	set(NOSTALGIA_BUILD_TYPE "Native")
 	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 if(APPLE)
 	set(CMAKE_MACOSX_RPATH OFF)
-	set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Library/nostalgia")
-	set(NOSTALGIA_DIST_BIN              nostalgia-studio.app/Contents/MacOS)
-	set(NOSTALGIA_DIST_LIB              nostalgia-studio.app/Contents/Library)
-	set(NOSTALGIA_DIST_MODULE           nostalgia-studio.app/Contents/Plugins)
-	set(NOSTALGIA_DIST_RESOURCES        nostalgia-studio.app/Contents/Resources)
-	set(NOSTALGIA_DIST_MAC_APP_CONTENTS nostalgia-studio.app/Contents)
 else()
-	set(CMAKE_INSTALL_RPATH "$ORIGIN" "$ORIGIN/../lib/ox" "$ORIGIN/../lib/nostalgia" "$ORIGIN/../")
+	if(UNIX)
+		set(BUILD_SHARED_LIBS ON)
+	endif()
+	set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
 	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-	set(NOSTALGIA_DIST_BIN       bin)
-	set(NOSTALGIA_DIST_LIB       lib)
-	set(NOSTALGIA_DIST_MODULE    lib/nostalgia/modules)
-	set(NOSTALGIA_DIST_RESOURCES share)
 endif()
 
 add_subdirectory(deps/ox)
 include_directories(
 	deps/ox/src
 )
+add_subdirectory(deps/teagba)
 
-if(BUILDCORE_TARGET STREQUAL "gba")
+if(NOT BUILDCORE_TARGET STREQUAL "gba")
-	add_subdirectory(deps/gbastartup)
-else()
 	include_directories(
 		SYSTEM
-			deps/glfw/deps
 			deps/glfw/include
 			deps/imgui
 			deps/imgui/backends
 			deps/nfde/src/include
+			/usr/local/include
 	)
 	add_subdirectory(deps/glad)
+	set(GLFW_BUILD_EXAMPLES OFF)
+	set(GLFW_BUILD_TESTS OFF)
+	set(GLFW_BUILD_DOCS OFF)
 	add_subdirectory(deps/glfw)
+	add_subdirectory(deps/glutils)
 	add_subdirectory(deps/imgui)
 	add_subdirectory(deps/lodepng)
 	add_subdirectory(deps/nfde)

Dockerfile

@@ -31,7 +31,6 @@ RUN dnf install -y clang \
                    python3-pip \
                    libglvnd-devel \
                    gtk3-devel
-RUN pip install conan
 
 ###############################################################################
 # Install devkitARM

Makefile

@@ -1,40 +1,40 @@
-PROJECT_NAME=nostalgia
+BC_VAR_PROJECT_NAME=nostalgia
+BC_VAR_PROJECT_NAME_CAP=Nostalgia
 BUILDCORE_PATH=deps/buildcore
-VCPKG_PKGS=sdl2 jsoncpp
 include ${BUILDCORE_PATH}/base.mk
 
-ifeq ($(OS),darwin)
+ifeq ($(BC_VAR_OS),darwin)
-	NOSTALGIA_STUDIO=./dist/${CURRENT_BUILD}/nostalgia-studio.app/Contents/MacOS/nostalgia-studio
+	NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio.app/Contents/MacOS/${BC_VAR_PROJECT_NAME_CAP}Studio
 	MGBA=/Applications/mGBA.app/Contents/MacOS/mGBA
 else
-	NOSTALGIA_STUDIO=./dist/${CURRENT_BUILD}/bin/nostalgia-studio
+	NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio
 	MGBA=mgba-qt
 endif
 
 .PHONY: pkg-gba
-pkg-gba: install
+pkg-gba: build
-	${ENV_RUN} ./scripts/pkg-gba sample_project
+	${BC_CMD_ENVRUN} ${BC_PY3} ./scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
 
 .PHONY: run
-run: install
+run: build
-	./dist/${CURRENT_BUILD}/bin/nostalgia sample_project
+	./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
 .PHONY: run-studio
-run-studio: install
+run-studio: build
 	${NOSTALGIA_STUDIO}
 .PHONY: gba-run
 gba-run: pkg-gba
-	${MGBA} nostalgia.gba
+	${MGBA} ${BC_VAR_PROJECT_NAME}.gba
 .PHONY: debug
-debug: install
+debug: build
-	${DEBUGGER} ./dist/${CURRENT_BUILD}/bin/nostalgia sample_project
+	${BC_CMD_HOST_DEBUGGER} ./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
 .PHONY: debug-studio
-debug-studio: install
+debug-studio: build
-	${DEBUGGER} ${NOSTALGIA_STUDIO}
+	${BC_CMD_HOST_DEBUGGER} ${NOSTALGIA_STUDIO}
 
 .PHONY: configure-gba
 configure-gba:
-	${ENV_RUN} ${SETUP_BUILD} --toolchain=deps/gbabuildcore/cmake/modules/GBA.cmake --target=gba --current_build=0 --build_type=release --build_root=${BUILD_PATH}
+	${BC_CMD_SETUP_BUILD} --toolchain=deps/gbabuildcore/cmake/modules/GBA.cmake --target=gba --current_build=0 --build_type=release --build_root=${BC_VAR_BUILD_PATH}
 
 .PHONY: configure-gba-debug
 configure-gba-debug:
-	${ENV_RUN} ${SETUP_BUILD} --toolchain=deps/gbabuildcore/cmake/modules/GBA.cmake --target=gba --current_build=0 --build_type=debug --build_root=${BUILD_PATH}
+	${BC_CMD_SETUP_BUILD} --toolchain=deps/gbabuildcore/cmake/modules/GBA.cmake --target=gba --current_build=0 --build_type=debug --build_root=${BC_VAR_BUILD_PATH}

README.md

@@ -8,6 +8,15 @@
 * Install Ninja, Make, and CMake
 * Consider also installing ccache for faster subsequent build times
 
+### Debian
+
+For Debian (and probably other Linux distros, but the package names will
+probably differ), install the following additional packages:
+* pkg-config
+* xorg-dev
+* libgtk-3-dev
+* python3-mypy
+
 ## Build
 
 Build options: release, debug, asan, gba, gba-debug

deps/buildcore/base.cmake

@@ -44,12 +44,13 @@ else()
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=2")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wmissing-field-initializers")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor")
-	#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnull-dereference")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-null-dereference")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-compare")
-	#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-conversion")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-conversion")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wconversion")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-variable")
 	# release build options

deps/buildcore/base.mk

@@ -1,5 +1,5 @@
 #
-#  Copyright 2016 - 2021 gary@drinkingtea.net
+#  Copyright 2016 - 2023 gary@drinkingtea.net
 #
 #  This Source Code Form is subject to the terms of the Mozilla Public
 #  License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,89 +9,99 @@
 ifeq (${OS},Windows_NT)
 	SHELL := powershell.exe
 	.SHELLFLAGS := -NoProfile -Command
-	OS=windows
+	BC_VAR_OS=windows
-	HOST_ENV=${OS}
 else
-	OS=$(shell uname | tr [:upper:] [:lower:])
+	BC_VAR_OS=$(shell uname | tr [:upper:] [:lower:])
-	HOST_ENV=${OS}-$(shell uname -m)
 endif
 
-DEVENV=devenv$(shell pwd | sed 's/\//-/g')
+ifneq ($(shell which python3 2> /dev/null),)
-DEVENV_IMAGE=${PROJECT_NAME}-devenv
+	BC_CMD_HOST_PY3=python3
+else
+	ifeq ($(shell python -c 'import sys; print(sys.version_info[0])'),3)
+		BC_CMD_HOST_PY3=python
+	else
+		echo 'Please install Python3 on host'
+		exit 1
+	endif
+endif
+
+ifdef BC_VAR_USE_DOCKER_DEVENV
 	ifneq ($(shell which docker 2> /dev/null),)
-	ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)
+		BC_VAR_DEVENV=devenv$(shell pwd | sed 's/\//-/g')
-		ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV}
+		BC_VAR_DEVENV_IMAGE=${BC_VAR_PROJECT_NAME}-devenv
+		ifeq ($(shell docker inspect --format="{{.State.Status}}" ${BC_VAR_DEVENV} 2>&1),running)
+			BC_CMD_ENVRUN=docker exec -i -t --user $(shell id -u ${USER}) ${BC_VAR_DEVENV}
 		endif
 	endif
+	ifneq ($(shell ${BC_CMD_ENVRUN} which python3 2> /dev/null),)
+		BC_CMD_PY3=${BC_CMD_ENVRUN} python3
+	else
+		ifeq ($(shell ${BC_CMD_ENVRUN} python -c 'import sys; print(sys.version_info[0])'),3)
+			BC_CMD_PY3=${BC_CMD_ENVRUN} python
+		else
+			echo 'Please install Python3 in devenv'
+			exit 1
+		endif
+	endif
+else
+	BC_CMD_PY3=${BC_CMD_HOST_PY3}
+endif
 
-ifneq ($(shell ${ENV_RUN} which python3 2> /dev/null),)
+BC_VAR_SCRIPTS=${BUILDCORE_PATH}/scripts
-	PYTHON3=python3
+BC_CMD_SETUP_BUILD=${BC_CMD_PY3} ${BC_VAR_SCRIPTS}/setup-build.py
-else
+BC_CMD_PYBB=${BC_CMD_PY3} ${BC_VAR_SCRIPTS}/pybb.py
-	ifeq ($(shell ${ENV_RUN} python -c 'import sys; print(sys.version_info[0])'),3)
+BC_CMD_HOST_PYBB=${BC_CMD_HOST_PY3} ${BC_VAR_SCRIPTS}/pybb.py
-		PYTHON3=python
+BC_CMD_CMAKE_BUILD=${BC_CMD_PYBB} cmake-build
-	endif
+BC_CMD_GETENV=${BC_CMD_PYBB} getenv
-endif
+BC_CMD_CTEST=${BC_CMD_PYBB} ctest-all
+BC_CMD_RM_RF=${BC_CMD_PYBB} rm
+BC_CMD_MKDIR_P=${BC_CMD_PYBB} mkdir
+BC_CMD_CAT=${BC_CMD_PYBB} cat
+BC_CMD_DEBUGGER=${BC_CMD_PYBB} debug
+BC_CMD_HOST_DEBUGGER=${BC_CMD_HOST_PYBB} debug
+BC_VAR_HOSTENV=$(shell ${BC_CMD_ENVRUN} ${BC_CMD_PYBB} hostenv)
+BC_VAR_BUILD_PATH=build
+BC_VAR_CURRENT_BUILD=$(BC_VAR_HOSTENV)-$(shell ${BC_CMD_ENVRUN} ${BC_CMD_CAT} .current_build)
 
-SCRIPTS=${BUILDCORE_PATH}/scripts
+ifdef BC_VAR_USE_VCPKG
-SETUP_BUILD=${PYTHON3} ${SCRIPTS}/setup-build.py
+ifndef BC_VAR_VCPKG_DIR_BASE
-PYBB=${PYTHON3} ${SCRIPTS}/pybb.py
+	BC_VAR_VCPKG_DIR_BASE=.vcpkg
-CMAKE_BUILD=${PYBB} cmake-build
-GET_ENV=${PYBB} getenv
-CTEST=${PYBB} ctest-all
-RM_RF=${PYBB} rm
-HOST=$(shell ${PYBB} hostname)
-BUILDCORE_HOST_SPECIFIC_BUILDPATH=$(shell ${GET_ENV} BUILDCORE_HOST_SPECIFIC_BUILDPATH)
-ifneq (${BUILDCORE_HOST_SPECIFIC_BUILDPATH},)
-BUILD_PATH=build/${HOST}
-else
-BUILD_PATH=build
 endif
-ifdef USE_VCPKG
+ifndef BC_VAR_VCPKG_VERSION
-	ifndef VCPKG_DIR_BASE
+	BC_VAR_VCPKG_VERSION=2023.08.09
-		VCPKG_DIR_BASE=.vcpkg
 endif
-	ifndef VCPKG_VERSION
-		VCPKG_VERSION=2020.06
 endif
-	VCPKG_TOOLCHAIN=--toolchain=${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake
-endif
-ifeq ($(OS),darwin)
-	DEBUGGER=lldb --
-else
-	DEBUGGER=gdb --args
-endif
-
-VCPKG_DIR=$(VCPKG_DIR_BASE)/$(VCPKG_VERSION)-$(HOST_ENV)
-CURRENT_BUILD=$(HOST_ENV)-$(shell ${ENV_RUN} ${PYBB} cat .current_build)
 
 .PHONY: build
 build:
-	${ENV_RUN} ${CMAKE_BUILD} ${BUILD_PATH}
+	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH}
 .PHONY: install
 install:
-	${ENV_RUN} ${CMAKE_BUILD} ${BUILD_PATH} install
+	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} install
 .PHONY: clean
 clean:
-	${ENV_RUN} ${CMAKE_BUILD} ${BUILD_PATH} clean
+	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} clean
 .PHONY: purge
 purge:
-	${ENV_RUN} ${RM_RF} .current_build
+	${BC_CMD_RM_RF} .current_build
-	${ENV_RUN} ${RM_RF} ${BUILD_PATH}
+	${BC_CMD_RM_RF} ${BC_VAR_BUILD_PATH}
-	${ENV_RUN} ${RM_RF} dist
+	${BC_CMD_RM_RF} dist
+	${BC_CMD_RM_RF} compile_commands.json
 .PHONY: test
 test: build
-	${ENV_RUN} mypy ${SCRIPTS}
+	${BC_CMD_ENVRUN} ${BC_CMD_PY3} -m mypy ${BC_VAR_SCRIPTS}
-	${ENV_RUN} ${CMAKE_BUILD} ${BUILD_PATH} test
+	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} test
 .PHONY: test-verbose
 test-verbose: build
-	${ENV_RUN} ${CTEST} ${BUILD_PATH} --output-on-failure
+	${BC_CMD_CTEST} ${BC_VAR_BUILD_PATH} --output-on-failure
 .PHONY: test-rerun-verbose
 test-rerun-verbose: build
-	${ENV_RUN} ${CTEST} ${BUILD_PATH} --rerun-failed --output-on-failure
+	${BC_CMD_CTEST} ${BC_VAR_BUILD_PATH} --rerun-failed --output-on-failure
 
+ifdef BC_VAR_USE_DOCKER_DEVENV
 .PHONY: devenv-image
 devenv-image:
-	docker build . -t ${DEVENV_IMAGE}
+	docker build . -t ${BC_VAR_DEVENV_IMAGE}
 .PHONY: devenv-create
 devenv-create:
 	docker run -d \
@@ -103,71 +113,77 @@ devenv-create:
 		-v $(shell pwd):/usr/src/project \
 		-v /dev/shm:/dev/shm \
 		--restart=always \
-		--name ${DEVENV} \
+		--name ${BC_VAR_DEVENV} \
-		-t ${DEVENV_IMAGE} bash
+		-t ${BC_VAR_DEVENV_IMAGE} bash
 .PHONY: devenv-destroy
 devenv-destroy:
-	docker rm -f ${DEVENV}
+	docker rm -f ${BC_VAR_DEVENV}
-ifdef ENV_RUN
+ifdef BC_CMD_ENVRUN
 .PHONY: devenv-shell
 devenv-shell:
-	${ENV_RUN} bash
+	${BC_CMD_ENVRUN} bash
+endif
 endif
 
-ifdef USE_VCPKG
+ifdef BC_VAR_USE_VCPKG
+
+BC_VAR_VCPKG_TOOLCHAIN=--toolchain=${BC_VAR_VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake
+BC_VAR_VCPKG_DIR=$(BC_VAR_VCPKG_DIR_BASE)/$(BC_VAR_VCPKG_VERSION)-$(BC_VAR_HOSTENV)
 
 .PHONY: vcpkg
-vcpkg: ${VCPKG_DIR} vcpkg-install
+vcpkg: ${BC_VAR_VCPKG_DIR} vcpkg-install
 
-${VCPKG_DIR}:
+${BC_VAR_VCPKG_DIR}:
-	${ENV_RUN} ${RM_RF} ${VCPKG_DIR}
+	${BC_CMD_RM_RF} ${BC_VAR_VCPKG_DIR}
-	${ENV_RUN} mkdir -p ${VCPKG_DIR_BASE}
+	${BC_CMD_PYBB} mkdir ${BC_VAR_VCPKG_DIR_BASE}
-	${ENV_RUN} git clone -b release --depth 1 --branch ${VCPKG_VERSION} https://github.com/microsoft/vcpkg.git ${VCPKG_DIR}
+	${BC_CMD_ENVRUN} git clone -b release --depth 1 --branch ${BC_VAR_VCPKG_VERSION} https://github.com/microsoft/vcpkg.git ${BC_VAR_VCPKG_DIR}
-ifneq (${OS},windows)
+ifneq (${BC_VAR_OS},windows)
-	${ENV_RUN} ${VCPKG_DIR}/bootstrap-vcpkg.sh
+	${BC_CMD_ENVRUN} ${BC_VAR_VCPKG_DIR}/bootstrap-vcpkg.sh
 else
-	${ENV_RUN} ${VCPKG_DIR}/bootstrap-vcpkg.bat
+	${BC_CMD_ENVRUN} ${BC_VAR_VCPKG_DIR}/bootstrap-vcpkg.bat
 endif
 
 .PHONY: vcpkg-install
 vcpkg-install:
-ifneq (${OS},windows)
+ifneq (${BC_VAR_OS},windows)
-	${VCPKG_DIR}/vcpkg install ${VCPKG_PKGS}
+	${BC_CMD_ENVRUN} ${BC_VAR_VCPKG_DIR}/vcpkg install ${BC_VAR_VCPKG_PKGS}
 else
-	${VCPKG_DIR}/vcpkg install --triplet x64-windows ${VCPKG_PKGS}
+	${BC_CMD_ENVRUN} ${BC_VAR_VCPKG_DIR}/vcpkg install --triplet x64-windows ${BC_VAR_VCPKG_PKGS}
 endif
 
-else ifdef USE_CONAN # USE_VCPKG ################################################
+else ifdef USE_CONAN # USE_VCPKG / USE_CONAN ####################################
-
 .PHONY: setup-conan
 conan-config:
-	${ENV_RUN} conan profile new ${PROJECT_NAME} --detect --force
+	${BC_CMD_ENVRUN} conan profile new ${BC_VAR_PROJECT_NAME} --detect --force
-ifeq ($(OS),linux)
+ifeq ($(BC_VAR_OS),linux)
-	${ENV_RUN} conan profile update settings.compiler.libcxx=libstdc++11 ${PROJECT_NAME}
+	${BC_CMD_ENVRUN} conan profile update settings.compiler.libcxx=libstdc++11 ${BC_VAR_PROJECT_NAME}
 else
-	${ENV_RUN} conan profile update settings.compiler.cppstd=20 ${PROJECT_NAME}
+	${BC_CMD_ENVRUN} conan profile update settings.compiler.cppstd=20 ${BC_VAR_PROJECT_NAME}
-ifeq ($(OS),windows)
+ifeq ($(BC_VAR_OS),windows)
-	${ENV_RUN} conan profile update settings.compiler.runtime=static ${PROJECT_NAME}
+	${BC_CMD_ENVRUN} conan profile update settings.compiler.runtime=static ${BC_VAR_PROJECT_NAME}
 endif
 endif
+
 .PHONY: conan
 conan:
-	${ENV_RUN} ${PYBB} conan-install ${PROJECT_NAME}
+	${BC_CMD_PYBB} conan-install ${BC_VAR_PROJECT_NAME}
-endif # USE_VCPKG ###############################################
+endif # USE_CONAN ###############################################
 
+ifeq (${BC_VAR_OS},darwin)
 .PHONY: configure-xcode
 configure-xcode:
-	${ENV_RUN} ${SETUP_BUILD} ${VCPKG_TOOLCHAIN} --build_tool=xcode --current_build=0 --build_root=${BUILD_PATH}
+	${BC_CMD_SETUP_BUILD} ${BC_VAR_VCPKG_TOOLCHAIN} --build_tool=xcode --current_build=0 --build_root=${BC_VAR_BUILD_PATH}
+endif
 
 .PHONY: configure-release
 configure-release:
-	${ENV_RUN} ${SETUP_BUILD} ${VCPKG_TOOLCHAIN} --build_type=release --build_root=${BUILD_PATH}
+	${BC_CMD_SETUP_BUILD} ${BC_VAR_VCPKG_TOOLCHAIN} --build_type=release --build_root=${BC_VAR_BUILD_PATH}
 
 .PHONY: configure-debug
 configure-debug:
-	${ENV_RUN} ${SETUP_BUILD} ${VCPKG_TOOLCHAIN} --build_type=debug --build_root=${BUILD_PATH}
+	${BC_CMD_SETUP_BUILD} ${BC_VAR_VCPKG_TOOLCHAIN} --build_type=debug --build_root=${BC_VAR_BUILD_PATH}
 
 .PHONY: configure-asan
 configure-asan:
-	${ENV_RUN} ${SETUP_BUILD} ${VCPKG_TOOLCHAIN} --build_type=asan --build_root=${BUILD_PATH}
+	${BC_CMD_SETUP_BUILD} ${BC_VAR_VCPKG_TOOLCHAIN} --build_type=asan --build_root=${BC_VAR_BUILD_PATH}
 

deps/buildcore/scripts/pybb.py

@@ -18,18 +18,20 @@ import subprocess
 import sys
 from typing import List, Optional
 
-
+import util
-def mkdir(path: str):
-    if not os.path.exists(path):
-        os.mkdir(path)
 
 
-# this exists because Windows is utterly incapable of providing a proper rm -rf
+def mkdir(path: str) -> int:
-def rm(path: str):
+    try:
-    if (os.path.exists(path) or os.path.islink(path)) and not os.path.isdir(path):
+        util.mkdir_p(path)
-        os.remove(path)
+    except Exception:
-    elif os.path.isdir(path):
+        return 1
-        shutil.rmtree(path)
+    return 0
+
+
+def rm_multi(paths: List[str]):
+    for path in paths:
+        util.rm(path)
 
 
 def ctest_all() -> int:
@@ -52,7 +54,10 @@ def cmake_build(base_path: str, target: Optional[str]) -> int:
         # nothing to build
         return 0
     for d in os.listdir(base_path):
-        args = ['cmake', '--build', os.path.join(base_path, d)]
+        path = os.path.join(base_path, d)
+        if not os.path.isdir(path):
+            continue
+        args = ['cmake', '--build', path]
         if target is not None:
             args.extend(['--target', target])
         err = subprocess.run(args).returncode
@@ -67,16 +72,13 @@ def conan() -> int:
     err = 0
     try:
         mkdir(conan_dir)
-    except:
+    except Exception:
         return 1
     if err != 0:
         return err
     args = ['conan', 'install', '../', '--build=missing', '-pr', project_name]
     os.chdir(conan_dir)
-    err = subprocess.run(args).returncode
+    return subprocess.run(args).returncode
-    if err != 0:
-        return err
-    return 0
 
 
 def cat(paths: List[str]) -> int:
@@ -84,48 +86,70 @@ def cat(paths: List[str]) -> int:
         try:
             with open(path) as f:
                 data = f.read()
-                sys.stdout.write(data)
+                print(data)
         except FileNotFoundError:
-            sys.stderr.write('cat: {}: no such file or directory\n'.format(path))
+            sys.stderr.write(f'cat: {path}: no such file or directory\n')
             return 1
-    sys.stdout.write('\n')
     return 0
 
 
+def debug(paths: List[str]) -> int:
+    if shutil.which('gdb') is not None:
+        args = ['gdb', '--args']
+    elif shutil.which('lldb') is not None:
+        args = ['lldb', '--']
+    else:
+        sys.stderr.write('debug: could not find a supported debugger\n')
+        return 1
+    args.extend(paths)
+    return subprocess.run(args).returncode
+
+
 def get_env(var_name: str) -> int:
     if var_name not in os.environ:
         return 1
-    sys.stdout.write(os.environ[var_name])
+    print(os.environ[var_name])
     return 0
 
 
 def hostname() -> int:
-    sys.stdout.write(platform.node())
+    print(platform.node())
     return 0
 
 
+def host_env() -> int:
+    os_name = platform.system().lower()
+    arch = util.get_arch()
+    print(f'{os_name}-{arch}')
+    return 0
+
+
+def clarg(idx: int) -> Optional[str]:
+    return sys.argv[idx] if len(sys.argv) > idx else None
+
+
 def main() -> int:
     err = 0
     if sys.argv[1] == 'mkdir':
-        try:
+        err = mkdir(sys.argv[2])
-            mkdir(sys.argv[2])
-        except:
-            err = 1
     elif sys.argv[1] == 'rm':
-        for i in range(2, len(sys.argv)):
+        rm_multi(sys.argv[2:])
-            rm(sys.argv[i])
     elif sys.argv[1] == 'conan-install':
         err = conan()
     elif sys.argv[1] == 'ctest-all':
         err = ctest_all()
     elif sys.argv[1] == 'cmake-build':
-        err = cmake_build(sys.argv[2], sys.argv[3] if len(sys.argv) > 3 else None)
+        err = cmake_build(sys.argv[2], clarg(3))
     elif sys.argv[1] == 'cat':
         err = cat(sys.argv[2:])
+    elif sys.argv[1] == 'debug':
+        err = debug(sys.argv[2:])
     elif sys.argv[1] == 'getenv':
         err = get_env(sys.argv[2])
     elif sys.argv[1] == 'hostname':
         err = hostname()
+    elif sys.argv[1] == 'hostenv':
+        err = host_env()
     else:
         sys.stderr.write('Command not found\n')
         err = 1

deps/buildcore/scripts/setup-build.py

@@ -15,18 +15,35 @@ import shutil
 import subprocess
 import sys
 
-from pybb import mkdir, rm
+import util
 
 
 def main() -> int:
     parser = argparse.ArgumentParser()
-    parser.add_argument('--target', help='Platform target',
+    parser.add_argument(
-                        default='{:s}-{:s}'.format(sys.platform, platform.machine()))
+            '--target',
-    parser.add_argument('--build_type', help='Build type (asan,debug,release)', default='release')
+            help='Platform target',
-    parser.add_argument('--build_tool', help='Build tool (default,xcode)', default='')
+            default=f'{util.get_os()}-{util.get_arch()}')
-    parser.add_argument('--build_root', help='Path to the root of build directories (must be in project dir)', default='build')
+    parser.add_argument(
-    parser.add_argument('--toolchain', help='Path to CMake toolchain file', default='')
+            '--build_type',
-    parser.add_argument('--current_build', help='Indicates whether or not to make this the active build', default=1)
+            help='Build type (asan,debug,release)',
+            default='release')
+    parser.add_argument(
+            '--build_tool',
+            help='Build tool (default,xcode)',
+            default='')
+    parser.add_argument(
+            '--build_root',
+            help='Path to the root build directory (must be in project dir)',
+            default='build')
+    parser.add_argument(
+            '--toolchain',
+            help='Path to CMake toolchain file',
+            default='')
+    parser.add_argument(
+            '--current_build',
+            help='Indicates whether or not to make this the active build',
+            default=1)
     args = parser.parse_args()
 
     if args.build_type == 'asan':
@@ -64,10 +81,10 @@ def main() -> int:
         return 1
 
     project_dir = os.getcwd()
-    build_dir = '{:s}/{:s}/{:s}'.format(project_dir, args.build_root, build_config)
+    build_dir = f'{project_dir}/{args.build_root}/{build_config}'
-    rm(build_dir)
+    util.rm(build_dir)
     cmake_cmd = [
-        'cmake', '-S', project_dir, '-B', build_dir, build_tool,
+        'cmake', '-S', project_dir, '-B', build_dir,
         '-DCMAKE_EXPORT_COMPILE_COMMANDS=ON',
         '-DCMAKE_TOOLCHAIN_FILE={:s}'.format(args.toolchain),
         '-DCMAKE_BUILD_TYPE={:s}'.format(build_type_arg),
@@ -75,22 +92,27 @@ def main() -> int:
         '-DBUILDCORE_BUILD_CONFIG={:s}'.format(build_config),
         '-DBUILDCORE_TARGET={:s}'.format(args.target),
     ]
+    if build_tool != '':
+        cmake_cmd.append(build_tool)
     if qt_path != '':
         cmake_cmd.append(qt_path)
     if platform.system() == 'Windows':
         cmake_cmd.append('-A x64')
 
-    subprocess.run(cmake_cmd)
+    cmake_err = subprocess.run(cmake_cmd).returncode
+    if cmake_err != 0:
+        return cmake_err
 
-    mkdir('dist')
+    util.mkdir_p('dist')
     if int(args.current_build) != 0:
         cb = open('.current_build', 'w')
         cb.write(args.build_type)
         cb.close()
 
-    rm('compile_commands.json')
+    util.rm('compile_commands.json')
     if platform.system() != 'Windows':
-        os.symlink('{:s}/compile_commands.json'.format(build_dir), 'compile_commands.json')
+        os.symlink(f'{build_dir}/compile_commands.json',
+                   'compile_commands.json')
     return 0
 
 

deps/buildcore/scripts/util.py

@@ -0,0 +1,38 @@
+#
+#  Copyright 2016 - 2021 gary@drinkingtea.net
+#
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+import os
+import platform
+import shutil
+
+
+def mkdir_p(path: str):
+    if not os.path.exists(path):
+        os.mkdir(path)
+
+
+# this exists because Windows is utterly incapable of providing a proper rm -rf
+def rm(path: str):
+    file_exists = os.path.exists(path)
+    is_link = os.path.islink(path)
+    is_dir = os.path.isdir(path)
+    if (file_exists or is_link) and not is_dir:
+        os.remove(path)
+    elif os.path.isdir(path):
+        shutil.rmtree(path)
+
+
+def get_os() -> str:
+    return platform.system().lower()
+
+
+def get_arch() -> str:
+    arch = platform.machine()
+    if arch.lower() == 'amd64':
+        arch = 'x86_64'
+    return arch

deps/gbabuildcore/cmake/modules/GBA.cmake

@@ -24,8 +24,8 @@ add_definitions(-DARM7)
 include(FindPackageHandleStandardArgs)
 
 macro(OBJCOPY_FILE EXE_NAME)
-	set(FO ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}.bin)
+	set(FO ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${EXE_NAME}.bin)
-	set(FI ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME})
+	set(FI ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${EXE_NAME})
 	message(STATUS ${FO})
 
 	# run objcopy

deps/gbastartup/CMakeLists.txt

@@ -1,12 +0,0 @@
-enable_language(C ASM)
-
-add_library(
-	GbaStartup OBJECT
-		gba_crt0.s
-		cstartup.cpp
-)
-
-target_link_libraries(
-	GbaStartup PUBLIC
-		OxStd
-)

deps/glutils/.liccor.yml

@@ -0,0 +1,6 @@
+---
+source:
+- include
+- src
+copyright_notice: |-
+  Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.

deps/glutils/CMakeLists.txt

@@ -0,0 +1,10 @@
+project(GlUtils CXX)
+
+add_subdirectory(src)
+
+install(
+    DIRECTORY
+        include/glutils
+    DESTINATION
+        include
+)

deps/glutils/include/glutils/glutils.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
 #pragma once
@@ -8,15 +8,18 @@
 
 #include <glad/glad.h>
 
+#include <ox/std/bounds.hpp>
+#include <ox/std/cstringview.hpp>
 #include <ox/std/error.hpp>
+#include <ox/std/size.hpp>
 #include <ox/std/string.hpp>
 #include <ox/std/vector.hpp>
 
-namespace nostalgia::glutils {
+namespace glutils {
 
-constexpr auto GlslVersion = "#version 330";
+struct Empty {
-
+	virtual ~Empty() noexcept = default;
-struct Empty {};
+};
 
 struct TextureBase {
 
@@ -40,6 +43,8 @@ struct TextureBase {
 		return *this;
 	}
 
+	virtual ~TextureBase() noexcept = default;
+
 };
 
 
@@ -59,7 +64,7 @@ struct GLObject: public Base {
 		o.id = 0;
 	}
 
-	~GLObject() noexcept {
+	~GLObject() noexcept override {
 		del(id);
 	}
 
@@ -106,7 +111,7 @@ extern template struct GLObject<deleteProgram>;
 extern template struct GLObject<deleteShader>;
 
 using GLBuffer = GLObject<deleteBuffer>;
-using GLFrameBuffer = GLObject<deleteBuffer>;
+using GLFrameBuffer = GLObject<deleteFrameBuffer>;
 using GLRenderBuffer = GLObject<deleteRenderBuffer>;
 using GLShader = GLObject<deleteShader>;
 using GLProgram = GLObject<deleteProgram>;
@@ -134,10 +139,50 @@ struct FrameBuffer {
 	}
 };
 
+class FrameBufferBind {
+	private:
+		static const FrameBuffer *s_activeFb;
+		const FrameBuffer *m_restoreFb = nullptr;
+	public:
+		explicit FrameBufferBind(const FrameBuffer &fb) noexcept;
+		~FrameBufferBind() noexcept;
+};
 
-ox::Result<GLProgram> buildShaderProgram(const GLchar *vert, const GLchar *frag, const GLchar *geo = nullptr) noexcept;
+void bind(const FrameBuffer &fb) noexcept;
 
-ox::Result<GLProgram> buildShaderProgram(const ox::String &vert, const ox::String &frag, const ox::String &geo = "") noexcept;
+struct ShaderVarSet {
+	GLsizei len{};
+	ox::String name;
+};
+
+struct ProgramSource {
+	ox::Vector<glutils::ShaderVarSet> const shaderParams;
+	GLsizei const rowLen = [this] {
+		GLsizei len{};
+		for (auto const&v : shaderParams) {
+			len += v.len;
+		}
+		return len;
+	}();
+	GLsizei const vboLen = rowLen * 4;
+	ox::String const vertShader{};
+	ox::String const fragShader{};
+	ox::String const geomShader{};
+};
+
+ox::Result<GLProgram> buildShaderProgram(ProgramSource const&src) noexcept;
+
+ox::Result<GLProgram> buildShaderProgram(
+		ox::CStringView const&vert,
+		ox::CStringView const&frag,
+		ox::CStringView const&geo = "") noexcept;
+
+void setupShaderParams(
+		GLProgram const&shader,
+		ox::Vector<ShaderVarSet> const&vars,
+		GLsizei vertexRowLen) noexcept;
+
+void setupShaderParams(GLProgram const&shader, ox::Vector<ShaderVarSet> const&vars) noexcept;
 
 glutils::GLVertexArray generateVertexArrayObject() noexcept;
 
@@ -146,6 +191,15 @@ glutils::GLBuffer generateBuffer() noexcept;
 [[nodiscard]]
 FrameBuffer generateFrameBuffer(int width, int height) noexcept;
 
+void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept;
+
+/**
+ * Resizes a FrameBuffer, and creates if it does not already exist.
+ */
+void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept;
+
+void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const&sz) noexcept;
+
 struct BufferSet {
 	glutils::GLVertexArray vao;
 	glutils::GLBuffer vbo;
@@ -155,8 +209,10 @@ struct BufferSet {
 	ox::Vector<GLuint> elements;
 };
 
-void sendVbo(const BufferSet &bg) noexcept;
+void sendVbo(BufferSet const&bs) noexcept;
 
-void sendEbo(const BufferSet &bg) noexcept;
+void sendEbo(BufferSet const&bs) noexcept;
+
+void clearScreen() noexcept;
 
 }

deps/glutils/src/CMakeLists.txt

@@ -0,0 +1,23 @@
+add_library(
+	GlUtils
+		glutils.cpp
+)
+
+target_include_directories(
+	GlUtils PUBLIC
+		../include
+)
+
+target_link_libraries(
+	GlUtils PUBLIC
+		OxStd
+		glad
+)
+
+install(
+	TARGETS
+		GlUtils
+	DESTINATION
+		LIBRARY DESTINATION lib
+		ARCHIVE DESTINATION lib
+)

deps/glutils/src/glutils.cpp

@@ -0,0 +1,233 @@
+/*
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ */
+
+#include <ox/std/assert.hpp>
+#include <ox/std/istring.hpp>
+#include <ox/std/trace.hpp>
+
+#include "glutils/glutils.hpp"
+
+namespace glutils {
+
+void deleteBuffer(GLuint b) noexcept {
+	glDeleteBuffers(1, &b);
+}
+
+void deleteFrameBuffer(GLuint b) noexcept {
+	glDeleteFramebuffers(1, &b);
+}
+
+void deleteRenderBuffer(GLuint b) noexcept {
+	glDeleteRenderbuffers(1, &b);
+}
+
+void deleteTexture(GLuint t) noexcept {
+	glDeleteTextures(1, &t);
+}
+
+void deleteVertexArray(GLuint v) noexcept {
+	glDeleteVertexArrays(1, &v);
+}
+
+void deleteProgram(GLuint p) noexcept {
+	glDeleteProgram(p);
+}
+
+void deleteShader(GLuint s) noexcept {
+	glDeleteShader(s);
+}
+
+template struct GLObject<deleteBuffer>;
+template struct GLObject<deleteFrameBuffer>;
+template struct GLObject<deleteRenderBuffer>;
+template struct GLObject<deleteTexture, TextureBase>;
+template struct GLObject<deleteVertexArray>;
+template struct GLObject<deleteProgram>;
+template struct GLObject<deleteShader>;
+
+const FrameBuffer *FrameBufferBind::s_activeFb = nullptr;
+
+FrameBufferBind::FrameBufferBind(const FrameBuffer &fb) noexcept: m_restoreFb(s_activeFb) {
+	s_activeFb = &fb;
+	glBindFramebuffer(GL_FRAMEBUFFER, fb);
+	glViewport(0, 0, fb.width, fb.height);
+}
+
+FrameBufferBind::~FrameBufferBind() noexcept {
+	s_activeFb = m_restoreFb;
+	if (s_activeFb) {
+		glBindFramebuffer(GL_FRAMEBUFFER, *s_activeFb);
+		glViewport(0, 0, s_activeFb->width, s_activeFb->height);
+	} else {
+		glBindFramebuffer(GL_FRAMEBUFFER, 0);
+	}
+}
+
+void bind(const FrameBuffer &fb) noexcept {
+	glBindFramebuffer(GL_FRAMEBUFFER, fb);
+	glViewport(0, 0, fb.width, fb.height);
+}
+
+
+static ox::Result<GLShader> buildShader(
+		GLuint shaderType,
+		const GLchar *src,
+		ox::CRStringView shaderName) noexcept {
+	GLShader shader(glCreateShader(shaderType));
+	glShaderSource(shader, 1, &src, nullptr);
+	glCompileShader(shader);
+	GLint status;
+	glGetShaderiv(shader, GL_COMPILE_STATUS, &status);
+	if (status != GL_TRUE) {
+		ox::Vector<char> errMsg(ox::units::KB);
+		glGetShaderInfoLog(shader, static_cast<GLsizei>(errMsg.size()), nullptr, errMsg.data());
+		oxErrorf("shader compile error in {}: {}", shaderName, errMsg.data());
+		return OxError(1, "shader compile error");
+	}
+	return shader;
+}
+
+ox::Result<GLProgram> buildShaderProgram(ProgramSource const&src) noexcept {
+	oxRequireM(program, buildShaderProgram(
+			src.vertShader,
+			src.fragShader,
+			src.geomShader));
+	setupShaderParams(program, src.shaderParams, src.rowLen);
+	return std::move(program);
+}
+
+void setupShaderParams(
+		GLProgram const&shader,
+		ox::Vector<ShaderVarSet> const&vars,
+		GLsizei vertexRowLen) noexcept {
+	// setup vars
+	for (auto lenWritten = 0LU; auto const&v : vars) {
+		auto const attr = static_cast<GLuint>(glGetAttribLocation(shader, v.name.c_str()));
+		glEnableVertexAttribArray(attr);
+		glVertexAttribPointer(
+				attr, v.len, GL_FLOAT, GL_FALSE,
+				vertexRowLen * static_cast<GLsizei>(sizeof(float)),
+				std::bit_cast<void*>(uintptr_t{lenWritten * sizeof(float)}));
+		lenWritten += static_cast<size_t>(v.len);
+	}
+}
+
+void setupShaderParams(GLProgram const&shader, ox::Vector<ShaderVarSet> const&vars) noexcept {
+	// get row len
+	GLsizei vertexRowLen{};
+	for (auto const&v : vars) {
+		vertexRowLen += v.len;
+	}
+	setupShaderParams(shader, vars, vertexRowLen);
+}
+
+ox::Result<GLProgram> buildShaderProgram(
+		ox::CStringView const&vert,
+		ox::CStringView const&frag,
+		ox::CStringView const&geo) noexcept {
+	GLProgram prgm(glCreateProgram());
+	oxRequire(vs, buildShader(GL_VERTEX_SHADER, vert.c_str(), "vshad"));
+	glAttachShader(prgm, vs);
+	if (geo.c_str() && geo.bytes() != 0) {
+		oxRequire(gs, buildShader(GL_GEOMETRY_SHADER, geo.c_str(), "gshad"));
+		glAttachShader(prgm, gs);
+	}
+	oxRequire(fs, buildShader(GL_FRAGMENT_SHADER, frag.c_str(), "fshad"));
+	glAttachShader(prgm, fs);
+	glLinkProgram(prgm);
+	return prgm;
+}
+
+GLVertexArray generateVertexArrayObject() noexcept {
+	GLVertexArray vao;
+	glGenVertexArrays(1, &vao.id);
+	return vao;
+}
+
+GLBuffer generateBuffer() noexcept {
+	GLBuffer buff;
+	glGenBuffers(1, &buff.id);
+	return buff;
+}
+
+FrameBuffer generateFrameBuffer(int width, int height) noexcept {
+	width = ox::max(1, width);
+	height = ox::max(1, height);
+	FrameBuffer fb;
+	fb.width = width;
+	fb.height = height;
+	glGenFramebuffers(1, &fb.fbo.id);
+	glBindFramebuffer(GL_FRAMEBUFFER, fb);
+	// color texture
+	glGenTextures(1, &fb.color.id);
+	glBindTexture(GL_TEXTURE_2D, fb.color);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr);
+	glGenerateMipmap(GL_TEXTURE_2D);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fb.color, 0);
+	// depth texture
+	glGenRenderbuffers(1, &fb.depth.id);
+	glBindRenderbuffer(GL_RENDERBUFFER, fb.depth);
+	glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, width, height);
+	glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, fb.depth);
+	// verify FBO
+	oxAssert(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE, "Frame Buffer is incomplete");
+	// restore primary FB
+	glBindFramebuffer(GL_FRAMEBUFFER, 0);
+	glBindTexture(GL_TEXTURE_2D, 0);
+	glBindRenderbuffer(GL_RENDERBUFFER, 0);
+	return fb;
+}
+
+void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
+	width = ox::max(1, width);
+	height = ox::max(1, height);
+	fb.width = width;
+	fb.height = height;
+	glBindFramebuffer(GL_FRAMEBUFFER, fb);
+	// color texture
+	glBindTexture(GL_TEXTURE_2D, fb.color);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, nullptr);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	// depth texture
+	glBindRenderbuffer(GL_RENDERBUFFER, fb.depth);
+	glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, width, height);
+	// restore primary FB
+	glBindFramebuffer(GL_FRAMEBUFFER, 0);
+	glBindTexture(GL_TEXTURE_2D, 0);
+	glBindRenderbuffer(GL_RENDERBUFFER, 0);
+}
+
+void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
+	if (!fb) {
+		fb = generateFrameBuffer(width, height);
+		return;
+	}
+	resizeFrameBuffer(fb, width, height);
+}
+
+void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const&sz) noexcept {
+	resizeInitFrameBuffer(fb, sz.width, sz.height);
+}
+
+void sendVbo(BufferSet const&bs) noexcept {
+	const auto bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.vertices)::value_type) * bs.vertices.size());
+	glBindBuffer(GL_ARRAY_BUFFER, bs.vbo);
+	glBufferData(GL_ARRAY_BUFFER, bufferSize, bs.vertices.data(), GL_DYNAMIC_DRAW);
+}
+
+void sendEbo(BufferSet const&bs) noexcept {
+	const auto bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.elements)::value_type) * bs.elements.size());
+	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, bs.ebo);
+	glBufferData(GL_ELEMENT_ARRAY_BUFFER, bufferSize, bs.elements.data(), GL_STATIC_DRAW);
+}
+
+void clearScreen() noexcept {
+	glClearColor(0, 0, 0, 1);
+	glClear(GL_COLOR_BUFFER_BIT);
+}
+
+}

deps/imgui/CMakeLists.txt

@@ -15,3 +15,8 @@ add_library(
 		backends/imgui_impl_glfw.cpp
 		backends/imgui_impl_opengl3.cpp
 )
+
+target_include_directories(
+	imgui SYSTEM PUBLIC
+		.
+)

deps/lodepng/CMakeLists.txt

@@ -12,3 +12,11 @@ target_include_directories(
 	lodepng PUBLIC SYSTEM
 		include
 )
+
+install(
+	TARGETS
+		lodepng
+	DESTINATION
+		LIBRARY DESTINATION lib
+		ARCHIVE DESTINATION lib
+)

deps/nfde/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.10)
 project(nativefiledialog-extended)
 
 if(NOT MSVC)
@@ -11,7 +11,7 @@ if(WIN32)
 elseif(APPLE)
   set(nfd_PLATFORM PLATFORM_MACOS)
 elseif(UNIX AND NOT APPLE)
-  set(nfd_PLATFORM PLATFORM_LINUX)
+  set(nfd_PLATFORM PLATFORM_UNIX)
 endif()
 
 message("nfd Platform: ${nfd_PLATFORM}")

deps/nfde/src/CMakeLists.txt

@@ -10,13 +10,12 @@ if(nfd_PLATFORM STREQUAL PLATFORM_WIN32)
   list(APPEND SOURCE_FILES nfd_win.cpp)
 endif()
 
-if(nfd_PLATFORM STREQUAL PLATFORM_LINUX)
+if(nfd_PLATFORM STREQUAL PLATFORM_UNIX)
   find_package(PkgConfig REQUIRED)
   # for Linux, we support GTK3 and xdg-desktop-portal
   option(NFD_PORTAL "Use xdg-desktop-portal instead of GTK" OFF)
   if(NOT NFD_PORTAL)
-    pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+    pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)
-    message("Using GTK version: ${GTK3_VERSION}")
     list(APPEND SOURCE_FILES nfd_gtk.cpp)
   else()
     pkg_check_modules(DBUS REQUIRED dbus-1)
@@ -31,19 +30,17 @@ if(nfd_PLATFORM STREQUAL PLATFORM_MACOS)
 endif()
 
 # Define the library
-add_library(${TARGET_NAME} OBJECT
+add_library(${TARGET_NAME}
   ${SOURCE_FILES})
 
 # Allow includes from include/
 target_include_directories(${TARGET_NAME}
   PUBLIC include/)
 
-if(nfd_PLATFORM STREQUAL PLATFORM_LINUX)
+if(nfd_PLATFORM STREQUAL PLATFORM_UNIX)
   if(NOT NFD_PORTAL)
-    target_include_directories(${TARGET_NAME}
-      PRIVATE ${GTK3_INCLUDE_DIRS})
     target_link_libraries(${TARGET_NAME}
-      PRIVATE ${GTK3_LIBRARIES})
+      PRIVATE PkgConfig::GTK3)
   else()
     target_include_directories(${TARGET_NAME}
       PRIVATE ${DBUS_INCLUDE_DIRS})

deps/ox/.liccor.yml

@@ -2,7 +2,7 @@
 source:
 - src
 copyright_notice: |-
-  Copyright 2015 - 2022 gary@drinkingtea.net
+  Copyright 2015 - 2024 gary@drinkingtea.net
 
   This Source Code Form is subject to the terms of the Mozilla Public
   License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.19)
 set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19
 
-project(Ox)
+project(Ox CXX)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 include(address_sanitizer)
@@ -56,7 +56,7 @@ if(NOT MSVC)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=2")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wmissing-field-initializers")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnull-dereference")
+	#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnull-dereference")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic")
@@ -76,10 +76,11 @@ enable_testing()
 
 include_directories(src)
 
-install(FILES OxConfig.cmake DESTINATION lib/ox)
+install(FILES OxConfig.cmake DESTINATION lib/cmake/ox)
 
 if(OX_USE_STDLIB)
 	set(JSONCPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps/jsoncpp/include")
 	add_subdirectory(deps/jsoncpp)
 endif()
+add_subdirectory(deps/cityhash)
 add_subdirectory(src)

deps/ox/OxConfig.cmake

@@ -1,15 +1,16 @@
 if("${CMAKE_FIND_ROOT_PATH}" STREQUAL "")
-	set(Ox_INCLUDE_DIRS /usr/local/include/)
+	set(OX_PATH /usr/local/include/)
-	set(OxStd_LIBRARY /usr/local/lib/ox/libOxStd.a)
-	set(OxFS_LIBRARY /usr/local/lib/ox/libOxFS.a)
-	set(OxClArgs_LIBRARY /usr/local/lib/ox/libOxClArgs.a)
-	set(OxMetalClaw_LIBRARY /usr/local/lib/ox/libOxMetalClaw.a)
-	set(OxModel_LIBRARY /usr/local/lib/ox/libOxModelClaw.a)
 else("${CMAKE_FIND_ROOT_PATH}" STREQUAL "")
-	set(Ox_INCLUDE_DIRS ${CMAKE_FIND_ROOT_PATH}/include/)
+	set(OX_PATH ${CMAKE_FIND_ROOT_PATH})
-	set(OxStd_LIBRARY ${CMAKE_FIND_ROOT_PATH}/lib/ox/libOxStd.a)
-	set(OxFS_LIBRARY ${CMAKE_FIND_ROOT_PATH}/lib/ox/libOxFS.a)
-	set(OxClArgs_LIBRARY ${CMAKE_FIND_ROOT_PATH}/lib/ox/libOxClArgs.a)
-	set(OxMetalClaw_LIBRARY ${CMAKE_FIND_ROOT_PATH}/lib/ox/libOxMetalClaw.a)
-	set(OxModel_LIBRARY ${CMAKE_FIND_ROOT_PATH}/lib/ox/libOxModel.a)
 endif("${CMAKE_FIND_ROOT_PATH}" STREQUAL "")
+
+set(OxClArgs_LIBRARY ${OX_PATH}/lib/ox/libOxClArgs.a)
+set(OxEvent_LIBRARY ${OX_PATH}/lib/ox/libOxEvent.a)
+set(OxFS_LIBRARY ${OX_PATH}/lib/ox/libOxFS.a)
+set(OxLogConn_LIBRARY ${OX_PATH}/lib/ox/libOxLogConn.a)
+set(OxMetalClaw_LIBRARY ${OX_PATH}/lib/ox/libOxMetalClaw.a)
+set(OxModel_LIBRARY ${OX_PATH}/lib/ox/libOxModel.a)
+set(OxOrganicClaw_LIBRARY ${OX_PATH}/lib/ox/libOxOrganicClaw.a)
+set(OxPreloader_LIBRARY ${OX_PATH}/lib/ox/libOxPreloader.a)
+set(OxStd_LIBRARY ${OX_PATH}/lib/ox/libOxStd.a)
+set(Ox_INCLUDE_DIRS ${OX_PATH}/include/)

deps/ox/deps/cityhash/CMakeLists.txt

@@ -0,0 +1,30 @@
+cmake_minimum_required(VERSION 3.19)
+set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19
+
+project(CityHash CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+set(NOSTALGIA_BUILD_PLAYER OFF)
+set(NOSTALGIA_BUILD_STUDIO_APP OFF)
+
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
+if(APPLE)
+	set(CMAKE_MACOSX_RPATH OFF)
+else()
+	if(UNIX)
+		set(BUILD_SHARED_LIBS ON)
+	endif()
+	set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
+	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+endif()
+
+add_library(CityHash INTERFACE)
+target_include_directories(CityHash INTERFACE include)

deps/ox/deps/cityhash/include/cityhash/city.h

@@ -0,0 +1,674 @@
+// Copyright (c) 2011 Google, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// CityHash, by Geoff Pike and Jyrki Alakuijala
+//
+// http://code.google.com/p/cityhash/
+//
+// This file provides a few functions for hashing strings.  All of them are
+// high-quality functions in the sense that they pass standard tests such
+// as Austin Appleby's SMHasher.  They are also fast.
+//
+// For 64-bit x86 code, on short strings, we don't know of anything faster than
+// CityHash64 that is of comparable quality.  We believe our nearest competitor
+// is Murmur3.  For 64-bit x86 code, CityHash64 is an excellent choice for hash
+// tables and most other hashing (excluding cryptography).
+//
+// For 64-bit x86 code, on long strings, the picture is more complicated.
+// On many recent Intel CPUs, such as Nehalem, Westmere, Sandy Bridge, etc.,
+// CityHashCrc128 appears to be faster than all competitors of comparable
+// quality.  CityHash128 is also good but not quite as fast.  We believe our
+// nearest competitor is Bob Jenkins' Spooky.  We don't have great data for
+// other 64-bit CPUs, but for long strings we know that Spooky is slightly
+// faster than CityHash on some relatively recent AMD x86-64 CPUs, for example.
+// Note that CityHashCrc128 is declared in citycrc.h.
+//
+// For 32-bit x86 code, we don't know of anything faster than CityHash32 that
+// is of comparable quality.  We believe our nearest competitor is Murmur3A.
+// (On 64-bit CPUs, it is typically faster to use the other CityHash variants.)
+//
+// Functions in the CityHash family are not suitable for cryptography.
+//
+// Please see CityHash's README file for more details on our performance
+// measurements and so on.
+//
+// WARNING: This code has been only lightly tested on big-endian platforms!
+// It is known to work well on little-endian platforms that have a small penalty
+// for unaligned reads, such as current Intel and AMD moderate-to-high-end CPUs.
+// It should work on all 32-bit and 64-bit platforms that allow unaligned reads;
+// bug reports are welcome.
+//
+// By the way, for some hash functions, given strings a and b, the hash
+// of a+b is easily derived from the hashes of a and b.  This property
+// doesn't hold for any hash functions in this file.
+
+#ifndef CITY_HASH_H_
+#define CITY_HASH_H_
+
+#if __has_include(<cstdint>)
+
+#include <cstdint>
+
+#else
+
+typedef signed char        int8_t;
+typedef unsigned char      uint8_t;
+typedef short              int16_t;
+typedef unsigned short     uint16_t;
+typedef int                int32_t;
+typedef unsigned int       uint32_t;
+typedef unsigned           uint_t;
+#if defined(__arm__) || defined(__ppc__)
+typedef long long          int64_t;
+typedef unsigned long long uint64_t;
+typedef __INTMAX_TYPE__    intmax_t;
+typedef __UINTMAX_TYPE__   uintmax_t;
+#else
+typedef long               int64_t;
+typedef unsigned long      uint64_t;
+typedef int64_t            intmax_t;
+typedef uint64_t           uintmax_t;
+#endif
+
+#if defined(_LP64) || defined(__ppc64__) || defined(__aarch64__)
+typedef long          intptr_t;
+typedef unsigned long uintptr_t;
+#elif defined(_WIN64)
+typedef int64_t  intptr_t;
+typedef uint64_t uintptr_t;
+#elif defined(_LP32) || defined(__ppc__) || defined(_WIN32) || defined(__arm__)
+typedef int32_t  intptr_t;
+typedef uint32_t uintptr_t;
+#else
+#error intptr_t, and uintptr_t undefined
+#endif
+
+using size_t = decltype(alignof(int));
+
+#endif
+
+namespace cityhash::detail {
+
+template<typename T>
+struct remove_reference {
+	using type = T;
+};
+
+template<typename T>
+struct remove_reference<T&> {
+	using type = T;
+};
+
+template<typename T>
+struct remove_reference<T&&> {
+	using type = T;
+};
+
+template<typename T>
+using remove_reference_t = typename remove_reference<T>::type;
+
+template<typename T>
+constexpr remove_reference_t<T> &&move(T &&t) noexcept {
+	return static_cast<remove_reference_t<T>&&>(t);
+}
+
+template<typename T>
+using remove_reference_t = typename remove_reference<T>::type;
+template<typename T1, typename T2>
+struct pair {
+	T1 first{};
+	T2 second{};
+	constexpr pair() noexcept = default;
+	constexpr pair(T1 a, T2 b) noexcept: first(detail::move(a)), second(detail::move(b)) {}
+};
+
+template<typename T>
+constexpr void swap(T &a, T &b) noexcept {
+	auto temp = detail::move(a);
+	a = detail::move(b);
+	b = detail::move(temp);
+}
+
+}
+
+namespace cityhash {
+
+using uint128 = cityhash::detail::pair<uint64_t, uint64_t>;
+
+namespace detail {
+
+template<typename T>
+[[nodiscard]]
+constexpr T byteSwap(T i) noexcept {
+	if constexpr(sizeof(T) == 1) {
+		return i;
+	} else if constexpr(sizeof(T) == 2) {
+		return static_cast<T>(i << 8) | static_cast<T>(i >> 8);
+	} else if constexpr(sizeof(T) == 4) {
+		return ((i >> 24) & 0x000000ff) |
+				 ((i >>  8) & 0x0000ff00) |
+				 ((i <<  8) & 0x00ff0000) |
+				 ((i << 24) & 0xff000000);
+	} else if constexpr(sizeof(T) == 8) {
+		return ((i >> 56) & 0x00000000000000ff) |
+				 ((i >> 40) & 0x000000000000ff00) |
+				 ((i >> 24) & 0x0000000000ff0000) |
+				 ((i >>  8) & 0x00000000ff000000) |
+				 ((i <<  8) & 0x000000ff00000000) |
+				 ((i << 24) & 0x0000ff0000000000) |
+				 ((i << 40) & 0x00ff000000000000) |
+				 ((i << 56) & 0xff00000000000000);
+	}
+}
+
+
+[[nodiscard]]
+constexpr uint64_t Uint128Low64(const uint128& x) noexcept { return x.first; }
+[[nodiscard]]
+constexpr uint64_t Uint128High64(const uint128& x) noexcept { return x.second; }
+
+// Hash 128 input bits down to 64 bits of output.
+// This is intended to be a reasonably good hash function.
+[[nodiscard]]
+constexpr uint64_t Hash128to64(const uint128& x) noexcept {
+  // Murmur-inspired hashing.
+  const uint64_t kMul = 0x9ddfea08eb382d69ULL;
+  uint64_t a = (detail::Uint128Low64(x) ^ detail::Uint128High64(x)) * kMul;
+  a ^= (a >> 47);
+  uint64_t b = (detail::Uint128High64(x) ^ a) * kMul;
+  b ^= (b >> 47);
+  b *= kMul;
+  return b;
+}
+
+[[nodiscard]]
+constexpr uint64_t UNALIGNED_LOAD64(const char *p) noexcept {
+  uint64_t result{};
+  result |= static_cast<uint64_t>(p[0]);
+  result |= static_cast<uint64_t>(p[1]) << 8;
+  result |= static_cast<uint64_t>(p[2]) << 16;
+  result |= static_cast<uint64_t>(p[3]) << 24;
+  result |= static_cast<uint64_t>(p[4]) << 32;
+  result |= static_cast<uint64_t>(p[5]) << 40;
+  result |= static_cast<uint64_t>(p[6]) << 48;
+  result |= static_cast<uint64_t>(p[7]) << 56;
+  //memcpy(&result, p, sizeof(result));
+  return result;
+}
+
+[[nodiscard]]
+constexpr uint32_t UNALIGNED_LOAD32(const char *p) noexcept {
+  uint32_t result{};
+  result |= static_cast<uint32_t>(p[0]);
+  result |= static_cast<uint32_t>(p[1]) << 8;
+  result |= static_cast<uint32_t>(p[2]) << 16;
+  result |= static_cast<uint32_t>(p[3]) << 24;
+  //memcpy(&result, p, sizeof(result));
+  return result;
+}
+
+#ifdef WORDS_BIGENDIAN
+#define uint32_in_expected_order(x) (detail::byteSwap<uint32_t>(x))
+#define uint64_in_expected_order(x) (detail::byteSwap<uint64_t>(x))
+#else
+#define uint32_in_expected_order(x) (x)
+#define uint64_in_expected_order(x) (x)
+#endif
+
+#if !defined(LIKELY)
+#if HAVE_BUILTIN_EXPECT
+#define LIKELY(x) (__builtin_expect(!!(x), 1))
+#else
+#define LIKELY(x) (x)
+#endif
+#endif
+
+[[nodiscard]]
+constexpr uint64_t Fetch64(const char *p) noexcept {
+  return uint64_in_expected_order(UNALIGNED_LOAD64(p));
+}
+
+[[nodiscard]]
+constexpr uint32_t Fetch32(const char *p) noexcept {
+  return uint32_in_expected_order(UNALIGNED_LOAD32(p));
+}
+
+// Some primes between 2^63 and 2^64 for various uses.
+constexpr uint64_t k0 = 0xc3a5c85c97cb3127ULL;
+constexpr uint64_t k1 = 0xb492b66fbe98f273ULL;
+constexpr uint64_t k2 = 0x9ae16a3b2f90404fULL;
+
+// Magic numbers for 32-bit hashing.  Copied from Murmur3.
+constexpr uint32_t c1 = 0xcc9e2d51;
+constexpr uint32_t c2 = 0x1b873593;
+
+// A 32-bit to 32-bit integer hash copied from Murmur3.
+[[nodiscard]]
+constexpr uint32_t fmix(uint32_t h) noexcept {
+  h ^= h >> 16;
+  h *= 0x85ebca6b;
+  h ^= h >> 13;
+  h *= 0xc2b2ae35;
+  h ^= h >> 16;
+  return h;
+}
+
+[[nodiscard]]
+constexpr uint32_t Rotate32(uint32_t val, int shift) noexcept {
+  // Avoid shifting by 32: doing so yields an undefined result.
+  return shift == 0 ? val : ((val >> shift) | (val << (32 - shift)));
+}
+
+#undef PERMUTE3
+#define PERMUTE3(a, b, c) do { detail::swap(a, b); detail::swap(a, c); } while (0)
+
+[[nodiscard]]
+constexpr uint32_t Mur(uint32_t a, uint32_t h) noexcept {
+  // Helper from Murmur3 for combining two 32-bit values.
+  a *= detail::c1;
+  a = Rotate32(a, 17);
+  a *= detail::c2;
+  h ^= a;
+  h = Rotate32(h, 19);
+  return h * 5 + 0xe6546b64;
+}
+
+[[nodiscard]]
+constexpr uint32_t Hash32Len13to24(const char *s, size_t len) noexcept {
+  uint32_t a = Fetch32(s - 4 + (len >> 1));
+  uint32_t b = Fetch32(s + 4);
+  uint32_t c = Fetch32(s + len - 8);
+  uint32_t d = Fetch32(s + (len >> 1));
+  uint32_t e = Fetch32(s);
+  uint32_t f = Fetch32(s + len - 4);
+  uint32_t h = static_cast<uint32_t>(len);
+
+  return detail::fmix(Mur(f, Mur(e, Mur(d, Mur(c, Mur(b, Mur(a, h)))))));
+}
+
+[[nodiscard]]
+constexpr uint32_t Hash32Len0to4(const char *s, size_t len) noexcept {
+  uint32_t b = 0;
+  uint32_t c = 9;
+  for (size_t i = 0; i < len; i++) {
+    auto const v = static_cast<signed char>(s[i]);
+    b = b * detail::c1 + static_cast<uint32_t>(v);
+    c ^= b;
+  }
+  return detail::fmix(Mur(b, Mur(static_cast<uint32_t>(len), c)));
+}
+
+[[nodiscard]]
+constexpr uint32_t Hash32Len5to12(const char *s, size_t len) noexcept {
+  uint32_t a = static_cast<uint32_t>(len), b = a * 5, c = 9, d = b;
+  a += Fetch32(s);
+  b += Fetch32(s + len - 4);
+  c += Fetch32(s + ((len >> 1) & 4));
+  return detail::fmix(Mur(c, Mur(b, Mur(a, d))));
+}
+
+// Bitwise right rotate.  Normally this will compile to a single
+// instruction, especially if the shift is a manifest constant.
+[[nodiscard]]
+constexpr uint64_t Rotate(uint64_t val, int shift) noexcept {
+  // Avoid shifting by 64: doing so yields an undefined result.
+  return shift == 0 ? val : ((val >> shift) | (val << (64 - shift)));
+}
+
+[[nodiscard]]
+constexpr uint64_t ShiftMix(uint64_t val) noexcept {
+  return val ^ (val >> 47);
+}
+
+[[nodiscard]]
+constexpr uint64_t HashLen16(uint64_t u, uint64_t v) noexcept {
+  return Hash128to64(uint128(u, v));
+}
+
+[[nodiscard]]
+constexpr uint64_t HashLen16(uint64_t u, uint64_t v, uint64_t mul) noexcept {
+  // Murmur-inspired hashing.
+  uint64_t a = (u ^ v) * mul;
+  a ^= (a >> 47);
+  uint64_t b = (v ^ a) * mul;
+  b ^= (b >> 47);
+  b *= mul;
+  return b;
+}
+
+[[nodiscard]]
+constexpr uint64_t HashLen0to16(const char *s, size_t len) noexcept {
+  if (len >= 8) {
+    uint64_t mul = detail::k2 + len * 2;
+    uint64_t a = detail::Fetch64(s) + detail::k2;
+    uint64_t b = detail::Fetch64(s + len - 8);
+    uint64_t c = detail::Rotate(b, 37) * mul + a;
+    uint64_t d = (detail::Rotate(a, 25) + b) * mul;
+    return HashLen16(c, d, mul);
+  }
+  if (len >= 4) {
+    uint64_t mul = detail::k2 + len * 2;
+    uint64_t a = Fetch32(s);
+    return HashLen16(len + (a << 3), Fetch32(s + len - 4), mul);
+  }
+  if (len > 0) {
+    uint8_t a = static_cast<uint8_t>(s[0]);
+    uint8_t b = static_cast<uint8_t>(s[len >> 1]);
+    uint8_t c = static_cast<uint8_t>(s[len - 1]);
+    uint32_t y = static_cast<uint32_t>(a) + (static_cast<uint32_t>(b) << 8);
+    uint32_t z = static_cast<uint32_t>(len) + (static_cast<uint32_t>(c) << 2);
+    return ShiftMix(y * detail::k2 ^ z * detail::k0) * detail::k2;
+  }
+  return detail::k2;
+}
+
+// This probably works well for 16-byte strings as well, but it may be overkill
+// in that case.
+[[nodiscard]]
+constexpr uint64_t HashLen17to32(const char *s, size_t len) noexcept {
+  uint64_t mul = detail::k2 + len * 2;
+  uint64_t a = detail::Fetch64(s) * detail::k1;
+  uint64_t b = detail::Fetch64(s + 8);
+  uint64_t c = detail::Fetch64(s + len - 8) * mul;
+  uint64_t d = detail::Fetch64(s + len - 16) * detail::k2;
+  return HashLen16(detail::Rotate(a + b, 43) + detail::Rotate(c, 30) + d,
+                   a + detail::Rotate(b + detail::k2, 18) + c, mul);
+}
+
+// Return a 16-byte hash for 48 bytes.  Quick and dirty.
+// Callers do best to use "random-looking" values for a and b.
+[[nodiscard]]
+constexpr detail::pair<uint64_t, uint64_t> WeakHashLen32WithSeeds(
+    uint64_t w, uint64_t x, uint64_t y, uint64_t z, uint64_t a, uint64_t b) noexcept {
+  a += w;
+  b = detail::Rotate(b + a + z, 21);
+  uint64_t c = a;
+  a += x;
+  a += y;
+  b += detail::Rotate(a, 44);
+  return detail::pair(a + z, b + c);
+}
+
+// Return a 16-byte hash for s[0] ... s[31], a, and b.  Quick and dirty.
+[[nodiscard]]
+constexpr detail::pair<uint64_t, uint64_t> WeakHashLen32WithSeeds(
+    const char* s, uint64_t a, uint64_t b) noexcept {
+  return WeakHashLen32WithSeeds(detail::Fetch64(s),
+                                detail::Fetch64(s + 8),
+                                detail::Fetch64(s + 16),
+                                detail::Fetch64(s + 24),
+                                a,
+                                b);
+}
+
+// Return an 8-byte hash for 33 to 64 bytes.
+[[nodiscard]]
+constexpr uint64_t HashLen33to64(const char *s, size_t len) noexcept {
+  uint64_t mul = detail::k2 + len * 2;
+  uint64_t a = detail::Fetch64(s) * detail::k2;
+  uint64_t b = detail::Fetch64(s + 8);
+  uint64_t c = detail::Fetch64(s + len - 24);
+  uint64_t d = detail::Fetch64(s + len - 32);
+  uint64_t e = detail::Fetch64(s + 16) * detail::k2;
+  uint64_t f = detail::Fetch64(s + 24) * 9;
+  uint64_t g = detail::Fetch64(s + len - 8);
+  uint64_t h = detail::Fetch64(s + len - 16) * mul;
+  uint64_t u = detail::Rotate(a + g, 43) + (detail::Rotate(b, 30) + c) * 9;
+  uint64_t v = ((a + g) ^ d) + f + 1;
+  uint64_t w = detail::byteSwap((u + v) * mul) + h;
+  uint64_t x = detail::Rotate(e + f, 42) + c;
+  uint64_t y = (detail::byteSwap((v + w) * mul) + g) * mul;
+  uint64_t z = e + f + c;
+  a = detail::byteSwap((x + z) * mul + y) + b;
+  b = ShiftMix((z + a) * mul + d + h) * mul;
+  return b + x;
+}
+
+// A subroutine for CityHash128().  Returns a decent 128-bit hash for strings
+// of any length representable in signed long.  Based on City and Murmur.
+[[nodiscard]]
+constexpr uint128 CityMurmur(const char *s, size_t len, uint128 seed) noexcept {
+  uint64_t a = detail::Uint128Low64(seed);
+  uint64_t b = detail::Uint128High64(seed);
+  uint64_t c = 0;
+  uint64_t d = 0;
+  if (len <= 16) {
+    a = ShiftMix(a * detail::k1) * detail::k1;
+    c = b * detail::k1 + HashLen0to16(s, len);
+    d = ShiftMix(a + (len >= 8 ? detail::Fetch64(s) : c));
+  } else {
+    c = HashLen16(detail::Fetch64(s + len - 8) + detail::k1, a);
+    d = HashLen16(b + len, c + detail::Fetch64(s + len - 16));
+    a += d;
+    // len > 16 here, so do...while is safe
+    do {
+      a ^= ShiftMix(detail::Fetch64(s) * detail::k1) * detail::k1;
+      a *= detail::k1;
+      b ^= a;
+      c ^= ShiftMix(detail::Fetch64(s + 8) * detail::k1) * detail::k1;
+      c *= detail::k1;
+      d ^= c;
+      s += 16;
+      len -= 16;
+    } while (len > 16);
+  }
+  a = HashLen16(a, c);
+  b = HashLen16(d, b);
+  return uint128(a ^ b, HashLen16(b, a));
+}
+
+}
+
+
+[[nodiscard]]
+constexpr uint32_t CityHash32(const char *s, size_t len) noexcept {
+  if (len <= 24) {
+    return len <= 12 ?
+        (len <= 4 ? detail::Hash32Len0to4(s, len) : detail::Hash32Len5to12(s, len)) :
+        detail::Hash32Len13to24(s, len);
+  }
+
+  // len > 24
+  uint32_t h = static_cast<uint32_t>(len), g = detail::c1 * h, f = g;
+  uint32_t a0 = detail::Rotate32(detail::Fetch32(s + len - 4) * detail::c1, 17) * detail::c2;
+  uint32_t a1 = detail::Rotate32(detail::Fetch32(s + len - 8) * detail::c1, 17) * detail::c2;
+  uint32_t a2 = detail::Rotate32(detail::Fetch32(s + len - 16) * detail::c1, 17) * detail::c2;
+  uint32_t a3 = detail::Rotate32(detail::Fetch32(s + len - 12) * detail::c1, 17) * detail::c2;
+  uint32_t a4 = detail::Rotate32(detail::Fetch32(s + len - 20) * detail::c1, 17) * detail::c2;
+  h ^= a0;
+  h = detail::Rotate32(h, 19);
+  h = h * 5 + 0xe6546b64;
+  h ^= a2;
+  h = detail::Rotate32(h, 19);
+  h = h * 5 + 0xe6546b64;
+  g ^= a1;
+  g = detail::Rotate32(g, 19);
+  g = g * 5 + 0xe6546b64;
+  g ^= a3;
+  g = detail::Rotate32(g, 19);
+  g = g * 5 + 0xe6546b64;
+  f += a4;
+  f = detail::Rotate32(f, 19);
+  f = f * 5 + 0xe6546b64;
+  size_t iters = (len - 1) / 20;
+  do {
+    uint32_t a0 = detail::Rotate32(detail::Fetch32(s) * detail::c1, 17) * detail::c2;
+    uint32_t a1 = detail::Fetch32(s + 4);
+    uint32_t a2 = detail::Rotate32(detail::Fetch32(s + 8) * detail::c1, 17) * detail::c2;
+    uint32_t a3 = detail::Rotate32(detail::Fetch32(s + 12) * detail::c1, 17) * detail::c2;
+    uint32_t a4 = detail::Fetch32(s + 16);
+    h ^= a0;
+    h = detail::Rotate32(h, 18);
+    h = h * 5 + 0xe6546b64;
+    f += a1;
+    f = detail::Rotate32(f, 19);
+    f = f * detail::c1;
+    g += a2;
+    g = detail::Rotate32(g, 18);
+    g = g * 5 + 0xe6546b64;
+    h ^= a3 + a1;
+    h = detail::Rotate32(h, 19);
+    h = h * 5 + 0xe6546b64;
+    g ^= a4;
+    g = detail::byteSwap(g) * 5;
+    h += a4 * 5;
+    h = detail::byteSwap(h);
+    f += a0;
+    PERMUTE3(f, h, g);
+    s += 20;
+  } while (--iters != 0);
+  g = detail::Rotate32(g, 11) * detail::c1;
+  g = detail::Rotate32(g, 17) * detail::c1;
+  f = detail::Rotate32(f, 11) * detail::c1;
+  f = detail::Rotate32(f, 17) * detail::c1;
+  h = detail::Rotate32(h + g, 19);
+  h = h * 5 + 0xe6546b64;
+  h = detail::Rotate32(h, 17) * detail::c1;
+  h = detail::Rotate32(h + f, 19);
+  h = h * 5 + 0xe6546b64;
+  h = detail::Rotate32(h, 17) * detail::c1;
+  return h;
+}
+
+[[nodiscard]]
+constexpr uint64_t CityHash64(const char *s, size_t len) noexcept {
+  if (len <= 32) {
+    if (len <= 16) {
+      return detail::HashLen0to16(s, len);
+    } else {
+      return detail::HashLen17to32(s, len);
+    }
+  } else if (len <= 64) {
+    return detail::HashLen33to64(s, len);
+  }
+
+  // For strings over 64 bytes we hash the end first, and then as we
+  // loop we keep 56 bytes of state: v, w, x, y, and z.
+  uint64_t x = detail::Fetch64(s + len - 40);
+  uint64_t y = detail::Fetch64(s + len - 16) + detail::Fetch64(s + len - 56);
+  uint64_t z = detail::HashLen16(detail::Fetch64(s + len - 48) + len, detail::Fetch64(s + len - 24));
+  detail::pair<uint64_t, uint64_t> v = detail::WeakHashLen32WithSeeds(s + len - 64, len, z);
+  detail::pair<uint64_t, uint64_t> w = detail::WeakHashLen32WithSeeds(s + len - 32, y + detail::k1, x);
+  x = x * detail::k1 + detail::Fetch64(s);
+
+  // Decrease len to the nearest multiple of 64, and operate on 64-byte chunks.
+  len = (len - 1) & ~static_cast<size_t>(63);
+  do {
+    x = detail::Rotate(x + y + v.first + detail::Fetch64(s + 8), 37) * detail::k1;
+    y = detail::Rotate(y + v.second + detail::Fetch64(s + 48), 42) * detail::k1;
+    x ^= w.second;
+    y += v.first + detail::Fetch64(s + 40);
+    z = detail::Rotate(z + w.first, 33) * detail::k1;
+    v = detail::WeakHashLen32WithSeeds(s, v.second * detail::k1, x + w.first);
+    w = detail::WeakHashLen32WithSeeds(s + 32, z + w.second, y + detail::Fetch64(s + 16));
+	 detail::swap(z, x);
+    s += 64;
+    len -= 64;
+  } while (len != 0);
+  return detail::HashLen16(detail::HashLen16(v.first, w.first) + detail::ShiftMix(y) * detail::k1 + z,
+                   detail::HashLen16(v.second, w.second) + x);
+}
+
+[[nodiscard]]
+constexpr uint64_t CityHash64WithSeeds(const char *s, size_t len,
+                           uint64_t seed0, uint64_t seed1) noexcept {
+  return detail::HashLen16(CityHash64(s, len) - seed0, seed1);
+}
+
+[[nodiscard]]
+constexpr uint64_t CityHash64WithSeed(const char *s, size_t len, uint64_t seed) noexcept {
+  return CityHash64WithSeeds(s, len, detail::k2, seed);
+}
+
+[[nodiscard]]
+constexpr uint128 CityHash128WithSeed(const char *s, size_t len, uint128 seed) noexcept {
+  if (len < 128) {
+    return detail::CityMurmur(s, len, seed);
+  }
+
+  // We expect len >= 128 to be the common case.  Keep 56 bytes of state:
+  // v, w, x, y, and z.
+  detail::pair<uint64_t, uint64_t> v, w;
+  uint64_t x = detail::Uint128Low64(seed);
+  uint64_t y = detail::Uint128High64(seed);
+  uint64_t z = len * detail::k1;
+  v.first = detail::Rotate(y ^ detail::k1, 49) * detail::k1 + detail::Fetch64(s);
+  v.second = detail::Rotate(v.first, 42) * detail::k1 + detail::Fetch64(s + 8);
+  w.first = detail::Rotate(y + z, 35) * detail::k1 + x;
+  w.second = detail::Rotate(x + detail::Fetch64(s + 88), 53) * detail::k1;
+
+  // This is the same inner loop as CityHash64(), manually unrolled.
+  do {
+    x = detail::Rotate(x + y + v.first + detail::Fetch64(s + 8), 37) * detail::k1;
+    y = detail::Rotate(y + v.second + detail::Fetch64(s + 48), 42) * detail::k1;
+    x ^= w.second;
+    y += v.first + detail::Fetch64(s + 40);
+    z = detail::Rotate(z + w.first, 33) * detail::k1;
+    v = detail::WeakHashLen32WithSeeds(s, v.second * detail::k1, x + w.first);
+    w = detail::WeakHashLen32WithSeeds(s + 32, z + w.second, y + detail::Fetch64(s + 16));
+	 detail::swap(z, x);
+    s += 64;
+    x = detail::Rotate(x + y + v.first + detail::Fetch64(s + 8), 37) * detail::k1;
+    y = detail::Rotate(y + v.second + detail::Fetch64(s + 48), 42) * detail::k1;
+    x ^= w.second;
+    y += v.first + detail::Fetch64(s + 40);
+    z = detail::Rotate(z + w.first, 33) * detail::k1;
+    v = detail::WeakHashLen32WithSeeds(s, v.second * detail::k1, x + w.first);
+    w = detail::WeakHashLen32WithSeeds(s + 32, z + w.second, y + detail::Fetch64(s + 16));
+	 detail::swap(z, x);
+    s += 64;
+    len -= 128;
+  } while (LIKELY(len >= 128));
+  x += detail::Rotate(v.first + z, 49) * detail::k0;
+  y = y * detail::k0 + detail::Rotate(w.second, 37);
+  z = z * detail::k0 + detail::Rotate(w.first, 27);
+  w.first *= 9;
+  v.first *= detail::k0;
+  // If 0 < len < 128, hash up to 4 chunks of 32 bytes each from the end of s.
+  for (size_t tail_done = 0; tail_done < len; ) {
+    tail_done += 32;
+    y = detail::Rotate(x + y, 42) * detail::k0 + v.second;
+    w.first += detail::Fetch64(s + len - tail_done + 16);
+    x = x * detail::k0 + w.first;
+    z += w.second + detail::Fetch64(s + len - tail_done);
+    w.second += v.first;
+    v = detail::WeakHashLen32WithSeeds(s + len - tail_done, v.first + z, v.second);
+    v.first *= detail::k0;
+  }
+  // At this point our 56 bytes of state should contain more than
+  // enough information for a strong 128-bit hash.  We use two
+  // different 56-byte-to-8-byte hashes to get a 16-byte final result.
+  x = detail::HashLen16(x, v.first);
+  y = detail::HashLen16(y + z, w.first);
+  return uint128(detail::HashLen16(x + v.second, w.second) + y,
+                 detail::HashLen16(x + w.second, y + v.second));
+}
+
+[[nodiscard]]
+constexpr uint128 CityHash128(const char *s, size_t len) noexcept {
+  return len >= 16 ?
+      CityHash128WithSeed(s + 16, len - 16,
+                          uint128(detail::Fetch64(s), detail::Fetch64(s + 8) + detail::k0)) :
+      CityHash128WithSeed(s, len, uint128(detail::k0, detail::k1));
+}
+
+}
+
+#endif  // CITY_HASH_H_

deps/ox/src/ox/CMakeLists.txt

@@ -1,3 +1,18 @@
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+	set(OX_OS_WINDOWS TRUE)
+endif()
+if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+	set(OX_OS_FREEBSD TRUE)
+else()
+	set(OX_OS_FREEBSD FALSE)
+endif()
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+	set(OX_OS_LINUX TRUE)
+else()
+	set(OX_OS_LINUX FALSE)
+endif()
+
 if(OX_USE_STDLIB)
 	add_subdirectory(oc)
 endif()
@@ -5,6 +20,7 @@ add_subdirectory(clargs)
 add_subdirectory(claw)
 add_subdirectory(event)
 add_subdirectory(fs)
+add_subdirectory(logconn)
 add_subdirectory(mc)
 add_subdirectory(model)
 add_subdirectory(preloader)

deps/ox/src/ox/clargs/CMakeLists.txt

@@ -12,6 +12,11 @@ set_property(
 		POSITION_INDEPENDENT_CODE ON
 )
 
+if(NOT MSVC)
+	target_compile_options(OxClArgs PRIVATE -Wsign-conversion)
+	target_compile_options(OxClArgs PRIVATE -Wconversion)
+endif()
+
 target_link_libraries(
 	OxClArgs PUBLIC
 		OxStd
@@ -27,6 +32,6 @@ install(
 install(
 	TARGETS
 		OxClArgs
-	LIBRARY DESTINATION lib/ox
+	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib/ox
+	ARCHIVE DESTINATION lib
 )

deps/ox/src/ox/clargs/clargs.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include <ox/std/string.hpp>
@@ -12,57 +12,57 @@
 namespace ox {
 
 ClArgs::ClArgs(int argc, const char **args) noexcept {
-	for (int i = 0; i < argc; i++) {
+	for (auto i = 0u; i < static_cast<unsigned>(argc); ++i) {
-		String arg = args[i];
+		auto arg = String(args[i]);
 		if (arg[0] == '-') {
 			while (arg[0] == '-' && arg.len()) {
 				arg = arg.substr(1);
 			}
 			m_bools[arg] = true;
 			// parse additional arguments
-			if (i < argc && args[i + 1]) {
+			if (i < static_cast<unsigned>(argc) && args[i + 1]) {
-				String val = args[i + 1];
+				auto val = String(args[i + 1]);
 				if (val.len() && val[i] != '-') {
 					if (val == "false") {
 						m_bools[arg] = false;
 					}
 					m_strings[arg] = val;
-					if (auto r = ox_atoi(val.c_str()); r.error == 0) {
+					if (auto r = ox::atoi(val.c_str()); r.error == 0) {
 						m_ints[arg] = r.value;
 					}
-					i++;
+					++i;
 				}
 			}
 		}
 	}
 }
 
-bool ClArgs::getBool(const char *arg, bool defaultValue) const noexcept {
+bool ClArgs::getBool(ox::CRStringView arg, bool defaultValue) const noexcept {
 	auto [value, err] = m_ints.at(arg);
 	return !err ? *value : defaultValue;
 }
 
-String ClArgs::getString(const char *arg, const char *defaultValue) const noexcept {
+String ClArgs::getString(ox::CRStringView arg, ox::StringView defaultValue) const noexcept {
 	auto [value, err] = m_strings.at(arg);
-	return !err ? *value : defaultValue;
+	return !err ? ox::String(*value) : ox::String(defaultValue);
 }
 
-int ClArgs::getInt(const char *arg, int defaultValue) const noexcept {
+int ClArgs::getInt(ox::CRStringView arg, int defaultValue) const noexcept {
 	auto [value, err] = m_ints.at(arg);
 	return !err ? *value : defaultValue;
 }
 
-Result<bool> ClArgs::getBool(const char *arg) const noexcept {
+Result<bool> ClArgs::getBool(ox::CRStringView arg) const noexcept {
 	oxRequire(out, m_bools.at(arg));
 	return *out;
 }
 
-Result<String> ClArgs::getString(const char *argName) const noexcept {
+Result<String> ClArgs::getString(ox::CRStringView argName) const noexcept {
 	oxRequire(out, m_strings.at(argName));
 	return *out;
 }
 
-Result<int> ClArgs::getInt(const char *arg) const noexcept {
+Result<int> ClArgs::getInt(ox::CRStringView arg) const noexcept {
 	oxRequire(out, m_ints.at(arg));
 	return *out;
 }

deps/ox/src/ox/clargs/clargs.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -22,17 +22,22 @@ class ClArgs {
 	public:
 		ClArgs(int argc, const char **args) noexcept;
 
-		bool getBool(const char *arg, bool defaultValue) const noexcept;
+		[[nodiscard]]
+		bool getBool(ox::CRStringView arg, bool defaultValue) const noexcept;
 
-		String getString(const char *argName, const char *defaultArg) const noexcept;
+		[[nodiscard]]
+		String getString(ox::CRStringView argName, ox::StringView defaultValue) const noexcept;
 
-		int getInt(const char *arg, int defaultValue) const noexcept;
+		[[nodiscard]]
+		int getInt(ox::CRStringView arg, int defaultValue) const noexcept;
 
-		Result<bool> getBool(const char *arg) const noexcept;
+		[[nodiscard]]
+		Result<bool> getBool(ox::CRStringView arg) const noexcept;
 
-		Result<String> getString(const char *argName) const noexcept;
+		[[nodiscard]]
+		Result<String> getString(ox::CRStringView argName) const noexcept;
 
-		Result<int> getInt(const char *arg) const noexcept;
+		Result<int> getInt(ox::CRStringView arg) const noexcept;
 
 };
 

deps/ox/src/ox/claw/CMakeLists.txt

@@ -5,6 +5,10 @@ add_library(
 		write.cpp
 )
 
+if(NOT MSVC)
+	target_compile_options(OxClaw PRIVATE -Wsign-conversion)
+	target_compile_options(OxClaw PRIVATE -Wconversion)
+endif()
 
 target_link_libraries(
 	OxClaw PUBLIC
@@ -12,6 +16,22 @@ target_link_libraries(
 		$<$<BOOL:${OX_USE_STDLIB}>:OxOrganicClaw>
 )
 
+#if(OX_USE_STDLIB)
+#	add_executable(
+#		readclaw
+#			readclaw.cpp
+#	)
+#	target_link_libraries(
+#		readclaw PUBLIC
+#			OxClaw
+#	)
+#endif()
+
+install(TARGETS OxClaw
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib
+)
+
 if(OX_RUN_TESTS)
 	add_subdirectory(test)
 endif()

deps/ox/src/ox/claw/claw.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/claw/format.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/claw/read.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,34 +12,66 @@
 
 namespace ox {
 
-Result<ClawHeader> readClawHeader(const char *buff, std::size_t buffLen) noexcept {
+ox::Result<ox::StringView> readClawTypeId(ox::BufferView buff) noexcept {
-	const auto s1End = ox_strchr(buff, ';', buffLen);
+	auto buffRaw = buff.data();
+	auto buffLen = buff.size();
+	size_t outSz{};
+	const auto s1End = ox::strchr(buffRaw, ';', buffLen);
 	if (!s1End) {
 		return OxError(1, "Could not read Claw header");
 	}
-	const auto s1Size = s1End - buff;
+	auto const fmtSz = static_cast<std::size_t>(s1End - buffRaw) + 1;
-	const String fmt(buff, s1Size);
+	buffRaw += fmtSz;
-	buff += s1Size + 1;
+	buffLen -= fmtSz;
-	buffLen -= s1Size + 1;
+	outSz += fmtSz;
-
+	auto const s2End = ox::strchr(buffRaw, ';', buffLen);
-	const auto s2End = ox_strchr(buff, ';', buffLen);
 	if (!s2End) {
 		return OxError(2, "Could not read Claw header");
 	}
-	const auto s2Size = s2End - buff;
+	auto const s2Size = static_cast<std::size_t>(s2End - buffRaw) + 1;
-	const String typeName(buff, s2Size);
+	buffRaw += s2Size;
-	buff += s2Size + 1;
+	buffLen -= s2Size;
-	buffLen -= s2Size + 1;
+	outSz += s2Size;
-
+	auto const s3End = ox::strchr(buffRaw, ';', buffLen) + 1;
-	const auto s3End = ox_strchr(buff, ';', buffLen);
 	if (!s3End) {
 		return OxError(3, "Could not read Claw header");
 	}
-	const auto s3Size = s3End - buff;
+	auto const s3Size = static_cast<std::size_t>(s3End - buffRaw);
-	const String versionStr(buff, s3Size);
+	buffRaw += s3Size;
-	buff += s3Size + 1;
+	buffLen -= s3Size;
-	buffLen -= s3Size + 1;
+	outSz += s3Size;
+	return {{buff.data() + fmtSz, outSz - fmtSz - 1}};
+}
 
+Result<ClawHeader> readClawHeader(ox::BufferView buff) noexcept {
+	auto buffRaw = buff.data();
+	auto buffLen = buff.size();
+	const auto s1End = ox::strchr(buffRaw, ';', buffLen);
+	if (!s1End) {
+		return OxError(1, "Could not read Claw header");
+	}
+	auto const s1Size = static_cast<std::size_t>(s1End - buffRaw);
+	StringView const fmt(buffRaw, s1Size);
+	buffRaw += s1Size + 1;
+	buffLen -= s1Size + 1;
+
+	auto const s2End = ox::strchr(buffRaw, ';', buffLen);
+	if (!s2End) {
+		return OxError(2, "Could not read Claw header");
+	}
+	auto const s2Size = static_cast<std::size_t>(s2End - buffRaw);
+	StringView const typeName(buffRaw, s2Size);
+	buffRaw += s2Size + 1;
+	buffLen -= s2Size + 1;
+
+	auto const s3End = ox::strchr(buffRaw, ';', buffLen);
+	if (!s3End) {
+		return OxError(3, "Could not read Claw header");
+	}
+	auto const s3Size = static_cast<std::size_t>(s3End - buffRaw);
+	StringView const versionStr(buffRaw, s3Size);
+	buffRaw += s3Size + 1;
+	buffLen -= s3Size + 1;
 	ClawHeader hdr;
 	if (fmt == "M2") {
 		hdr.fmt = ClawFormat::Metal;
@@ -49,38 +81,31 @@ Result<ClawHeader> readClawHeader(const char *buff, std::size_t buffLen) noexcep
 		return OxError(4, "Claw format does not match any supported format/version combo");
 	}
 	hdr.typeName = typeName;
-	if (auto r = ox_atoi(versionStr.c_str()); r.error == 0) {
+	std::ignore = ox::atoi(versionStr).copyTo(hdr.typeVersion);
-		hdr.typeVersion = r.value;
+	hdr.data = buffRaw;
-	}
-	hdr.data = buff;
 	hdr.dataSize = buffLen;
 	return hdr;
 }
 
-Result<ClawHeader> readClawHeader(const ox::Buffer &buff) noexcept {
+Result<BufferView> stripClawHeader(ox::BufferView buff) noexcept {
-	return readClawHeader(buff.data(), buff.size());
-}
-
-Result<Buffer> stripClawHeader(const char *buff, std::size_t buffLen) noexcept {
-	oxRequire(header, readClawHeader(buff, buffLen));
-	Buffer out(header.dataSize);
-	ox_memcpy(out.data(), header.data, out.size());
-	return out;
-}
-
-Result<Buffer> stripClawHeader(const ox::Buffer &buff) noexcept {
-	return stripClawHeader(buff.data(), buff.size());
-}
-
-Result<ModelObject> readClaw(TypeStore *ts, const Buffer &buff) noexcept {
 	oxRequire(header, readClawHeader(buff));
-	oxRequire(t, ts->template getLoad(header.typeName, header.typeVersion, header.typeParams));
+	return {{header.data, header.dataSize}};
+}
+
+Result<ModelObject> readClaw(TypeStore &ts, BufferView buff) noexcept {
+	oxRequire(header, readClawHeader(buff));
+	auto const [t, tdErr] = ts.getLoad(
+			header.typeName, header.typeVersion, header.typeParams);
+	if (tdErr) {
+		return OxError(3, "Could not load type descriptor");
+	}
 	ModelObject obj;
 	oxReturnError(obj.setType(t));
 	switch (header.fmt) {
 		case ClawFormat::Metal:
 		{
-			MetalClawReader reader(reinterpret_cast<const uint8_t*>(header.data), header.dataSize);
+			ox::BufferReader br({header.data, header.dataSize});
+			MetalClawReader reader(br);
 			ModelHandlerInterface handler(&reader);
 			oxReturnError(model(&handler, &obj));
 			return obj;
@@ -88,7 +113,7 @@ Result<ModelObject> readClaw(TypeStore *ts, const Buffer &buff) noexcept {
 		case ClawFormat::Organic:
 		{
 #ifdef OX_USE_STDLIB
-			OrganicClawReader reader(header.data, header.dataSize);
+			OrganicClawReader reader({header.data, header.dataSize});
 			ModelHandlerInterface handler(&reader);
 			oxReturnError(model(&handler, &obj));
 			return obj;

deps/ox/src/ox/claw/read.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <ox/std/span.hpp>
 #include <ox/mc/read.hpp>
 #ifdef OX_USE_STDLIB
 #include <ox/oc/read.hpp>
@@ -31,17 +32,15 @@ struct ClawHeader {
 	std::size_t dataSize = 0;
 };
 
-Result<ClawHeader> readClawHeader(const char *buff, std::size_t buffLen) noexcept;
+ox::Result<ox::StringView> readClawTypeId(ox::BufferView buff) noexcept;
 
-Result<ClawHeader> readClawHeader(const ox::Buffer &buff) noexcept;
+Result<ClawHeader> readClawHeader(ox::BufferView buff) noexcept;
 
-Result<Buffer> stripClawHeader(const char *buff, std::size_t buffLen) noexcept;
+Result<BufferView> stripClawHeader(ox::BufferView buff) noexcept;
-
-Result<Buffer> stripClawHeader(const ox::Buffer &buff) noexcept;
 
 template<typename T>
-Error readClaw(const char *buff, std::size_t buffLen, T *val) {
+Error readClaw(ox::BufferView buff, T &val) {
-	oxRequire(header, readClawHeader(buff, buffLen));
+	oxRequire(header, readClawHeader(buff));
 	if (header.typeName != getModelTypeName<T>()) {
 		return OxError(Error_ClawTypeMismatch, "Claw Read: Type mismatch");
 	}
@@ -51,15 +50,16 @@ Error readClaw(const char *buff, std::size_t buffLen, T *val) {
 	switch (header.fmt) {
 		case ClawFormat::Metal:
 		{
-			MetalClawReader reader(reinterpret_cast<const uint8_t*>(header.data), header.dataSize);
+			ox::BufferReader br({header.data, header.dataSize});
+			MetalClawReader reader(br);
 			ModelHandlerInterface handler(&reader);
-			return model(&handler, val);
+			return model(&handler, &val);
 		}
 		case ClawFormat::Organic:
 		{
 #ifdef OX_USE_STDLIB
 			OrganicClawReader reader(header.data, header.dataSize);
-			return model(&reader, val);
+			return model(&reader, &val);
 #else
 			break;
 #endif
@@ -71,22 +71,12 @@ Error readClaw(const char *buff, std::size_t buffLen, T *val) {
 }
 
 template<typename T>
-Result<T> readClaw(const char *buff, std::size_t buffLen) {
+Result<T> readClaw(ox::BufferView buff) {
-	T val;
+	Result<T> val;
-	oxReturnError(readClaw(buff, buffLen, &val));
+	oxReturnError(readClaw(buff, val.value));
 	return val;
 }
 
-template<typename T>
+Result<ModelObject> readClaw(TypeStore &ts, BufferView buff) noexcept;
-Error readClaw(const Buffer &buff, T *val) {
-	return readClaw<T>(buff.data(), buff.size(), val);
-}
-
-template<typename T>
-Result<T> readClaw(const Buffer &buff) {
-	return readClaw<T>(buff.data(), buff.size());
-}
-
-Result<ModelObject> readClaw(TypeStore *ts, const Buffer &buff) noexcept;
 
 }

deps/ox/src/ox/claw/readclaw.cpp

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015 - 2024 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+#include <cstdio>
+
+#include <ox/std/reader.hpp>
+#include <ox/std/trace.hpp>
+
+#include "claw.hpp"
+
+
+int main(int argc, char **args) {
+	if (argc > 2) {
+		oxErr("Too many arguments");
+		return -1;
+	}
+	auto const file = argc == 1 ? stdin : fopen(args[1], "r");
+	if (fseek(file, 0, SEEK_END)) {
+		oxErr("Could not get file size\n");
+		return -2;
+	}
+	auto const size = static_cast<std::size_t>(ftell(file));
+	oxDebugf("{}", size);
+	return 0;
+}

deps/ox/src/ox/claw/test/CMakeLists.txt

@@ -8,7 +8,8 @@ target_link_libraries(
 		OxClaw
 )
 
-add_test("[ox/claw] ClawTest ClawHeaderReader" ClawTest ClawHeaderReader)
+add_test("[ox/claw] ClawHeaderReader" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ClawTest ClawHeaderReader)
-add_test("[ox/claw] ClawTest ClawHeaderReader2" ClawTest ClawHeaderReader2)
+add_test("[ox/claw] ClawHeaderReader2" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ClawTest ClawHeaderReader2)
-add_test("[ox/claw] ClawTest ClawWriter" ClawTest ClawWriter)
+add_test("[ox/claw] ClawHeaderReadTypeId" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ClawTest ClawHeaderReadTypeId)
-add_test("[ox/claw] ClawTest ClawReader" ClawTest ClawReader)
+add_test("[ox/claw] ClawWriter" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ClawTest ClawWriter)
+add_test("[ox/claw] ClawReader" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ClawTest ClawReader)

deps/ox/src/ox/claw/test/tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,11 +8,7 @@
 
 #undef NDEBUG
 
-#include <assert.h>
-#include <iostream>
 #include <map>
-#include <memory>
-#include <string>
 #include <ox/claw/format.hpp>
 #include <ox/claw/read.hpp>
 #include <ox/claw/write.hpp>
@@ -33,7 +29,7 @@ struct TestStructNest {
 	static constexpr auto TypeVersion = 1;
 	bool Bool = false;
 	uint32_t Int = 0;
-	ox::BString<32> String = "";
+	ox::IString<32> String = "";
 };
 
 struct TestStruct {
@@ -51,7 +47,7 @@ struct TestStruct {
 	int32_t Int8 = 0;
 	int unionIdx = 1;
 	TestUnion Union;
-	ox::BString<32> String = "";
+	ox::IString<32> String = "";
 	uint32_t List[4] = {0, 0, 0, 0};
 	TestStructNest EmptyStruct;
 	TestStructNest Struct;
@@ -66,7 +62,7 @@ struct TestStruct {
 
 template<typename T>
 constexpr ox::Error model(T *io, ox::CommonPtrWith<TestUnion> auto *obj) {
-	io->template setTypeInfo<TestUnion>();
+	oxReturnError(io->template setTypeInfo<TestUnion>());
 	oxReturnError(io->field("Bool", &obj->Bool));
 	oxReturnError(io->field("Int", &obj->Int));
 	oxReturnError(io->fieldCString("String", &obj->String));
@@ -75,7 +71,7 @@ constexpr ox::Error model(T *io, ox::CommonPtrWith<TestUnion> auto *obj) {
 
 template<typename T>
 constexpr ox::Error model(T *io, ox::CommonPtrWith<TestStructNest> auto *obj) {
-	io->template setTypeInfo<TestStructNest>();
+	oxReturnError(io->template setTypeInfo<TestStructNest>());
 	oxReturnError(io->field("Bool", &obj->Bool));
 	oxReturnError(io->field("Int", &obj->Int));
 	oxReturnError(io->field("String", &obj->String));
@@ -84,7 +80,7 @@ constexpr ox::Error model(T *io, ox::CommonPtrWith<TestStructNest> auto *obj) {
 
 template<typename T>
 constexpr ox::Error model(T *io, ox::CommonPtrWith<TestStruct> auto *obj) {
-	io->template setTypeInfo<TestStruct>();
+	oxReturnError(io->template setTypeInfo<TestStruct>());
 	oxReturnError(io->field("Bool", &obj->Bool));
 	oxReturnError(io->field("Int", &obj->Int));
 	oxReturnError(io->field("Int1", &obj->Int1));
@@ -107,13 +103,13 @@ constexpr ox::Error model(T *io, ox::CommonPtrWith<TestStruct> auto *obj) {
 	return OxError(0);
 }
 
-static std::map<std::string_view, ox::Error(*)()> tests = {
+static std::map<ox::StringView, ox::Error(*)()> tests = {
 	{
 		{
 			"ClawHeaderReader",
 			[] {
-				ox::String hdr = "O1;com.drinkingtea.ox.claw.test.Header;2;";
+				constexpr auto hdr = ox::StringLiteral("O1;com.drinkingtea.ox.claw.test.Header;2;");
-				auto [ch, err] = ox::readClawHeader(hdr.c_str(), hdr.len() + 1);
+				auto [ch, err] = ox::readClawHeader({hdr.c_str(), hdr.len() + 1});
 				oxAssert(err, "Error parsing header");
 				oxAssert(ch.fmt == ox::ClawFormat::Organic, "Format wrong");
 				oxAssert(ch.typeName == "com.drinkingtea.ox.claw.test.Header", "Type name wrong");
@@ -124,8 +120,8 @@ static std::map<std::string_view, ox::Error(*)()> tests = {
 		{
 			"ClawHeaderReader2",
 			[] {
-				ox::String hdr = "M2;com.drinkingtea.ox.claw.test.Header2;3;";
+				constexpr auto hdr = ox::StringLiteral("M2;com.drinkingtea.ox.claw.test.Header2;3;");
-				auto [ch, err] = ox::readClawHeader(hdr.c_str(), hdr.len() + 1);
+				auto [ch, err] = ox::readClawHeader({hdr.c_str(), hdr.len() + 1});
 				oxAssert(err, "Error parsing header");
 				oxAssert(ch.fmt == ox::ClawFormat::Metal, "Format wrong");
 				oxAssert(ch.typeName == "com.drinkingtea.ox.claw.test.Header2", "Type name wrong");
@@ -133,13 +129,23 @@ static std::map<std::string_view, ox::Error(*)()> tests = {
 				return OxError(0);
 			}
 		},
+		{
+			"ClawHeaderReadTypeId",
+			[] {
+				constexpr auto hdr = ox::StringLiteral("M2;com.drinkingtea.ox.claw.test.Header2;3;awefawf");
+				constexpr auto expected = ox::StringLiteral("com.drinkingtea.ox.claw.test.Header2;3");
+				oxRequire(actual, ox::readClawTypeId({hdr.data(), hdr.len() + 1}));
+				oxExpect(actual, expected);
+				return ox::Error{};
+			}
+		},
 		{
 			"ClawWriter",
 			[] {
 				// This test doesn't confirm much, but it does show that the writer
 				// doesn't segfault
 				TestStruct ts;
-				oxReturnError(ox::writeClaw(&ts, ox::ClawFormat::Metal));
+				oxReturnError(ox::writeClaw(ts, ox::ClawFormat::Metal));
 				return OxError(0);
 			}
 		},
@@ -158,12 +164,10 @@ static std::map<std::string_view, ox::Error(*)()> tests = {
 				testIn.Struct.Bool = false;
 				testIn.Struct.Int = 300;
 				testIn.Struct.String = "Test String 2";
-
+				const auto [buff, err] = ox::writeMC(testIn);
-				auto [buff, err] = ox::writeClaw(&testIn, ox::ClawFormat::Metal);
+				oxAssert(err, "writeClaw failed");
-				oxAssert(err, "writeMC failed");
+				oxAssert(ox::readMC(buff, testOut), "readClaw failed");
-				oxAssert(ox::readClaw(buff.data(), buff.size(), &testOut), "readMC failed");
 				//std::cout << testIn.Union.Int << "|" << testOut.Union.Int << "|\n";
-
 				oxAssert(testIn.Bool               == testOut.Bool, "Bool value mismatch");
 				oxAssert(testIn.Int                == testOut.Int, "Int value mismatch");
 				oxAssert(testIn.Int1               == testOut.Int1, "Int1 value mismatch");
@@ -194,14 +198,14 @@ static std::map<std::string_view, ox::Error(*)()> tests = {
 };
 
 int main(int argc, const char **args) {
-	int retval = -1;
+	if (argc < 2) {
-	if (argc > 0) {
+		oxError("Must specify test to run");
-		auto testName = args[1];
-		if (tests.find(testName) != tests.end()) {
-			retval = tests[testName]();
-		} else {
-			retval = 1;
 	}
+	auto const testName = args[1];
+	auto const func = tests.find(testName);
+	if (func != tests.end()) {
+		oxAssert(func->second(), "Test returned Error");
+		return 0;
 	}
-	return retval;
+	return -1;
 }

deps/ox/src/ox/claw/write.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "write.hpp"

deps/ox/src/ox/claw/write.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -14,6 +14,7 @@
 #endif
 #include <ox/std/buffer.hpp>
 #include <ox/std/string.hpp>
+#include <ox/std/stringview.hpp>
 
 #include "format.hpp"
 
@@ -26,10 +27,15 @@ struct TypeInfoCatcher {
 	const char *name = nullptr;
 	int version = 0;
 
-	template<typename T = void>
+	template<typename T>
-	constexpr void setTypeInfo(const char *name = T::TypeName, int v = T::TypeVersion, const Vector<String>& = {}, int = 0) noexcept {
+	constexpr ox::Error setTypeInfo(
-		this->name = name;
+			const char *pName = T::TypeName,
-		this->version = v;
+			int pVersion = T::TypeVersion,
+			const Vector<String>& = {},
+			std::size_t = 0) noexcept {
+		this->name = pName;
+		this->version = pVersion;
+		return {};
 	}
 
 	constexpr Error field(...) noexcept {
@@ -53,50 +59,64 @@ struct type_version<T, decltype((void) T::TypeVersion, -1)> {
 };
 
 template<typename T>
-constexpr const char *getTypeName(T *t) noexcept {
+constexpr const char *getTypeName(const T *t) noexcept {
 	TypeInfoCatcher tnc;
-	oxIgnoreError(model(&tnc, t));
+	std::ignore = model(&tnc, t);
 	return tnc.name;
 }
 
 template<typename T>
-constexpr int getTypeVersion(T *t) noexcept {
+constexpr int getTypeVersion(const T *t) noexcept {
 	TypeInfoCatcher tnc;
-	oxIgnoreError(model(&tnc, t));
+	std::ignore = model(&tnc, t);
 	return tnc.version;
 }
 
 template<typename T>
-Result<String> writeClawHeader(T *t, ClawFormat fmt) noexcept {
+ox::Error writeClawHeader(Writer_c auto &writer, const T *t, ClawFormat fmt) noexcept {
-	String out;
 	switch (fmt) {
 		case ClawFormat::Metal:
-			out += "M2;";
+			oxReturnError(write(writer, "M2;"));
 			break;
 		case ClawFormat::Organic:
-			out += "O1;";
+			oxReturnError(write(writer, "O1;"));
 			break;
 		default:
 			return OxError(1);
 	}
-	out += detail::getTypeName(t);
+	oxReturnError(write(writer, detail::getTypeName(t)));
-	out += ";";
+	oxReturnError(writer.put(';'));
 	const auto tn = detail::getTypeVersion(t);
 	if (tn > -1) {
-		out += tn;
+		oxReturnError(ox::writeItoa(tn, writer));
 	}
-	out += ";";
+	oxReturnError(writer.put(';'));
-	return out;
+	return {};
-}
+}
-
+
-}
+}
-
+
-Result<Buffer> writeClaw(auto *t, ClawFormat fmt = ClawFormat::Metal) {
+Result<Buffer> writeClaw(
-	oxRequire(header, detail::writeClawHeader(t, fmt));
+		const auto &t,
-	oxRequire(data, fmt == ClawFormat::Metal ? writeMC(t) : writeOC(t));
+		ClawFormat fmt = ClawFormat::Metal,
-	Buffer out(header.len() + data.size());
+		std::size_t buffReserveSz = 2 * units::KB) noexcept {
-	memcpy(out.data(), header.data(), header.len());
+	Buffer out(buffReserveSz);
-	memcpy(out.data() + header.len(), data.data(), data.size());
+	BufferWriter bw(&out, 0);
+	oxReturnError(detail::writeClawHeader(bw, &t, fmt));
+#ifdef OX_USE_STDLIB
+	if (fmt == ClawFormat::Metal) {
+		oxReturnError(writeMC(bw, t));
+	} else if (fmt == ClawFormat::Organic) {
+		oxRequire(data, writeOC(t));
+		oxReturnError(bw.write(data.data(), data.size()));
+	}
+#else
+	if (fmt != ClawFormat::Metal) {
+		return OxError(1, "OC is not supported in this build");
+	}
+	oxReturnError(writeMC(bw, t));
+#endif
+	out.resize(bw.tellp());
 	return out;
 }
 

deps/ox/src/ox/event/CMakeLists.txt

@@ -5,6 +5,7 @@ add_library(
 
 if(NOT MSVC)
     target_compile_options(OxEvent PRIVATE -Wsign-conversion)
+    target_compile_options(OxEvent PRIVATE -Wconversion)
 endif()
 
 if(NOT OX_BARE_METAL)
@@ -36,8 +37,8 @@ install(
 )
 
 install(TARGETS OxEvent
-        LIBRARY DESTINATION lib/ox
+        LIBRARY DESTINATION lib
-        ARCHIVE DESTINATION lib/ox
+        ARCHIVE DESTINATION lib
 )
 
 if(OX_RUN_TESTS)

deps/ox/src/ox/event/event.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/event/signal.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "signal.hpp"

deps/ox/src/ox/event/signal.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -245,7 +245,7 @@ class Signal<Error(Args...)> {
 			}
 
 			Error call(Args... args) noexcept final {
-				return f(args...);
+				return f(ox::forward<Args>(args)...);
 			}
 		};
 
@@ -260,7 +260,7 @@ class Signal<Error(Args...)> {
 			}
 
 			Error call(Args... args) noexcept final {
-				return (m_receiver->*(m_methodPtr))(args...);
+				return (m_receiver->*(m_methodPtr))(ox::forward<Args>(args)...);
 			}
 
 			void cleanup(Signal *signal) noexcept final {
@@ -286,7 +286,7 @@ class Signal<Error(Args...)> {
 			}
 
 			Error call(Args... args) noexcept final {
-				return (m_receiver->*(m_methodPtr))(args...);
+				return (m_receiver->*(m_methodPtr))(ox::forward<Args>(args)...);
 			}
 
 			void cleanup(Signal*) noexcept final {
@@ -391,14 +391,14 @@ Error Signal<Error(Args...)>::disconnectObject(const void *receiver) const noexc
 template<class... Args>
 void Signal<Error(Args...)>::emit(Args... args) const noexcept {
 	for (auto &f : m_slots) {
-		oxIgnoreError(f->call(args...));
+		std::ignore = f->call(ox::forward<Args>(args)...);
 	}
 }
 
 template<class... Args>
 Error Signal<Error(Args...)>::emitCheckError(Args... args) const noexcept {
 	for (auto &f : m_slots) {
-		oxReturnError(f->call(args...));
+		oxReturnError(f->call(ox::forward<Args>(args)...));
 	}
 	return OxError(0);
 }

deps/ox/src/ox/event/test/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable(
 
 target_link_libraries(EventTest OxEvent)
 
-add_test("[ox/event] Test 1" EventTest "test1")
+add_test("[ox/event] Test 1" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/EventTest "test1")

deps/ox/src/ox/event/test/tests.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #undef NDEBUG
@@ -21,7 +21,7 @@ struct TestStruct: public ox::SignalHandler {
 	}
 };
 
-std::map<std::string, std::function<ox::Error()>> tests = {
+std::map<ox::StringView, std::function<ox::Error()>> tests = {
 	{
 		"test1",
 		[] {
@@ -39,12 +39,14 @@ std::map<std::string, std::function<ox::Error()>> tests = {
 };
 
 int main(int argc, const char **args) {
-	if (argc > 1) {
+	if (argc < 2) {
-		auto testName = args[1];
+		oxError("Must specify test to run");
-		if (tests.find(testName) != tests.end()) {
-			oxAssert(tests[testName](), "Test returned Error");
-			return 0;
 	}
+	auto const testName = args[1];
+	auto const func = tests.find(testName);
+	if (func != tests.end()) {
+		oxAssert(func->second(), "Test returned Error");
+		return 0;
 	}
 	return -1;
 }

deps/ox/src/ox/fs/CMakeLists.txt

@@ -1,6 +1,8 @@
 
 add_library(
 	OxFS
+		ptrarith/nodebuffer.hpp
+		ptrarith/ptr.hpp
 		filestore/filestoretemplate.cpp
 		filesystem/filelocation.cpp
 		filesystem/pathiterator.cpp
@@ -9,13 +11,11 @@ add_library(
 		filesystem/passthroughfs.cpp
 )
 
-if(NOT OX_BARE_METAL)
+if(NOT MSVC)
-	if(NOT APPLE AND NOT MSVC)
+	target_compile_options(OxFS PRIVATE -Wsign-conversion)
-		target_link_libraries(
-			OxFS PUBLIC
-				stdc++fs
-		)
 endif()
+
+if(NOT OX_BARE_METAL)
 	set_property(
 		TARGET
 			OxFS
@@ -38,7 +38,6 @@ if(NOT OX_BARE_METAL)
 	target_link_libraries(
 		oxfs-tool
 			OxFS
-			OxStd
 	)
 
 	install(
@@ -75,8 +74,8 @@ install(
 install(
 	TARGETS
 		OxFS
-	LIBRARY DESTINATION lib/ox
+	LIBRARY DESTINATION lib
-	ARCHIVE DESTINATION lib/ox
+	ARCHIVE DESTINATION lib
 )
 
 if(OX_RUN_TESTS)

deps/ox/src/ox/fs/filestore/filestoretemplate.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "filestoretemplate.hpp"

deps/ox/src/ox/fs/filestore/filestoretemplate.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -75,25 +75,25 @@ class FileStoreTemplate {
 	public:
 		FileStoreTemplate() = default;
 
-		FileStoreTemplate(void *buff, size_t buffSize);
+		FileStoreTemplate(void *buff, std::size_t buffSize);
 
-		static Error format(void *buffer, size_t bufferSize);
+		static Error format(void *buffer, std::size_t bufferSize);
 
-		Error setSize(InodeId_t buffSize);
+		Error setSize(std::size_t buffSize);
 
-		Error incLinks(InodeId_t id);
+		Error incLinks(uint64_t id);
 
-		Error decLinks(InodeId_t id);
+		Error decLinks(uint64_t id);
 
-		Error write(InodeId_t id, const void *data, FsSize_t dataSize, uint8_t fileType = 0);
+		Error write(uint64_t id64, const void *data, FsSize_t dataSize, uint8_t fileType = 0);
 
-		Error remove(InodeId_t id);
+		Error remove(uint64_t id);
 
-		Error read(InodeId_t id, void *out, FsSize_t outSize, FsSize_t *size = nullptr) const;
+		Error read(uint64_t id, void *out, FsSize_t outSize, FsSize_t *size = nullptr) const;
 
-		Error read(InodeId_t id, FsSize_t readStart, FsSize_t readSize, void *data, FsSize_t *size = nullptr) const;
+		Error read(uint64_t id, FsSize_t readStart, FsSize_t readSize, void *data, FsSize_t *size = nullptr) const;
 
-		ptrarith::Ptr<uint8_t, std::size_t> read(InodeId_t id) const;
+		ptrarith::Ptr<uint8_t, std::size_t> read(uint64_t id) const;
 
 		/**
 		 * Reads the "file" at the given id. You are responsible for freeing
@@ -106,11 +106,11 @@ class FileStoreTemplate {
 		 * @return 0 if read is a success
 		 */
 		template<typename T>
-		Error read(InodeId_t id, FsSize_t readStart,
+		Error read(uint64_t id, FsSize_t readStart,
 		           FsSize_t readSize, T *data,
 		           FsSize_t *size) const;
 
-		Result<StatInfo> stat(InodeId_t id) const;
+		Result<StatInfo> stat(uint64_t id) const;
 
 		Error resize();
 
@@ -185,56 +185,56 @@ class FileStoreTemplate {
 		 */
 		ItemPtr rootInode();
 
-		bool canWrite(ItemPtr existing, size_t size);
+		bool canWrite(ItemPtr existing, std::size_t size);
 
 };
 
 template<typename size_t>
-FileStoreTemplate<size_t>::FileStoreTemplate(void *buff, size_t buffSize) {
+FileStoreTemplate<size_t>::FileStoreTemplate(void *buff, std::size_t buffSize) {
-	m_buffSize = buffSize;
+	m_buffSize = static_cast<size_t>(buffSize);
 	m_buffer = reinterpret_cast<ptrarith::NodeBuffer<size_t, FileStoreItem<size_t>>*>(buff);
-	if (!m_buffer->valid(buffSize)) {
+	if (!m_buffer->valid(m_buffSize)) {
 		m_buffSize = 0;
 		m_buffer = nullptr;
 	}
 }
 
 template<typename size_t>
-Error FileStoreTemplate<size_t>::format(void *buffer, size_t bufferSize) {
+Error FileStoreTemplate<size_t>::format(void *buffer, std::size_t bufferSize) {
-	auto nb = new (buffer) Buffer(bufferSize);
+	auto nb = new (buffer) Buffer(static_cast<size_t>(bufferSize));
 	auto fsData = nb->malloc(sizeof(FileStoreData)).value;
 	if (!fsData.valid()) {
-		oxTrace("ox::fs::FileStoreTemplate::format::fail", "Could not read data section of FileStoreData");
+		oxTrace("ox.fs.FileStoreTemplate.format.fail", "Could not read data section of FileStoreData");
 		return OxError(1, "Could not read data section of FileStoreData");
 	}
 	auto data = nb->template dataOf<FileStoreData>(fsData);
 	if (!data.valid()) {
-		oxTrace("ox::fs::FileStoreTemplate::format::fail", "Could not read data section of FileStoreData");
+		oxTrace("ox.fs.FileStoreTemplate.format.fail", "Could not read data section of FileStoreData");
 		return OxError(1, "Could not read data section of FileStoreData");
 	}
 	new (data) FileStoreData;
-	return OxError(0);
+	return {};
 }
 
 template<typename size_t>
-Error FileStoreTemplate<size_t>::setSize(InodeId_t size) {
+Error FileStoreTemplate<size_t>::setSize(std::size_t size) {
 	if (m_buffSize >= size) {
-		return m_buffer->setSize(size);
+		return m_buffer->setSize(static_cast<size_t>(size));
 	}
 	return OxError(1);
 }
 
 template<typename size_t>
-Error FileStoreTemplate<size_t>::incLinks(InodeId_t id) {
+Error FileStoreTemplate<size_t>::incLinks(uint64_t id) {
-	oxRequireM(item, find(id).validate());
+	oxRequireM(item, find(static_cast<size_t>(id)).validate());
-	item->links++;
+	++item->links;
 	return OxError(0);
 }
 
 template<typename size_t>
-Error FileStoreTemplate<size_t>::decLinks(InodeId_t id) {
+Error FileStoreTemplate<size_t>::decLinks(uint64_t id) {
-	oxRequireM(item, find(id).validate());
+	oxRequireM(item, find(static_cast<size_t>(id)).validate());
-	item->links--;
+	--item->links;
 	if (item->links == 0) {
 		oxReturnError(remove(item));
 	}
@@ -242,8 +242,9 @@ Error FileStoreTemplate<size_t>::decLinks(InodeId_t id) {
 }
 
 template<typename size_t>
-Error FileStoreTemplate<size_t>::write(InodeId_t id, const void *data, FsSize_t dataSize, uint8_t fileType) {
+Error FileStoreTemplate<size_t>::write(uint64_t id64, const void *data, FsSize_t dataSize, uint8_t fileType) {
-	oxTracef("ox::fs::FileStoreTemplate::write", "Attempting to write to inode {}", id);
+	const auto id = static_cast<size_t>(id64);
+	oxTracef("ox.fs.FileStoreTemplate.write", "Attempting to write to inode {}", id);
 	auto existing = find(id);
 	if (!canWrite(existing, dataSize)) {
 		oxReturnError(compact());
@@ -253,10 +254,10 @@ Error FileStoreTemplate<size_t>::write(InodeId_t id, const void *data, FsSize_t
 	if (canWrite(existing, dataSize)) {
 		// delete the old node if it exists
 		if (existing.valid()) {
-			oxTracef("ox::fs::FileStoreTemplate::write", "Freeing old version of inode found at offset: {}", existing.offset());
+			oxTracef("ox.fs.FileStoreTemplate.write", "Freeing old version of inode found at offset: {}", existing.offset());
 			auto err = m_buffer->free(existing);
 			if (err) {
-				oxTrace("ox::fs::FileStoreTemplate::write::fail", "Free of old version of inode failed");
+				oxTrace("ox.fs.FileStoreTemplate.write.fail", "Free of old version of inode failed");
 				return err;
 			}
 			existing = nullptr;
@@ -265,12 +266,12 @@ Error FileStoreTemplate<size_t>::write(InodeId_t id, const void *data, FsSize_t
 		auto dest = m_buffer->malloc(dataSize).value;
 		// if first malloc failed, compact and try again
 		if (!dest.valid()) {
-			oxTrace("ox::fs::FileStoreTemplate::write", "Allocation failed, compacting");
+			oxTrace("ox.fs.FileStoreTemplate.write", "Allocation failed, compacting");
 			oxReturnError(compact());
 			dest = m_buffer->malloc(dataSize).value;
 		}
 		if (dest.valid()) {
-			oxTrace("ox::fs::FileStoreTemplate::write", "Memory allocated");
+			oxTrace("ox.fs.FileStoreTemplate.write", "Memory allocated");
 			dest->id = id;
 			dest->fileType = fileType;
 			auto destData = m_buffer->template dataOf<uint8_t>(dest);
@@ -278,27 +279,27 @@ Error FileStoreTemplate<size_t>::write(InodeId_t id, const void *data, FsSize_t
 				oxAssert(destData.size() == dataSize, "Allocation size does not match data.");
 				// write data if any was provided
 				if (data != nullptr) {
-					ox_memcpy(destData, data, dest->size());
+					ox::memcpy(destData, data, dest->size());
-					oxTrace("ox::fs::FileStoreTemplate::write", "Data written");
+					oxTrace("ox.fs.FileStoreTemplate.write", "Data written");
 				}
 				auto fsData = fileStoreData();
 				if (fsData) {
-					oxTracef("ox::fs::FileStoreTemplate::write", "Searching for root node at {}", fsData->rootNode.get());
+					oxTracef("ox.fs.FileStoreTemplate.write", "Searching for root node at {}", fsData->rootNode.get());
 					auto root = m_buffer->ptr(fsData->rootNode);
 					if (root.valid()) {
-						oxTracef("ox::fs::FileStoreTemplate::write",
+						oxTracef("ox.fs.FileStoreTemplate.write",
 						         "Placing {} on {} at {}", dest->id.get(), root->id.get(), destData.offset());
 						return placeItem(dest);
 					} else {
-						oxTracef("ox::fs::FileStoreTemplate::write",
+						oxTracef("ox.fs.FileStoreTemplate.write",
 						        "Initializing root inode: {} (offset: {}, data size: {})",
 						        dest->id.get(), dest.offset(), destData.size());
 						fsData->rootNode = dest.offset();
-						oxTracef("ox::fs::FileStoreTemplate::write", "Root inode: {}", dest->id.get());
+						oxTracef("ox.fs.FileStoreTemplate.write", "Root inode: {}", dest->id.get());
 						return OxError(0);
 					}
 				} else {
-					oxTrace("ox::fs::FileStoreTemplate::write::fail", "Could not place item due to absence of FileStore header.");
+					oxTrace("ox.fs.FileStoreTemplate.write.fail", "Could not place item due to absence of FileStore header.");
 				}
 			}
 		}
@@ -308,34 +309,34 @@ Error FileStoreTemplate<size_t>::write(InodeId_t id, const void *data, FsSize_t
 }
 
 template<typename size_t>
-Error FileStoreTemplate<size_t>::remove(InodeId_t id) {
+Error FileStoreTemplate<size_t>::remove(uint64_t id) {
-	return remove(find(id));
+	return remove(find(static_cast<size_t>(id)));
 }
 
 template<typename size_t>
-Error FileStoreTemplate<size_t>::read(InodeId_t id, void *out, FsSize_t outSize, FsSize_t *size) const {
+Error FileStoreTemplate<size_t>::read(uint64_t id, void *out, FsSize_t outSize, FsSize_t *size) const {
-	oxTracef("ox::fs::FileStoreTemplate::read", "Attempting to read from inode {}", id);
+	oxTracef("ox.fs.FileStoreTemplate.read", "Attempting to read from inode {}", id);
-	auto src = find(id);
+	auto src = find(static_cast<size_t>(id));
 	// error check
 	if (!src.valid()) {
-		oxTracef("ox::fs::FileStoreTemplate::read::fail", "Could not find requested item: {}", id);
+		oxTracef("ox.fs.FileStoreTemplate.read.fail", "Could not find requested item: {}", id);
-		return OxError(1);
+		return OxError(1, "Could not find requested item");
 	}
 
 	auto srcData = m_buffer->template dataOf<uint8_t>(src);
-	oxTracef("ox::fs::FileStoreTemplate::read::found", "{} found at {} with data section at {}",
+	oxTracef("ox.fs.FileStoreTemplate.read.found", "{} found at {} with data section at {}",
 	         id, src.offset(), srcData.offset());
-	oxTracef("ox::fs::FileStoreTemplate::read::outSize", "{} {} {}", srcData.offset(), srcData.size(), outSize);
+	oxTracef("ox.fs.FileStoreTemplate.read.outSize", "{} {} {}", srcData.offset(), srcData.size(), outSize);
 
 	// error check
 	if (!(srcData.valid() && srcData.size() <= outSize)) {
-		oxTracef("ox::fs::FileStoreTemplate::read::fail", "Could not read data section of item: {}", id);
+		oxTracef("ox.fs.FileStoreTemplate.read.fail", "Could not read data section of item: {}", id);
-		oxTracef("ox::fs::FileStoreTemplate::read::fail",
+		oxTracef("ox.fs.FileStoreTemplate.read.fail",
 		         "Item data section size: {}, Expected size: {}", srcData.size(), outSize);
 		return OxError(1);
 	}
 
-	ox_memcpy(out, srcData, srcData.size());
+	ox::memcpy(out, srcData, srcData.size());
 	if (size) {
 		*size = src.size();
 	}
@@ -344,45 +345,72 @@ Error FileStoreTemplate<size_t>::read(InodeId_t id, void *out, FsSize_t outSize,
 }
 
 template<typename size_t>
-Error FileStoreTemplate<size_t>::read(InodeId_t id, FsSize_t readStart, FsSize_t readSize, void *data, FsSize_t *size) const {
+Error FileStoreTemplate<size_t>::read(uint64_t id, FsSize_t readStart, FsSize_t readSize, void *out, FsSize_t *size) const {
-	oxRequireM(src, find(id).validate());
+	oxTracef("ox.fs.FileStoreTemplate.read", "Attempting to read from inode {}", id);
-	oxRequireM(srcData, src->data().validate());
+	auto src = find(static_cast<size_t>(id));
-	oxRequire(sub, srcData.template subPtr<uint8_t>(readStart, readSize).validate());
+	// error check
-	memcpy(data, sub, sub.size());
+	if (!src.valid()) {
-	if (size) {
+		oxTracef("ox.fs.FileStoreTemplate.read.fail", "Could not find requested item: {}", id);
-		*size = sub.size();
+		return OxError(1);
 	}
-	return OxError(0);
+
+	auto srcData = m_buffer->template dataOf<uint8_t>(src);
+	oxTracef("ox.fs.FileStoreTemplate.read.found", "{} found at {} with data section at {}",
+	         id, src.offset(), srcData.offset());
+	oxTracef("ox.fs.FileStoreTemplate.read.readSize", "{} {} {}", srcData.offset(), srcData.size(), readSize);
+
+	// error check
+	if (!(srcData.valid() && srcData.size() - readStart <= readSize)) {
+		oxTracef("ox.fs.FileStoreTemplate.read.fail", "Could not read data section of item: {}", id);
+		oxTracef("ox.fs.FileStoreTemplate.read.fail",
+		         "Item data section size: {}, Expected size: {}", srcData.size(), readSize);
+		return OxError(1);
+	}
+
+	ox::memcpy(out, srcData.get() + readStart, readSize);
+	if (size) {
+		*size = src.size();
+	}
+
+	return {};
 }
 
 template<typename size_t>
 template<typename T>
-Error FileStoreTemplate<size_t>::read(InodeId_t id, FsSize_t readStart,
+Error FileStoreTemplate<size_t>::read(uint64_t id, FsSize_t readStart,
-                                      FsSize_t readSize, T *data, FsSize_t *size) const {
+                                      FsSize_t readSize, T *out, FsSize_t *size) const {
-	oxRequireM(src, find(id).validate());
+	oxTracef("ox.fs.FileStoreTemplate.read", "Attempting to read from inode {}", id);
-	oxRequireM(srcData, src->data().validate());
+	auto src = find(static_cast<size_t>(id));
-	auto sub = srcData.template subPtr<uint8_t>(readStart, readSize);
+	// error check
-	if (sub.valid() && sub.size() % sizeof(T)) {
+	if (!src.valid()) {
-		for (FsSize_t i = 0; i < sub.size() / sizeof(T); i++) {
+		oxTracef("ox.fs.FileStoreTemplate.read.fail", "Could not find requested item: {}", id);
-			// do byte-by-byte copy to ensure alignment is right when
-			// copying to final destination
-			T tmp;
-			for (size_t ii = 0; ii < sizeof(T); ii++) {
-				reinterpret_cast<uint8_t*>(&tmp)[ii] = *(sub.get() + ii);
-			}
-			*(data + i) = tmp;
-		}
-		if (size) {
-			*size = sub.size();
-		}
-		return OxError(0);
-	}
 		return OxError(1);
 	}
 
+	auto srcData = m_buffer->template dataOf<uint8_t>(src);
+	oxTracef("ox.fs.FileStoreTemplate.read.found", "{} found at {} with data section at {}",
+	         id, src.offset(), srcData.offset());
+	oxTracef("ox.fs.FileStoreTemplate.read.readSize", "{} {} {}", srcData.offset(), srcData.size(), readSize);
+
+	// error check
+	if (!(srcData.valid() && srcData.size() - readStart <= readSize)) {
+		oxTracef("ox.fs.FileStoreTemplate.read.fail", "Could not read data section of item: {}", id);
+		oxTracef("ox.fs.FileStoreTemplate.read.fail",
+		         "Item data section size: {}, Expected size: {}", srcData.size(), readSize);
+		return OxError(1);
+	}
+
+	ox::memcpy(out, srcData.get() + readStart, readSize);
+	if (size) {
+		*size = src.size();
+	}
+
+	return {};
+}
+
 template<typename size_t>
-ptrarith::Ptr<uint8_t, std::size_t> FileStoreTemplate<size_t>::read(InodeId_t id) const {
+ptrarith::Ptr<uint8_t, std::size_t> FileStoreTemplate<size_t>::read(uint64_t id) const {
-	auto item = find(id);
+	auto item = find(static_cast<size_t>(id));
 	if (item.valid()) {
 		return item->data();
 	} else {
@@ -393,10 +421,10 @@ ptrarith::Ptr<uint8_t, std::size_t> FileStoreTemplate<size_t>::read(InodeId_t id
 template<typename size_t>
 Error FileStoreTemplate<size_t>::resize() {
 	oxReturnError(compact());
-	const auto newSize = size() - available();
+	const auto newSize = static_cast<std::size_t>(size() - available());
-	oxTracef("ox::fs::FileStoreTemplate::resize", "resize to: {}", newSize);
+	oxTracef("ox.fs.FileStoreTemplate.resize", "resize to: {}", newSize);
 	oxReturnError(m_buffer->setSize(newSize));
-	oxTracef("ox::fs::FileStoreTemplate::resize", "resized to: {}", m_buffer->size());
+	oxTracef("ox.fs.FileStoreTemplate.resize", "resized to: {}", m_buffer->size());
 	return OxError(0);
 }
 
@@ -405,17 +433,17 @@ Error FileStoreTemplate<size_t>::resize(std::size_t size, void *newBuff) {
 	if (m_buffer->size() > size) {
 		return OxError(1);
 	}
-	m_buffSize = size;
+	m_buffSize = static_cast<size_t>(size);
 	if (newBuff) {
 		m_buffer = reinterpret_cast<Buffer*>(newBuff);
-		oxReturnError(m_buffer->setSize(size));
+		oxReturnError(m_buffer->setSize(static_cast<size_t>(size)));
 	}
 	return OxError(0);
 }
 
 template<typename size_t>
-Result<StatInfo> FileStoreTemplate<size_t>::stat(InodeId_t id) const {
+Result<StatInfo> FileStoreTemplate<size_t>::stat(uint64_t id) const {
-	oxRequire(inode, find(id).validate());
+	oxRequire(inode, find(static_cast<size_t>(id)).validate());
 	return StatInfo {
 		id,
 		inode->links,
@@ -459,8 +487,8 @@ Result<typename FileStoreTemplate<size_t>::InodeId_t> FileStoreTemplate<size_t>:
 		return OxError(1);
 	}
 	for (auto i = 0; i < 100; i++) {
-		auto inode = fsData->random.gen() % MaxValue<InodeId_t>;
+		auto inode = static_cast<typename FileStoreTemplate<size_t>::InodeId_t>(fsData->random.gen() % MaxValue<InodeId_t>);
-		if (inode > ReservedInodeEnd && !find(inode).valid()) {
+		if (inode > ReservedInodeEnd && !find(static_cast<size_t>(inode)).valid()) {
 			return inode;
 		}
 	}
@@ -478,13 +506,13 @@ Error FileStoreTemplate<size_t>::compact() {
 		if (!item.valid()) {
 			return OxError(1);
 		}
-		oxTracef("ox::FileStoreTemplate::compact::moveItem", "Moving Item: {} from {} to {}", item->id.get(), oldAddr, item.offset());
+		oxTracef("ox.fs.FileStoreTemplate.compact.moveItem", "Moving Item: {} from {} to {}", item->id.get(), oldAddr, item.offset());
 		// update rootInode if this is it
 		auto fsData = fileStoreData();
 		if (fsData && oldAddr == fsData->rootNode) {
 			fsData->rootNode = item.offset();
 		}
-		auto parent = findParent(rootInode(), item->id, oldAddr);
+		auto parent = findParent(rootInode(), item->id, static_cast<size_t>(oldAddr));
 		oxAssert(parent.valid() || rootInode() == item.offset(),
 		         "Parent inode not found for item that should have parent.");
 		if (parent.valid()) {
@@ -521,7 +549,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr item) {
 		fsData->rootNode = item;
 		item->left = root->left;
 		item->right = root->right;
-		oxTracef("ox::fs::FileStoreTemplate::placeItem", "Overwrote Root Item: {}", item->id.get());
+		oxTracef("ox.fs.FileStoreTemplate.placeItem", "Overwrote Root Item: {}", item->id.get());
 		return OxError(0);
 	} else {
 		return placeItem(root, item);
@@ -531,7 +559,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr item) {
 template<typename size_t>
 Error FileStoreTemplate<size_t>::placeItem(ItemPtr root, ItemPtr item, int depth) {
 	if (depth > 5000) {
-		oxTrace("ox::fs::FileStoreTemplate::placeItem::fail", "Excessive recursion depth, stopping before stack overflow.");
+		oxTrace("ox.fs.FileStoreTemplate.placeItem.fail", "Excessive recursion depth, stopping before stack overflow.");
 		return OxError(2);
 	}
 	if (item->id > root->id) {
@@ -542,7 +570,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr root, ItemPtr item, int depth
 				item->left = right->left;
 				item->right = right->right;
 			}
-			oxTracef("ox::fs::FileStoreTemplate::placeItem", "Placed Item: {}", item->id.get());
+			oxTracef("ox.fs.FileStoreTemplate.placeItem", "Placed Item: {}", item->id.get());
 			return OxError(0);
 		} else {
 			return placeItem(right, item, depth + 1);
@@ -555,13 +583,13 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr root, ItemPtr item, int depth
 				item->left = left->left;
 				item->right = left->right;
 			}
-			oxTracef("ox::fs::FileStoreTemplate::placeItem", "Placed Item: {}", item->id.get());
+			oxTracef("ox.fs.FileStoreTemplate.placeItem", "Placed Item: {}", item->id.get());
 			return OxError(0);
 		} else {
 			return placeItem(left, item, depth + 1);
 		}
 	} else {
-		oxTrace("ox::fs::FileStoreTemplate::placeItem::fail", "Cannot insert an item on itself.");
+		oxTrace("ox.fs.FileStoreTemplate.placeItem.fail", "Cannot insert an item on itself.");
 		return OxError(1, "Cannot insert an item on itself.");
 	}
 }
@@ -603,14 +631,14 @@ Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr item) {
 template<typename size_t>
 Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr root, ItemPtr item, int depth) {
 	if (depth >= 5000) {
-		oxTrace("ox::fs::FileStoreTemplate::unplaceItem::fail", "Excessive recursion depth, stopping before stack overflow.");
+		oxTrace("ox.fs.FileStoreTemplate.unplaceItem.fail", "Excessive recursion depth, stopping before stack overflow.");
 		return OxError(1, "Excessive recursion depth, stopping before stack overflow.");
 	}
 	if (item->id > root->id) {
 		auto right = m_buffer->ptr(root->right);
 		if (right->id == item->id) {
 			root->right = 0;
-			oxTracef("ox::fs::FileStoreTemplate::unplaceItem", "Unplaced Item: {}", item->id.get());
+			oxTracef("ox.fs.FileStoreTemplate.unplaceItem", "Unplaced Item: {}", item->id.get());
 		} else {
 			return unplaceItem(right, item, depth + 1);
 		}
@@ -618,7 +646,7 @@ Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr root, ItemPtr item, int dep
 		auto left = m_buffer->ptr(root->left);
 		if (left->id == item->id) {
 			root->left = 0;
-			oxTracef("ox::fs::FileStoreTemplate::unplaceItem", "Unplaced Item: {}", item->id.get());
+			oxTracef("ox.fs.FileStoreTemplate.unplaceItem", "Unplaced Item: {}", item->id.get());
 		} else {
 			return unplaceItem(left, item, depth + 1);
 		}
@@ -673,22 +701,22 @@ typename FileStoreTemplate<size_t>::ItemPtr FileStoreTemplate<size_t>::findParen
 template<typename size_t>
 typename FileStoreTemplate<size_t>::ItemPtr FileStoreTemplate<size_t>::find(ItemPtr item, InodeId_t id, int depth) const {
 	if (depth > 5000) {
-		oxTracef("ox::fs::FileStoreTemplate::find::fail", "Excessive recursion depth, stopping before stack overflow. Search for: {}", id);
+		oxTracef("ox.fs.FileStoreTemplate.find.fail", "Excessive recursion depth, stopping before stack overflow. Search for: {}", id);
 		return nullptr;
 	}
 	if (!item.valid()) {
-		oxTrace("ox::fs::FileStoreTemplate::find::fail", "item invalid");
+		oxTrace("ox.fs.FileStoreTemplate.find.fail", "item invalid");
 		return nullptr;
 	}
 	// do search
 	if (id > item->id) {
-		oxTracef("ox::fs::FileStoreTemplate::find", "Not a match, searching on {}", item->right.get());
+		oxTracef("ox.fs.FileStoreTemplate.find", "Not a match, searching on {}", item->right.get());
 		return find(m_buffer->ptr(item->right), id, depth + 1);
 	} else if (id < item->id) {
-		oxTracef("ox::fs::FileStoreTemplate::find", "Not a match, searching on {}", item->left.get());
+		oxTracef("ox.fs.FileStoreTemplate.find", "Not a match, searching on {}", item->left.get());
 		return find(m_buffer->ptr(item->left), id, depth + 1);
 	} else if (id == item->id) {
-		oxTracef("ox::fs::FileStoreTemplate::find", "Found {} at {}", id, item.offset());
+		oxTracef("ox.fs.FileStoreTemplate.find", "Found {} at {}", id, item.offset());
 		return item;
 	}
 	return nullptr;
@@ -696,7 +724,7 @@ typename FileStoreTemplate<size_t>::ItemPtr FileStoreTemplate<size_t>::find(Item
 
 template<typename size_t>
 typename FileStoreTemplate<size_t>::ItemPtr FileStoreTemplate<size_t>::find(InodeId_t id) const {
-	oxTracef("ox::fs::FileStoreTemplate::find", "Searching for inode: {}", id);
+	oxTracef("ox.fs.FileStoreTemplate.find", "Searching for inode: {}", id);
 	auto fsData = fileStoreData();
 	if (fsData) {
 		auto root = m_buffer->ptr(fsData->rootNode);
@@ -704,10 +732,10 @@ typename FileStoreTemplate<size_t>::ItemPtr FileStoreTemplate<size_t>::find(Inod
 			auto item = find(root, id);
 			return item;
 		} else {
-			oxTrace("ox::fs::FileStoreTemplate::find::fail", "No root node");
+			oxTrace("ox.fs.FileStoreTemplate.find.fail", "No root node");
 		}
 	} else {
-		oxTrace("ox::fs::FileStoreTemplate::find::fail", "No FileStore Data");
+		oxTrace("ox.fs.FileStoreTemplate.find.fail", "No FileStore Data");
 	}
 	return nullptr;
 }
@@ -726,8 +754,9 @@ typename FileStoreTemplate<size_t>::ItemPtr FileStoreTemplate<size_t>::rootInode
 }
 
 template<typename size_t>
-bool FileStoreTemplate<size_t>::canWrite(ItemPtr existing, size_t size) {
+bool FileStoreTemplate<size_t>::canWrite(ItemPtr existing, std::size_t size) {
-	return existing.size() >= size || m_buffer->spaceNeeded(size) <= m_buffer->available();
+	const auto sz = static_cast<size_t>(size);
+	return existing.size() >= sz || m_buffer->spaceNeeded(sz) <= m_buffer->available();
 }
 
 template<typename size_t>

deps/ox/src/ox/fs/filesystem/directory.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "directory.hpp"

deps/ox/src/ox/fs/filesystem/directory.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -48,14 +48,14 @@ struct OX_PACKED DirectoryEntry {
 			auto d = data();
 			if (d.valid()) {
 				d->inode = inode;
-				ox_strncpy(d->name, name, ox::min(bufferSize, static_cast<InodeId_t>(MaxFileNameLength)));
+				ox::strncpy(d->name, name, ox::min(bufferSize, static_cast<InodeId_t>(MaxFileNameLength)));
 				return OxError(0);
 			}
 			return OxError(1);
 		}
 
 		ptrarith::Ptr<DirectoryEntryData, InodeId_t> data() noexcept {
-			oxTracef("ox::fs::DirectoryEntry::data", "{} {} {}", this->fullSize(), sizeof(*this), this->size());
+			oxTracef("ox.fs.DirectoryEntry.data", "{} {} {}", this->fullSize(), sizeof(*this), this->size());
 			return ptrarith::Ptr<DirectoryEntryData, InodeId_t>(this, this->fullSize(), sizeof(*this), this->size(), this->size());
 		}
 
@@ -69,10 +69,10 @@ struct OX_PACKED DirectoryEntry {
 
 		[[nodiscard]]
 		InodeId_t size() const {
-			return fullSize() - sizeof(*this);
+			return fullSize() - static_cast<InodeId_t>(sizeof(*this));
 		}
 
-		void setSize(InodeId_t) {
+		void setSize(std::size_t) {
 			// ignore set value
 		}
 
@@ -94,9 +94,9 @@ class Directory {
 		FileStore m_fs;
 
 	public:
-		Directory() = default;
+		Directory() noexcept = default;
 
-		Directory(FileStore fs, InodeId_t inode);
+		Directory(FileStore fs, uint64_t inode) noexcept;
 
 		/**
 		 * Initializes Directory.
@@ -108,24 +108,26 @@ class Directory {
 		/**
 		 * @param parents indicates the operation should create non-existent directories in the path, like mkdir -p
 		 */
-		Error write(PathIterator path, InodeId_t inode, FileName *nameBuff = nullptr) noexcept;
+		Error write(PathIterator path, uint64_t inode64, FileName *nameBuff = nullptr) noexcept;
 
 		Error remove(PathIterator path, FileName *nameBuff = nullptr) noexcept;
 
 		template<typename F>
 		Error ls(F cb) noexcept;
 
+		[[nodiscard]]
 		Result<typename FileStore::InodeId_t> findEntry(const FileName &name) const noexcept;
 
+		[[nodiscard]]
 		Result<typename FileStore::InodeId_t> find(PathIterator name, FileName *nameBuff = nullptr) const noexcept;
 
 };
 
 template<typename FileStore, typename InodeId_t>
-Directory<FileStore, InodeId_t>::Directory(FileStore fs, InodeId_t inodeId) {
+Directory<FileStore, InodeId_t>::Directory(FileStore fs, uint64_t inodeId) noexcept {
 	m_fs = fs;
-	m_inodeId = inodeId;
+	m_inodeId = static_cast<InodeId_t>(inodeId);
-	auto buff = m_fs.read(inodeId).template to<Buffer>();
+	auto buff = m_fs.read(static_cast<InodeId_t>(inodeId)).template to<Buffer>();
 	if (buff.valid()) {
 		m_size = buff.size();
 	}
@@ -134,7 +136,7 @@ Directory<FileStore, InodeId_t>::Directory(FileStore fs, InodeId_t inodeId) {
 template<typename FileStore, typename InodeId_t>
 Error Directory<FileStore, InodeId_t>::init() noexcept {
 	constexpr auto Size = sizeof(Buffer);
-	oxTracef("ox::fs::Directory::init", "Initializing Directory with Inode ID: {}", m_inodeId);
+	oxTracef("ox.fs.Directory.init", "Initializing Directory with Inode ID: {}", m_inodeId);
 	oxReturnError(m_fs.write(m_inodeId, nullptr, Size, static_cast<uint8_t>(FileType::Directory)));
 	auto buff = m_fs.read(m_inodeId).template to<Buffer>();
 	if (!buff.valid()) {
@@ -149,7 +151,7 @@ Error Directory<FileStore, InodeId_t>::init() noexcept {
 template<typename FileStore, typename InodeId_t>
 Error Directory<FileStore, InodeId_t>::mkdir(PathIterator path, bool parents, FileName *nameBuff) {
 	if (path.valid()) {
-		oxTrace("ox::fs::Directory::mkdir", path.fullPath());
+		oxTrace("ox.fs.Directory.mkdir", path.fullPath());
 		// reuse nameBuff if it has already been allocated, as it is a rather large variable
 		if (nameBuff == nullptr) {
 			nameBuff = new (ox_alloca(sizeof(FileName))) FileName;
@@ -157,8 +159,8 @@ Error Directory<FileStore, InodeId_t>::mkdir(PathIterator path, bool parents, Fi
 
 		// determine if already exists
 		auto name = nameBuff;
-		oxReturnError(path.get(name));
+		oxReturnError(path.get(*name));
-		auto childInode = find(name->c_str());
+		auto childInode = find(PathIterator(*name));
 		if (!childInode.ok()) {
 			// if this is not the last item in the path and parents is disabled,
 			// return an error
@@ -166,7 +168,7 @@ Error Directory<FileStore, InodeId_t>::mkdir(PathIterator path, bool parents, Fi
 				return OxError(1);
 			}
 			childInode = m_fs.generateInodeId();
-			oxTracef("ox::fs::Directory::mkdir", "Generated Inode ID: {}", childInode.value);
+			oxTracef("ox.fs.Directory.mkdir", "Generated Inode ID: {}", childInode.value);
 			oxLogError(childInode.error);
 			oxReturnError(childInode.error);
 
@@ -174,7 +176,7 @@ Error Directory<FileStore, InodeId_t>::mkdir(PathIterator path, bool parents, Fi
 			Directory<FileStore, InodeId_t> child(m_fs, childInode.value);
 			oxReturnError(child.init());
 
-			auto err = write(name->c_str(), childInode.value);
+			auto err = write(PathIterator(*name), childInode.value);
 			if (err) {
 				oxLogError(err);
 				// could not index the directory, delete it
@@ -192,7 +194,8 @@ Error Directory<FileStore, InodeId_t>::mkdir(PathIterator path, bool parents, Fi
 }
 
 template<typename FileStore, typename InodeId_t>
-Error Directory<FileStore, InodeId_t>::write(PathIterator path, InodeId_t inode, FileName *nameBuff) noexcept {
+Error Directory<FileStore, InodeId_t>::write(PathIterator path, uint64_t inode64, FileName *nameBuff) noexcept {
+	const auto inode = static_cast<InodeId_t>(inode64);
 	// reuse nameBuff if it has already been allocated, as it is a rather large variable
 	if (nameBuff == nullptr) {
 		nameBuff = new (ox_alloca(sizeof(FileName))) FileName;
@@ -200,34 +203,34 @@ Error Directory<FileStore, InodeId_t>::write(PathIterator path, InodeId_t inode,
 	auto name = nameBuff;
 
 	if (path.next().hasNext()) { // not yet at target directory, recurse to next one
-		oxReturnError(path.get(name));
+		oxReturnError(path.get(*name));
-		oxTracef("ox::fs::Directory::write", "Attempting to write to next sub-Directory: {} of {}",
+		oxTracef("ox.fs.Directory.write", "Attempting to write to next sub-Directory: {} of {}",
-		        name->c_str(), path.fullPath());
+		         *name, path.fullPath());
 		oxRequire(nextChild, findEntry(*name));
-		oxTracef("ox::fs::Directory::write", "{}: {}", name->c_str(), nextChild);
+		oxTracef("ox.fs.Directory.write", "{}: {}", *name, nextChild);
 		if (nextChild) {
 			// reuse name because it is a rather large variable and will not be used again
 			// be attentive that this remains true
 			name = nullptr;
 			return Directory(m_fs, nextChild).write(path.next(), inode, nameBuff);
 		} else {
-			oxTracef("ox::fs::Directory::write", "{} not found and not allowed to create it.", name->c_str());
+			oxTracef("ox.fs.Directory.write", "{} not found and not allowed to create it.", *name);
 			return OxError(1, "File not found and not allowed to create it.");
 		}
 	} else {
-		oxTrace("ox::fs::Directory::write", path.fullPath());
+		oxTrace("ox.fs.Directory.write", path.fullPath());
 		// insert the new entry on this directory
 
 		// get the name
-		oxReturnError(path.next(name));
+		oxReturnError(path.next(*name));
 
 		// find existing version of directory
-		oxTracef("ox::fs::Directory::write", "Searching for directory inode {}", m_inodeId);
+		oxTracef("ox.fs.Directory.write", "Searching for directory inode {}", m_inodeId);
 		oxRequire(oldStat, m_fs.stat(m_inodeId));
-		oxTracef("ox::fs::Directory::write", "Found existing directory of size {}", oldStat.size);
+		oxTracef("ox.fs.Directory.write", "Found existing directory of size {}", oldStat.size);
 		auto old = m_fs.read(m_inodeId).template to<Buffer>();
 		if (!old.valid()) {
-			oxTrace("ox::fs::Directory::write::fail", "Could not read existing version of Directory");
+			oxTrace("ox.fs.Directory.write.fail", "Could not read existing version of Directory");
 			return OxError(1, "Could not read existing version of Directory");
 		}
 
@@ -236,20 +239,20 @@ Error Directory<FileStore, InodeId_t>::write(PathIterator path, InodeId_t inode,
 		const auto newSize = oldStat.size + Buffer::spaceNeeded(entryDataSize);
 		auto cpy = ox_malloca(newSize, Buffer, *old, oldStat.size);
 		if (cpy == nullptr) {
-			oxTrace("ox::fs::Directory::write::fail", "Could not allocate memory for copy of Directory");
+			oxTrace("ox.fs.Directory.write.fail", "Could not allocate memory for copy of Directory");
 			return OxError(1, "Could not allocate memory for copy of Directory");
 		}
 
 		oxReturnError(cpy->setSize(newSize));
 		auto val = cpy->malloc(entryDataSize).value;
 		if (!val.valid()) {
-			oxTrace("ox::fs::Directory::write::fail", "Could not allocate memory for new directory entry");
+			oxTrace("ox.fs.Directory.write.fail", "Could not allocate memory for new directory entry");
 			return OxError(1, "Could not allocate memory for new directory entry");
 		}
 
-		oxTracef("ox::fs::Directory::write", "Attempting to write Directory entry: {}", name->data());
+		oxTracef("ox.fs.Directory.write", "Attempting to write Directory entry: {}", name->data());
 		oxReturnError(val->init(inode, name->data(), val.size()));
-		return m_fs.write(m_inodeId, cpy, cpy->size(), static_cast<uint8_t>(FileType::Directory));
+		return m_fs.write(m_inodeId, cpy.get(), cpy->size(), static_cast<uint8_t>(FileType::Directory));
 	}
 }
 
@@ -260,24 +263,24 @@ Error Directory<FileStore, InodeId_t>::remove(PathIterator path, FileName *nameB
 		nameBuff = new (ox_alloca(sizeof(FileName))) FileName;
 	}
 	auto &name = *nameBuff;
-	oxReturnError(path.get(&name));
+	oxReturnError(path.get(name));
 
-	oxTrace("ox::fs::Directory::remove", name.c_str());
+	oxTrace("ox.fs.Directory.remove", name);
 	auto buff = m_fs.read(m_inodeId).template to<Buffer>();
 	if (buff.valid()) {
-		oxTrace("ox::fs::Directory::remove", "Found directory buffer.");
+		oxTrace("ox.fs.Directory.remove", "Found directory buffer.");
 		for (auto i = buff->iterator(); i.valid(); i.next()) {
 			auto data = i->data();
 			if (data.valid()) {
-				if (ox_strncmp(data->name, name.c_str(), name.len()) == 0) {
+				if (name == data->name) {
 					oxReturnError(buff->free(i));
 				}
 			} else {
-				oxTrace("ox::fs::Directory::remove", "INVALID DIRECTORY ENTRY");
+				oxTrace("ox.fs.Directory.remove", "INVALID DIRECTORY ENTRY");
 			}
 		}
 	} else {
-		oxTrace("ox::fs::Directory::remove::fail", "Could not find directory buffer");
+		oxTrace("ox.fs.Directory.remove.fail", "Could not find directory buffer");
 		return OxError(1, "Could not find directory buffer");
 	}
 	return OxError(0);
@@ -286,20 +289,20 @@ Error Directory<FileStore, InodeId_t>::remove(PathIterator path, FileName *nameB
 template<typename FileStore, typename InodeId_t>
 template<typename F>
 Error Directory<FileStore, InodeId_t>::ls(F cb) noexcept {
-	oxTrace("ox::fs::Directory::ls");
+	oxTrace("ox.fs.Directory.ls");
 	auto buff = m_fs.read(m_inodeId).template to<Buffer>();
 	if (!buff.valid()) {
-		oxTrace("ox::fs::Directory::ls::fail", "Could not directory buffer");
+		oxTrace("ox.fs.Directory.ls.fail", "Could not directory buffer");
 		return OxError(1, "Could not directory buffer");
 	}
 
-	oxTrace("ox::fs::Directory::ls", "Found directory buffer.");
+	oxTrace("ox.fs.Directory.ls", "Found directory buffer.");
 	for (auto i = buff->iterator(); i.valid(); i.next()) {
 		auto data = i->data();
 		if (data.valid()) {
 			oxReturnError(cb(data->name, data->inode));
 		} else {
-			oxTrace("ox::fs::Directory::ls", "INVALID DIRECTORY ENTRY");
+			oxTrace("ox.fs.Directory.ls", "INVALID DIRECTORY ENTRY");
 		}
 	}
 
@@ -308,26 +311,26 @@ Error Directory<FileStore, InodeId_t>::ls(F cb) noexcept {
 
 template<typename FileStore, typename InodeId_t>
 Result<typename FileStore::InodeId_t> Directory<FileStore, InodeId_t>::findEntry(const FileName &name) const noexcept {
-	oxTrace("ox::fs::Directory::findEntry", name.c_str());
+	oxTrace("ox.fs.Directory.findEntry", name);
 	auto buff = m_fs.read(m_inodeId).template to<Buffer>();
 	if (!buff.valid()) {
-		oxTrace("ox::fs::Directory::findEntry::fail", "Could not findEntry directory buffer");
+		oxTrace("ox.fs.Directory.findEntry.fail", "Could not findEntry directory buffer");
 		return OxError(2, "Could not findEntry directory buffer");
 	}
-	oxTracef("ox::fs::Directory::findEntry", "Found directory buffer, size: {}", buff.size());
+	oxTracef("ox.fs.Directory.findEntry", "Found directory buffer, size: {}", buff.size());
 	for (auto i = buff->iterator(); i.valid(); i.next()) {
 		auto data = i->data();
 		if (data.valid()) {
-			oxTracef("ox::fs::Directory::findEntry", "Comparing \"{}\" to \"{}\"", name.c_str(), data->name);
+			oxTracef("ox.fs.Directory.findEntry", "Comparing \"{}\" to \"{}\"", name, data->name);
-			if (ox_strncmp(data->name, name.c_str(), MaxFileNameLength) == 0) {
+			if (name == data->name) {
-				oxTracef("ox::fs::Directory::findEntry", "\"{}\" match found.", name.c_str());
+				oxTracef("ox.fs.Directory.findEntry", "\"{}\" match found.", name);
 				return static_cast<InodeId_t>(data->inode);
 			}
 		} else {
-			oxTrace("ox::fs::Directory::findEntry") << "INVALID DIRECTORY ENTRY";
+			oxTrace("ox.fs.Directory.findEntry") << "INVALID DIRECTORY ENTRY";
 		}
 	}
-	oxTrace("ox::fs::Directory::findEntry::fail", "Entry not present");
+	oxTrace("ox.fs.Directory.findEntry.fail", "Entry not present");
 	return OxError(1, "Entry not present");
 }
 
@@ -340,9 +343,9 @@ Result<typename FileStore::InodeId_t> Directory<FileStore, InodeId_t>::find(Path
 
 	// determine if already exists
 	auto name = nameBuff;
-	oxReturnError(path.get(name));
+	oxReturnError(path.get(*name));
 
-	oxRequire(v, findEntry(name->c_str()));
+	oxRequire(v, findEntry(*name));
 	// recurse if not at end of path
 	if (auto p = path.next(); p.valid()) {
 		Directory dir(m_fs, v);

deps/ox/src/ox/fs/filesystem/filelocation.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include <ox/model/modelops.hpp>
@@ -36,22 +36,6 @@ FileAddress::FileAddress(ox::CRStringView path) noexcept {
 	m_type = FileAddressType::Path;
 }
 
-FileAddress::FileAddress(char *path) noexcept {
-	auto pathSize = ox_strlen(path) + 1;
-	m_data.path = new char[pathSize];
-	memcpy(m_data.path, path, pathSize);
-	m_type = FileAddressType::Path;
-}
-
-FileAddress::FileAddress(const char *path) noexcept {
-	m_data.constPath = path;
-	m_type = FileAddressType::ConstPath;
-}
-
-FileAddress::~FileAddress() noexcept {
-	cleanup();
-}
-
 FileAddress &FileAddress::operator=(const FileAddress &other) noexcept {
 	if (this == &other) {
 		return *this;
@@ -61,9 +45,14 @@ FileAddress &FileAddress::operator=(const FileAddress &other) noexcept {
 	switch (m_type) {
 		case FileAddressType::Path:
 		{
-			auto strSize = ox_strlen(other.m_data.path) + 1;
+			if (other.m_data.path) {
+				auto strSize = ox::strlen(other.m_data.path) + 1;
 				m_data.path = new char[strSize];
-			ox_memcpy(m_data.path, other.m_data.path, strSize);
+				ox::memcpy(m_data.path, other.m_data.path, strSize);
+			} else {
+				m_data.constPath = "";
+				m_type = FileAddressType::ConstPath;
+			}
 			break;
 		}
 		case FileAddressType::ConstPath:
@@ -99,6 +88,32 @@ FileAddress &FileAddress::operator=(FileAddress &&other) noexcept {
 	return *this;
 }
 
+bool FileAddress::operator==(FileAddress const&other) const noexcept {
+	if (m_type != other.m_type) {
+		auto const aIsPath =
+				m_type == FileAddressType::Path || m_type == FileAddressType::ConstPath;
+		auto const bIsPath =
+				other.m_type == FileAddressType::Path || other.m_type == FileAddressType::ConstPath;
+		if (!(aIsPath && bIsPath)) {
+			return false;
+		}
+	}
+	switch (m_type) {
+		case FileAddressType::ConstPath:
+		case FileAddressType::Path: {
+			auto const a = getPath();
+			auto const b = other.getPath();
+			return (other.m_type == FileAddressType::ConstPath || other.m_type == FileAddressType::Path)
+			    && (a.value == b.value);
+		}
+		case FileAddressType::Inode:
+			return m_data.inode == other.m_data.inode;
+		case FileAddressType::None:
+			return true;
+	}
+	return true;
+}
+
 bool FileAddress::operator==(CRStringView path) const noexcept {
 	auto [p, err] = getPath();
 	if (err) {
@@ -107,16 +122,4 @@ bool FileAddress::operator==(CRStringView path) const noexcept {
 	return path == p;
 }
 
-void FileAddress::cleanup() noexcept {
-	if (m_type == FileAddressType::Path) {
-		safeDeleteArray(m_data.path);
-		clear();
-	}
-}
-
-void FileAddress::clear() noexcept {
-	m_data.path = nullptr;
-	m_type = FileAddressType::None;
-}
-
 }

deps/ox/src/ox/fs/filesystem/filelocation.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -22,10 +22,13 @@ enum class FileAddressType: int8_t {
 	Inode,
 };
 
+template<typename T>
+constexpr Error model(T *h, CommonPtrWith<class FileAddress> auto *fa) noexcept;
+
 class FileAddress {
 
 	template<typename T>
-	friend constexpr Error model(T*, CommonPtrWith<FileAddress> auto*) noexcept;
+	friend constexpr Error model(T *h, CommonPtrWith<FileAddress> auto *fa) noexcept;
 
 	public:
 		static constexpr auto TypeName = "net.drinkingtea.ox.FileAddress";
@@ -41,13 +44,10 @@ class FileAddress {
 
 	protected:
 		FileAddressType m_type = FileAddressType::None;
-		Data m_data;
+		Data m_data{};
 
 	public:
-		constexpr FileAddress() noexcept {
+		constexpr FileAddress() noexcept = default;
-			m_data.inode = 0;
-			m_type = FileAddressType::None;
-		}
 
 		FileAddress(const FileAddress &other) noexcept;
 
@@ -57,22 +57,18 @@ class FileAddress {
 
 		FileAddress(uint64_t inode) noexcept;
 
-		FileAddress(CRStringView path) noexcept;
+		explicit FileAddress(CRStringView path) noexcept;
 
-		template<std::size_t SmallStrSz>
+		constexpr FileAddress(ox::StringLiteral path) noexcept;
-		FileAddress(const ox::BasicString<SmallStrSz> &path) noexcept: FileAddress(StringView(path)) {
-		}
 
-		FileAddress(char *path) noexcept;
+		constexpr ~FileAddress() noexcept;
-
-		FileAddress(const char *path) noexcept;
-
-		~FileAddress() noexcept;
 
 		FileAddress &operator=(const FileAddress &other) noexcept;
 
 		FileAddress &operator=(FileAddress &&other) noexcept;
 
+		bool operator==(const FileAddress &other) const noexcept;
+
 		bool operator==(CRStringView path) const noexcept;
 
 		[[nodiscard]]
@@ -86,7 +82,6 @@ class FileAddress {
 			}
 		}
 
-		[[nodiscard]]
 		constexpr Result<uint64_t> getInode() const noexcept {
 			switch (m_type) {
 				case FileAddressType::Inode:
@@ -96,12 +91,12 @@ class FileAddress {
 			}
 		}
 
-		constexpr Result<const char*> getPath() const noexcept {
+		constexpr Result<ox::CStringView> getPath() const noexcept {
 			switch (m_type) {
 				case FileAddressType::Path:
-					return m_data.path;
+					return ox::CStringView(m_data.path);
 				case FileAddressType::ConstPath:
-					return m_data.constPath;
+					return ox::CStringView(m_data.constPath);
 				default:
 					return OxError(1);
 			}
@@ -115,15 +110,36 @@ class FileAddress {
 		/**
 		 * Cleanup memory allocations.
 		 */
-		void cleanup() noexcept;
+		constexpr void cleanup() noexcept;
 
 		/**
 		 * Clears fields, but does not delete allocations.
 		 */
-		void clear() noexcept;
+		constexpr void clear() noexcept;
 
 };
 
+constexpr FileAddress::FileAddress(ox::StringLiteral path) noexcept {
+	m_data.constPath = path.c_str();
+	m_type = FileAddressType::ConstPath;
+}
+
+constexpr FileAddress::~FileAddress() noexcept {
+	cleanup();
+}
+
+constexpr void FileAddress::cleanup() noexcept {
+	if (m_type == FileAddressType::Path) {
+		safeDeleteArray(m_data.path);
+		clear();
+	}
+}
+
+constexpr void FileAddress::clear() noexcept {
+	m_data.path = nullptr;
+	m_type = FileAddressType::None;
+}
+
 template<>
 constexpr const char *getModelTypeName<FileAddress::Data>() noexcept {
 	return FileAddress::Data::TypeName;
@@ -135,32 +151,32 @@ constexpr const char *getModelTypeName<FileAddress>() noexcept {
 }
 
 template<typename T>
-constexpr Error model(T *io, CommonPtrWith<FileAddress::Data> auto *obj) noexcept {
+constexpr Error model(T *h, CommonPtrWith<FileAddress::Data> auto *obj) noexcept {
-	io->template setTypeInfo<FileAddress::Data>();
+	oxReturnError(h->template setTypeInfo<FileAddress::Data>());
-	oxReturnError(io->fieldCString("path", &obj->path));
+	oxReturnError(h->fieldCString("path", &obj->path));
-	oxReturnError(io->fieldCString("constPath", &obj->path));
+	oxReturnError(h->fieldCString("constPath", &obj->path));
-	oxReturnError(io->field("inode", &obj->inode));
+	oxReturnError(h->field("inode", &obj->inode));
-	return OxError(0);
+	return {};
 }
 
 template<typename T>
-constexpr Error model(T *io, CommonPtrWith<FileAddress> auto *fa) noexcept {
+constexpr Error model(T *h, CommonPtrWith<FileAddress> auto *fa) noexcept {
-	io->template setTypeInfo<FileAddress>();
+	oxReturnError(h->template setTypeInfo<FileAddress>());
 	if constexpr(T::opType() == OpType::Reflect) {
-		int8_t type = 0;
+		int8_t type = -1;
-		oxReturnError(io->field("type", &type));
+		oxReturnError(h->field("type", &type));
-		oxReturnError(io->field("data", UnionView(&fa->m_data, 0)));
+		oxReturnError(h->field("data", UnionView(&fa->m_data, type)));
 	} else if constexpr(T::opType() == OpType::Read) {
 		auto type = static_cast<int8_t>(fa->m_type);
-		oxReturnError(io->field("type", &type));
+		oxReturnError(h->field("type", &type));
 		fa->m_type = static_cast<FileAddressType>(type);
-		oxReturnError(io->field("data", UnionView(&fa->m_data, static_cast<int>(fa->m_type))));
+		oxReturnError(h->field("data", UnionView(&fa->m_data, static_cast<int>(fa->m_type))));
 	} else if constexpr(T::opType() == OpType::Write) {
-		auto type = static_cast<int8_t>(fa->m_type);
+		auto const type = static_cast<int8_t>(fa->m_type);
-		oxReturnError(io->field("type", &type));
+		oxReturnError(h->field("type", &type));
-		oxReturnError(io->field("data", UnionView(&fa->m_data, static_cast<int>(fa->m_type))));
+		oxReturnError(h->field("data", UnionView(&fa->m_data, static_cast<int>(fa->m_type))));
 	}
-	return OxError(0);
+	return {};
 }
 
 }

deps/ox/src/ox/fs/filesystem/filesystem.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include <ox/std/error.hpp>
@@ -13,13 +13,13 @@
 
 namespace ox {
 
-Result<const char*> FileSystem::directAccess(const FileAddress &addr) noexcept {
+Result<const char*> MemFS::directAccess(const FileAddress &addr) const noexcept {
 	switch (addr.type()) {
 		case FileAddressType::Inode:
 			return directAccess(addr.getInode().value);
 		case FileAddressType::ConstPath:
 		case FileAddressType::Path:
-			return directAccess(addr.getPath().value);
+			return directAccess(StringView(addr.getPath().value));
 		default:
 			return OxError(1);
 	}
@@ -28,10 +28,10 @@ Result<const char*> FileSystem::directAccess(const FileAddress &addr) noexcept {
 Error FileSystem::read(const FileAddress &addr, void *buffer, std::size_t size) noexcept {
 	switch (addr.type()) {
 		case FileAddressType::Inode:
-			return read(addr.getInode().value, buffer, size);
+			return readFileInode(addr.getInode().value, buffer, size);
 		case FileAddressType::ConstPath:
 		case FileAddressType::Path:
-			return read(addr.getPath().value, buffer, size);
+			return readFilePath(StringView(addr.getPath().value), buffer, size);
 		default:
 			return OxError(1);
 	}
@@ -39,34 +39,37 @@ Error FileSystem::read(const FileAddress &addr, void *buffer, std::size_t size)
 
 Result<Buffer> FileSystem::read(const FileAddress &addr) noexcept {
 	oxRequire(s, stat(addr));
-	Buffer buff(s.size);
+	Buffer buff(static_cast<std::size_t>(s.size));
 	oxReturnError(read(addr, buff.data(), buff.size()));
 	return buff;
 }
 
+Result<Buffer> FileSystem::read(CRStringView path) noexcept {
+	oxRequire(s, statPath(path));
+	Buffer buff(static_cast<std::size_t>(s.size));
+	oxReturnError(readFilePath(path, buff.data(), buff.size()));
+	return buff;
+}
+
 Error FileSystem::read(const FileAddress &addr, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept {
 	switch (addr.type()) {
 		case FileAddressType::Inode:
 			return read(addr.getInode().value, readStart, readSize, buffer, size);
 		case FileAddressType::ConstPath:
 		case FileAddressType::Path:
-			return read(addr.getPath().value, readStart, readSize, buffer, size);
+			return OxError(2, "Unsupported for path lookups");
 		default:
 			return OxError(1);
 	}
 }
 
-Result<Vector<String>> FileSystem::ls(const String &dir) const noexcept {
-	return ls(dir.c_str());
-}
-
 Error FileSystem::remove(const FileAddress &addr, bool recursive) noexcept {
 	switch (addr.type()) {
 		case FileAddressType::Inode:
 			return remove(addr.getInode().value, recursive);
 		case FileAddressType::ConstPath:
 		case FileAddressType::Path:
-			return remove(addr.getPath().value, recursive);
+			return remove(StringView(addr.getPath().value), recursive);
 		default:
 			return OxError(1);
 	}
@@ -75,10 +78,10 @@ Error FileSystem::remove(const FileAddress &addr, bool recursive) noexcept {
 Error FileSystem::write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType) noexcept {
 	switch (addr.type()) {
 		case FileAddressType::Inode:
-			return write(addr.getInode().value, buffer, size, fileType);
+			return writeFileInode(addr.getInode().value, buffer, size, fileType);
 		case FileAddressType::ConstPath:
 		case FileAddressType::Path:
-			return write(addr.getPath().value, buffer, size, fileType);
+			return writeFilePath(StringView(addr.getPath().value), buffer, size, fileType);
 		default:
 			return OxError(1);
 	}
@@ -87,10 +90,10 @@ Error FileSystem::write(const FileAddress &addr, const void *buffer, uint64_t si
 Result<FileStat> FileSystem::stat(const FileAddress &addr) const noexcept {
 	switch (addr.type()) {
 		case FileAddressType::Inode:
-			return stat(addr.getInode().value);
+			return statInode(addr.getInode().value);
 		case FileAddressType::ConstPath:
 		case FileAddressType::Path:
-			return stat(addr.getPath().value);
+			return statPath(StringView(addr.getPath().value));
 		default:
 			return OxError(1);
 	}

deps/ox/src/ox/fs/filesystem/filesystem.hpp

@@ -1,14 +1,15 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
 
 #include <ox/std/buffer.hpp>
+#include <ox/std/span.hpp>
 
 #include <ox/fs/filestore/filestoretemplate.hpp>
 #include <ox/fs/filesystem/filelocation.hpp>
@@ -29,61 +30,82 @@ class FileSystem {
 	public:
 		virtual ~FileSystem() noexcept = default;
 
-		virtual Error mkdir(const char *path, bool recursive) noexcept = 0;
+		virtual Error mkdir(CRStringView path, bool recursive) noexcept = 0;
 
 		/**
 		 * Moves an entry from one directory to another.
 		 * @param src the path to the file
 		 * @param dest the path of the destination directory
 		 */
-		virtual Error move(const char *src, const char *dest) noexcept = 0;
+		virtual Error move(CRStringView src, CRStringView dest) noexcept = 0;
-
-		virtual Error read(const char *path, void *buffer, std::size_t buffSize) noexcept = 0;
-
-		virtual Result<const char*> directAccess(const char *path) noexcept = 0;
-
-		virtual Error read(uint64_t inode, void *buffer, std::size_t size) noexcept = 0;
-
-		virtual Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept = 0;
-
-		virtual Result<const char*> directAccess(uint64_t inode) noexcept = 0;
 
 		Error read(const FileAddress &addr, void *buffer, std::size_t size) noexcept;
 
 		Result<Buffer> read(const FileAddress &addr) noexcept;
 
+		Result<Buffer> read(CRStringView path) noexcept;
+
+		inline Error read(CRStringView path, void *buffer, std::size_t buffSize) noexcept {
+			return readFilePath(path, buffer, buffSize);
+		}
+
+		inline Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
+			return readFileInode(inode, buffer, buffSize);
+		}
+
 		Error read(const FileAddress &addr, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept;
 
-		[[maybe_unused]]
+		virtual Result<Vector<String>> ls(CRStringView dir) const noexcept = 0;
-		Result<const char*> directAccess(const FileAddress &addr) noexcept;
 
-		Result<Vector<String>> ls(const String &dir) const noexcept;
+		virtual Error remove(CRStringView path, bool recursive) noexcept = 0;
-
-		virtual Result<Vector<String>> ls(const char *dir) const noexcept = 0;
-
-		virtual Error remove(const char *path, bool recursive) noexcept = 0;
 
 		Error remove(const FileAddress &addr, bool recursive = false) noexcept;
 
 		virtual Error resize(uint64_t size, void *buffer) noexcept = 0;
 
-		virtual Error write(const char *path, const void *buffer, uint64_t size, FileType fileType) noexcept = 0;
+		Error write(CRStringView path, const void *buffer, uint64_t size) noexcept {
+			return writeFilePath(path, buffer, size, FileType::NormalFile);
+		}
 
-		virtual Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept = 0;
+		Error write(CRStringView path, ox::Span<char> const&buff) noexcept {
+			return write(path, buff.data(), buff.size(), FileType::NormalFile);
+		}
+
+		Error write(uint64_t inode, const void *buffer, uint64_t size) noexcept {
+			return write(inode, buffer, size, FileType::NormalFile);
+		}
+
+		Error write(uint64_t inode, ox::Span<char> const&buff) noexcept {
+			return write(inode, buff.data(), buff.size(), FileType::NormalFile);
+		}
 
 		Error write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType = FileType::NormalFile) noexcept;
 
-		virtual Result<FileStat> stat(uint64_t inode) const noexcept = 0;
+		inline Error write(CRStringView path, const void *buffer, uint64_t size, FileType fileType) noexcept {
+			return writeFilePath(path, buffer, size, fileType);
+		}
 
-		virtual Result<FileStat> stat(const char *path) const noexcept = 0;
+		inline Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
+			return writeFileInode(inode, buffer, size, fileType);
+		}
+
+		inline Result<FileStat> stat(uint64_t inode) const noexcept {
+			return statInode(inode);
+		}
+
+		inline Result<FileStat> stat(CRStringView path) const noexcept {
+			return statPath(path);
+		}
 
 		Result<FileStat> stat(const FileAddress &addr) const noexcept;
 
 		[[nodiscard]]
 		virtual uint64_t spaceNeeded(uint64_t size) const noexcept = 0;
 
+		[[nodiscard]]
 		virtual Result<uint64_t> available() const noexcept = 0;
 
+		[[nodiscard]]
 		virtual Result<uint64_t> size() const noexcept = 0;
 
 		[[nodiscard]]
@@ -94,6 +116,39 @@ class FileSystem {
 		[[nodiscard]]
 		virtual bool valid() const noexcept = 0;
 
+	protected:
+		virtual Result<FileStat> statInode(uint64_t inode) const noexcept = 0;
+
+		virtual Result<FileStat> statPath(CRStringView path) const noexcept = 0;
+
+		virtual Error readFilePath(CRStringView path, void *buffer, std::size_t buffSize) noexcept = 0;
+
+		virtual Error readFileInode(uint64_t inode, void *buffer, std::size_t size) noexcept = 0;
+
+		virtual Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept = 0;
+
+		virtual Error writeFilePath(CRStringView path, const void *buffer, uint64_t size, FileType fileType) noexcept = 0;
+
+		virtual Error writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept = 0;
+
+};
+
+class MemFS: public FileSystem {
+	public:
+		Result<const char*> directAccess(const FileAddress &addr) const noexcept;
+
+		inline Result<const char*> directAccess(CRStringView path) const noexcept {
+			return directAccessPath(path);
+		}
+
+		inline Result<const char*> directAccess(uint64_t inode) const noexcept {
+			return directAccessInode(inode);
+		}
+
+	protected:
+		virtual Result<const char*> directAccessPath(CRStringView path) const noexcept = 0;
+
+		virtual Result<const char*> directAccessInode(uint64_t inode) const noexcept = 0;
 };
 
 /**
@@ -103,7 +158,7 @@ class FileSystem {
  * Note: Directory parameter must have a default constructor.
  */
 template<typename FileStore, typename Directory>
-class FileSystemTemplate: public FileSystem {
+class FileSystemTemplate: public MemFS {
 	private:
 		static constexpr auto InodeFsData = 2;
 
@@ -119,32 +174,34 @@ class FileSystemTemplate: public FileSystem {
 
 		FileSystemTemplate(void *buffer, uint64_t bufferSize, void(*freeBuffer)(char*) = detail::fsBuffFree) noexcept;
 
+		explicit FileSystemTemplate(ox::Buffer &buffer) noexcept;
+
 		explicit FileSystemTemplate(FileStore fs) noexcept;
 
 		~FileSystemTemplate() noexcept override;
 
 		static Error format(void *buff, uint64_t buffSize) noexcept;
 
-		Error mkdir(const char *path, bool recursive) noexcept override;
+		Error mkdir(CRStringView path, bool recursive) noexcept override;
 
-		Error move(const char *src, const char *dest) noexcept override;
+		Error move(CRStringView src, CRStringView dest) noexcept override;
 
-		Error read(const char *path, void *buffer, std::size_t buffSize) noexcept override;
+		Error readFilePath(CRStringView path, void *buffer, std::size_t buffSize) noexcept override;
 
-		Result<const char*> directAccess(const char*) noexcept override;
+		Result<const char*> directAccessPath(CRStringView) const noexcept override;
 
-		Error read(uint64_t inode, void *buffer, std::size_t size) noexcept override;
+		Error readFileInode(uint64_t inode, void *buffer, std::size_t size) noexcept override;
 
-		Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
+		Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
 
-		Result<const char*> directAccess(uint64_t) noexcept override;
+		Result<const char*> directAccessInode(uint64_t) const noexcept override;
 
-		Result<Vector<String>> ls(const char *path) const noexcept override;
+		Result<Vector<String>> ls(CRStringView dir) const noexcept override;
 
 		template<typename F>
-		Error ls(const char *path, F cb) const;
+		Error ls(CRStringView path, F cb) const;
 
-		Error remove(const char *path, bool recursive) noexcept override;
+		Error remove(CRStringView path, bool recursive) noexcept override;
 
 		/**
 		 * Resizes FileSystem to minimum possible size.
@@ -153,14 +210,15 @@ class FileSystemTemplate: public FileSystem {
 
 		Error resize(uint64_t size, void *buffer) noexcept override;
 
-		Error write(const char *path, const void *buffer, uint64_t size, FileType fileType) noexcept override;
+		Error writeFilePath(CRStringView path, const void *buffer, uint64_t size, FileType fileType) noexcept override;
 
-		Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept override;
+		Error writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept override;
 
-		Result<FileStat> stat(uint64_t inode) const noexcept override;
+		Result<FileStat> statInode(uint64_t inode) const noexcept override;
 
-		Result<FileStat> stat(const char *path) const noexcept override;
+		Result<FileStat> statPath(CRStringView path) const noexcept override;
 
+		[[nodiscard]]
 		uint64_t spaceNeeded(uint64_t size) const noexcept override;
 
 		Result<uint64_t> available() const noexcept override;
@@ -180,7 +238,7 @@ class FileSystemTemplate: public FileSystem {
 		/**
 		 * Finds the inode ID at the given path.
 		 */
-		Result<uint64_t> find(const char *path) const noexcept;
+		Result<uint64_t> find(CRStringView path) const noexcept;
 
 		Result<Directory> rootDir() const noexcept;
 
@@ -191,9 +249,14 @@ FileSystemTemplate<FileStore, Directory>::FileSystemTemplate(FileStore fs) noexc
 	m_fs = fs;
 }
 
+template<typename FileStore, typename Directory>
+FileSystemTemplate<FileStore, Directory>::FileSystemTemplate(ox::Buffer &buffer) noexcept:
+		m_fs(buffer.data(), static_cast<std::size_t>(buffer.size())) {
+}
+
 template<typename FileStore, typename Directory>
 FileSystemTemplate<FileStore, Directory>::FileSystemTemplate(void *buffer, uint64_t bufferSize, void(*freeBuffer)(char*)) noexcept:
-	m_fs(buffer, bufferSize),
+	m_fs(buffer, static_cast<std::size_t>(bufferSize)),
 	m_freeBuffer(freeBuffer) {
 }
 
@@ -206,8 +269,8 @@ FileSystemTemplate<FileStore, Directory>::~FileSystemTemplate() noexcept {
 
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::format(void *buff, uint64_t buffSize) noexcept {
-	oxReturnError(FileStore::format(buff, buffSize));
+	oxReturnError(FileStore::format(buff, static_cast<size_t>(buffSize)));
-	FileStore fs(buff, buffSize);
+	FileStore fs(buff, static_cast<size_t>(buffSize));
 
 	constexpr auto rootDirInode = MaxValue<typename FileStore::InodeId_t> / 2;
 	Directory rootDir(fs, rootDirInode);
@@ -215,11 +278,11 @@ Error FileSystemTemplate<FileStore, Directory>::format(void *buff, uint64_t buff
 
 	FileSystemData fd;
 	fd.rootDirInode = rootDirInode;
-	oxTracef("ox::fs::FileSystemTemplate::format", "rootDirInode: {}", fd.rootDirInode.get());
+	oxTracef("ox.fs.FileSystemTemplate.format", "rootDirInode: {}", fd.rootDirInode.get());
 	oxReturnError(fs.write(InodeFsData, &fd, sizeof(fd)));
 
 	if (!fs.read(fd.rootDirInode).valid()) {
-		oxTrace("ox::fs::FileSystemTemplate::format::error", "FileSystemTemplate::format did not correctly create root directory");
+		oxTrace("ox.fs.FileSystemTemplate.format.error", "FileSystemTemplate::format did not correctly create root directory");
 		return OxError(1);
 	}
 
@@ -227,14 +290,14 @@ Error FileSystemTemplate<FileStore, Directory>::format(void *buff, uint64_t buff
 }
 
 template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::mkdir(const char *path, bool recursive) noexcept {
+Error FileSystemTemplate<FileStore, Directory>::mkdir(CRStringView path, bool recursive) noexcept {
-	oxTracef("ox::fs::FileSystemTemplate::mkdir", "path: {}, recursive: {}", path, recursive);
+	oxTracef("ox.fs.FileSystemTemplate.mkdir", "path: {}, recursive: {}", path, recursive);
 	oxRequireM(rootDir, this->rootDir());
 	return rootDir.mkdir(path, recursive);
 }
 
 template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::move(const char *src, const char *dest) noexcept {
+Error FileSystemTemplate<FileStore, Directory>::move(CRStringView src, CRStringView dest) noexcept {
 	oxRequire(fd, fileSystemData());
 	Directory rootDir(m_fs, fd.rootDirInode);
 	oxRequireM(inode, rootDir.find(src));
@@ -244,44 +307,51 @@ Error FileSystemTemplate<FileStore, Directory>::move(const char *src, const char
 }
 
 template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::read(const char *path, void *buffer, std::size_t buffSize) noexcept {
+Error FileSystemTemplate<FileStore, Directory>::readFilePath(CRStringView path, void *buffer, std::size_t buffSize) noexcept {
+	oxRequire(fd, fileSystemData());
+	Directory rootDir(m_fs, fd.rootDirInode);
+	oxRequire(s, stat(path));
+	if (s.size > buffSize) {
+		return OxError(1, "Buffer to small to load file");
+	}
+	return readFileInodeRange(s.inode, 0, static_cast<size_t>(s.size), buffer, &buffSize);
+}
+
+template<typename FileStore, typename Directory>
+Result<const char*> FileSystemTemplate<FileStore, Directory>::directAccessPath(CRStringView path) const noexcept {
 	oxRequire(fd, fileSystemData());
 	Directory rootDir(m_fs, fd.rootDirInode);
 	oxRequire(inode, rootDir.find(path));
-	return read(inode, buffer, buffSize);
+	return directAccessInode(inode);
 }
 
 template<typename FileStore, typename Directory>
-Result<const char*> FileSystemTemplate<FileStore, Directory>::directAccess(const char *path) noexcept {
+Error FileSystemTemplate<FileStore, Directory>::readFileInode(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
-	oxRequire(fd, fileSystemData());
+	oxRequire(s, stat(inode));
-	Directory rootDir(m_fs, fd.rootDirInode);
+	if (s.size > buffSize) {
-	oxRequire(inode, rootDir.find(path));
+		return OxError(1, "Buffer to small to load file");
-	return directAccess(inode);
+	}
+	return readFileInodeRange(inode, 0, static_cast<size_t>(s.size), buffer, &buffSize);
 }
 
 template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
+Error FileSystemTemplate<FileStore, Directory>::readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept {
-	return m_fs.read(inode, buffer, buffSize);
-}
-
-template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept {
 	return m_fs.read(inode, readStart, readSize, reinterpret_cast<uint8_t*>(buffer), size);
 }
 
 template<typename FileStore, typename Directory>
-Result<const char*> FileSystemTemplate<FileStore, Directory>::directAccess(uint64_t inode) noexcept {
+Result<const char*> FileSystemTemplate<FileStore, Directory>::directAccessInode(uint64_t inode) const noexcept {
 	auto data = m_fs.read(inode);
 	if (!data.valid()) {
-		return OxError(1);
+		return OxError(1, "Data not valid");
 	}
 	return reinterpret_cast<char*>(data.get());
 }
 
 template<typename FileStore, typename Directory>
-Result<Vector<String>> FileSystemTemplate<FileStore, Directory>::ls(const char *path) const noexcept {
+Result<Vector<String>> FileSystemTemplate<FileStore, Directory>::ls(CRStringView path) const noexcept {
 	Vector<String> out;
-	oxReturnError(ls(path, [&out](const char *name, typename FileStore::InodeId_t) {
+	oxReturnError(ls(path, [&out](CRStringView name, typename FileStore::InodeId_t) {
 		out.emplace_back(name);
 		return OxError(0);
 	}));
@@ -290,19 +360,19 @@ Result<Vector<String>> FileSystemTemplate<FileStore, Directory>::ls(const char *
 
 template<typename FileStore, typename Directory>
 template<typename F>
-Error FileSystemTemplate<FileStore, Directory>::ls(const char *path, F cb) const {
+Error FileSystemTemplate<FileStore, Directory>::ls(CRStringView path, F cb) const {
-	oxTracef("ox::fs::FileSystemTemplate::ls", "path: {}", path);
+	oxTracef("ox.fs.FileSystemTemplate.ls", "path: {}", path);
 	oxRequire(s, stat(path));
 	Directory dir(m_fs, s.inode);
 	return dir.ls(cb);
 }
 
 template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::remove(const char *path, bool recursive) noexcept {
+Error FileSystemTemplate<FileStore, Directory>::remove(CRStringView path, bool recursive) noexcept {
 	oxRequire(fd, fileSystemData());
 	Directory rootDir(m_fs, fd.rootDirInode);
 	oxRequire(inode, rootDir.find(path));
-	oxRequire(st, stat(inode));
+	oxRequire(st, statInode(inode));
 	if (st.fileType == FileType::NormalFile || recursive) {
 		if (auto err = rootDir.remove(path)) {
 			// removal failed, try putting the index back
@@ -310,7 +380,7 @@ Error FileSystemTemplate<FileStore, Directory>::remove(const char *path, bool re
 			return err;
 		}
 	} else {
-		oxTrace("FileSystemTemplate::remove::fail", "Tried to remove directory without recursive setting.");
+		oxTrace("FileSystemTemplate.remove.fail", "Tried to remove directory without recursive setting.");
 		return OxError(1);
 	}
 	return OxError(0);
@@ -323,12 +393,12 @@ Error FileSystemTemplate<FileStore, Directory>::resize() noexcept {
 
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::resize(uint64_t size, void *buffer) noexcept {
-	oxReturnError(m_fs.resize(size, buffer));
+	oxReturnError(m_fs.resize(static_cast<size_t>(size), buffer));
 	return OxError(0);
 }
 
 template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::write(const char *path, const void *buffer, uint64_t size, FileType fileType) noexcept {
+Error FileSystemTemplate<FileStore, Directory>::writeFilePath(CRStringView path, const void *buffer, uint64_t size, FileType fileType) noexcept {
 	auto [inode, err] = find(path);
 	if (err) {
 		oxRequire(generatedId, m_fs.generateInodeId());
@@ -336,17 +406,17 @@ Error FileSystemTemplate<FileStore, Directory>::write(const char *path, const vo
 		oxRequireM(rootDir, this->rootDir());
 		oxReturnError(rootDir.write(path, inode));
 	}
-	oxReturnError(write(inode, buffer, size, fileType));
+	oxReturnError(writeFileInode(inode, buffer, size, fileType));
 	return OxError(0);
 }
 
 template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
+Error FileSystemTemplate<FileStore, Directory>::writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
-	return m_fs.write(inode, buffer, size, static_cast<uint8_t>(fileType));
+	return m_fs.write(inode, buffer, static_cast<size_t>(size), static_cast<uint8_t>(fileType));
 }
 
 template<typename FileStore, typename Directory>
-Result<FileStat> FileSystemTemplate<FileStore, Directory>::stat(uint64_t inode) const noexcept {
+Result<FileStat> FileSystemTemplate<FileStore, Directory>::statInode(uint64_t inode) const noexcept {
 	oxRequire(s, m_fs.stat(inode));
 	FileStat out;
 	out.inode = s.inode;
@@ -357,14 +427,14 @@ Result<FileStat> FileSystemTemplate<FileStore, Directory>::stat(uint64_t inode)
 }
 
 template<typename FileStore, typename Directory>
-Result<FileStat> FileSystemTemplate<FileStore, Directory>::stat(const char *path) const noexcept {
+Result<FileStat> FileSystemTemplate<FileStore, Directory>::statPath(CRStringView path) const noexcept {
 	oxRequire(inode, find(path));
 	return stat(inode);
 }
 
 template<typename FileStore, typename Directory>
 uint64_t FileSystemTemplate<FileStore, Directory>::spaceNeeded(uint64_t size) const noexcept {
-	return m_fs.spaceNeeded(size);
+	return m_fs.spaceNeeded(static_cast<size_t>(size));
 }
 
 template<typename FileStore, typename Directory>
@@ -400,10 +470,10 @@ Result<typename FileSystemTemplate<FileStore, Directory>::FileSystemData> FileSy
 }
 
 template<typename FileStore, typename Directory>
-Result<uint64_t> FileSystemTemplate<FileStore, Directory>::find(const char *path) const noexcept {
+Result<uint64_t> FileSystemTemplate<FileStore, Directory>::find(CRStringView path) const noexcept {
 	oxRequire(fd, fileSystemData());
 	// return root as a special case
-	if (ox_strcmp(path, "/") == 0) {
+	if (path == "/") {
 		return static_cast<uint64_t>(fd.rootDirInode);
 	}
 	Directory rootDir(m_fs, fd.rootDirInode);

deps/ox/src/ox/fs/filesystem/passthroughfs.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include <ox/std/error.hpp>
@@ -13,25 +13,25 @@
 #if defined(OX_HAS_PASSTHROUGHFS)
 
 #include <fstream>
+#include <string_view>
 
 namespace ox {
 
-PassThroughFS::PassThroughFS(const char *dirPath) {
+PassThroughFS::PassThroughFS(CRStringView dirPath) {
-	m_path = dirPath;
+	m_path = std::string_view(dirPath.data(), dirPath.bytes());
 }
 
-PassThroughFS::~PassThroughFS() noexcept {
+PassThroughFS::~PassThroughFS() noexcept = default;
-}
 
 String PassThroughFS::basePath() const noexcept {
-	return m_path.string().c_str();
+	return ox::String(m_path.string().c_str());
 }
 
-Error PassThroughFS::mkdir(const char *path, bool recursive) noexcept {
+Error PassThroughFS::mkdir(CRStringView path, bool recursive) noexcept {
 	bool success = false;
 	const auto p = m_path / stripSlash(path);
 	const auto u8p = p.u8string();
-	oxTrace("ox::fs::PassThroughFS::mkdir", u8p.c_str());
+	oxTrace("ox.fs.PassThroughFS.mkdir", std::bit_cast<const char*>(u8p.c_str()));
 	if (recursive) {
 		std::error_code ec;
 		const auto isDir = std::filesystem::is_directory(p, ec);
@@ -39,7 +39,7 @@ Error PassThroughFS::mkdir(const char *path, bool recursive) noexcept {
 			success = true;
 		} else {
 			success = std::filesystem::create_directories(p, ec);
-			oxReturnError(OxError(ec.value(), "PassThroughFS: mkdir failed"));
+			oxReturnError(OxError(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: mkdir failed"));
 		}
 	} else {
 		std::error_code ec;
@@ -47,15 +47,14 @@ Error PassThroughFS::mkdir(const char *path, bool recursive) noexcept {
 		if (isDir) {
 			success = true;
 		} else {
-			std::error_code ec;
 			success = std::filesystem::create_directory(p, ec);
-			oxReturnError(OxError(ec.value(), "PassThroughFS: mkdir failed"));
+			oxReturnError(OxError(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: mkdir failed"));
 		}
 	}
 	return OxError(success ? 0 : 1);
 }
 
-Error PassThroughFS::move(const char *src, const char *dest) noexcept {
+Error PassThroughFS::move(CRStringView src, CRStringView dest) noexcept {
 	std::error_code ec;
 	std::filesystem::rename(m_path / stripSlash(src), m_path / stripSlash(dest), ec);
 	if (ec.value()) {
@@ -64,46 +63,11 @@ Error PassThroughFS::move(const char *src, const char *dest) noexcept {
 	return OxError(0);
 }
 
-Error PassThroughFS::read(const char *path, void *buffer, std::size_t buffSize) noexcept {
+Result<Vector<String>> PassThroughFS::ls(CRStringView dir) const noexcept {
-	try {
-		std::ifstream file((m_path / stripSlash(path)), std::ios::binary | std::ios::ate);
-		const std::size_t size = file.tellg();
-		file.seekg(0, std::ios::beg);
-		if (size > buffSize) {
-			oxTracef("ox::fs::PassThroughFS::read::error", "Read failed: Buffer too small: {}", path);
-			return OxError(1);
-		}
-		file.read(static_cast<char*>(buffer), buffSize);
-	} catch (const std::fstream::failure &f) {
-		oxTracef("ox::fs::PassThroughFS::read::error", "Read of {} failed: {}", path, f.what());
-		return OxError(2);
-	}
-	return OxError(0);
-}
-
-Result<const char*> PassThroughFS::directAccess(const char*) noexcept {
-	return OxError(1, "PassThroughFS::directAccess not supported");
-}
-
-Error PassThroughFS::read(uint64_t, void*, std::size_t) noexcept {
-	// unsupported
-	return OxError(1, "read(uint64_t, void*, std::size_t) is not supported by PassThroughFS");
-}
-
-Error PassThroughFS::read(uint64_t, std::size_t, std::size_t, void*, std::size_t*) noexcept {
-	// unsupported
-	return OxError(1, "read(uint64_t, std::size_t, std::size_t, void*, std::size_t*) is not supported by PassThroughFS");
-}
-
-Result<const char*> PassThroughFS::directAccess(uint64_t) noexcept {
-	return OxError(1, "PassThroughFS::directAccess not supported");
-}
-
-Result<Vector<String>> PassThroughFS::ls(const char *dir) const noexcept {
 	Vector<String> out;
 	std::error_code ec;
 	const auto di = std::filesystem::directory_iterator(m_path / stripSlash(dir), ec);
-	oxReturnError(OxError(ec.value(), "PassThroughFS: ls failed"));
+	oxReturnError(OxError(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: ls failed"));
 	for (const auto &p : di) {
 		const auto u8p = p.path().filename().u8string();
 		out.emplace_back(reinterpret_cast<const char*>(u8p.c_str()));
@@ -111,7 +75,7 @@ Result<Vector<String>> PassThroughFS::ls(const char *dir) const noexcept {
 	return out;
 }
 
-Error PassThroughFS::remove(const char *path, bool recursive) noexcept {
+Error PassThroughFS::remove(CRStringView path, bool recursive) noexcept {
 	if (recursive) {
 		return OxError(std::filesystem::remove_all(m_path / stripSlash(path)) != 0);
 	} else {
@@ -124,38 +88,21 @@ Error PassThroughFS::resize(uint64_t, void*) noexcept {
 	return OxError(1, "resize is not supported by PassThroughFS");
 }
 
-Error PassThroughFS::write(const char *path, const void *buffer, uint64_t size, FileType) noexcept {
+Result<FileStat> PassThroughFS::statInode(uint64_t) const noexcept {
-	const auto p = (m_path / stripSlash(path));
-	try {
-		std::ofstream f(p, std::ios::binary);
-		f.write(static_cast<const char*>(buffer), size);
-	} catch (const std::fstream::failure &f) {
-		oxTracef("ox::fs::PassThroughFS::read::error", "Write of {} failed: {}", path, f.what());
-		return OxError(1);
-	}
-	return OxError(0);
-}
-
-Error PassThroughFS::write(uint64_t, const void*, uint64_t, FileType) noexcept {
 	// unsupported
-	return OxError(1, "write(uint64_t, void*, uint64_t, uint8_t) is not supported by PassThroughFS");
+	return OxError(1, "statInode(uint64_t) is not supported by PassThroughFS");
 }
 
-Result<FileStat> PassThroughFS::stat(uint64_t) const noexcept {
+Result<FileStat> PassThroughFS::statPath(CRStringView path) const noexcept {
-	// unsupported
-	return OxError(1, "stat(uint64_t) is not supported by PassThroughFS");
-}
-
-Result<FileStat> PassThroughFS::stat(const char *path) const noexcept {
 	std::error_code ec;
 	const auto p = m_path / stripSlash(path);
 	const FileType type = std::filesystem::is_directory(p, ec) ?
 		FileType::Directory : FileType::NormalFile;
-	oxTracef("ox::fs::PassThroughFS::stat", "{} {}", ec.message(), path);
+	oxTracef("ox.fs.PassThroughFS.statInode", "{} {}", ec.message(), path);
 	const uint64_t size = type == FileType::Directory ? 0 : std::filesystem::file_size(p, ec);
-	oxTracef("ox::fs::PassThroughFS::stat", "{} {}", ec.message(), path);
+	oxTracef("ox.fs.PassThroughFS.statInode", "{} {}", ec.message(), path);
-	oxTracef("ox::fs::PassThroughFS::stat::size", "{} {}", path, size);
+	oxTracef("ox.fs.PassThroughFS.statInode.size", "{} {}", path, size);
-	oxReturnError(OxError(ec.value()));
+	oxReturnError(OxError(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: stat failed"));
 	return FileStat{0, 0, size, type};
 }
 
@@ -166,14 +113,14 @@ uint64_t PassThroughFS::spaceNeeded(uint64_t size) const noexcept {
 Result<uint64_t> PassThroughFS::available() const noexcept {
 	std::error_code ec;
 	const auto s = std::filesystem::space(m_path, ec);
-	oxReturnError(OxError(ec.value(), "PassThroughFS: could not get FS size"));
+	oxReturnError(OxError(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: could not get FS size"));
 	return s.available;
 }
 
 Result<uint64_t> PassThroughFS::size() const noexcept {
 	std::error_code ec;
 	const auto s = std::filesystem::space(m_path, ec);
-	oxReturnError(OxError(ec.value(), "PassThroughFS: could not get FS size"));
+	oxReturnError(OxError(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: could not get FS size"));
 	return s.capacity;
 }
 
@@ -194,12 +141,56 @@ bool PassThroughFS::valid() const noexcept {
 	return false;
 }
 
-const char *PassThroughFS::stripSlash(const char *path) noexcept {
+Error PassThroughFS::readFilePath(CRStringView path, void *buffer, std::size_t buffSize) noexcept {
-	const auto pathLen = ox_strlen(path);
+	try {
-	for (auto i = 0u; i < pathLen && path[0] == '/'; i++) {
+		std::ifstream file((m_path / stripSlash(path)), std::ios::binary | std::ios::ate);
-		path++;
+		const std::size_t size = static_cast<std::size_t>(file.tellg());
+		file.seekg(0, std::ios::beg);
+		if (size > buffSize) {
+			oxTracef("ox.fs.PassThroughFS.read.error", "Read failed: Buffer too small: {}", path);
+			return OxError(1);
 		}
-	return path;
+		file.read(static_cast<char*>(buffer), static_cast<std::streamsize>(buffSize));
+	} catch (const std::fstream::failure &f) {
+		oxTracef("ox.fs.PassThroughFS.read.error", "Read of {} failed: {}", path, f.what());
+		return OxError(2);
+	}
+	return OxError(0);
+}
+
+Error PassThroughFS::readFileInode(uint64_t, void*, std::size_t) noexcept {
+	// unsupported
+	return OxError(1, "readFileInode(uint64_t, void*, std::size_t) is not supported by PassThroughFS");
+}
+
+Error PassThroughFS::readFileInodeRange(uint64_t, std::size_t, std::size_t, void*, std::size_t*) noexcept {
+	// unsupported
+	return OxError(1, "read(uint64_t, std::size_t, std::size_t, void*, std::size_t*) is not supported by PassThroughFS");
+}
+
+Error PassThroughFS::writeFilePath(CRStringView path, const void *buffer, uint64_t size, FileType) noexcept {
+	const auto p = (m_path / stripSlash(path));
+	try {
+		std::ofstream f(p, std::ios::binary);
+		f.write(static_cast<const char*>(buffer), static_cast<std::streamsize>(size));
+	} catch (const std::fstream::failure &f) {
+		oxTracef("ox.fs.PassThroughFS.read.error", "Write of {} failed: {}", path, f.what());
+		return OxError(1);
+	}
+	return OxError(0);
+}
+
+Error PassThroughFS::writeFileInode(uint64_t, const void*, uint64_t, FileType) noexcept {
+	// unsupported
+	return OxError(1, "writeFileInode(uint64_t, void*, uint64_t, uint8_t) is not supported by PassThroughFS");
+}
+
+std::string_view PassThroughFS::stripSlash(StringView path) noexcept {
+	const auto pathLen = ox::strlen(path);
+	for (auto i = 0u; i < pathLen && path[0] == '/'; i++) {
+		path = substr(path, 1);
+	}
+	return {path.data(), path.bytes()};
 }
 
 }

deps/ox/src/ox/fs/filesystem/passthroughfs.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -11,7 +11,6 @@
 #if __has_include(<filesystem>) && defined(OX_USE_STDLIB)
 
 #include <filesystem>
-#include <string>
 
 #include <ox/std/bit.hpp>
 #include "filesystem.hpp"
@@ -30,50 +29,38 @@ class PassThroughFS: public FileSystem {
 		std::filesystem::path m_path;
 
 	public:
-		explicit PassThroughFS(const char *dirPath);
+		explicit PassThroughFS(CRStringView dirPath);
 
 		~PassThroughFS() noexcept override;
 
 		[[nodiscard]]
 		String basePath() const noexcept;
 
-		Error mkdir(const char *path, bool recursive = false) noexcept override;
+		Error mkdir(CRStringView path, bool recursive) noexcept override;
 
-		Error move(const char *src, const char *dest) noexcept override;
+		Error move(CRStringView src, CRStringView dest) noexcept override;
 
-		Error read(const char *path, void *buffer, std::size_t buffSize) noexcept override;
+		Result<Vector<String>> ls(CRStringView dir) const noexcept override;
-
-		Result<const char*> directAccess(const char*) noexcept override;
-
-		Error read(uint64_t inode, void *buffer, std::size_t size) noexcept override;
-
-		Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
-
-		Result<const char*> directAccess(uint64_t) noexcept override;
-
-		Result<Vector<String>> ls(const char *dir) const noexcept override;
 
 		template<typename F>
-		Error ls(const char *dir, F cb) const noexcept;
+		Error ls(CRStringView dir, F cb) const noexcept;
 
-		Error remove(const char *path, bool recursive = false) noexcept override;
+		Error remove(CRStringView path, bool recursive) noexcept override;
 
-		Error resize(uint64_t size, void *buffer = nullptr) noexcept override;
+		Error resize(uint64_t size, void *buffer) noexcept override;
 
-		Error write(const char *path, const void *buffer, uint64_t size, FileType fileType = FileType::NormalFile) noexcept override;
+		Result<FileStat> statInode(uint64_t inode) const noexcept override;
 
-		Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType = FileType::NormalFile) noexcept override;
+		Result<FileStat> statPath(CRStringView path) const noexcept override;
-
-		Result<FileStat> stat(uint64_t inode) const noexcept override;
-
-		Result<FileStat> stat(const char *path) const noexcept override;
 
+		[[nodiscard]]
 		uint64_t spaceNeeded(uint64_t size) const noexcept override;
 
 		Result<uint64_t> available() const noexcept override;
 
 		Result<uint64_t> size() const noexcept override;
 
+		[[nodiscard]]
 		char *buff() noexcept override;
 
 		Error walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) noexcept override;
@@ -81,19 +68,31 @@ class PassThroughFS: public FileSystem {
 		[[nodiscard]]
 		bool valid() const noexcept override;
 
+	protected:
+		Error readFilePath(CRStringView path, void *buffer, std::size_t buffSize) noexcept override;
+
+		Error readFileInode(uint64_t inode, void *buffer, std::size_t size) noexcept override;
+
+		Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
+
+		Error writeFilePath(CRStringView path, const void *buffer, uint64_t size, FileType fileType) noexcept override;
+
+		Error writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept override;
+
 	private:
 		/**
 		 * Strips the leading slashes from a string.
 		 */
-		static const char *stripSlash(const char *path) noexcept;
+		[[nodiscard]]
+		static std::string_view stripSlash(StringView path) noexcept;
 
 };
 
 template<typename F>
-Error PassThroughFS::ls(const char *dir, F cb) const noexcept {
+Error PassThroughFS::ls(CRStringView dir, F cb) const noexcept {
 	std::error_code ec;
 	const auto di = std::filesystem::directory_iterator(m_path / stripSlash(dir), ec);
-	oxReturnError(OxError(ec.value(), "PassThroughFS: ls failed"));
+	oxReturnError(OxError(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: ls failed"));
 	for (auto &p : di) {
 		oxReturnError(cb(p.path().filename().c_str(), 0));
 	}

deps/ox/src/ox/fs/filesystem/pathiterator.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include <ox/std/memops.hpp>
@@ -19,17 +19,20 @@ PathIterator::PathIterator(const char *path, std::size_t maxSize, std::size_t it
 	m_iterator = iterator;
 }
 
-PathIterator::PathIterator(const char *path): PathIterator(path, ox_strlen(path)) {
+PathIterator::PathIterator(const char *path): PathIterator(path, ox::strlen(path)) {
+}
+
+PathIterator::PathIterator(CRStringView path): PathIterator(path.data(), path.bytes()) {
 }
 
 /**
  * @return 0 if no error
  */
 Error PathIterator::dirPath(char *out, std::size_t outSize) {
-	int idx = ox_lastIndexOf(m_path, '/', m_maxSize);
+	const auto idx = ox::lastIndexOf(m_path, '/', m_maxSize);
-	std::size_t size = idx + 1;
+	const auto size = static_cast<std::size_t>(idx + 1);
 	if (idx >= 0 && size < outSize) {
-		ox_memcpy(out, m_path, size);
+		ox::memcpy(out, m_path, size);
 		out[size] = 0;
 		return OxError(0);
 	} else {
@@ -41,12 +44,12 @@ Error PathIterator::dirPath(char *out, std::size_t outSize) {
  * @return 0 if no error
  */
 Error PathIterator::fileName(char *out, std::size_t outSize) {
-	auto idx = ox_lastIndexOf(m_path, '/', m_maxSize);
+	auto idx = ox::lastIndexOf(m_path, '/', m_maxSize);
 	if (idx >= 0) {
 		idx++; // pass up the preceding /
-		std::size_t fileNameSize = ox_strlen(&m_path[idx]);
+		std::size_t fileNameSize = static_cast<size_t>(ox::strlen(&m_path[idx]));
 		if (fileNameSize < outSize) {
-			ox_memcpy(out, &m_path[idx], fileNameSize);
+			ox::memcpy(out, &m_path[idx], fileNameSize);
 			out[fileNameSize] = 0;
 			return OxError(0);
 		} else {
@@ -58,14 +61,15 @@ Error PathIterator::fileName(char *out, std::size_t outSize) {
 }
 
 // Gets the get item in the path
-Error PathIterator::get(char *pathOut, std::size_t pathOutSize) {
+Error PathIterator::get(IString<MaxFileNameLength> &fileName) {
 	std::size_t size = 0;
+	std::ignore = fileName.resize(MaxFileNameLength);
 	if (m_iterator >= m_maxSize) {
-		oxTracef("ox::fs::PathIterator::get", "m_iterator ({}) >= m_maxSize ({})", m_iterator, m_maxSize);
+		oxTracef("ox.fs.PathIterator.get", "m_iterator ({}) >= m_maxSize ({})", m_iterator, m_maxSize);
 		return OxError(1);
 	}
-	if (!ox_strlen(&m_path[m_iterator])) {
+	if (!ox::strlen(&m_path[m_iterator])) {
-		oxTrace("ox::fs::PathIterator::get", "!ox_strlen(&m_path[m_iterator])");
+		oxTrace("ox.fs.PathIterator.get", "!ox::strlen(&m_path[m_iterator])");
 		return OxError(1);
 	}
 	auto start = m_iterator;
@@ -73,90 +77,80 @@ Error PathIterator::get(char *pathOut, std::size_t pathOutSize) {
 		start++;
 	}
 	// end is at the next /
-	const char *substr = ox_strchr(&m_path[start], '/', m_maxSize - start);
+	const char *substr = ox::strchr(&m_path[start], '/', m_maxSize - start);
 	// correct end if it is invalid, which happens if there is no next /
 	if (!substr) {
-		substr = ox_strchr(&m_path[start], 0, m_maxSize - start);
+		substr = ox::strchr(&m_path[start], 0, m_maxSize - start);
 	}
-	std::size_t end = substr - m_path;
+	const auto end = static_cast<size_t>(substr - m_path);
 	size = end - start;
 	// cannot fit the output in the output parameter
-	if (size >= pathOutSize || size == 0) {
+	if (size >= MaxFileNameLength || size == 0) {
 		return OxError(1);
 	}
-	ox_memcpy(pathOut, &m_path[start], size);
+	ox::memcpy(fileName.data(), &m_path[start], size);
 	// truncate trailing /
-	if (size && pathOut[size - 1] == '/') {
+	if (size && fileName[size - 1] == '/') {
 		size--;
 	}
-	pathOut[size] = 0; // end with null terminator
+	oxReturnError(fileName.resize(size));
-	return OxError(0);
+	return {};
 }
 
-// Gets the get item in the path
+/**
-Error PathIterator::next(char *pathOut, std::size_t pathOutSize) {
+ * @return 0 if no error
+ */
+Error PathIterator::next(IString<MaxFileNameLength> &fileName) {
 	std::size_t size = 0;
 	auto retval = OxError(1);
-	if (m_iterator < m_maxSize && ox_strlen(&m_path[m_iterator])) {
+	std::ignore = fileName.resize(MaxFileNameLength);
+	if (m_iterator < m_maxSize && ox::strlen(&m_path[m_iterator])) {
 		retval = OxError(0);
 		if (m_path[m_iterator] == '/') {
 			m_iterator++;
 		}
-		std::size_t start = m_iterator;
+		const auto start = m_iterator;
 		// end is at the next /
-		const char *substr = ox_strchr(&m_path[start], '/', m_maxSize - start);
+		const char *substr = ox::strchr(&m_path[start], '/', m_maxSize - start);
 		// correct end if it is invalid, which happens if there is no next /
 		if (!substr) {
-			substr = ox_strchr(&m_path[start], 0, m_maxSize - start);
+			substr = ox::strchr(&m_path[start], 0, m_maxSize - start);
 		}
-		std::size_t end = substr - m_path;
+		const auto end = static_cast<size_t>(substr - m_path);
 		size = end - start;
 		// cannot fit the output in the output parameter
-		if (size >= pathOutSize) {
+		if (size >= MaxFileNameLength) {
 			return OxError(1);
 		}
-		ox_memcpy(pathOut, &m_path[start], size);
+		ox::memcpy(fileName.data(), &m_path[start], size);
 	}
 	// truncate trailing /
-	if (size && pathOut[size - 1] == '/') {
+	if (size && fileName[size - 1] == '/') {
 		size--;
 	}
-	pathOut[size] = 0; // end with null terminator
+	fileName[size] = 0; // end with null terminator
+	oxReturnError(fileName.resize(size));
 	m_iterator += size;
 	return retval;
 }
 
-/**
- * @return 0 if no error
- */
-Error PathIterator::get(BString<MaxFileNameLength> *fileName) {
-	return get(fileName->data(), fileName->cap());
-}
-
-/**
- * @return 0 if no error
- */
-Error PathIterator::next(BString<MaxFileNameLength> *fileName) {
-	return next(fileName->data(), fileName->cap());
-}
-
 Result<std::size_t> PathIterator::nextSize() const {
 	std::size_t size = 0;
 	auto retval = OxError(1);
 	auto it = m_iterator;
-	if (it < m_maxSize && ox_strlen(&m_path[it])) {
+	if (it < m_maxSize && ox::strlen(&m_path[it])) {
 		retval = OxError(0);
 		if (m_path[it] == '/') {
 			it++;
 		}
-		std::size_t start = it;
+		const auto start = it;
 		// end is at the next /
-		const char *substr = ox_strchr(&m_path[start], '/', m_maxSize - start);
+		const char *substr = ox::strchr(&m_path[start], '/', m_maxSize - start);
 		// correct end if it is invalid, which happens if there is no next /
 		if (!substr) {
-			substr = ox_strchr(&m_path[start], 0, m_maxSize - start);
+			substr = ox::strchr(&m_path[start], 0, m_maxSize - start);
 		}
-		std::size_t end = substr - m_path;
+		const auto end = static_cast<std::size_t>(substr - m_path);
 		size = end - start;
 	}
 	it += size;
@@ -165,18 +159,18 @@ Result<std::size_t> PathIterator::nextSize() const {
 
 bool PathIterator::hasNext() const {
 	std::size_t size = 0;
-	if (m_iterator < m_maxSize && ox_strlen(&m_path[m_iterator])) {
+	if (m_iterator < m_maxSize && ox::strlen(&m_path[m_iterator])) {
 		std::size_t start = m_iterator;
 		if (m_path[start] == '/') {
 			start++;
 		}
 		// end is at the next /
-		const char *substr = ox_strchr(&m_path[start], '/', m_maxSize - start);
+		const char *substr = ox::strchr(&m_path[start], '/', m_maxSize - start);
 		// correct end if it is invalid, which happens if there is no next /
 		if (!substr) {
-			substr = ox_strchr(&m_path[start], 0, m_maxSize - start);
+			substr = ox::strchr(&m_path[start], 0, m_maxSize - start);
 		}
-		std::size_t end = substr - m_path;
+		const auto end = static_cast<std::size_t>(substr - m_path);
 		size = end - start;
 	}
 	return size > 0;
@@ -189,22 +183,22 @@ bool PathIterator::valid() const {
 PathIterator PathIterator::next() const {
 	std::size_t size = 0;
 	auto iterator = m_iterator;
-	if (iterator < m_maxSize && ox_strlen(&m_path[iterator])) {
+	if (iterator < m_maxSize && ox::strlen(&m_path[iterator])) {
 		if (m_path[iterator] == '/') {
 			iterator++;
 		}
-		std::size_t start = iterator;
+		const auto start = iterator;
 		// end is at the next /
-		const char *substr = ox_strchr(&m_path[start], '/', m_maxSize - start);
+		const char *substr = ox::strchr(&m_path[start], '/', m_maxSize - start);
 		// correct end if it is invalid, which happens if there is no next /
 		if (!substr) {
-			substr = ox_strchr(&m_path[start], 0, m_maxSize - start);
+			substr = ox::strchr(&m_path[start], 0, m_maxSize - start);
 		}
-		std::size_t end = substr - m_path;
+		const auto end = static_cast<std::size_t>(substr - m_path);
 		size = end - start;
 	}
 	iterator += size;
-	return PathIterator(m_path, m_maxSize, iterator + 1);
+	return {m_path, m_maxSize, iterator + 1};
 }
 
 const char *PathIterator::fullPath() const {

deps/ox/src/ox/fs/filesystem/pathiterator.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -13,7 +13,7 @@
 namespace ox {
 
 constexpr std::size_t MaxFileNameLength = 255;
-using FileName = BString<MaxFileNameLength>;
+using FileName = IString<MaxFileNameLength>;
 
 class PathIterator {
 	private:
@@ -26,6 +26,8 @@ class PathIterator {
 
 		PathIterator(const char *path);
 
+		PathIterator(CRStringView path);
+
 		/**
 		 * @return 0 if no error
 		 */
@@ -39,22 +41,12 @@ class PathIterator {
 		/**
 		 * @return 0 if no error
 		 */
-		Error next(char *pathOut, std::size_t pathOutSize);
+		Error next(FileName &fileName);
 
 		/**
 		 * @return 0 if no error
 		 */
-		Error get(char *pathOut, std::size_t pathOutSize);
+		Error get(FileName &fileName);
-
-		/**
-		 * @return 0 if no error
-		 */
-		Error next(FileName *fileName);
-
-		/**
-		 * @return 0 if no error
-		 */
-		Error get(FileName *fileName);
 
 		/**
 		 * @return 0 if no error

deps/ox/src/ox/fs/filesystem/types.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/fs/fs.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -37,7 +37,7 @@ class OX_PACKED NodeBuffer {
 				Iterator(NodeBuffer *buffer, ItemPtr current) noexcept {
 					m_buffer = buffer;
 					m_current = current;
-					oxTrace("ox::ptrarith::Iterator::start") << current.offset();
+					oxTrace("ox.ptrarith.Iterator.start") << current.offset();
 				}
 
 				operator const Item*() const noexcept {
@@ -77,7 +77,7 @@ class OX_PACKED NodeBuffer {
 				[[nodiscard]]
 				bool hasNext() noexcept {
 					if (m_current.valid()) {
-						oxTrace("ox::ptrarith::NodeBuffer::Iterator::hasNext::current") << m_current.offset();
+						oxTrace("ox.ptrarith.NodeBuffer.Iterator.hasNext.current") << m_current.offset();
 						auto next = m_buffer->next(m_current);
 						return next.valid() && m_buffer->firstItem() != next;
 					}
@@ -85,7 +85,7 @@ class OX_PACKED NodeBuffer {
 				}
 
 				void next() noexcept {
-					oxTrace("ox::ptrarith::NodeBuffer::Iterator::next") << m_it++;
+					oxTrace("ox.ptrarith.NodeBuffer.Iterator.next") << m_it++;
 					if (hasNext()) {
 						m_current = m_buffer->next(m_current);
 					} else {
@@ -97,9 +97,9 @@ class OX_PACKED NodeBuffer {
 		Header m_header;
 
 	public:
-		NodeBuffer(const NodeBuffer &other, size_t size) noexcept;
+		NodeBuffer(const NodeBuffer &other, std::size_t size) noexcept;
 
-		explicit NodeBuffer(size_t size) noexcept;
+		explicit NodeBuffer(std::size_t size) noexcept;
 
 		[[nodiscard]]
 		const Iterator iterator() const noexcept;
@@ -129,7 +129,7 @@ class OX_PACKED NodeBuffer {
 
 		ItemPtr ptr(size_t offset) noexcept;
 
-		Result<ItemPtr> malloc(size_t size) noexcept;
+		Result<ItemPtr> malloc(std::size_t size) noexcept;
 
 		Error free(ItemPtr item) noexcept;
 
@@ -139,7 +139,7 @@ class OX_PACKED NodeBuffer {
 		/**
 		 * Set size, capacity.
 		 */
-		Error setSize(size_t size) noexcept;
+		Error setSize(std::size_t size) noexcept;
 
 		/**
 		 * Get size, capacity.
@@ -159,7 +159,7 @@ class OX_PACKED NodeBuffer {
 		 * bytes
 		 */
 		[[nodiscard]]
-		static size_t spaceNeeded(size_t size) noexcept;
+		static size_t spaceNeeded(std::size_t size) noexcept;
 
 		template<typename F>
 		Error compact(F cb = [](uint64_t, ItemPtr) {}) noexcept;
@@ -171,17 +171,17 @@ class OX_PACKED NodeBuffer {
 };
 
 template<typename size_t, typename Item>
-NodeBuffer<size_t, Item>::NodeBuffer(size_t size) noexcept {
+NodeBuffer<size_t, Item>::NodeBuffer(std::size_t size) noexcept {
-	m_header.size = size;
+	m_header.size = static_cast<size_t>(size);
-	ox_memset(this + 1, 0, size - sizeof(*this));
+	ox::memset(this + 1, 0, size - sizeof(*this));
-	oxTrace("ox::NodeBuffer::constructor") << m_header.firstItem;
+	oxTracef("ox.NodeBuffer.constructor", "{}", m_header.firstItem.get());
 }
 
 template<typename size_t, typename Item>
-NodeBuffer<size_t, Item>::NodeBuffer(const NodeBuffer &other, size_t size) noexcept {
+NodeBuffer<size_t, Item>::NodeBuffer(const NodeBuffer &other, std::size_t size) noexcept {
-	oxTracef("ox::ptrarith::NodeBuffer::copy", "other.m_header.firstItem: {}", other.m_header.firstItem.get());
+	oxTracef("ox.ptrarith.NodeBuffer.copy", "other.m_header.firstItem: {}", other.m_header.firstItem.get());
-	ox_memset(this + 1, 0, size - sizeof(*this));
+	ox::memset(this + 1, 0, size - sizeof(*this));
-	ox_memcpy(this, &other, size);
+	ox::memcpy(this, &other, size);
 }
 
 template<typename size_t, typename Item>
@@ -191,7 +191,7 @@ const typename NodeBuffer<size_t, Item>::Iterator NodeBuffer<size_t, Item>::iter
 
 template<typename size_t, typename Item>
 typename NodeBuffer<size_t, Item>::Iterator NodeBuffer<size_t, Item>::iterator() noexcept {
-	oxTrace("ox::ptrarith::NodeBuffer::iterator::size") << m_header.size;
+	oxTracef("ox.ptrarith.NodeBuffer.iterator.size", "{}", m_header.size.get());
 	return Iterator(this, firstItem());
 }
 
@@ -265,9 +265,10 @@ typename NodeBuffer<size_t, Item>::ItemPtr NodeBuffer<size_t, Item>::ptr(size_t
 }
 
 template<typename size_t, typename Item>
-Result<typename NodeBuffer<size_t, Item>::ItemPtr> NodeBuffer<size_t, Item>::malloc(size_t size) noexcept {
+Result<typename NodeBuffer<size_t, Item>::ItemPtr> NodeBuffer<size_t, Item>::malloc(std::size_t size) noexcept {
-	oxTracef("ox::ptrarith::NodeBuffer::malloc", "Size: {}", size);
+	const auto sz = static_cast<std::size_t>(size);
-	size_t fullSize = size + sizeof(Item);
+	oxTracef("ox.ptrarith.NodeBuffer.malloc", "Size: {}", sz);
+	size_t fullSize = static_cast<size_t>(sz + sizeof(Item));
 	if (m_header.size - m_header.bytesUsed >= fullSize) {
 		auto last = lastItem();
 		size_t addr;
@@ -276,23 +277,23 @@ Result<typename NodeBuffer<size_t, Item>::ItemPtr> NodeBuffer<size_t, Item>::mal
 		} else {
 			// there is no first item, so this must be the first item
 			if (!m_header.firstItem) {
-				oxTrace("ox::ptrarith::NodeBuffer::malloc", "No first item, initializing.");
+				oxTrace("ox.ptrarith.NodeBuffer.malloc", "No first item, initializing.");
-				m_header.firstItem = sizeof(m_header);
+				m_header.firstItem = static_cast<size_t>(sizeof(m_header));
 				addr = m_header.firstItem;
 			} else {
-				oxTrace("ox::ptrarith::NodeBuffer::malloc::fail", "NodeBuffer is in invalid state.");
+				oxTrace("ox.ptrarith.NodeBuffer.malloc.fail", "NodeBuffer is in invalid state.");
 				return OxError(1, "NodeBuffer is in invalid state.");
 			}
 		}
-		oxTracef("ox::ptrarith::NodeBuffer::malloc", "buffer size: {}; addr: {}; fullSize: {}", m_header.size.get(), addr, fullSize);
+		oxTracef("ox.ptrarith.NodeBuffer.malloc", "buffer size: {}; addr: {}; fullSize: {}", m_header.size.get(), addr, fullSize);
 		auto out = ItemPtr(this, m_header.size, addr, fullSize);
 		if (!out.valid()) {
-			oxTrace("ox::ptrarith::NodeBuffer::malloc::fail", "Unknown");
+			oxTrace("ox.ptrarith.NodeBuffer.malloc.fail", "Unknown");
 			return OxError(1, "NodeBuffer::malloc: unknown failure");
 		}
-		ox_memset(out, 0, fullSize);
+		ox::memset(out, 0, fullSize);
 		new (out) Item;
-		out->setSize(size);
+		out->setSize(sz);
 
 		auto first = firstItem();
 		auto oldLast = last;
@@ -300,7 +301,7 @@ Result<typename NodeBuffer<size_t, Item>::ItemPtr> NodeBuffer<size_t, Item>::mal
 		if (first.valid()) {
 			first->prev = out.offset();
 		} else {
-			oxTrace("ox::ptrarith::NodeBuffer::malloc::fail", "NodeBuffer malloc failed due to invalid first element pointer.");
+			oxTrace("ox.ptrarith.NodeBuffer.malloc.fail", "NodeBuffer malloc failed due to invalid first element pointer.");
 			return OxError(1, "NodeBuffer malloc failed due to invalid first element pointer.");
 		}
 
@@ -310,22 +311,22 @@ Result<typename NodeBuffer<size_t, Item>::ItemPtr> NodeBuffer<size_t, Item>::mal
 		} else { // check to see if this is the first allocation
 			if (out.offset() != first.offset()) {
 				// if this is not the first allocation, there should be an oldLast
-				oxTrace("ox::ptrarith::NodeBuffer::malloc::fail", "NodeBuffer malloc failed due to invalid last element pointer.");
+				oxTrace("ox.ptrarith.NodeBuffer.malloc.fail", "NodeBuffer malloc failed due to invalid last element pointer.");
 				return OxError(1, "NodeBuffer malloc failed due to invalid last element pointer.");
 			}
 			out->prev = out.offset();
 		}
 		m_header.bytesUsed += out.size();
-		oxTracef("ox::ptrarith::NodeBuffer::malloc", "Offset: {}", out.offset());
+		oxTracef("ox.ptrarith.NodeBuffer.malloc", "Offset: {}", out.offset());
 		return out;
 	}
-	oxTracef("ox::ptrarith::NodeBuffer::malloc::fail", "Insufficient space: {} needed, {} available", fullSize, available());
+	oxTracef("ox.ptrarith.NodeBuffer.malloc.fail", "Insufficient space: {} needed, {} available", fullSize, available());
 	return OxError(1);
 }
 
 template<typename size_t, typename Item>
 Error NodeBuffer<size_t, Item>::free(ItemPtr item) noexcept {
-	oxTracef("ox::ptrarith::NodeBuffer::free", "offset: {}", item.offset());
+	oxTracef("ox.ptrarith.NodeBuffer.free", "offset: {}", item.offset());
 	auto prev = this->prev(item);
 	auto next = this->next(item);
 	if (prev.valid() && next.valid()) {
@@ -337,16 +338,16 @@ Error NodeBuffer<size_t, Item>::free(ItemPtr item) noexcept {
 			}
 		} else {
 			// only one item, null out first
-			oxTrace("ox::ptrarith::NodeBuffer::free", "Nulling out firstItem.");
+			oxTrace("ox.ptrarith.NodeBuffer.free", "Nulling out firstItem.");
 			m_header.firstItem = 0;
 		}
 	} else {
 		if (!prev.valid()) {
-			oxTracef("ox::ptrarith::NodeBuffer::free::fail", "NodeBuffer free failed due to invalid prev element pointer: {}", prev.offset());
+			oxTracef("ox.ptrarith.NodeBuffer.free.fail", "NodeBuffer free failed due to invalid prev element pointer: {}", prev.offset());
 			return OxError(1);
 		}
 		if (!next.valid()) {
-			oxTracef("ox::ptrarith::NodeBuffer::free::fail", "NodeBuffer free failed due to invalid next element pointer: {}", next.offset());
+			oxTracef("ox.ptrarith.NodeBuffer.free.fail", "NodeBuffer free failed due to invalid next element pointer: {}", next.offset());
 			return OxError(1);
 		}
 	}
@@ -355,18 +356,18 @@ Error NodeBuffer<size_t, Item>::free(ItemPtr item) noexcept {
 }
 
 template<typename size_t, typename Item>
-Error NodeBuffer<size_t, Item>::setSize(size_t size) noexcept {
+Error NodeBuffer<size_t, Item>::setSize(std::size_t size) noexcept {
-	oxTracef("ox::ptrarith::NodeBuffer::setSize", "{} to {}", m_header.size.get(), size);
+	oxTracef("ox.ptrarith.NodeBuffer.setSize", "{} to {}", m_header.size.get(), size);
 	auto last = lastItem();
 	auto end = last.valid() ? last.end() : sizeof(m_header);
-	oxTracef("ox::ptrarith::NodeBuffer::setSize", "end: {}", end);
+	oxTracef("ox.ptrarith.NodeBuffer.setSize", "end: {}", end);
 	if (end > size) {
 		// resizing to less than buffer size
 		return OxError(1);
 	} else {
-		m_header.size = size;
+		m_header.size = static_cast<size_t>(size);
 		auto data = reinterpret_cast<uint8_t*>(this) + end;
-		ox_memset(data, 0, size - end);
+		ox::memset(data, 0, size - end);
 		return OxError(0);
 	}
 }
@@ -387,8 +388,8 @@ size_t NodeBuffer<size_t, Item>::available() const noexcept {
 }
 
 template<typename size_t, typename Item>
-size_t NodeBuffer<size_t, Item>::spaceNeeded(size_t size) noexcept {
+size_t NodeBuffer<size_t, Item>::spaceNeeded(std::size_t size) noexcept {
-	return sizeof(Item) + size;
+	return static_cast<size_t>(sizeof(Item) + size);
 }
 
 template<typename size_t, typename Item>
@@ -404,7 +405,7 @@ Error NodeBuffer<size_t, Item>::compact(F cb) noexcept {
 			return OxError(2);
 		}
 		// move node
-		ox_memcpy(dest, src, src->fullSize());
+		ox::memcpy(dest, src, src->fullSize());
 		oxReturnError(cb(src, dest));
 		// update surrounding nodes
 		auto prev = ptr(dest->prev);
@@ -442,8 +443,8 @@ struct OX_PACKED Item {
 			return m_size;
 		}
 
-		void setSize(size_t size) {
+		void setSize(std::size_t size) {
-			m_size = size;
+			m_size = static_cast<size_t>(size);
 		}
 };
 

deps/ox/src/ox/fs/ptrarith/ptr.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -29,7 +29,13 @@ class [[nodiscard]] Ptr {
 
 		constexpr Ptr(std::nullptr_t) noexcept;
 
-		constexpr Ptr(void *dataStart, size_t dataSize, size_t itemStart, size_t itemSize = sizeof(T), size_t itemTypeSize = sizeof(T), bool prevalidated = false) noexcept;
+		constexpr Ptr(
+			void *pDataStart,
+			std::size_t pDataSize,
+			std::size_t pItemStart,
+			std::size_t pItemSize = sizeof(T),
+			std::size_t pItemTypeSize = sizeof(T),
+			bool pPrevalidated = false) noexcept;
 
 		[[nodiscard]]
 		constexpr bool valid() const noexcept;
@@ -86,17 +92,27 @@ constexpr Ptr<T, size_t, minOffset>::Ptr(std::nullptr_t) noexcept {
 }
 
 template<typename T, typename size_t, size_t minOffset>
-constexpr Ptr<T, size_t, minOffset>::Ptr(void *dataStart, size_t dataSize, size_t itemStart, size_t itemSize, size_t itemTypeSize, bool prevalidated) noexcept {
+constexpr Ptr<T, size_t, minOffset>::Ptr(
+		void *pDataStart,
+		std::size_t pDataSize,
+		std::size_t pItemStart,
+		std::size_t pItemSize,
+		std::size_t pItemTypeSize,
+		bool pPrevalidated) noexcept {
+	const auto dataSize = static_cast<size_t>(pDataSize);
+	const auto itemStart = static_cast<size_t>(pItemStart);
+	const auto itemSize = static_cast<size_t>(pItemSize);
+	const auto itemTypeSize = static_cast<size_t>(pItemTypeSize);
 	// do some sanity checks before assuming this is valid
 	if (itemSize >= itemTypeSize &&
-	    dataStart &&
+	    pDataStart &&
 	    itemStart >= minOffset &&
 	    itemStart + itemSize <= dataSize) {
-		m_dataStart = reinterpret_cast<uint8_t*>(dataStart);
+		m_dataStart = reinterpret_cast<uint8_t*>(pDataStart);
 		m_dataSize = dataSize;
 		m_itemOffset = itemStart;
 		m_itemSize = itemSize;
-		m_validated = prevalidated;
+		m_validated = pPrevalidated;
 	}
 }
 
@@ -208,7 +224,7 @@ constexpr const Ptr<SubT, size_t, sizeof(T)> Ptr<T, size_t, minOffset>::subPtr(s
 template<typename T, typename size_t, size_t minOffset>
 template<typename SubT>
 constexpr const Ptr<SubT, size_t, sizeof(T)> Ptr<T, size_t, minOffset>::subPtr(size_t offset) const noexcept {
-	oxTracef("ox::fs::Ptr::subPtr", "{} {} {} {} {}", m_itemOffset, this->size(), offset, m_itemSize, (m_itemSize - offset));
+	oxTracef("ox.fs.Ptr.subPtr", "{} {} {} {} {}", m_itemOffset, this->size(), offset, m_itemSize, (m_itemSize - offset));
 	return subPtr<SubT>(offset, m_itemSize - offset);
 }
 
@@ -221,8 +237,7 @@ constexpr Ptr<SubT, size_t, sizeof(T)> Ptr<T, size_t, minOffset>::subPtr(size_t
 template<typename T, typename size_t, size_t minOffset>
 template<typename SubT>
 constexpr Ptr<SubT, size_t, sizeof(T)> Ptr<T, size_t, minOffset>::subPtr(size_t offset) noexcept {
-	oxTracef("ox::fs::Ptr::subPtr", "{} {} {} {} {}", m_itemOffset, this->size(), offset, m_itemSize, (m_itemSize - offset));
+	oxTracef("ox.fs.Ptr.subPtr", "{} {} {} {} {}", m_itemOffset, this->size(), offset, m_itemSize, (m_itemSize - offset));
-	return subPtr<SubT>(offset, m_itemSize - offset);
 	return subPtr<SubT>(offset, m_itemSize - offset);
 }
 

deps/ox/src/ox/fs/test/CMakeLists.txt

@@ -6,24 +6,23 @@ add_executable(
 target_link_libraries(
 	FSTests
 		OxFS
-		OxStd
 		OxMetalClaw
 )
 
-add_test("[ox/fs] PtrArith::setSize" FSTests PtrArith::setSize)
+add_test("[ox/fs] PtrArith::setSize" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PtrArith::setSize)
 
-add_test("[ox/fs] PathIterator::next1" FSTests PathIterator::next1)
+add_test("[ox/fs] PathIterator::next1" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::next1)
-add_test("[ox/fs] PathIterator::next2" FSTests PathIterator::next2)
+add_test("[ox/fs] PathIterator::next2" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::next2)
-add_test("[ox/fs] PathIterator::next3" FSTests PathIterator::next3)
+add_test("[ox/fs] PathIterator::next3" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::next3)
-add_test("[ox/fs] PathIterator::next4" FSTests PathIterator::next4)
+add_test("[ox/fs] PathIterator::next4" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::next4)
-add_test("[ox/fs] PathIterator::next5" FSTests PathIterator::next5)
+add_test("[ox/fs] PathIterator::next5" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::next5)
-add_test("[ox/fs] PathIterator::hasNext" FSTests PathIterator::hasNext)
+add_test("[ox/fs] PathIterator::hasNext" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::hasNext)
 
-add_test("[ox/fs] PathIterator::dirPath" FSTests PathIterator::dirPath)
+add_test("[ox/fs] PathIterator::dirPath" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::dirPath)
-add_test("[ox/fs] PathIterator::fileName" FSTests PathIterator::fileName)
+add_test("[ox/fs] PathIterator::fileName" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests PathIterator::fileName)
 
-add_test("[ox/fs] NodeBuffer::insert" FSTests "NodeBuffer::insert")
+add_test("[ox/fs] NodeBuffer::insert" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests "NodeBuffer::insert")
-add_test("[ox/fs] FileStore::readWrite" FSTests "FileStore::readWrite")
+add_test("[ox/fs] FileStore::readWrite" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests "FileStore::readWrite")
 
-add_test("[ox/fs] Directory" FSTests "Directory")
+add_test("[ox/fs] Directory" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests "Directory")
-add_test("[ox/fs] FileSystem" FSTests "FileSystem")
+add_test("[ox/fs] FileSystem" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/FSTests "FileSystem")

deps/ox/src/ox/fs/test/tests.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 // make sure asserts are enabled for the test file
@@ -26,15 +26,15 @@ struct OX_PACKED NodeType: public ox::ptrarith::Item<T> {
 		}
 };
 
-const std::map<std::string_view, std::function<ox::Error(std::string_view)>> tests = {
+const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests = {
 	{
 		{
 			"PtrArith::setSize",
-			[](std::string_view) {
+			[](ox::StringView) {
 				using BuffPtr_t = uint32_t;
 				ox::Vector<char> buff(5 * ox::units::MB);
 				auto buffer = new (buff.data()) ox::ptrarith::NodeBuffer<BuffPtr_t, NodeType<BuffPtr_t>>(buff.size());
-				using String = ox::BString<6>;
+				using String = ox::IString<6>;
 				auto a1 = buffer->malloc(sizeof(String)).value;
 				auto a2 = buffer->malloc(sizeof(String)).value;
 				oxAssert(a1.valid(), "Allocation 1 failed.");
@@ -57,85 +57,85 @@ const std::map<std::string_view, std::function<ox::Error(std::string_view)>> tes
 		},
 		{
 			"PathIterator::next1",
-			[](std::string_view) {
+			[](ox::StringView) {
-				ox::String path = "/usr/share/charset.gbag";
+				auto const path = ox::String("/usr/share/charset.gbag");
 				ox::PathIterator it(path.c_str(), path.len());
-				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
+				ox::FileName buff;
-				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "usr") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff) == 0 && buff == "usr", "PathIterator shows wrong next");
-				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "share") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff) == 0 && buff == "share", "PathIterator shows wrong next");
-				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "charset.gbag") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff) == 0 && buff == "charset.gbag", "PathIterator shows wrong next");
 				return OxError(0);
 			}
 		},
 		{
 			"PathIterator::next2",
-			[](std::string_view) {
+			[](ox::StringView) {
-				ox::String path = "/usr/share/";
+				auto const path = ox::String("/usr/share/");
 				ox::PathIterator it(path.c_str(), path.len());
-				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
+				ox::FileName buff;
-				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "usr") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff) == 0 && ox::strcmp(buff, "usr") == 0, "PathIterator shows wrong next");
-				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "share") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff) == 0 && ox::strcmp(buff, "share") == 0, "PathIterator shows wrong next");
 				return OxError(0);
 			}
 		},
 		{
 			"PathIterator::next3",
-			[](std::string_view) {
+			[](ox::StringView) {
-				ox::String path = "/";
+				auto const path = ox::String("/");
 				ox::PathIterator it(path.c_str(), path.len());
-				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
+				ox::FileName buff;
-				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "\0") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff) == 0 && ox::strcmp(buff, "\0") == 0, "PathIterator shows wrong next");
 				return OxError(0);
 			}
 		},
 		{
 			"PathIterator::next4",
-			[](std::string_view) {
+			[](ox::StringView) {
-				ox::String path = "usr/share/charset.gbag";
+				auto const path = ox::String("usr/share/charset.gbag");
 				ox::PathIterator it(path.c_str(), path.len());
-				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
+				ox::FileName buff;
-				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "usr") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff) == 0 && ox::strcmp(buff, "usr") == 0, "PathIterator shows wrong next");
-				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "share") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff) == 0 && ox::strcmp(buff, "share") == 0, "PathIterator shows wrong next");
-				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "charset.gbag") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff) == 0 && ox::strcmp(buff, "charset.gbag") == 0, "PathIterator shows wrong next");
 				return OxError(0);
 			}
 		},
 		{
 			"PathIterator::next5",
-			[](std::string_view) {
+			[](ox::StringView) {
-				ox::String path = "usr/share/";
+				auto const path = ox::String("usr/share/");
 				ox::PathIterator it(path.c_str(), path.len());
-				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
+				ox::FileName buff;
-				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "usr") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff) == 0 && ox::strcmp(buff, "usr") == 0, "PathIterator shows wrong next");
-				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "share") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff) == 0 && ox::strcmp(buff, "share") == 0, "PathIterator shows wrong next");
 				return OxError(0);
 			}
 		},
 		{
 			"PathIterator::dirPath",
-			[] (std::string_view) {
+			[] (ox::StringView) {
-				ox::String path = "/usr/share/charset.gbag";
+				auto const path = ox::String("/usr/share/charset.gbag");
 				ox::PathIterator it(path.c_str(), path.len());
 				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
-				oxAssert(it.dirPath(buff, path.len()) == 0 && ox_strcmp(buff, "/usr/share/") == 0, "PathIterator shows incorrect dir path");
+				oxAssert(it.dirPath(buff, path.len()) == 0 && ox::strcmp(buff, "/usr/share/") == 0, "PathIterator shows incorrect dir path");
 				return OxError(0);
 			}
 		},
 		{
 			"PathIterator::fileName",
-			[](std::string_view) {
+			[](ox::StringView) {
-				ox::String path = "/usr/share/charset.gbag";
+				auto const path = ox::String("/usr/share/charset.gbag");
 				ox::PathIterator it(path.c_str(), path.len());
 				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
-				oxAssert(it.fileName(buff, path.len()) == 0 && ox_strcmp(buff, "charset.gbag") == 0, "PathIterator shows incorrect file name");
+				oxAssert(it.fileName(buff, path.len()) == 0 && ox::strcmp(buff, "charset.gbag") == 0, "PathIterator shows incorrect file name");
 				return OxError(0);
 			}
 		},
 		{
 			"PathIterator::hasNext",
-			[](std::string_view) {
+			[](ox::StringView) {
 				const auto path = "/file1";
-				ox::PathIterator it(path, ox_strlen(path));
+				ox::PathIterator it(path, ox::strlen(path));
 				oxAssert(it.hasNext(), "PathIterator shows incorrect hasNext");
 				oxAssert(!it.next().hasNext(), "PathIterator shows incorrect hasNext");
 				return OxError(0);
@@ -143,7 +143,7 @@ const std::map<std::string_view, std::function<ox::Error(std::string_view)>> tes
 		},
 		{
 			"Ptr::subPtr",
-			[](std::string_view) {
+			[](ox::StringView) {
 				constexpr auto buffLen = 5000;
 				ox::ptrarith::Ptr<uint8_t, uint32_t> p(ox_alloca(buffLen), buffLen, 500, 500);
 				oxAssert(p.valid(), "Ptr::subPtr: Ptr p is invalid.");
@@ -155,7 +155,7 @@ const std::map<std::string_view, std::function<ox::Error(std::string_view)>> tes
 		},
 		{
 			"NodeBuffer::insert",
-			[](std::string_view) {
+			[](ox::StringView) {
 				constexpr auto buffLen = 5000;
 				auto list = new (ox_alloca(buffLen)) ox::ptrarith::NodeBuffer<uint32_t, ox::FileStoreItem<uint32_t>>(buffLen);
 				oxAssert(list->malloc(50).value.valid(), "NodeBuffer::insert: malloc 1 failed");
@@ -168,12 +168,12 @@ const std::map<std::string_view, std::function<ox::Error(std::string_view)>> tes
 		},
 		{
 			"FileStore::readWrite",
-			[](std::string_view) {
+			[](ox::StringView) {
 				constexpr auto buffLen = 5000;
 				constexpr auto str1 = "Hello, World!";
-				constexpr auto str1Len = ox_strlen(str1) + 1;
+				constexpr auto str1Len = ox::strlen(str1) + 1;
 				constexpr auto str2 = "Hello, Moon!";
-				constexpr auto str2Len = ox_strlen(str2) + 1;
+				constexpr auto str2Len = ox::strlen(str2) + 1;
 				auto list = new (ox_alloca(buffLen)) ox::ptrarith::NodeBuffer<uint32_t, ox::FileStoreItem<uint32_t>>(buffLen);
 				oxAssert(ox::FileStore32::format(list, buffLen), "FileStore::format failed.");
 				ox::FileStore32 fileStore(list, buffLen);
@@ -189,26 +189,26 @@ const std::map<std::string_view, std::function<ox::Error(std::string_view)>> tes
 		},
 		{
 			"Directory",
-			[](std::string_view) {
+			[](ox::StringView) {
 				ox::Vector<uint8_t> fsBuff(5000);
 				oxAssert(ox::FileStore32::format(fsBuff.data(), fsBuff.size()), "FS format failed");
 				ox::FileStore32 fileStore(fsBuff.data(), fsBuff.size());
 				ox::Directory32 dir(fileStore, 105);
 
-				oxTrace("ox::fs::test::Directory") << "Init";
+				oxTrace("ox.fs.test.Directory") << "Init";
 				oxAssert(dir.init(), "Init failed");
 
-				oxTrace("ox::fs::test::Directory") << "write 1";
+				oxTrace("ox.fs.test.Directory") << "write 1";
 				oxAssert(dir.write("/file1", 1), "Directory write of file1 failed");
 
-				oxTrace("ox::fs::test::Directory") << "find";
+				oxTrace("ox.fs.test.Directory") << "find";
 				oxAssert(dir.find("file1").error, "Could not find file1");
 				oxAssert(dir.find("file1").value == 1, "Could not find file1");
 
-				oxTrace("ox::fs::test::Directory") << "write 2";
+				oxTrace("ox.fs.test.Directory") << "write 2";
 				oxAssert(dir.write("/file3", 3), "Directory write of file3 failed");
 
-				oxTrace("ox::fs::test::Directory") << "write 3";
+				oxTrace("ox.fs.test.Directory") << "write 3";
 				oxAssert(dir.write("/file2", 2), "Directory write of file2 failed");
 
 				return OxError(0);
@@ -216,13 +216,13 @@ const std::map<std::string_view, std::function<ox::Error(std::string_view)>> tes
 		},
 		{
 			"FileSystem",
-			[](std::string_view) {
+			[](ox::StringView) {
 				ox::Vector<uint8_t> fsBuff(5000);
-				oxTrace("ox::fs::test::FileSystem") << "format";
+				oxTrace("ox.fs.test.FileSystem") << "format";
 				oxAssert(ox::FileSystem32::format(fsBuff.data(), fsBuff.size()), "FileSystem format failed");
 				ox::FileSystem32 fs(ox::FileStore32(fsBuff.data(), fsBuff.size()));
 
-				oxTrace("ox::fs::test::FileSystem") << "mkdir";
+				oxTrace("ox.fs.test.FileSystem") << "mkdir";
 				oxAssert(fs.mkdir("/dir", true), "mkdir failed");
 				oxAssert(fs.stat("/dir").error, "mkdir failed");
 				oxAssert(fs.mkdir("/l1d1/l2d1/l3d1", true), "mkdir failed");
@@ -237,16 +237,16 @@ const std::map<std::string_view, std::function<ox::Error(std::string_view)>> tes
 };
 
 int main(int argc, const char **args) {
-	int retval = -1;
+	if (argc < 2) {
-	if (argc > 1) {
+		oxError("Must specify test to run");
-		std::string_view testName = args[1];
+		return -1;
-		std::string_view testArg;
-		if (args[2]) {
-			testArg = args[2];
 	}
-		if (tests.find(testName) != tests.end()) {
+	ox::StringView const testName = args[1];
-			retval = static_cast<int>(tests.at(testName)(testArg));
+	ox::StringView const testArg = args[2] ? args[2] : nullptr;
+	auto const func = tests.find(testName);
+	if (func != tests.end()) {
+		oxAssert(func->second(testArg), "Test returned Error");
+		return 0;
 	}
-	}
+	return -1;
-	return retval;
 }

deps/ox/src/ox/fs/tool.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include <cstdio>
@@ -26,7 +26,7 @@ static ox::Result<Buff> loadFsBuff(const char *path) noexcept {
 		const auto size = static_cast<std::size_t>(file.tellg());
 		file.seekg(0, std::ios::beg);
 		const auto buff = new char[size];
-		file.read(buff, size);
+		file.read(buff, static_cast<std::streamsize>(size));
 		return Buff{buff, size};
 	} catch (const std::ios_base::failure &e) {
 		oxErrorf("Could not read OxFS file: {}", e.what());
@@ -56,7 +56,7 @@ static ox::Error runRead(ox::FileSystem *fs, int argc, const char **argv) noexce
 		oxErr("Must provide a path to a file to read\n");
 		return OxError(1);
 	}
-	oxRequire(buff, fs->read(argv[1]));
+	oxRequire(buff, fs->read(ox::StringView(argv[1])));
 	fwrite(buff.data(), sizeof(decltype(buff)::value_type), buff.size(), stdout);
 	return OxError(0);
 }
@@ -67,7 +67,7 @@ static ox::Error run(int argc, const char **argv) noexcept {
 		return OxError(1);
 	}
 	const auto fsPath = argv[1];
-	ox::String subCmd = argv[2];
+	ox::String subCmd(argv[2]);
 	oxRequire(fs, loadFs(fsPath));
 	if (subCmd == "ls") {
 		return runLs(fs.get(), argc - 2, argv + 2);

deps/ox/src/ox/logconn/CMakeLists.txt

@@ -0,0 +1,40 @@
+cmake_minimum_required(VERSION 3.10)
+
+add_library(
+	OxLogConn
+		logconn.cpp
+)
+
+set_property(
+	TARGET
+		OxLogConn
+	PROPERTY
+		POSITION_INDEPENDENT_CODE ON
+)
+
+if(NOT MSVC)
+	target_compile_options(OxLogConn PRIVATE -Wsign-conversion)
+endif()
+
+target_link_libraries(
+	OxLogConn PUBLIC
+		OxStd
+		OxMetalClaw
+		$<$<BOOL:${OX_OS_FREEBSD}>:pthread>
+		$<$<BOOL:${OX_OS_WINDOWS}>:ws2_32>
+)
+
+install(
+	FILES
+		circularbuff.hpp
+		logconn.hpp
+	DESTINATION
+		include/ox/logconn
+)
+
+install(
+	TARGETS
+		OxLogConn
+	LIBRARY DESTINATION lib
+	ARCHIVE DESTINATION lib
+)

deps/ox/src/ox/logconn/circularbuff.hpp

@@ -0,0 +1,99 @@
+/*
+ * Copyright 2015 - 2024 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <ox/std/assert.hpp>
+#include <ox/std/buffer.hpp>
+#include <ox/std/units.hpp>
+
+namespace ox::detail {
+
+class CirculerBuffer {
+	private:
+		std::size_t m_readPt = 0;
+		std::size_t m_writePt = 0;
+		ox::Buffer m_buff = ox::Buffer(ox::units::MB);
+
+	private:
+		[[nodiscard]]
+		constexpr auto avail() const noexcept {
+			if (m_writePt >= m_readPt) {
+				return m_buff.size() - (m_writePt - m_readPt);
+			} else {
+				return (m_buff.size() - m_writePt) - (m_buff.size() - m_readPt);
+			}
+		}
+
+	public:
+		constexpr ox::Error put(char v) noexcept {
+			return write(&v, 1);
+			if (1 > avail()) {
+				return OxError(1, "Insufficient space in buffer");
+			}
+			m_buff[m_writePt] = v;
+			++m_writePt;
+			return {};
+		}
+
+		constexpr ox::Error write(const char *buff, std::size_t sz) noexcept {
+			if (sz > avail()) {
+				return OxError(1, "Insufficient space in buffer");
+			}
+			// write seg 1
+			const auto seg1Sz = ox::min(sz, m_buff.size() - m_writePt);
+			ox::listcpy(&m_buff[m_writePt], &buff[0], seg1Sz);
+			m_writePt += sz;
+			if (seg1Sz != sz) {
+				m_writePt -= m_buff.size();
+				// write seg 2
+				const auto seg2Sz = sz - seg1Sz;
+				ox::listcpy(&m_buff[0], &buff[seg1Sz], seg2Sz);
+				oxAssert(m_buff[0] == buff[seg1Sz], "break");
+			}
+			return {};
+		}
+
+		constexpr ox::Error seekp(std::size_t bytesFwd) noexcept {
+			if (bytesFwd > avail()) {
+				return OxError(1, "Insufficient space in buffer to seek that far ahead");
+			}
+			m_writePt += bytesFwd;
+			if (m_writePt > m_buff.size()) {
+				m_writePt -= m_buff.size();
+			}
+			return {};
+		}
+
+		constexpr ox::Error seekp(int, ios_base::seekdir) noexcept {
+			return OxError(1, "Unimplemented");
+		}
+
+		[[nodiscard]]
+		constexpr std::size_t tellp() const noexcept {
+			return m_buff.size() - avail();
+		}
+
+		[[nodiscard]]
+		constexpr std::size_t read(char *out, std::size_t outSize) noexcept {
+			const auto bytesRead = ox::min(outSize, m_buff.size() - avail());
+			// read seg 1
+			const auto seg1Sz = ox::min(bytesRead, m_buff.size() - m_readPt);
+			ox::listcpy(&out[0], &m_buff[m_readPt], seg1Sz);
+			m_readPt += bytesRead;
+			if (seg1Sz != bytesRead) {
+				m_readPt -= m_buff.size();
+				// read seg 2
+				const auto seg2Sz = bytesRead - seg1Sz;
+				ox::listcpy(&out[seg1Sz], &m_buff[0], seg2Sz);
+			}
+			return bytesRead;
+		}
+};
+
+}

deps/ox/src/ox/logconn/def.hpp

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 - 2024 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#if defined(DEBUG) && !defined(OX_BARE_METAL)
+#define OX_INIT_DEBUG_LOGGER(loggerName, appName) \
+	ox::LoggerConn loggerName; \
+    { \
+		const auto loggerErr = (loggerName).initConn(appName); \
+		if (loggerErr) { \
+			oxErrf("Could not connect to logger: {} ({}:{})\n", toStr(loggerErr), loggerErr.file, loggerErr.line); \
+		} else { \
+			ox::trace::setLogger(&(loggerName)); \
+		} \
+		ox::trace::init(); \
+	}
+#else
+#define OX_INIT_DEBUG_LOGGER(loggerName, appName)
+#endif
+
+

deps/ox/src/ox/logconn/logconn.cpp

@@ -0,0 +1,107 @@
+/*
+ * Copyright 2015 - 2024 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+#ifdef OX_USE_STDLIB
+#include <cstdio>
+
+#include <sys/types.h>
+#ifndef _WIN32
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <unistd.h>
+#else
+#include <winsock.h>
+#undef interface
+#undef min
+#undef max
+#endif
+
+
+#include "logconn.hpp"
+
+#include <ox/std/bit.hpp>
+
+namespace ox {
+
+using namespace trace;
+
+void closeSock(auto s) noexcept {
+#ifdef _WIN32
+	closesocket(s);
+#else
+	close(s);
+#endif
+}
+
+LoggerConn::LoggerConn() noexcept: m_netThread([this]{this->msgSend();}) {
+}
+
+LoggerConn::~LoggerConn() noexcept {
+	m_running = false;
+	m_waitCond.notify_one();
+	m_netThread.join();
+	if (m_socket) {
+		closeSock(m_socket);
+	}
+}
+
+ox::Error LoggerConn::initConn(ox::CRStringView appName) noexcept {
+	sockaddr_in addr{};
+	addr.sin_family = AF_INET;
+	addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+	addr.sin_port = htons(5590);
+	m_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+	oxReturnError(OxError(static_cast<ox::ErrorCode>(connect(m_socket, reinterpret_cast<sockaddr*>(&addr), sizeof(addr)))));
+	return sendInit({.appName = ox::BasicString<128>(appName)});
+}
+
+ox::Error LoggerConn::send(const char *buff, std::size_t len) const noexcept {
+	std::size_t totalSent = 0;
+	while (totalSent < len) {
+		//std::fprintf(stdout, "Sending %lu/%lu bytes on socket %d\n", len, totalSent, m_socket);
+		const auto sent = ::send(m_socket, buff, len, 0);
+		if (sent < 0) {
+			std::fprintf(stderr, "Could not send msg\n");
+			return OxError(1, "Could not send msg");
+		}
+		totalSent += static_cast<std::size_t>(sent);
+	}
+	return {};
+}
+
+ox::Error LoggerConn::send(const TraceMsg &msg) noexcept {
+	return send(MsgId::TraceEvent, msg);
+}
+
+ox::Error LoggerConn::sendInit(const InitTraceMsg &msg) noexcept {
+	return send(MsgId::Init, msg);
+}
+
+void LoggerConn::msgSend() noexcept {
+	while (true) {
+		std::unique_lock lk(m_waitMut);
+		m_waitCond.wait(lk);
+		if (!m_running) {
+			break;
+		}
+		std::lock_guard buffLk(m_buffMut);
+		while (true) {
+			ox::Array<char, ox::units::KB> tmp;
+			const auto read = m_buff.read(tmp.data(), tmp.size());
+			if (!read) {
+				break;
+			}
+			//std::printf("LoggerConn: sending %lu bytes\n", read);
+			std::ignore = send(tmp.data(), read);
+		}
+	}
+}
+
+}
+#endif

deps/ox/src/ox/logconn/logconn.hpp

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2015 - 2024 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#ifdef OX_USE_STDLIB
+#include <condition_variable>
+#include <mutex>
+#include <thread>
+#endif
+
+#include <ox/mc/write.hpp>
+#include <ox/std/trace.hpp>
+
+#include "circularbuff.hpp"
+
+namespace ox {
+
+#ifdef OX_USE_STDLIB
+class LoggerConn: public trace::Logger {
+	private:
+		int m_socket = 0;
+		detail::CirculerBuffer m_buff;
+		std::thread m_netThread;
+		std::condition_variable m_waitCond;
+		std::mutex m_waitMut;
+		std::mutex m_buffMut;
+		bool m_running = true;
+	public:
+		LoggerConn() noexcept;
+		LoggerConn(const LoggerConn&) noexcept = delete;
+		~LoggerConn() noexcept override;
+		LoggerConn &operator=(const LoggerConn&) noexcept = delete;
+		ox::Error send(const trace::TraceMsg&) noexcept final;
+		ox::Error sendInit(const trace::InitTraceMsg&) noexcept final;
+		ox::Error initConn(ox::CRStringView appName) noexcept;
+		ox::Error send(const char *buff, std::size_t len) const noexcept;
+	private:
+		void msgSend() noexcept;
+		ox::Error send(trace::MsgId msgId, const auto &msg) noexcept {
+			ox::Array<char, 10 * ox::units::KB> buff;
+			std::size_t sz = 0;
+			oxReturnError(ox::writeMC(&buff[0], buff.size(), msg, &sz));
+			//std::printf("sz: %lu\n", sz);
+			oxRequire(szBuff, serialize(static_cast<uint32_t>(sz)));
+			std::unique_lock buffLk(m_buffMut);
+			oxReturnError(m_buff.put(static_cast<char>(msgId)));
+			oxReturnError(m_buff.write(szBuff.data(), szBuff.size()));
+			oxReturnError(m_buff.write(buff.data(), sz));
+			buffLk.unlock();
+			m_waitCond.notify_one();
+			return {};
+		}
+
+};
+
+#else
+
+class LoggerConn: public trace::Logger {
+	private:
+	public:
+		constexpr LoggerConn() noexcept = default;
+		LoggerConn(const LoggerConn&) noexcept = delete;
+		constexpr ~LoggerConn() noexcept override = default;
+		LoggerConn &operator=(const LoggerConn&) noexcept = delete;
+		ox::Error send(const trace::TraceMsg&) noexcept final { return {}; }
+		static ox::Error initConn() noexcept { return {}; }
+		static ox::Error send(const char*, std::size_t) noexcept { return {}; }
+};
+#endif
+
+}
+

deps/ox/src/ox/mc/CMakeLists.txt

@@ -7,6 +7,7 @@ add_library(
 
 if(NOT MSVC)
 	target_compile_options(OxMetalClaw PRIVATE -Wsign-conversion)
+	target_compile_options(OxMetalClaw PRIVATE -Wconversion)
 endif()
 
 target_link_libraries(
@@ -38,8 +39,8 @@ install(
 )
 
 install(TARGETS OxMetalClaw
-        LIBRARY DESTINATION lib/ox
+        LIBRARY DESTINATION lib
-        ARCHIVE DESTINATION lib/ox
+        ARCHIVE DESTINATION lib
 )
 
 if(OX_RUN_TESTS)

deps/ox/src/ox/mc/err.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -11,9 +11,9 @@
 namespace ox {
 
 enum {
-	MC_PRESENCEMASKOUTBOUNDS = 1,
+	McPresenceMapOverflow = 1,
-	MC_BUFFENDED = 2,
+	McBuffEnded = 2,
-	MC_OUTBUFFENDED = 4
+	McOutputBuffEnded = 4
 };
 
 }

deps/ox/src/ox/mc/intops.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -14,6 +14,7 @@
 #include <ox/std/byteswap.hpp>
 #include <ox/std/math.hpp>
 #include <ox/std/memops.hpp>
+#include <ox/std/reader.hpp>
 
 namespace ox::mc {
 
@@ -34,7 +35,7 @@ constexpr std::size_t highestBit(I val) noexcept {
 	if constexpr(is_signed_v<I>) {
 		--shiftStart;
 	}
-	for (auto i = shiftStart; i < MaxValue<decltype(i)>; --i) {
+	for (auto i = shiftStart; i > 0; --i) {
 		const auto bitValue = (val >> i) & 1;
 		if (bitValue) {
 			highestBit = i;
@@ -63,13 +64,14 @@ struct McInt {
 
 template<typename I>
 [[nodiscard]]
-constexpr McInt encodeInteger(I input) noexcept {
+constexpr McInt encodeInteger(I pInput) noexcept {
+	auto const input = ox::ResizedInt_t<I, 64>{pInput};
 	McInt out;
 	const auto inputNegative = is_signed_v<I> && input < 0;
 	// move input to uint64_t to allow consistent bit manipulation, and to avoid
 	// overflow concerns
 	uint64_t val = 0;
-	ox_memcpy(&val, &input, sizeof(I));
+	ox::memcpy(&val, &input, sizeof(input));
 	if (val) {
 		// bits needed to represent number factoring in space possibly
 		// needed for signed bit
@@ -92,7 +94,7 @@ constexpr McInt encodeInteger(I input) noexcept {
 		}
 		if (bytes == 9) {
 			out.data[0] = bytesIndicator;
-			ox_memcpy(&out.data[1], &leVal, sizeof(I));
+			ox::memcpy(&out.data[1], &leVal, 8);
 			if (inputNegative) {
 				out.data[1] |= 0b1000'0000;
 			}
@@ -102,7 +104,7 @@ constexpr McInt encodeInteger(I input) noexcept {
 			auto intermediate =
 				static_cast<uint64_t>(leVal.raw() | (negBit << (valBits - 1))) << bytes |
 				static_cast<uint64_t>(bytesIndicator);
-			ox_memcpy(out.data, &intermediate, sizeof(intermediate));
+			ox::memcpy(out.data, &intermediate, sizeof(intermediate));
 		}
 		out.length = bytes;
 	}
@@ -114,7 +116,7 @@ constexpr McInt encodeInteger(I input) noexcept {
  * length integer.
  */
 [[nodiscard]]
-static constexpr std::size_t countBytes(unsigned b) noexcept {
+constexpr std::size_t countBytes(unsigned b) noexcept {
 	std::size_t i = 0;
 	while ((b >> i) & 1) ++i;
 	return i + 1;
@@ -131,17 +133,21 @@ static_assert(countBytes(0b0111'1111) == 8);
 static_assert(countBytes(0b1111'1111) == 9);
 
 template<typename I>
-constexpr Result<I> decodeInteger(const uint8_t buff[9], std::size_t buffLen, std::size_t *bytesRead) noexcept {
+constexpr Result<I> decodeInteger(Reader_c auto&rdr, std::size_t *bytesRead) noexcept {
-	const auto bytes = countBytes(buff[0]);
+	uint8_t firstByte = 0;
+	oxReturnError(rdr.read(&firstByte, 1));
+	oxReturnError(rdr.seekg(-1, ox::ios_base::cur));
+	const auto bytes = countBytes(firstByte);
 	if (bytes == 9) {
 		*bytesRead = bytes;
 		I out = 0;
-		ox_memcpy(&out, &buff[1], sizeof(I));
+		oxReturnError(rdr.seekg(1, ox::ios_base::cur));
+		oxReturnError(rdr.read(&out, sizeof(I)));
 		return fromLittleEndian<I>(out);
-	} else if (buffLen >= bytes) {
+	}
 	*bytesRead = bytes;
 	uint64_t decoded = 0;
-		ox_memcpy(&decoded, &buff[0], bytes);
+	oxReturnError(rdr.read(&decoded, bytes));
 	decoded >>= bytes;
 	// move sign bit
 	if constexpr(is_signed_v<I>) {
@@ -152,7 +158,9 @@ constexpr Result<I> decodeInteger(const uint8_t buff[9], std::size_t buffLen, st
 			 // fill in all bits between encoded sign and real sign with 1s
 			 // split it up because the 32-bit ARM can't shift more than 32 bits
 			 ox::Array<uint32_t, 2> d = {};
-				ox_memcpy(d.data(), &decoded, sizeof(decoded));
+			 //d[0] = decoded & 0xffff'ffff;
+			 //d[1] = decoded >> 32;
+			 ox::memcpy(d.data(), &decoded, sizeof(decoded));
 			 auto bit = negBit;
 			 for (; bit < ox::min<std::size_t>(Bits<I>, 32); ++bit) {
 				 d[0] |= 1 << bit;
@@ -167,19 +175,18 @@ constexpr Result<I> decodeInteger(const uint8_t buff[9], std::size_t buffLen, st
 				 d[0] = d[1];
 				 d[1] = d0Tmp;
 			 }
-				ox_memcpy(&out, d.data(), sizeof(out));
+			 ox::memcpy(&out, d.data(), sizeof(out));
 			 return out;
 		 }
 	}
 	return static_cast<I>(decoded);
 }
-	return OxError(1);
-}
 
 template<typename I>
-constexpr Result<I> decodeInteger(McInt m) noexcept {
+Result<I> decodeInteger(McInt m) noexcept {
-	std::size_t bytesRead;
+	std::size_t bytesRead{};
-	return decodeInteger<I>(m.data, 9, &bytesRead);
+	BufferReader br({reinterpret_cast<const char*>(m.data), 9});
+	return decodeInteger<I>(br, &bytesRead);
 }
 
 }

deps/ox/src/ox/mc/mc.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/mc/presenceindicator.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "err.hpp"
@@ -11,7 +11,7 @@
 
 namespace ox {
 
-template class FieldBitmapReader<uint8_t*>;
+template class FieldBitmapWriterBase<uint8_t*>;
-template class FieldBitmapReader<const uint8_t*>;
+template class FieldBitmapWriterBase<const uint8_t*>;
 
 }

deps/ox/src/ox/mc/presenceindicator.hpp

@@ -1,26 +1,86 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
 
+#include <ox/std/array.hpp>
+#include <ox/std/bit.hpp>
 #include <ox/std/error.hpp>
 #include <ox/std/types.hpp>
+#include <ox/std/reader.hpp>
+
+#include "err.hpp"
 
 namespace ox {
 
-template<typename T>
+template<Reader_c Reader>
 class FieldBitmapReader {
+	protected:
+		mutable std::size_t m_mapBlockIdx = ~std::size_t{0};
+		mutable uint64_t m_mapBlock = 0;
+		std::size_t m_mapStart = 0;
+		Reader &m_reader;
+
+	public:
+		explicit constexpr FieldBitmapReader(Reader &reader) noexcept;
+
+		constexpr Result<bool> get(std::size_t i) const noexcept;
+
+	private:
+		constexpr ox::Error loadMapBlock(std::size_t id) const noexcept;
+
+};
+
+template<Reader_c Reader>
+constexpr FieldBitmapReader<Reader>::FieldBitmapReader(Reader &reader) noexcept:
+	m_mapStart(reader.tellg()),
+	m_reader(reader) {
+}
+
+template<Reader_c Reader>
+constexpr Result<bool> FieldBitmapReader<Reader>::get(std::size_t idx) const noexcept {
+	constexpr auto blockBits = sizeof(m_mapBlock);
+	auto const blockIdx = idx / blockBits;
+	if (m_mapBlockIdx != blockIdx) [[unlikely]] {
+		oxReturnError(loadMapBlock(blockIdx));
+	}
+	idx %= blockBits;
+	return (m_mapBlock >> idx) & 1;
+}
+
+template<Reader_c Reader>
+constexpr ox::Error FieldBitmapReader<Reader>::loadMapBlock(std::size_t idx) const noexcept {
+	oxRequire(g, m_reader.tellg());
+	oxReturnError(m_reader.seekg(static_cast<int>(m_mapStart + idx), ox::ios_base::beg));
+	ox::Array<char, sizeof(m_mapBlock)> mapBlock{};
+	oxReturnError(m_reader.read(mapBlock.data(), sizeof(m_mapBlock)));
+	// Warning: narrow-conv
+	oxReturnError(m_reader.seekg(static_cast<int>(g), ox::ios_base::beg));
+	m_mapBlock = 0;
+	for (auto i = 0ull; auto b : mapBlock) {
+		m_mapBlock |= static_cast<uint64_t>(std::bit_cast<uint8_t>(b)) << i;
+		i += 8;
+	}
+	m_mapBlockIdx = idx;
+	return {};
+}
+
+
+template<typename T>
+class FieldBitmapWriterBase {
 	protected:
 		T m_map = nullptr;
 		std::size_t m_mapLen = 0;
 
 	public:
-		constexpr FieldBitmapReader(T map, std::size_t maxLen) noexcept;
+		constexpr FieldBitmapWriterBase(T map, std::size_t maxLen) noexcept;
+
+		constexpr auto setBuffer(T map, std::size_t maxLen) noexcept;
 
 		constexpr Result<bool> get(std::size_t i) const noexcept;
 
@@ -34,39 +94,45 @@ class FieldBitmapReader {
 };
 
 template<typename T>
-constexpr FieldBitmapReader<T>::FieldBitmapReader(T map, std::size_t maxLen) noexcept {
+constexpr FieldBitmapWriterBase<T>::FieldBitmapWriterBase(T map, std::size_t maxLen) noexcept {
 	m_map = map;
 	m_mapLen = maxLen;
 }
 
 template<typename T>
-constexpr Result<bool> FieldBitmapReader<T>::get(std::size_t i) const noexcept {
+constexpr auto FieldBitmapWriterBase<T>::setBuffer(T map, std::size_t maxLen) noexcept {
+	m_map = map;
+	m_mapLen = maxLen;
+}
+
+template<typename T>
+constexpr Result<bool> FieldBitmapWriterBase<T>::get(std::size_t i) const noexcept {
 	if (i / 8 < m_mapLen) {
 		return (m_map[i / 8] >> (i % 8)) & 1;
 	} else {
-		return OxError(MC_PRESENCEMASKOUTBOUNDS);
+		return OxError(McPresenceMapOverflow);
 	}
 }
 
 template<typename T>
-constexpr void FieldBitmapReader<T>::setFields(int fields) noexcept {
+constexpr void FieldBitmapWriterBase<T>::setFields(int fields) noexcept {
 	m_mapLen = static_cast<std::size_t>((fields / 8 + 1) - (fields % 8 == 0));
 }
 
 template<typename T>
-constexpr void FieldBitmapReader<T>::setMaxLen(int maxLen) noexcept {
+constexpr void FieldBitmapWriterBase<T>::setMaxLen(int maxLen) noexcept {
 	m_mapLen = static_cast<std::size_t>(maxLen);
 }
 
 template<typename T>
-constexpr int64_t FieldBitmapReader<T>::getMaxLen() const noexcept {
+constexpr int64_t FieldBitmapWriterBase<T>::getMaxLen() const noexcept {
 	return static_cast<int64_t>(m_mapLen);
 }
 
-extern template class FieldBitmapReader<uint8_t*>;
+extern template class FieldBitmapWriterBase<uint8_t*>;
-extern template class FieldBitmapReader<const uint8_t*>;
+extern template class FieldBitmapWriterBase<const uint8_t*>;
 
-class FieldBitmap: public FieldBitmapReader<uint8_t*> {
+class FieldBitmap: public FieldBitmapWriterBase<uint8_t*> {
 
 	public:
 		constexpr FieldBitmap(uint8_t *map, std::size_t maxLen) noexcept;
@@ -75,7 +141,8 @@ class FieldBitmap: public FieldBitmapReader<uint8_t*> {
 
 };
 
-constexpr FieldBitmap::FieldBitmap(uint8_t *map, std::size_t maxLen) noexcept: FieldBitmapReader<uint8_t*>(map, maxLen) {
+constexpr FieldBitmap::FieldBitmap(uint8_t *map, std::size_t maxLen) noexcept:
+	FieldBitmapWriterBase<uint8_t*>(map, maxLen) {
 }
 
 constexpr Error FieldBitmap::set(std::size_t i, bool on) noexcept {
@@ -83,11 +150,11 @@ constexpr Error FieldBitmap::set(std::size_t i, bool on) noexcept {
 		if (on) {
 			m_map[i / 8] |= 1 << (i % 8);
 		} else {
-			m_map[i / 8] &= ~(1 << (i % 8));
+			m_map[i / 8] &= ~static_cast<uint8_t>(1 << (i % 8));
 		}
-		return OxError(0);
+		return {};
 	} else {
-		return OxError(MC_PRESENCEMASKOUTBOUNDS);
+		return OxError(McPresenceMapOverflow);
 	}
 }
 

deps/ox/src/ox/mc/read.cpp

@@ -1,11 +1,19 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
+#include <ox/model/modelhandleradaptor.hpp>
+#include <ox/std/buffer.hpp>
+#include <ox/std/reader.hpp>
+
+#include "read.hpp"
+
 namespace ox {
 
+template class ModelHandlerInterface<MetalClawReaderTemplate<BufferReader>>;
+
 }

deps/ox/src/ox/mc/read.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -15,6 +15,7 @@
 #include <ox/model/types.hpp>
 #include <ox/std/buffer.hpp>
 #include <ox/std/byteswap.hpp>
+#include <ox/std/optional.hpp>
 #include <ox/std/string.hpp>
 #include <ox/std/trace.hpp>
 #include <ox/std/vector.hpp>
@@ -26,22 +27,20 @@
 
 namespace ox {
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-class MetalClawReaderTemplate {
+class MetalClawReaderTemplate: public ModelHandlerBase<MetalClawReaderTemplate<Reader>, ox::OpType::Read> {
 
 	private:
-		FieldBitmapReader<const uint8_t*> m_fieldPresence;
+		FieldBitmapReader<Reader> m_fieldPresence;
-		int m_fields = 0;
+		std::size_t m_fields = 0;
-		int m_field = 0;
+		std::size_t m_field = 0;
-		int m_unionIdx = -1;
+		ox::Optional<int> m_unionIdx;
-		std::size_t m_buffIt = 0;
+		Reader &m_reader;
-		std::size_t m_buffLen = 0;
-		const uint8_t *m_buff = nullptr;
-		MetalClawReaderTemplate<HandlerMaker> *m_parent = nullptr;
 
 	public:
-		constexpr MetalClawReaderTemplate(const uint8_t *buff, std::size_t buffLen, int unionIdx = -1,
+		explicit constexpr MetalClawReaderTemplate(
-		                                  MetalClawReaderTemplate<HandlerMaker> *parent = nullptr) noexcept;
+				Reader &reader,
+				ox::Optional<int> const&unionIdx = {}) noexcept;
 
 		constexpr ~MetalClawReaderTemplate() noexcept;
 
@@ -78,7 +77,7 @@ class MetalClawReaderTemplate {
 		constexpr Error field(const char*, BasicString<SmallStringSize> *val) noexcept;
 
 		template<std::size_t L>
-		constexpr Error field(const char*, BString<L> *val) noexcept;
+		constexpr Error field(const char*, IString<L> *val) noexcept;
 
 		constexpr Error fieldCString(const char*, char *val, std::size_t buffLen) noexcept;
 
@@ -95,18 +94,20 @@ class MetalClawReaderTemplate {
 		/**
 		 * Reads an string length from the current location in the buffer.
 		 */
-		[[nodiscard]]
+		constexpr Result<StringLength> stringLength(const char *name) noexcept;
-		constexpr StringLength stringLength(const char *name) noexcept;
 
 		template<typename T = std::nullptr_t>
-		constexpr void setTypeInfo(const char *name = T::TypeName, int version = T::TypeVersion,
+		constexpr ox::Error setTypeInfo(
-		                           const Vector<String>& = {}, int fields = ModelFieldCount_v<T>) noexcept;
+				const char *name = T::TypeName,
+				int version = T::TypeVersion,
+				const Vector<String>& = {},
+				std::size_t fields = ModelFieldCount_v<T>) noexcept;
 
 		/**
 		 * Returns a MetalClawReader to parse a child object.
 		 */
 		[[nodiscard]]
-		constexpr MetalClawReaderTemplate<HandlerMaker> child(const char *name, int unionIdx = -1) noexcept;
+		constexpr MetalClawReaderTemplate<Reader> child(const char *name, ox::Optional<int> unionIdx = {}) noexcept;
 
 		/**
 		 * Indicates whether or not the next field to be read is present.
@@ -125,142 +126,130 @@ class MetalClawReaderTemplate {
 
 		constexpr void nextField() noexcept;
 
-		[[nodiscard]]
-		static constexpr auto opType() noexcept {
-			return OpType::Read;
-		}
-
 	private:
 		template<typename I>
 		constexpr Error readInteger(I *val) noexcept;
 
 };
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr MetalClawReaderTemplate<HandlerMaker>::MetalClawReaderTemplate(const uint8_t *buff, std::size_t buffLen,
+constexpr MetalClawReaderTemplate<Reader>::MetalClawReaderTemplate(
-                                                                         int unionIdx,
+		Reader &reader,
-                                                                         MetalClawReaderTemplate *parent) noexcept:
+		ox::Optional<int> const&unionIdx) noexcept:
-		m_fieldPresence(buff, buffLen),
+		m_fieldPresence(reader),
 		m_unionIdx(unionIdx),
-		m_buffLen(buffLen),
+		m_reader(reader) {
-		m_buff(buff),
-		m_parent(parent) {
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr MetalClawReaderTemplate<HandlerMaker>::~MetalClawReaderTemplate() noexcept {
+constexpr MetalClawReaderTemplate<Reader>::~MetalClawReaderTemplate() noexcept {
-	if (m_parent) {
-		m_parent->m_buffIt += m_buffIt;
-	}
 	if (m_field != m_fields) {
-		oxTrace("ox::mc::MetalClawReader::error") << "MetalClawReader: incorrect fields number given";
+		oxTrace("ox.mc.MetalClawReader.error") << "MetalClawReader: incorrect fields number given";
 	}
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, int8_t *val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int8_t *val) noexcept {
 	return readInteger(val);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, int16_t *val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int16_t *val) noexcept {
 	return readInteger(val);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, int32_t *val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int32_t *val) noexcept {
 	return readInteger(val);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, int64_t *val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int64_t *val) noexcept {
 	return readInteger(val);
 }
 
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, uint8_t *val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint8_t *val) noexcept {
 	return readInteger(val);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, uint16_t *val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint16_t *val) noexcept {
 	return readInteger(val);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, uint32_t *val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint32_t *val) noexcept {
 	return readInteger(val);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, uint64_t *val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint64_t *val) noexcept {
 	return readInteger(val);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, bool *val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, bool *val) noexcept {
-	if (m_unionIdx == -1 || m_unionIdx == m_field) {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
-		auto valErr = m_fieldPresence.get(static_cast<std::size_t>(m_field));
+		auto const result = m_fieldPresence.get(static_cast<std::size_t>(m_field));
-		*val = valErr.value;
+		*val = result.value;
-		oxReturnError(valErr.error);
+		oxReturnError(result);
 	}
 	++m_field;
 	return OxError(0);
 }
 
 // array handler
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char *name, auto *val, std::size_t valLen) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, auto *val, std::size_t valLen) noexcept {
-	if (m_unionIdx == -1 || m_unionIdx == m_field) {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
 		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			// read the length
-			if (m_buffIt >= m_buffLen) {
-				return OxError(MC_BUFFENDED);
-			}
 			std::size_t bytesRead = 0;
-			oxRequire(len, mc::decodeInteger<ArrayLength>(&m_buff[m_buffIt], m_buffLen - m_buffIt, &bytesRead));
+			oxRequire(len, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
-			m_buffIt += bytesRead;
 			// read the list
 			if (valLen >= len) {
-				auto reader = child("");
+				auto reader = child({});
-				auto handler = HandlerMaker(&reader);
+				auto &handler = *reader.interface();
-				handler.setTypeInfo("List", 0, {}, static_cast<int>(len));
+				oxReturnError(handler.setTypeInfo("List", 0, {}, static_cast<std::size_t>(len)));
 				for (std::size_t i = 0; i < len; ++i) {
-					oxReturnError(handler.field("", &val[i]));
+					oxReturnError(handler.field({}, &val[i]));
 				}
 			} else {
-				oxTrace("ox::mc::read::field(T)") << name << ", size:" << valLen;
+				oxTracef("ox.mc.read.field(T)", "{}, length: {}", name, valLen);
-				return OxError(MC_OUTBUFFENDED);
+				return OxError(McOutputBuffEnded);
 			}
 		}
 	}
 	++m_field;
-	return OxError(0);
+	return {};
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
 template<typename T>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, HashMap<String, T> *val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, HashMap<String, T> *val) noexcept {
-	if (m_unionIdx == -1 || m_unionIdx == m_field) {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
 		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			// read the length
-			if (m_buffIt >= m_buffLen) {
+			oxRequire(g, m_reader.tellg());
-				return OxError(MC_BUFFENDED);
-			}
 			std::size_t bytesRead = 0;
-			oxRequire(len, mc::decodeInteger<ArrayLength>(&m_buff[m_buffIt], m_buffLen - m_buffIt, &bytesRead));
+			oxRequire(len, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
-			m_buffIt += bytesRead;
+			oxReturnError(m_reader.seekg(g));
 			// read the list
 			auto reader = child("");
-			auto handler = HandlerMaker(&reader);
+			auto &handler = *reader.interface();
-			handler.setTypeInfo("List", 0, {}, static_cast<int>(len));
+			oxReturnError(handler.setTypeInfo("List", 0, {}, static_cast<std::size_t>(len)));
-			for (std::size_t i = 0; i < len; ++i) {
+			// this loop body needs to be in a lambda because of the potential alloca call
-				const auto keyLen = handler.stringLength(nullptr);
+			constexpr auto loopBody = [](auto &handler, auto &val) {
+				oxRequire(keyLen, handler.stringLength(nullptr));
 				auto wkey = ox_malloca(keyLen + 1, char, 0);
 				auto wkeyPtr = wkey.get();
-				oxReturnError(handler.fieldCString("", &wkeyPtr, static_cast<int>(keyLen + 1)));
+				oxReturnError(handler.fieldCString("", &wkeyPtr, keyLen + 1));
-				oxReturnError(handler.field("", &val->operator[](wkey.get())));
+				return handler.field("", &val[wkeyPtr]);
+			};
+			for (std::size_t i = 0; i < len; ++i) {
+				oxReturnError(loopBody(handler, *val));
 			}
 		}
 	}
@@ -268,72 +257,72 @@ constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, HashMa
 	return OxError(0);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
 template<typename T>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char *name, T *val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, T *val) noexcept {
 	if constexpr(isVector_v<T>) {
-		if (m_unionIdx == -1 || m_unionIdx == m_field) {
+		if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
 			// set size of val if the field is present, don't worry about it if not
 			if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 				oxRequire(len, arrayLength(name, false));
-				val->resize(len);
+				oxReturnError(ox::resizeVector(*val, len));
+				return field(name, val->data(), val->size());
+			}
+			oxReturnError(ox::resizeVector(*val, 0));
+		}
+		++m_field;
+		return {};
+	} else if constexpr(isArray_v<T>) {
+		if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
+			// set size of val if the field is present, don't worry about it if not
+			if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+				oxRequire(len, arrayLength(name, false));
+				if (len > val->size()) {
+					return OxError(1, "Input array is too long");
+				}
 			}
 			return field(name, val->data(), val->size());
 		}
 		++m_field;
-		return OxError(0);
+		return {};
 	} else {
-		if ((m_unionIdx == -1 || m_unionIdx == m_field) && val) {
+		if ((!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) && val) {
 			if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 				auto reader = child("");
-				auto handler = HandlerMaker(&reader);
+				oxReturnError(model(reader.interface(), val));
-				oxReturnError(model(&handler, val));
 			}
 		}
 		++m_field;
-		return OxError(0);
+		return {};
 	}
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
 template<typename U, bool force>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, UnionView<U, force> val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, UnionView<U, force> val) noexcept {
-	if ((m_unionIdx == -1 || m_unionIdx == m_field) && val.get()) {
+	if ((!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) && val.get()) {
 		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
-			auto reader = child("", val.idx());
+			auto reader = child("", ox::Optional<int>(ox::in_place, val.idx()));
-			auto handler = HandlerMaker(&reader);
+			oxReturnError(model(reader.interface(), val.get()));
-			oxReturnError(model(&handler, val.get()));
 		}
 	}
 	++m_field;
-	return OxError(0);
+	return {};
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
 template<std::size_t SmallStringSize>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, BasicString<SmallStringSize> *val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, BasicString<SmallStringSize> *val) noexcept {
-	if (m_unionIdx == -1 || m_unionIdx == m_field) {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
 		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			// read the length
-			if (m_buffIt >= m_buffLen) {
-				return OxError(MC_BUFFENDED);
-			}
 			std::size_t bytesRead = 0;
-			oxRequire(size, mc::decodeInteger<StringLength>(&m_buff[m_buffIt], m_buffLen - m_buffIt, &bytesRead));
+			oxRequire(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
-			m_buffIt += bytesRead;
 			const auto cap = size;
 			*val = BasicString<SmallStringSize>(cap);
 			auto data = val->data();
 			// read the string
-			if (static_cast<StringLength>(cap) < size) {
+			oxReturnError(m_reader.read(data, size));
-				return OxError(MC_OUTBUFFENDED);
-			}
-			if (m_buffIt + size > m_buffLen) {
-				return OxError(MC_BUFFENDED);
-			}
-			memcpy(data, &m_buff[m_buffIt], size);
-			data[size] = 0;
-			m_buffIt += size;
 		} else {
 			*val = "";
 		}
@@ -342,81 +331,71 @@ constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, BasicS
 	return OxError(0);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
 template<std::size_t L>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char *name, BString<L> *val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, IString<L> *val) noexcept {
-	return fieldCString(name, val->data(), val->cap());
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
-}
-
-template<auto HandlerMaker>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::fieldCString(const char*, char *val, std::size_t buffLen) noexcept {
 		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			// read the length
-		if (m_buffIt >= m_buffLen) {
-			return OxError(MC_BUFFENDED);
-		}
 			std::size_t bytesRead = 0;
-		auto [size, err] = mc::decodeInteger<StringLength>(&m_buff[m_buffIt], m_buffLen - m_buffIt, &bytesRead);
+			oxRequire(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
-		if (size > buffLen) {
+			*val = IString<L>();
-			return OxError(MC_OUTBUFFENDED);
+			oxReturnError(val->resize(size));
+			auto const data = val->data();
+			// read the string
+			oxReturnError(m_reader.read(data, size));
+		} else {
+			*val = "";
+		}
+	}
+	++m_field;
+	return {};
+}
+
+template<Reader_c Reader>
+constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char *val, std::size_t buffLen) noexcept {
+	if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+		// read the length
+		std::size_t bytesRead = 0;
+		oxRequire(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
+		if (size > buffLen) {
+			return OxError(McOutputBuffEnded);
 		}
-		m_buffIt += bytesRead;
-		oxReturnError(err);
 		// re-allocate in case too small
 		auto data = val;
 		// read the string
-		if (m_buffIt + size <= m_buffLen) {
+		oxReturnError(m_reader.read(data, size));
-			ox_memcpy(data, &m_buff[m_buffIt], size);
 		data[size] = 0;
-			m_buffIt += size;
-		} else {
-			return OxError(MC_BUFFENDED);
-		}
 	}
 	++m_field;
 	return OxError(0);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::fieldCString(const char*, char **val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char **val) noexcept {
 	if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 		// read the length
-		if (m_buffIt >= m_buffLen) {
-			return OxError(MC_BUFFENDED);
-		}
 		std::size_t bytesRead = 0;
-		auto [size, err] = mc::decodeInteger<StringLength>(&m_buff[m_buffIt], m_buffLen - m_buffIt, &bytesRead);
+		oxRequire(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
-		m_buffIt += bytesRead;
-		oxReturnError(err);
 		// re-allocate in case too small
 		safeDelete(*val);
 		*val = new char[size + 1];
 		auto data = *val;
 		// read the string
-		if (m_buffIt + size <= m_buffLen) {
+		oxReturnError(m_reader.read(data, size));
-			ox_memcpy(data, &m_buff[m_buffIt], size);
 		data[size] = 0;
-			m_buffIt += size;
-		} else {
-			return OxError(MC_BUFFENDED);
-		}
 	}
 	++m_field;
 	return OxError(0);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::fieldCString(const char*, char **val, std::size_t buffLen) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char **val, std::size_t buffLen) noexcept {
-	if (m_unionIdx == -1 || m_unionIdx == m_field) {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
 		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			// read the length
-			if (m_buffIt >= m_buffLen) {
-				return OxError(MC_BUFFENDED);
-			}
 			std::size_t bytesRead = 0;
-			auto [size, err] = mc::decodeInteger<StringLength>(&m_buff[m_buffIt], m_buffLen - m_buffIt, &bytesRead);
+			oxRequire(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
-			m_buffIt += bytesRead;
-			oxReturnError(err);
 			// re-allocate if too small
 			if (buffLen < size + 1) {
 				safeDelete(*val);
@@ -425,13 +404,8 @@ constexpr Error MetalClawReaderTemplate<HandlerMaker>::fieldCString(const char*,
 			}
 			auto data = *val;
 			// read the string
-			if (m_buffIt + size <= m_buffLen) {
+			oxReturnError(m_reader.read(data, size));
-				ox_memcpy(data, &m_buff[m_buffIt], size);
 			data[size] = 0;
-				m_buffIt += size;
-			} else {
-				return OxError(MC_BUFFENDED);
-			}
 		} else {
 			auto data = *val;
 			if (data) {
@@ -443,18 +417,16 @@ constexpr Error MetalClawReaderTemplate<HandlerMaker>::fieldCString(const char*,
 	return OxError(0);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr Result<ArrayLength> MetalClawReaderTemplate<HandlerMaker>::arrayLength(const char*, bool pass) noexcept {
+constexpr Result<ArrayLength> MetalClawReaderTemplate<Reader>::arrayLength(const char*, bool pass) noexcept {
-	if ((m_unionIdx == -1 || m_unionIdx == m_field)) {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
 		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			// read the length
-			if (m_buffIt >= m_buffLen) {
-				return OxError(MC_BUFFENDED);
-			}
 			std::size_t bytesRead = 0;
-			auto out = mc::decodeInteger<ArrayLength>(&m_buff[m_buffIt], m_buffLen - m_buffIt, &bytesRead).value;
+			oxRequire(g, m_reader.tellg());
-			if (pass) {
+			oxRequire(out, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
-				m_buffIt += bytesRead;
+			if (!pass) {
+				oxReturnError(m_reader.seekg(g));
 			}
 			return out;
 		}
@@ -462,20 +434,29 @@ constexpr Result<ArrayLength> MetalClawReaderTemplate<HandlerMaker>::arrayLength
 	return OxError(1);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
+constexpr Result<StringLength> MetalClawReaderTemplate<Reader>::stringLength(const char*) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+			// read the length
+			std::size_t bytesRead = 0;
+			auto len = mc::decodeInteger<StringLength>(m_reader, &bytesRead);
+			oxReturnError(m_reader.seekg(-static_cast<int64_t>(bytesRead), ox::ios_base::cur));
+			return len;
+		}
+	}
+	return 0;
+}
+
+template<Reader_c Reader>
 template<typename I>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::readInteger(I *val) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::readInteger(I *val) noexcept {
-	if (m_unionIdx == -1 || m_unionIdx == m_field) {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
 		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			std::size_t bytesRead = 0;
-			if (m_buffIt >= m_buffLen) {
+			auto const result = mc::decodeInteger<I>(m_reader, &bytesRead);
-				oxTrace("ox::MetalClaw::readInteger") << "Buffer ended";
+			oxReturnError(result);
-				return OxError(MC_BUFFENDED);
+			*val = result.value;
-			}
-			auto valErr = mc::decodeInteger<I>(&m_buff[m_buffIt], m_buffLen - m_buffIt, &bytesRead);
-			m_buffIt += bytesRead;
-			oxReturnError(valErr.error);
-			*val = valErr.value;
 		} else {
 			*val = 0;
 		}
@@ -484,23 +465,18 @@ constexpr Error MetalClawReaderTemplate<HandlerMaker>::readInteger(I *val) noexc
 	return OxError(0);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
 template<typename T, typename CB>
-constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, CB cb) noexcept {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, CB cb) noexcept {
-	if (m_unionIdx == -1 || m_unionIdx == m_field) {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
 		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 			// read the length
-			if (m_buffIt >= m_buffLen) {
-				return OxError(MC_BUFFENDED);
-			}
 			std::size_t bytesRead = 0;
-			oxRequire(len, mc::decodeInteger<ArrayLength>(&m_buff[m_buffIt], m_buffLen - m_buffIt, &bytesRead));
+			oxRequire(len, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
-			m_buffIt += bytesRead;
-
 			// read the list
 			auto reader = child("");
-			auto handler = HandlerMaker(&reader);
+			auto &handler = *reader.interface();
-			handler.setTypeInfo("List", 0, {}, static_cast<int>(len));
+			oxReturnError(handler.setTypeInfo("List", 0, {}, static_cast<std::size_t>(len)));
 			for (std::size_t i = 0; i < len; ++i) {
 				T val;
 				oxReturnError(handler.field("", &val));
@@ -512,48 +488,38 @@ constexpr Error MetalClawReaderTemplate<HandlerMaker>::field(const char*, CB cb)
 	return OxError(0);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr StringLength MetalClawReaderTemplate<HandlerMaker>::stringLength(const char*) noexcept {
-	if ((m_unionIdx == -1 || m_unionIdx == m_field)) {
-		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
-			// read the length
-			std::size_t bytesRead = 0;
-			auto len = mc::decodeInteger<StringLength>(&m_buff[m_buffIt], m_buffLen - m_buffIt, &bytesRead);
-			return len.value;
-		}
-	}
-	return 0;
-}
-
-template<auto HandlerMaker>
 template<typename T>
-constexpr void MetalClawReaderTemplate<HandlerMaker>::setTypeInfo(const char*, int, const Vector<String>&, int fields) noexcept {
+constexpr ox::Error MetalClawReaderTemplate<Reader>::setTypeInfo(
+		const char*, int, const Vector<String>&, std::size_t fields) noexcept {
 	m_fields = fields;
-	m_buffIt = static_cast<std::size_t>((fields / 8 + 1) - (fields % 8 == 0));
+	// Warning: narrow-conv
-	m_fieldPresence.setFields(fields);
+	return m_reader.seekg(
-	m_fieldPresence.setMaxLen(static_cast<int>(m_buffIt));
+			static_cast<int>((fields / 8 + 1) - (fields % 8 == 0)),
+			ox::ios_base::cur);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr MetalClawReaderTemplate<HandlerMaker> MetalClawReaderTemplate<HandlerMaker>::child(const char*, int unionIdx) noexcept {
+constexpr MetalClawReaderTemplate<Reader> MetalClawReaderTemplate<Reader>::child(
-	return MetalClawReaderTemplate<HandlerMaker>(m_buff + m_buffIt, m_buffLen - m_buffIt, unionIdx, this);
+		const char*,
+		ox::Optional<int> unionIdx) noexcept {
+	return MetalClawReaderTemplate<Reader>(m_reader, unionIdx);
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr bool MetalClawReaderTemplate<HandlerMaker>::fieldPresent(const char*) const noexcept {
+constexpr bool MetalClawReaderTemplate<Reader>::fieldPresent(const char*) const noexcept {
 	return m_fieldPresence.get(static_cast<std::size_t>(m_field)).value;
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr bool MetalClawReaderTemplate<HandlerMaker>::fieldPresent(int fieldNo) const noexcept {
+constexpr bool MetalClawReaderTemplate<Reader>::fieldPresent(int fieldNo) const noexcept {
 	return m_fieldPresence.get(static_cast<std::size_t>(fieldNo)).value;
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
 [[nodiscard]]
-constexpr int MetalClawReaderTemplate<HandlerMaker>::whichFieldPresent(const char*, const ModelUnion &u) const noexcept {
+constexpr int MetalClawReaderTemplate<Reader>::whichFieldPresent(const char*, const ModelUnion &u) const noexcept {
-	FieldBitmapReader<const uint8_t*> p(m_buff + m_buffIt, m_buffLen - m_buffIt);
+	FieldBitmapReader<Reader> p(m_reader);
-	p.setFields(u.fieldCount());
 	for (auto i = 0u; i < u.fieldCount(); ++i) {
 		if (p.get(i)) {
 			return static_cast<int>(i);
@@ -562,32 +528,28 @@ constexpr int MetalClawReaderTemplate<HandlerMaker>::whichFieldPresent(const cha
 	return -1;
 }
 
-template<auto HandlerMaker>
+template<Reader_c Reader>
-constexpr void MetalClawReaderTemplate<HandlerMaker>::nextField() noexcept {
+constexpr void MetalClawReaderTemplate<Reader>::nextField() noexcept {
 	++m_field;
 }
 
-using MetalClawReader = MetalClawReaderTemplate<[](auto r) {
+using MetalClawReader = MetalClawReaderTemplate<ox::BufferReader>;
-	return ModelHandlerInterface{r};
-}>;
 
 template<typename T>
-Error readMC(const char *buff, std::size_t buffLen, T *val) noexcept {
+Error readMC(ox::BufferView buff, T &val) noexcept {
-	MetalClawReader reader(reinterpret_cast<const uint8_t*>(buff), buffLen);
+	BufferReader br(buff);
-	ModelHandlerInterface handler(&reader);
+	MetalClawReader reader(br);
-	return model(&handler, val);
+	ModelHandlerInterface<MetalClawReader, ox::OpType::Read> handler(&reader);
+	return model(&handler, &val);
 }
 
 template<typename T>
-Result<T> readMC(const char *buff, std::size_t buffLen) noexcept {
+Result<T> readMC(ox::BufferView buff) noexcept {
-	T val;
+	Result<T> val;
-	oxReturnError(readMC(buff, buffLen, &val));
+	oxReturnError(readMC(buff, val.value));
 	return val;
 }
 
-template<typename T>
+extern template class ModelHandlerInterface<MetalClawReaderTemplate<BufferReader>>;
-Result<T> readMC(const Buffer &buff) noexcept {
-	return readMC<T>(buff.data(), buff.size());
-}
 
 }

deps/ox/src/ox/mc/test/CMakeLists.txt

@@ -8,9 +8,9 @@ target_link_libraries(
 		OxMetalClaw
 )
 
-add_test("[ox/mc] McTest Writer" McTest MetalClawWriter)
+add_test("[ox/mc] Writer" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/McTest MetalClawWriter)
-add_test("[ox/mc] McTest Reader" McTest MetalClawReader)
+add_test("[ox/mc] Reader" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/McTest MetalClawReader)
-#add_test("[ox/mc] McTest MetalClawDef" McTest MetalClawDef)
+#add_test("[ox/mc] MetalClawDef" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/McTest MetalClawDef)
-add_test("[ox/mc] McTest MetalClawModelValue" McTest MetalClawModelValue)
+add_test("[ox/mc] MetalClawModelValue" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/McTest MetalClawModelValue)
-add_test("[ox/mc] McTest encodeInteger" McTest encodeInteger)
+add_test("[ox/mc] encodeInteger" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/McTest encodeInteger)
-add_test("[ox/mc] McTest decodeInteger" McTest decodeInteger)
+add_test("[ox/mc] decodeInteger" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/McTest decodeInteger)

deps/ox/src/ox/mc/test/tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18,8 +18,8 @@ union TestUnion {
 	static constexpr auto TypeName = "TestUnion";
 	static constexpr auto TypeVersion = 1;
 	bool Bool;
-	uint32_t Int = 5;
+	uint32_t Int;
-	char *CString;
+	char *CString{};
 };
 
 struct TestStructNest {
@@ -27,7 +27,7 @@ struct TestStructNest {
 	static constexpr auto TypeVersion = 1;
 	bool Bool = false;
 	uint32_t Int = 0;
-	ox::BString<32> BString = "";
+	ox::IString<32> IString = "";
 };
 
 struct TestStruct {
@@ -45,10 +45,11 @@ struct TestStruct {
 	int32_t Int8 = 0;
 	int unionIdx = 1;
 	TestUnion Union;
-	ox::String String = "";
+	ox::String String;
-	ox::BString<32> BString = "";
+	ox::IString<32> IString = "";
 	uint32_t List[4] = {0, 0, 0, 0};
 	ox::Vector<uint32_t> Vector = {1, 2, 3, 4, 5};
+	ox::Vector<uint32_t> Vector2 = {1, 2, 3, 4, 5};
 	ox::HashMap<ox::String, int> Map;
 	TestStructNest EmptyStruct;
 	TestStructNest Struct;
@@ -61,7 +62,7 @@ struct TestStruct {
 
 template<typename T>
 constexpr ox::Error model(T *io, ox::CommonPtrWith<TestUnion> auto *obj) noexcept {
-	io->template setTypeInfo<TestUnion>();
+	oxReturnError(io->template setTypeInfo<TestUnion>());
 	oxReturnError(io->field("Bool", &obj->Bool));
 	oxReturnError(io->field("Int", &obj->Int));
 	oxReturnError(io->fieldCString("CString", &obj->CString));
@@ -71,13 +72,12 @@ constexpr ox::Error model(T *io, ox::CommonPtrWith<TestUnion> auto *obj) noexcep
 oxModelBegin(TestStructNest)
 	oxModelField(Bool)
 	oxModelField(Int)
-	oxModelField(BString)
+	oxModelField(IString)
 oxModelEnd()
 
 template<typename T>
 constexpr ox::Error model(T *io, ox::CommonPtrWith<TestStruct> auto *obj) noexcept {
-	io->template setTypeInfo<TestStruct>();
+	oxReturnError(io->template setTypeInfo<TestStruct>());
-	oxReturnError(io->field("Vector", &obj->Vector));
 	oxReturnError(io->field("Bool", &obj->Bool));
 	oxReturnError(io->field("Int", &obj->Int));
 	oxReturnError(io->field("Int1", &obj->Int1));
@@ -95,25 +95,27 @@ constexpr ox::Error model(T *io, ox::CommonPtrWith<TestStruct> auto *obj) noexce
 		oxReturnError(io->field("Union", ox::UnionView{&obj->Union, obj->unionIdx}));
 	}
 	oxReturnError(io->field("String", &obj->String));
-	oxReturnError(io->field("BString", &obj->BString));
+	oxReturnError(io->field("IString", &obj->IString));
 	oxReturnError(io->field("List", obj->List, 4));
+	oxReturnError(io->field("Vector", &obj->Vector));
+	oxReturnError(io->field("Vector2", &obj->Vector2));
 	oxReturnError(io->field("Map", &obj->Map));
-	oxReturnError(io->field("EmptyStruct", &obj->EmptyStruct));
 	oxReturnError(io->field("Struct", &obj->Struct));
+	oxReturnError(io->field("EmptyStruct", &obj->EmptyStruct));
 	return OxError(0);
 }
 
-std::map<ox::String, ox::Error(*)()> tests = {
+std::map<ox::StringView, ox::Error(*)()> tests = {
 	{
 		{
 			"MetalClawWriter",
 			[] {
 				// This test doesn't confirm much, but it does show that the writer
 				// doesn't segfault
-				static constexpr size_t buffLen = 1024;
+				ox::Array<char, 1024> buff;
-				char buff[buffLen];
 				TestStruct ts;
-				oxReturnError(ox::writeMC(buff, buffLen, &ts));
+				oxReturnError(ox::writeMC(buff.data(), buff.size(), ts));
+				oxReturnError(ox::writeMC(ts));
 				return OxError(0);
 			}
 		},
@@ -122,26 +124,26 @@ std::map<ox::String, ox::Error(*)()> tests = {
 			"MetalClawReader",
 			[] {
 				// setup for tests
-				static constexpr size_t buffLen = 1024;
-				char buff[buffLen];
 				TestStruct testIn, testOut;
 				testIn.Bool = true;
 				testIn.Int = 42;
-				testIn.Union.Int = 42;
+				testIn.IString = "Test String 1";
-				testIn.String = "Test String 0";
+				testIn.String = "Test String 2";
-				testIn.BString = "Test String 1";
+				testIn.Vector = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, };
+				testIn.Vector2 = {};
 				testIn.List[0] = 1;
 				testIn.List[1] = 2;
 				testIn.List[2] = 3;
 				testIn.List[3] = 4;
-				testIn.Map["asdf"] = 93;
+				testIn.Struct.Bool = true;
-				testIn.Map["aoeu"] = 94;
-				testIn.Struct.Bool = false;
 				testIn.Struct.Int = 300;
-				testIn.Struct.BString = "Test String 2";
+				testIn.Struct.IString = "Test String 3";
+				testIn.unionIdx = 1;
+				testIn.Union.Int = 93;
 				// run tests
-				oxAssert(ox::writeMC(buff, buffLen, &testIn), "writeMC failed");
+				const auto [buff, err] = ox::writeMC(testIn);
-				oxAssert(ox::readMC(buff, buffLen, &testOut), "readMC failed");
+				oxAssert(err, "writeMC failed");
+				oxAssert(ox::readMC(buff, testOut), "readMC failed");
 				//std::cout << testIn.Union.Int << "|" << testOut.Union.Int << "|\n";
 				oxAssert(testIn.Bool                == testOut.Bool,                "Bool value mismatch");
 				oxAssert(testIn.Int                 == testOut.Int,                 "Int value mismatch");
@@ -155,22 +157,24 @@ std::map<ox::String, ox::Error(*)()> tests = {
 				oxAssert(testIn.Int8                == testOut.Int8,                "Int8 value mismatch");
 				oxAssert(testIn.Union.Int           == testOut.Union.Int,           "Union.Int value mismatch");
 				oxAssert(testIn.String              == testOut.String,              "String value mismatch");
-				oxAssert(testIn.BString             == testOut.BString,             "BString value mismatch");
+				oxDebugf("{}", testOut.IString.len());
+				oxExpect(testIn.IString,               testOut.IString);
 				oxAssert(testIn.List[0]             == testOut.List[0],             "List[0] value mismatch");
 				oxAssert(testIn.List[1]             == testOut.List[1],             "List[1] value mismatch");
 				oxAssert(testIn.List[2]             == testOut.List[2],             "List[2] value mismatch");
 				oxAssert(testIn.List[3]             == testOut.List[3],             "List[3] value mismatch");
-				oxAssert(testIn.Vector[0]           == testOut.Vector[0],           "Vector[0] value mismatch");
+				oxAssert(testIn.Vector.size()       == testOut.Vector.size(),       "Vector size mismatch");
-				oxAssert(testIn.Vector[1]           == testOut.Vector[1],           "Vector[1] value mismatch");
+				for (auto i = 0u; i < testIn.Vector.size(); ++i) {
-				oxAssert(testIn.Vector[2]           == testOut.Vector[2],           "Vector[2] value mismatch");
+					oxAssert(testIn.Vector[i]        == testOut.Vector[i],           ox::sfmt("Vector[{}] value mismatch", i));
-				oxAssert(testIn.Vector[3]           == testOut.Vector[3],           "Vector[3] value mismatch");
+				}
+				oxAssert(testIn.Vector2.size()      == testOut.Vector2.size(),      "Vector2 size mismatch");
 				oxAssert(testIn.Map["asdf"]         == testOut.Map["asdf"],         "Map[\"asdf\"] value mismatch");
 				oxAssert(testIn.Map["aoeu"]         == testOut.Map["aoeu"],         "Map[\"aoeu\"] value mismatch");
 				oxAssert(testIn.EmptyStruct.Bool    == testOut.EmptyStruct.Bool,    "EmptyStruct.Bool value mismatch");
 				oxAssert(testIn.EmptyStruct.Int     == testOut.EmptyStruct.Int,     "EmptyStruct.Int value mismatch");
-				oxAssert(testIn.EmptyStruct.BString == testOut.EmptyStruct.BString, "EmptyStruct.BString value mismatch");
+				oxAssert(testIn.EmptyStruct.IString == testOut.EmptyStruct.IString, "EmptyStruct.IString value mismatch");
 				oxAssert(testIn.Struct.Int          == testOut.Struct.Int,          "Struct.Int value mismatch");
-				oxAssert(testIn.Struct.BString      == testOut.Struct.BString,      "Struct.BString value mismatch");
+				oxAssert(testIn.Struct.IString      == testOut.Struct.IString,      "Struct.IString value mismatch");
 				oxAssert(testIn.Struct.Bool         == testOut.Struct.Bool,         "Struct.Bool value mismatch");
 				return OxError(0);
 			}
@@ -264,6 +268,9 @@ std::map<ox::String, ox::Error(*)()> tests = {
 					return OxError(0);
 				};
 				oxAssert(check(uint32_t(14)), "Decode of 14 failed.");
+				oxAssert(check(int8_t(-1)), "Decode of -1 failed.");
+				oxAssert(check(int16_t(-1)), "Decode of -1 failed.");
+				oxAssert(check(int32_t(-1)), "Decode of -1 failed.");
 				oxAssert(check(int64_t(-1)), "Decode of -1 failed.");
 				oxAssert(check(int64_t(-2)), "Decode of -2 failed.");
 				oxAssert(check(int64_t(-127)), "Decode of -127 failed.");
@@ -297,44 +304,44 @@ std::map<ox::String, ox::Error(*)()> tests = {
 				TestStruct testIn;
 				testIn.Bool = true;
 				testIn.Int = 42;
-				testIn.BString = "Test String 1";
+				testIn.IString = "Test String 1";
 				testIn.List[0] = 1;
 				testIn.List[1] = 2;
 				testIn.List[2] = 3;
 				testIn.List[3] = 4;
 				testIn.Struct.Bool = true;
 				testIn.Struct.Int = 300;
-				testIn.Struct.BString = "Test String 2";
+				testIn.Struct.IString = "Test String 2";
 				testIn.unionIdx = 1;
 				testIn.Union.Int = 93;
-				oxAssert(ox::writeMC(dataBuff.data(), dataBuff.size(), &testIn), "Data generation failed");
+				oxAssert(ox::writeMC(dataBuff.data(), dataBuff.size(), testIn), "Data generation failed");
 				ox::TypeStore typeStore;
 				const auto [type, typeErr] = ox::buildTypeDef(&typeStore, &testIn);
 				oxAssert(typeErr, "Descriptor write failed");
 				ox::ModelObject testOut;
 				oxReturnError(testOut.setType(type));
-				oxAssert(ox::readMC(dataBuff.data(), dataBuff.size(), &testOut), "Data read failed");
+				oxAssert(ox::readMC(dataBuff, testOut), "Data read failed");
-				oxAssert(testOut["Int"].get<int>() == testIn.Int, "testOut.Int failed");
+				oxAssert(testOut.at("Int").unwrap()->get<int>() == testIn.Int, "testOut.Int failed");
-				oxAssert(testOut["Bool"].get<bool>() == testIn.Bool, "testOut.Bool failed");
+				oxAssert(testOut.at("Bool").unwrap()->get<bool>() == testIn.Bool, "testOut.Bool failed");
-				oxAssert(testOut["BString"].get<ox::String>() == testIn.BString.c_str(), "testOut.String failed");
+				oxAssert(testOut.at("IString").unwrap()->get<ox::String>() == testIn.IString.c_str(), "testOut.String failed");
-				oxAssert(testOut["String"].get<ox::String>() == testIn.String, "testOut.String failed");
+				oxAssert(testOut.at("String").unwrap()->get<ox::String>() == testIn.String, "testOut.String failed");
-				auto &testOutStruct = testOut["Struct"].get<ox::ModelObject>();
+				auto &testOutStruct = testOut.at("Struct").unwrap()->get<ox::ModelObject>();
-				auto &testOutUnion = testOut["Union"].get<ox::ModelUnion>();
+				auto &testOutUnion = testOut.at("Union").unwrap()->get<ox::ModelUnion>();
-				auto &testOutList = testOut["List"].get<ox::ModelValueVector>();
+				auto &testOutList = testOut.at("List").unwrap()->get<ox::ModelValueVector>();
-				auto testOutStructCopy = testOut["Struct"].get<ox::ModelObject>();
+				auto testOutStructCopy = testOut.at("Struct").unwrap()->get<ox::ModelObject>();
-				auto testOutUnionCopy = testOut["Union"].get<ox::ModelUnion>();
+				auto testOutUnionCopy = testOut.at("Union").unwrap()->get<ox::ModelUnion>();
-				auto testOutListCopy = testOut["List"].get<ox::ModelValueVector>();
+				auto testOutListCopy = testOut.at("List").unwrap()->get<ox::ModelValueVector>();
 				oxAssert(testOutStruct.typeName() == TestStructNest::TypeName, "ModelObject TypeName failed");
 				oxAssert(testOutStruct.typeVersion() == TestStructNest::TypeVersion, "ModelObject TypeVersion failed");
-				oxAssert(testOutStruct["Bool"].get<bool>() == testIn.Struct.Bool, "testOut.Struct.Bool failed");
+				oxAssert(testOutStruct.at("Bool").unwrap()->get<bool>() == testIn.Struct.Bool, "testOut.Struct.Bool failed");
-				oxAssert(testOutStruct["BString"].get<ox::String>() == testIn.Struct.BString.c_str(), "testOut.Struct.BString failed");
+				oxAssert(testOutStruct.at("IString").unwrap()->get<ox::String>() == testIn.Struct.IString.c_str(), "testOut.Struct.IString failed");
-				oxAssert(testOut["unionIdx"].get<int>() == testIn.unionIdx, "testOut.unionIdx failed");
+				oxAssert(testOut.at("unionIdx").unwrap()->get<int>() == testIn.unionIdx, "testOut.unionIdx failed");
 				oxAssert(testOutUnion.unionIdx() == testIn.unionIdx, "testOut.Union idx wrong");
-				oxAssert(testOutUnion["Int"].get<uint32_t>() == testIn.Union.Int, "testOut.Union.Int failed");
+				oxAssert(testOutUnion.at("Int").unwrap()->get<uint32_t>() == testIn.Union.Int, "testOut.Union.Int failed");
 				oxAssert(testOutList[0].get<uint32_t>() == testIn.List[0], "testOut.List[0] failed");
 				oxAssert(testOutList[1].get<uint32_t>() == testIn.List[1], "testOut.Struct.List[1] failed");
-				oxAssert(testOutStructCopy["Bool"].get<bool>() == testIn.Struct.Bool, "testOut.Struct.Bool (copy) failed");
+				oxAssert(testOutStructCopy.at("Bool").unwrap()->get<bool>() == testIn.Struct.Bool, "testOut.Struct.Bool (copy) failed");
-				oxAssert(testOutStructCopy["BString"].get<ox::String>() == testIn.Struct.BString.c_str(), "testOut.Struct.BString (copy) failed");
+				oxAssert(testOutStructCopy.at("IString").unwrap()->get<ox::String>() == testIn.Struct.IString.c_str(), "testOut.Struct.IString (copy) failed");
 				oxAssert(testOutListCopy[0].get<uint32_t>() == testIn.List[0], "testOut.Struct.List[0] (copy) failed");
 				oxAssert(testOutListCopy[1].get<uint32_t>() == testIn.List[1], "testOut.Struct.List[1] (copy) failed");
 				return OxError(0);
@@ -351,19 +358,20 @@ std::map<ox::String, ox::Error(*)()> tests = {
 				 TestStruct testIn, testOut;
 				 testIn.Bool = true;
 				 testIn.Int = 42;
-				 testIn.BString = "Test String 1";
+				 testIn.IString = "Test String 1";
 				 testIn.List[0] = 1;
 				 testIn.List[1] = 2;
 				 testIn.List[2] = 3;
 				 testIn.List[3] = 4;
 				 testIn.Struct.Bool = false;
 				 testIn.Struct.Int = 300;
-				 testIn.Struct.BString = "Test String 2";
+				 testIn.Struct.IString = "Test String 2";
-				 oxAssert(ox::writeMC(dataBuff, dataBuffLen, &testIn), "Data generation failed");
+				 oxAssert(ox::writeMC(dataBuff, dataBuffLen, testIn), "Data generation failed");
 				 ox::TypeStore typeStore;
 				 const auto [type, typeErr] = ox::buildTypeDef(&typeStore, &testIn);
 				 oxAssert(typeErr, "Descriptor write failed");
-				 oxReturnError(ox::walkModel<ox::MetalClawReader>(type, dataBuff, dataBuffLen,
+				 ox::BufferReader br({dataBuff, dataBuffLen});
+				 oxReturnError(ox::walkModel<ox::MetalClawReader>(type, br,
 					[](const ox::Vector<ox::FieldName>&, const ox::Vector<ox::String>&, const ox::DescriptorField &f, ox::MetalClawReader *rdr) -> ox::Error {
 						//std::cout << f.fieldName.c_str() << '\n';
 						auto fieldName = f.fieldName.c_str();
@@ -456,11 +464,14 @@ std::map<ox::String, ox::Error(*)()> tests = {
 };
 
 int main(int argc, const char **args) {
-	if (argc > 0) {
+	if (argc < 2) {
-		auto testName = args[1];
+		oxError("Must specify test to run");
-		if (tests.find(testName) != tests.end()) {
-			oxAssert(tests[testName](), "Test failed...");
-		}
 	}
+	auto const testName = args[1];
+	auto const func = tests.find(testName);
+	if (func != tests.end()) {
+		oxAssert(func->second(), "Test returned Error");
 		return 0;
 	}
+	return -1;
+}

deps/ox/src/ox/mc/types.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -14,7 +14,7 @@
 
 namespace ox {
 
-using StringLength = uint32_t;
+using StringLength = std::size_t;
-using ArrayLength = uint32_t;
+using ArrayLength = std::size_t;
 
 }

deps/ox/src/ox/mc/write.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -15,4 +15,7 @@
 
 namespace ox {
 
+template class ModelHandlerInterface<MetalClawWriter<BufferWriter>>;
+template class ModelHandlerInterface<MetalClawWriter<CharBuffWriter>>;
+
 }

deps/ox/src/ox/mc/write.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -16,6 +16,7 @@
 #include <ox/std/buffer.hpp>
 #include <ox/std/byteswap.hpp>
 #include <ox/std/hashmap.hpp>
+#include <ox/std/optional.hpp>
 #include <ox/std/string.hpp>
 #include <ox/std/types.hpp>
 #include <ox/std/units.hpp>
@@ -27,54 +28,45 @@
 
 namespace ox {
 
+template<Writer_c Writer>
 class MetalClawWriter {
 
 	private:
+		ox::Vector<uint8_t, 16> m_presenceMapBuff{};
 		FieldBitmap m_fieldPresence;
-		int m_fields = 0;
 		int m_field = 0;
-		int m_unionIdx = -1;
+		ox::Optional<int> m_unionIdx;
-		std::size_t m_buffIt = 0;
+		std::size_t m_writerBeginP{};
-		std::size_t m_buffLen = 0;
+		Writer &m_writer;
-		uint8_t *m_buff = nullptr;
 
 	public:
-		constexpr MetalClawWriter(uint8_t *buff, std::size_t buffLen, int unionIdx = -1) noexcept;
+		constexpr explicit MetalClawWriter(Writer &writer, ox::Optional<int> const&unionIdx = {}) noexcept;
 
-		constexpr ~MetalClawWriter() noexcept;
+		constexpr ~MetalClawWriter() noexcept = default;
 
-		constexpr Error field(const char*, CommonPtrWith<int8_t> auto *val) noexcept;
+		constexpr Error field(const char*, const int8_t *val) noexcept;
-		constexpr Error field(const char*, CommonPtrWith<int16_t> auto *val) noexcept;
+		constexpr Error field(const char*, const int16_t *val) noexcept;
-		constexpr Error field(const char*, CommonPtrWith<int32_t> auto *val) noexcept;
+		constexpr Error field(const char*, const int32_t *val) noexcept;
-		constexpr Error field(const char*, CommonPtrWith<int64_t> auto *val) noexcept;
+		constexpr Error field(const char*, const int64_t *val) noexcept;
 
-		constexpr Error field(const char*, CommonPtrWith<uint8_t> auto *val) noexcept;
+		constexpr Error field(const char*, const uint8_t *val) noexcept;
-		constexpr Error field(const char*, CommonPtrWith<uint16_t> auto *val) noexcept;
+		constexpr Error field(const char*, const uint16_t *val) noexcept;
-		constexpr Error field(const char*, CommonPtrWith<uint32_t> auto *val) noexcept;
+		constexpr Error field(const char*, const uint32_t *val) noexcept;
-		constexpr Error field(const char*, CommonPtrWith<uint64_t> auto *val) noexcept;
+		constexpr Error field(const char*, const uint64_t *val) noexcept;
 
-		constexpr Error field(const char*, CommonPtrWith<bool> auto *val) noexcept;
+		constexpr Error field(const char*, const bool *val) noexcept;
 
 		template<typename T>
-		constexpr Error field(const char*, T *val, std::size_t len) noexcept;
+		constexpr Error field(const char*, const T *val, std::size_t len) noexcept;
 
 		template<typename T>
 		constexpr Error field(const char *name, const HashMap<String, T> *val) noexcept;
 
-		template<typename T>
-		constexpr Error field(const char*, HashMap<String, T> *val) noexcept;
-
 		template<std::size_t SmallStringSize>
 		constexpr Error field(const char*, const BasicString<SmallStringSize> *val) noexcept;
 
 		template<std::size_t L>
-		constexpr Error field(const char*, const BString<L> *val) noexcept;
+		constexpr Error field(const char*, const IString<L> *val) noexcept;
-
-		template<std::size_t SmallStringSize>
-		constexpr Error field(const char*, BasicString<SmallStringSize> *val) noexcept;
-
-		template<std::size_t L>
-		constexpr Error field(const char*, BString<L> *val) noexcept;
 
 		constexpr Error fieldCString(const char *name, const char *const*val, std::size_t buffLen) noexcept;
 
@@ -84,338 +76,331 @@ class MetalClawWriter {
 
 		constexpr Error fieldCString(const char *name, const char *val, std::size_t len) noexcept;
 
-		constexpr Error fieldCString(const char *name, char **val, std::size_t buffLen) noexcept {
-			return fieldCString(name, const_cast<const char**>(val), buffLen);
-		}
-
-		constexpr Error fieldCString(const char *name, char **val) noexcept {
-			return fieldCString(name, const_cast<const char**>(val));
-		}
-
-		constexpr Error fieldCString(const char *name, char *val, std::size_t buffLen) noexcept {
-			return fieldCString(name, const_cast<const char*>(val), buffLen);
-		}
-
 		template<typename T>
-		constexpr Error field(const char*, T *val) noexcept;
+		constexpr Error field(const char*, const T *val) noexcept;
 
 		template<typename U, bool force = false>
 		constexpr Error field(const char*, UnionView<U, force> val) noexcept;
 
 		template<typename T = std::nullptr_t>
-		constexpr void setTypeInfo(const char *name = T::TypeName, int version = T::TypeVersion,
+		constexpr ox::Error setTypeInfo(
-		                           const Vector<String>& = {}, int fields = ModelFieldCount_v<T>) noexcept;
+				const char *name = T::TypeName,
+				int version = T::TypeVersion,
+		        const Vector<String>& = {},
+				std::size_t fields = ModelFieldCount_v<T>) noexcept;
 
+		/**
+		 * stringLength is not implemented in MetalClawWriter
+		 */
 		[[nodiscard]]
-		constexpr std::size_t size() const noexcept;
+		constexpr auto stringLength(const char*) noexcept {
+			return 0;
+		}
+
+		/**
+		 * stringLength is not implemented in MetalClawWriter
+		 */
+		[[nodiscard]]
+		constexpr auto arrayLength(const char*, bool = true) noexcept {
+			return 0;
+		}
 
 		[[nodiscard]]
 		static constexpr auto opType() noexcept {
 			return OpType::Write;
 		}
 
+		ox::Error finalize() noexcept;
+
 	private:
 		constexpr Error appendInteger(Integer_c auto val) noexcept {
 			bool fieldSet = false;
-			if (val && (m_unionIdx == -1 || m_unionIdx == m_field)) {
+			if (val && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
 				auto mi = mc::encodeInteger(val);
-				if (mi.length < m_buffLen) {
+				oxReturnError(m_writer.write(reinterpret_cast<const char*>(mi.data), mi.length));
 				fieldSet = true;
-					ox_memcpy(&m_buff[m_buffIt], mi.data, mi.length);
-					m_buffIt += mi.length;
-				} else {
-					return OxError(MC_BUFFENDED);
-				}
 			}
 			oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
-			m_field++;
+			++m_field;
 			return OxError(0);
 		}
 
 };
 
-constexpr MetalClawWriter::MetalClawWriter(uint8_t *buff, std::size_t buffLen, int unionIdx) noexcept:
+extern template class ModelHandlerInterface<MetalClawWriter<BufferWriter>>;
-	m_fieldPresence(buff, buffLen),
+extern template class ModelHandlerInterface<MetalClawWriter<CharBuffWriter>>;
+
+template<Writer_c Writer>
+constexpr MetalClawWriter<Writer>::MetalClawWriter(Writer &writer, ox::Optional<int> const&unionIdx) noexcept:
+	m_fieldPresence(m_presenceMapBuff.data(), m_presenceMapBuff.size()),
 	m_unionIdx(unionIdx),
-	m_buffLen(buffLen),
+	m_writerBeginP(writer.tellp()),
-	m_buff(buff) {
+	m_writer(writer) {
 }
 
-constexpr MetalClawWriter::~MetalClawWriter() noexcept {
+template<Writer_c Writer>
-	if (m_field != m_fields) {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const int8_t *val) noexcept {
-		oxTrace("ox::mc::MetalClawWriter::error") << "MetalClawReader: incorrect fields number given";
-	}
-}
-
-constexpr Error MetalClawWriter::field(const char*, CommonPtrWith<int8_t> auto *val) noexcept {
 	return appendInteger(*val);
 }
 
-constexpr Error MetalClawWriter::field(const char*, CommonPtrWith<int16_t> auto *val) noexcept {
+template<Writer_c Writer>
+constexpr Error MetalClawWriter<Writer>::field(const char*, const int16_t *val) noexcept {
 	return appendInteger(*val);
 }
 
-constexpr Error MetalClawWriter::field(const char*, CommonPtrWith<int32_t> auto *val) noexcept {
+template<Writer_c Writer>
+constexpr Error MetalClawWriter<Writer>::field(const char*, const int32_t *val) noexcept {
 	return appendInteger(*val);
 }
 
-constexpr Error MetalClawWriter::field(const char*, CommonPtrWith<int64_t> auto *val) noexcept {
+template<Writer_c Writer>
+constexpr Error MetalClawWriter<Writer>::field(const char*, const int64_t *val) noexcept {
 	return appendInteger(*val);
 }
 
-
+template<Writer_c Writer>
-constexpr Error MetalClawWriter::field(const char*, CommonPtrWith<uint8_t> auto *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const uint8_t *val) noexcept {
 	return appendInteger(*val);
 }
 
-constexpr Error MetalClawWriter::field(const char*, CommonPtrWith<uint16_t> auto *val) noexcept {
+template<Writer_c Writer>
+constexpr Error MetalClawWriter<Writer>::field(const char*, const uint16_t *val) noexcept {
 	return appendInteger(*val);
 }
 
-constexpr Error MetalClawWriter::field(const char*, CommonPtrWith<uint32_t> auto *val) noexcept {
+template<Writer_c Writer>
+constexpr Error MetalClawWriter<Writer>::field(const char*, const uint32_t *val) noexcept {
 	return appendInteger(*val);
 }
 
-constexpr Error MetalClawWriter::field(const char*, CommonPtrWith<uint64_t> auto *val) noexcept {
+template<Writer_c Writer>
+constexpr Error MetalClawWriter<Writer>::field(const char*, const uint64_t *val) noexcept {
 	return appendInteger(*val);
 }
 
-constexpr Error MetalClawWriter::field(const char*, CommonPtrWith<bool> auto *val) noexcept {
+template<Writer_c Writer>
-	if (m_unionIdx == -1 || m_unionIdx == m_field) {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const bool *val) noexcept {
+	if (!m_unionIdx.has_value() || *m_unionIdx == m_field) {
 		oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), *val));
 	}
 	++m_field;
 	return OxError(0);
 }
 
+template<Writer_c Writer>
 template<std::size_t SmallStringSize>
-constexpr Error MetalClawWriter::field(const char*, const BasicString<SmallStringSize> *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const BasicString<SmallStringSize> *val) noexcept {
 	bool fieldSet = false;
-	if (val->len() && (m_unionIdx == -1 || m_unionIdx == m_field)) {
+	if (val->len() && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
 		// write the length
 		const auto strLen = mc::encodeInteger(val->len());
-		if (m_buffIt + strLen.length + static_cast<std::size_t>(val->len()) < m_buffLen) {
+		oxReturnError(m_writer.write(reinterpret_cast<const char*>(strLen.data), strLen.length));
-			memcpy(&m_buff[m_buffIt], strLen.data, strLen.length);
-			m_buffIt += strLen.length;
 		// write the string
-			memcpy(&m_buff[m_buffIt], val->c_str(), static_cast<std::size_t>(val->len()));
+		oxReturnError(m_writer.write(val->c_str(), static_cast<std::size_t>(val->len())));
-			m_buffIt += static_cast<std::size_t>(val->len());
 		fieldSet = true;
-		} else {
-			return OxError(MC_BUFFENDED);
-		}
 	}
 	oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
 	return OxError(0);
 }
 
+template<Writer_c Writer>
 template<std::size_t L>
-constexpr Error MetalClawWriter::field(const char *name, const BString<L> *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(const char *name, const IString<L> *val) noexcept {
-	return fieldCString(name, val->data(), val->cap());
+	return fieldCString(name, val->data(), val->len());
 }
 
-template<std::size_t SmallStringSize>
+template<Writer_c Writer>
-constexpr Error MetalClawWriter::field(const char *name, BasicString<SmallStringSize> *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *const*val, std::size_t) noexcept {
-	return field(name, const_cast<const BasicString<SmallStringSize>*>(val));
-}
-
-template<std::size_t L>
-constexpr Error MetalClawWriter::field(const char *name, BString<L> *val) noexcept {
-	return fieldCString(name, val->data(), val->cap());
-}
-
-constexpr Error MetalClawWriter::fieldCString(const char*, const char *const*val, std::size_t) noexcept {
 	bool fieldSet = false;
-	if (m_unionIdx == -1 || m_unionIdx == m_field) {
+	if (!m_unionIdx.has_value() || *m_unionIdx == m_field) {
-		const auto strLen = *val ? ox_strlen(*val) : 0;
+		const auto strLen = *val ? ox::strlen(*val) : 0;
 		// write the length
 		const auto strLenBuff = mc::encodeInteger(strLen);
-		if (m_buffIt + strLenBuff.length + static_cast<std::size_t>(strLen) < m_buffLen) {
+		oxReturnError(m_writer.write(reinterpret_cast<const char*>(strLenBuff.data), strLenBuff.length));
-			ox_memcpy(&m_buff[m_buffIt], strLenBuff.data, strLenBuff.length);
-			m_buffIt += strLenBuff.length;
 		// write the string
-			ox_memcpy(&m_buff[m_buffIt], *val, static_cast<std::size_t>(strLen));
+		oxReturnError(m_writer.write(*val, static_cast<std::size_t>(strLen)));
-			m_buffIt += static_cast<std::size_t>(strLen);
 		fieldSet = true;
-		} else {
-			return OxError(MC_BUFFENDED);
-		}
 	}
 	oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
 	return OxError(0);
 }
 
-constexpr Error MetalClawWriter::fieldCString(const char *name, const char **val) noexcept {
+template<Writer_c Writer>
+constexpr Error MetalClawWriter<Writer>::fieldCString(const char *name, const char **val) noexcept {
 	return fieldCString(name, val, {});
 }
 
-constexpr Error MetalClawWriter::fieldCString(const char *name, const char *const*val) noexcept {
+template<Writer_c Writer>
+constexpr Error MetalClawWriter<Writer>::fieldCString(const char *name, const char *const*val) noexcept {
 	return fieldCString(name, val, {});
 }
 
-constexpr Error MetalClawWriter::fieldCString(const char*, const char *val, std::size_t strLen) noexcept {
+template<Writer_c Writer>
+constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *val, std::size_t strLen) noexcept {
 	bool fieldSet = false;
-	if (strLen && (m_unionIdx == -1 || m_unionIdx == m_field)) {
+	if (strLen && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
 		// write the length
 		const auto strLenBuff = mc::encodeInteger(strLen);
-		if (m_buffIt + strLenBuff.length + static_cast<std::size_t>(strLen) < m_buffLen) {
+		oxReturnError(m_writer.write(reinterpret_cast<const char*>(strLenBuff.data), strLenBuff.length));
-			ox_memcpy(&m_buff[m_buffIt], strLenBuff.data, strLenBuff.length);
-			m_buffIt += strLenBuff.length;
 		// write the string
-			ox_memcpy(&m_buff[m_buffIt], val, static_cast<std::size_t>(strLen));
+		oxReturnError(m_writer.write(val, static_cast<std::size_t>(strLen)));
-			m_buffIt += static_cast<std::size_t>(strLen);
 		fieldSet = true;
-		} else {
-			return OxError(MC_BUFFENDED);
-		}
 	}
 	oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
 	return OxError(0);
 }
 
+template<Writer_c Writer>
 template<typename T>
-constexpr Error MetalClawWriter::field(const char*, T *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const T *val) noexcept {
-	if constexpr(isVector_v<T>) {
+	if constexpr(isVector_v<T> || isArray_v<T>) {
 		return field(nullptr, val->data(), val->size());
 	} else {
 		bool fieldSet = false;
-		if (val && (m_unionIdx == -1 || m_unionIdx == m_field)) {
+		if (val && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
-			MetalClawWriter writer(m_buff + m_buffIt, m_buffLen - m_buffIt);
+			auto const writeIdx = m_writer.tellp();
-			ModelHandlerInterface handler{&writer};
+			MetalClawWriter<Writer> writer(m_writer);
+			ModelHandlerInterface<MetalClawWriter<Writer>> handler{&writer};
 			oxReturnError(model(&handler, val));
-			if (static_cast<std::size_t>(writer.m_fieldPresence.getMaxLen()) < writer.m_buffIt) {
+			oxReturnError(writer.finalize());
-				m_buffIt += writer.m_buffIt;
+			fieldSet = writeIdx != m_writer.tellp();
-				fieldSet = true;
 		}
+		oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
+		++m_field;
+		return {};
+	}
+}
+
+template<Writer_c Writer>
+template<typename U, bool force>
+constexpr Error MetalClawWriter<Writer>::field(const char*, UnionView<U, force> val) noexcept {
+	bool fieldSet = false;
+	if (val.get() && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
+		auto const writeIdx = m_writer.tellp();
+		MetalClawWriter<Writer> writer(m_writer, ox::Optional<int>(ox::in_place, val.idx()));
+		ModelHandlerInterface handler{&writer};
+		oxReturnError(model(&handler, val.get()));
+		oxReturnError(writer.finalize());
+		fieldSet = writeIdx != m_writer.tellp();
+	}
+	oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
+	++m_field;
+	return {};
+}
+
+template<Writer_c Writer>
+template<typename T>
+constexpr Error MetalClawWriter<Writer>::field(const char*, const T *val, std::size_t len) noexcept {
+	bool fieldSet = false;
+	if (len && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
+		// write the length
+		const auto arrLen = mc::encodeInteger(len);
+		oxReturnError(m_writer.write(reinterpret_cast<const char*>(arrLen.data), arrLen.length));
+		auto const writeIdx = m_writer.tellp();
+		MetalClawWriter<Writer> writer(m_writer);
+		ModelHandlerInterface handler{&writer};
+		oxReturnError(handler.template setTypeInfo<T>("List", 0, {}, static_cast<std::size_t>(len)));
+		// write the array
+		for (std::size_t i = 0; i < len; ++i) {
+			oxReturnError(handler.field("", &val[i]));
+		}
+		oxReturnError(writer.finalize());
+		fieldSet = writeIdx != m_writer.tellp();
 	}
 	oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
 	return OxError(0);
 }
-}
-
-template<typename U, bool force>
-constexpr Error MetalClawWriter::field(const char*, UnionView<U, force> val) noexcept {
-	bool fieldSet = false;
-	if (val.get() && (m_unionIdx == -1 || m_unionIdx == m_field)) {
-		MetalClawWriter writer(m_buff + m_buffIt, m_buffLen - m_buffIt, val.idx());
-		ModelHandlerInterface handler{&writer};
-		oxReturnError(model(&handler, val.get()));
-		if (static_cast<std::size_t>(writer.m_fieldPresence.getMaxLen()) < writer.m_buffIt) {
-			m_buffIt += writer.m_buffIt;
-			fieldSet = true;
-		}
-	}
-	oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
-	m_field++;
-	return OxError(0);
-}
 
+template<Writer_c Writer>
 template<typename T>
-constexpr Error MetalClawWriter::field(const char*, T *val, std::size_t len) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const HashMap<String, T> *val) noexcept {
-	bool fieldSet = false;
-
-	if (len && (m_unionIdx == -1 || m_unionIdx == m_field)) {
-		// write the length
-		const auto arrLen = mc::encodeInteger(len);
-		if (m_buffIt + arrLen.length < m_buffLen) {
-			ox_memcpy(&m_buff[m_buffIt], arrLen.data, arrLen.length);
-			m_buffIt += arrLen.length;
-		} else {
-			return OxError(MC_BUFFENDED);
-		}
-
-		MetalClawWriter writer(m_buff + m_buffIt, m_buffLen - m_buffIt);
-		ModelHandlerInterface handler{&writer};
-		handler.setTypeInfo<T>("List", 0, {}, len);
-
-		// write the array
-		for (std::size_t i = 0; i < len; i++) {
-			oxReturnError(handler.field("", &val[i]));
-		}
-
-		m_buffIt += writer.m_buffIt;
-		fieldSet = true;
-	}
-
-	oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
-	m_field++;
-	return OxError(0);
-}
-
-template<typename T>
-constexpr Error MetalClawWriter::field(const char*, const HashMap<String, T> *val) noexcept {
 	const auto &keys = val->keys();
 	const auto len = keys.size();
 	bool fieldSet = false;
-	if (len && (m_unionIdx == -1 || m_unionIdx == m_field)) {
+	if (len && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
 		// write the length
 		const auto arrLen = mc::encodeInteger(len);
-		if (m_buffIt + arrLen.length < m_buffLen) {
+		oxReturnError(m_writer.write(reinterpret_cast<const char*>(arrLen.data), arrLen.length));
-			ox_memcpy(&m_buff[m_buffIt], arrLen.data, arrLen.length);
+		// write map
-			m_buffIt += arrLen.length;
+		MetalClawWriter<Writer> writer(m_writer);
-		} else {
-			return OxError(MC_BUFFENDED);
-		}
-		MetalClawWriter writer(m_buff + m_buffIt, m_buffLen - m_buffIt);
 		ModelHandlerInterface handler{&writer};
 		// double len for both key and value
-		handler.setTypeInfo("Map", 0, {}, len * 2);
+		oxReturnError(handler.setTypeInfo("Map", 0, {}, len * 2));
-		// write the array
+		// this loop body needs to be in a lambda because of the potential alloca call
-		for (std::size_t i = 0; i < len; i++) {
+		constexpr auto loopBody = [](auto &handler, auto const&key, auto const&val) -> ox::Error {
-			const auto &key = keys[i];
+			const auto keyLen = key.len();
-			const auto keyLen = ox_strlen(key);
 			auto wkey = ox_malloca(keyLen + 1, char, 0);
-			memcpy(wkey, key.c_str(), keyLen + 1);
+			memcpy(wkey.get(), key.c_str(), keyLen + 1);
 			oxReturnError(handler.fieldCString("", wkey.get(), keyLen));
-			oxRequireM(value, val->at(key));
+			oxRequireM(value, val.at(key));
-			oxReturnError(handler.field("", value));
+			return handler.field("", value);
+		};
+		// write the array
+		for (std::size_t i = 0; i < len; ++i) {
+			auto const&key = keys[i];
+			oxReturnError(loopBody(handler, key, *val));
 		}
-		m_buffIt += writer.m_buffIt;
+		oxReturnError(writer.finalize());
 		fieldSet = true;
 	}
 	oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
-	m_field++;
+	++m_field;
 	return OxError(0);
 }
 
+template<Writer_c Writer>
 template<typename T>
-constexpr Error MetalClawWriter::field(const char *name, HashMap<String, T> *val) noexcept {
+constexpr ox::Error MetalClawWriter<Writer>::setTypeInfo(
-	return field(name, const_cast<const HashMap<String, T>*>(val));
+		const char*,
+		int,
+		const Vector<String>&,
+		std::size_t fields) noexcept {
+	const auto fieldPresenceLen = (fields - 1) / 8 + 1;
+	oxReturnError(m_writer.write(nullptr, fieldPresenceLen));
+	m_presenceMapBuff.resize(fieldPresenceLen);
+	m_fieldPresence.setBuffer(m_presenceMapBuff.data(), m_presenceMapBuff.size());
+	m_fieldPresence.setFields(static_cast<int>(fields));
+	return {};
 }
 
-template<typename T>
+template<Writer_c Writer>
-constexpr void MetalClawWriter::setTypeInfo(const char*, int, const Vector<String>&, int fields) noexcept {
+ox::Error MetalClawWriter<Writer>::finalize() noexcept {
-	m_fields = fields;
+	const auto end = m_writer.tellp();
-	m_fieldPresence.setFields(fields);
+	oxReturnError(m_writer.seekp(m_writerBeginP));
-	m_buffIt = static_cast<std::size_t>(m_fieldPresence.getMaxLen());
+	oxReturnError(m_writer.write(
-	ox_memset(m_buff, 0, m_buffIt);
+			reinterpret_cast<const char*>(m_presenceMapBuff.data()),
+			m_presenceMapBuff.size()));
+	oxReturnError(m_writer.seekp(end));
+	return {};
 }
 
-constexpr std::size_t MetalClawWriter::size() const noexcept {
+Result<Buffer> writeMC(Writer_c auto &writer, const auto &val) noexcept {
-	return m_buffIt;
+	MetalClawWriter mcWriter(writer);
+	ModelHandlerInterface handler{&mcWriter};
+	oxReturnError(model(&handler, &val));
+	oxReturnError(mcWriter.finalize());
+	return {};
 }
 
-Result<Buffer> writeMC(auto *val) noexcept {
+Result<Buffer> writeMC(auto const&val, std::size_t buffReserveSz = 2 * units::KB) noexcept {
-	Buffer buff(10 * units::MB);
+	Buffer buff(buffReserveSz);
-	MetalClawWriter writer(reinterpret_cast<uint8_t*>(buff.data()), buff.size());
+	BufferWriter bw(&buff, 0);
-	ModelHandlerInterface handler{&writer};
+	oxReturnError(writeMC(bw, val));
-	oxReturnError(model(&handler, val));
+	buff.resize(bw.tellp());
-	buff.resize(writer.size());
 	return buff;
 }
 
-Error writeMC(char *buff, std::size_t buffLen, auto *val, std::size_t *sizeOut = nullptr) noexcept {
+Error writeMC(char *buff, std::size_t buffLen, auto const&val, std::size_t *sizeOut = nullptr) noexcept {
-	MetalClawWriter writer(reinterpret_cast<uint8_t*>(buff), buffLen);
+	CharBuffWriter bw(buff, buffLen);
-	ModelHandlerInterface handler(&writer);
+	oxReturnError(writeMC(bw, val));
-	auto err = model(&handler, val);
 	if (sizeOut) {
-		*sizeOut = writer.size();
+		*sizeOut = bw.tellp();
 	}
-	return err;
+	return {};
 }
 
 }

deps/ox/src/ox/model/CMakeLists.txt

@@ -5,6 +5,11 @@ add_library(
 		modelvalue.cpp
 )
 
+if(NOT MSVC)
+	target_compile_options(OxModel PRIVATE -Wconversion)
+	target_compile_options(OxModel PRIVATE -Wsign-conversion)
+endif()
+
 target_link_libraries(
 	OxModel PUBLIC
 		OxStd
@@ -40,8 +45,8 @@ install(
 )
 
 install(TARGETS OxModel
-        LIBRARY DESTINATION lib/ox
+        LIBRARY DESTINATION lib
-        ARCHIVE DESTINATION lib/ox
+        ARCHIVE DESTINATION lib
 )
 
 if(OX_RUN_TESTS)

deps/ox/src/ox/model/def.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2024 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,8 +10,8 @@
 
 #include <ox/std/concepts.hpp>
 
-#define oxModelBegin(modelName) constexpr ox::Error model(auto *io, ox::CommonPtrWith<modelName> auto *o) noexcept { io->template setTypeInfo<modelName>();
+#define oxModelBegin(modelName) constexpr ox::Error model(auto *io, [[maybe_unused]] ox::CommonPtrWith<modelName> auto *o) noexcept { oxReturnError(io->template setTypeInfo<modelName>());
 #define oxModelEnd() return OxError(0); }
 #define oxModelField(fieldName) oxReturnError(io->field(#fieldName, &o->fieldName));
-#define oxModelFieldRename(serFieldName, objFieldName) oxReturnError(io->field(#serFieldName, &o->objFieldName));
+#define oxModelFieldRename(objFieldName, serFieldName) oxReturnError(io->field(#serFieldName, &o->objFieldName));
 #define oxModelFriend(modelName) friend constexpr ox::Error model(auto*, ox::CommonPtrWith<modelName> auto*) noexcept