[ox/std] Add source_location

.gitattributes

@@ -1 +0,0 @@
-sample_project text eol=lf

.gitea/workflows/build.yaml

@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   build:
-    runs-on: olympic
+    runs-on: nostalgia
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
@@ -17,10 +17,3 @@ jobs:
       - run: make purge configure-release
       - run: make build
       - run: make test
-      - run: make install
-      - run: mv dist/linux-x86_64-release nostalgia-linux-x86_64
-      - run: tar cf nostalgia-linux-x86_64.tar nostalgia-linux-x86_64
-      - uses: actions/upload-artifact@v3
-        with:
-          name: nostalgia-linux-x86_64
-          path: nostalgia-linux-x86_64.tar

.gitignore

@@ -6,14 +6,12 @@
 .mypy_cache
 .stfolder
 .stignore
-.vs
-util/scripts/__pycache__
+scripts/__pycache__
 pyenv
 CMakeLists.txt.user
 ROM.oxfs
 Session.vim
 build
-cmake-build-*
 compile_commands.json
 dist
 graph_info.json

.liccor.yml

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:41
+FROM fedora:36
 
 RUN dnf update -y
 

Makefile

@@ -1,68 +1,35 @@
 BC_VAR_PROJECT_NAME=nostalgia
 BC_VAR_PROJECT_NAME_CAP=Nostalgia
-BC_VAR_DEVENV_ROOT=util
 BUILDCORE_PATH=deps/buildcore
 include ${BUILDCORE_PATH}/base.mk
 
 ifeq ($(BC_VAR_OS),darwin)
-	PROJECT_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio.app/Contents/MacOS/${BC_VAR_PROJECT_NAME_CAP}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
-	PROJECT_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio
+	NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio
 	MGBA=mgba-qt
 endif
-PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}
 
 .PHONY: pkg-gba
-pkg-gba: build-pack build-gba-player
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME_CAP}
-
-.PHONY: pkg-mac
-pkg-mac: install
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-dmg.py NostalgiaStudio
-
-.PHONY: generate-studio-rsrc
-generate-studio-rsrc:
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/olympic/studio/applib/src/rsrc.json
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/nostalgia/studio/rsrc.json
-
-.PHONY: build-gba-player
-build-gba-player:
-	cmake --build ./build/gba-*
-
-.PHONY: build-player
-build-player:
-	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} ${BC_VAR_PROJECT_NAME_CAP}
-
-.PHONY: build-pack
-build-pack:
-	cmake --build ./build/${BC_VAR_CURRENT_BUILD} --target ${BC_VAR_PROJECT_NAME}-pack
-
+pkg-gba: build
+	${BC_CMD_ENVRUN} ${BC_PY3} ./scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
 
 .PHONY: run
-run: build-player
-	${PROJECT_PLAYER} sample_project
-
-.PHONY: build-studio
-build-studio:
-	cmake --build ./build/${BC_VAR_CURRENT_BUILD} --target ${BC_VAR_PROJECT_NAME_CAP}Studio
-
+run: build
+	./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
 .PHONY: run-studio
-run-studio: build-studio
-	${PROJECT_STUDIO}
-
+run-studio: build
+	${NOSTALGIA_STUDIO}
 .PHONY: gba-run
 gba-run: pkg-gba
-	${MGBA} ${BC_VAR_PROJECT_NAME_CAP}.gba
-
+	${MGBA} ${BC_VAR_PROJECT_NAME}.gba
 .PHONY: debug
 debug: build
-	${BC_CMD_HOST_DEBUGGER} ${PROJECT_PLAYER} sample_project
-
+	${BC_CMD_HOST_DEBUGGER} ./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
 .PHONY: debug-studio
 debug-studio: build
-	${BC_CMD_HOST_DEBUGGER} ${PROJECT_STUDIO}
-
+	${BC_CMD_HOST_DEBUGGER} ${NOSTALGIA_STUDIO}
 
 .PHONY: configure-gba
 configure-gba:
@@ -71,25 +38,3 @@ configure-gba:
 .PHONY: configure-gba-debug
 configure-gba-debug:
 	${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}
-
-.PHONY: loc
-loc:
-	${BC_PY3} util/scripts/loc.py \
-		--search-dirs \
-			src \
-			deps/ox/src \
-			deps/buildcore \
-			deps/gbabuildcore \
-			deps/glutils \
-			deps/teagba \
-		--include-exts \
-			.cpp \
-			.hpp \
-			.py \
-			.s \
-			.cmake \
-		--exclude-paths \
-			deps/teagba/src/gba_crt0.s \
-			src/olympic/studio/applib/src/font.cpp \
-			src/olympic/studio/applib/src/font.hpp \
-			src/nostalgia/studio/icondata.cpp

deps/buildcore/base.mk

@@ -93,7 +93,7 @@ purge:
 	${BC_CMD_RM_RF} compile_commands.json
 .PHONY: test
 test: build
-	${BC_CMD_ENVRUN} ${BC_CMD_PY3} -m mypy ${BC_VAR_SCRIPTS}
+	${BC_CMD_ENVRUN} mypy ${BC_VAR_SCRIPTS}
 	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} test
 .PHONY: test-verbose
 test-verbose: build

deps/buildcore/scripts/pybb.py

@@ -11,7 +11,6 @@
 # "Python Busy Box" - adds cross-platform equivalents to Unix commands that
 #                     don't translate well to that other operating system
 
-import multiprocessing
 import os
 import platform
 import shutil
@@ -58,11 +57,7 @@ def cmake_build(base_path: str, target: Optional[str]) -> int:
         path = os.path.join(base_path, d)
         if not os.path.isdir(path):
             continue
-        args = ['cmake', '--build', path, f'-j{multiprocessing.cpu_count()}']
-        if path.endswith('release'):
-            args.append('--config=release')
-        elif path.endswith('debug'):
-            args.append('--config=debug')
+        args = ['cmake', '--build', path]
         if target is not None:
             args.extend(['--target', target])
         err = subprocess.run(args).returncode

deps/buildcore/scripts/util.py

@@ -35,6 +35,4 @@ def get_arch() -> str:
     arch = platform.machine().lower()
     if arch == 'amd64':
         arch = 'x86_64'
-    elif arch == 'aarch64':
-        arch = 'arm64'
     return arch

deps/gbabuildcore/base.cmake

@@ -1,8 +1,8 @@
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/modules)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc++")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-unwind-tables")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-unwind-tables")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthumb-interwork")

deps/glad/CMakeLists.txt

@@ -1,11 +1,2 @@
-add_library(glad src/glad.c)
-
-target_include_directories(glad PUBLIC include)
-
-install(
-	TARGETS
-		glad
-	DESTINATION
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
-)
+add_library(glad OBJECT src/glad.c)
+target_include_directories(glad PUBLIC include)

deps/glutils/include/glutils/glutils.hpp

@@ -89,7 +89,7 @@ struct GLObject: public Base {
 		return id;
 	}
 
-	constexpr operator GLuint const&() const noexcept {
+	constexpr operator const GLuint&() const noexcept {
 		return id;
 	}
 
@@ -135,7 +135,7 @@ struct FrameBuffer {
 		return fbo.id;
 	}
 
-	constexpr operator GLuint const&() const noexcept {
+	constexpr operator const GLuint&() const noexcept {
 		return fbo.id;
 	}
 
@@ -158,14 +158,14 @@ struct FrameBuffer {
 
 class FrameBufferBind {
 	private:
-		static FrameBuffer const *s_activeFb;
-		FrameBuffer const *m_restoreFb = nullptr;
+		static const FrameBuffer *s_activeFb;
+		const FrameBuffer *m_restoreFb = nullptr;
 	public:
-		explicit FrameBufferBind(FrameBuffer const &fb) noexcept;
+		explicit FrameBufferBind(const FrameBuffer &fb) noexcept;
 		~FrameBufferBind() noexcept;
 };
 
-void bind(FrameBuffer const &fb) noexcept;
+void bind(const FrameBuffer &fb) noexcept;
 
 struct ShaderVarSet {
 	GLsizei len{};
@@ -176,7 +176,7 @@ struct ProgramSource {
 	ox::Vector<glutils::ShaderVarSet> const shaderParams;
 	GLsizei const rowLen = [this] {
 		GLsizei len{};
-		for (auto const &v : shaderParams) {
+		for (auto const&v : shaderParams) {
 			len += v.len;
 		}
 		return len;
@@ -187,23 +187,23 @@ struct ProgramSource {
 	ox::String const geomShader{};
 };
 
-ox::Result<GLProgram> buildShaderProgram(ProgramSource const &src) noexcept;
+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;
+		ox::CStringView const&vert,
+		ox::CStringView const&frag,
+		ox::CStringView const&geo = "") noexcept;
 
 void setupShaderParams(
-		GLProgram const &shader,
-		ox::Vector<ShaderVarSet> const &vars,
+		GLProgram const&shader,
+		ox::Vector<ShaderVarSet> const&vars,
 		GLsizei vertexRowLen) noexcept;
 
-void setupShaderParams(GLProgram const &shader, ox::Vector<ShaderVarSet> const &vars) noexcept;
+void setupShaderParams(GLProgram const&shader, ox::Vector<ShaderVarSet> const&vars) noexcept;
 
-GLVertexArray generateVertexArrayObject() noexcept;
+glutils::GLVertexArray generateVertexArrayObject() noexcept;
 
-GLBuffer generateBuffer() noexcept;
+glutils::GLBuffer generateBuffer() noexcept;
 
 [[nodiscard]]
 FrameBuffer generateFrameBuffer(int width, int height) noexcept;
@@ -215,20 +215,20 @@ void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept;
  */
 void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept;
 
-void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const &sz) noexcept;
+void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const&sz) noexcept;
 
 struct BufferSet {
-	GLVertexArray vao;
-	GLBuffer vbo;
-	GLBuffer ebo;
-	GLTexture tex;
+	glutils::GLVertexArray vao;
+	glutils::GLBuffer vbo;
+	glutils::GLBuffer ebo;
+	glutils::GLTexture tex;
 	ox::Vector<float> vertices;
 	ox::Vector<GLuint> elements;
 };
 
-void sendVbo(BufferSet const &bs) noexcept;
+void sendVbo(BufferSet const&bs) noexcept;
 
-void sendEbo(BufferSet const &bs) noexcept;
+void sendEbo(BufferSet const&bs) noexcept;
 
 void clearScreen() noexcept;
 

deps/glutils/src/glutils.cpp

@@ -46,9 +46,9 @@ template struct GLObject<deleteVertexArray>;
 template struct GLObject<deleteProgram>;
 template struct GLObject<deleteShader>;
 
-FrameBuffer const *FrameBufferBind::s_activeFb = nullptr;
+const FrameBuffer *FrameBufferBind::s_activeFb = nullptr;
 
-FrameBufferBind::FrameBufferBind(FrameBuffer const &fb) noexcept: m_restoreFb(s_activeFb) {
+FrameBufferBind::FrameBufferBind(const FrameBuffer &fb) noexcept: m_restoreFb(s_activeFb) {
 	s_activeFb = &fb;
 	glBindFramebuffer(GL_FRAMEBUFFER, fb);
 	glViewport(0, 0, fb.width, fb.height);
@@ -64,15 +64,15 @@ FrameBufferBind::~FrameBufferBind() noexcept {
 	}
 }
 
-void bind(FrameBuffer const &fb) noexcept {
+void bind(const FrameBuffer &fb) noexcept {
 	glBindFramebuffer(GL_FRAMEBUFFER, fb);
 	glViewport(0, 0, fb.width, fb.height);
 }
 
 
 static ox::Result<GLShader> buildShader(
-		GLuint const shaderType,
-		GLchar const *src,
+		GLuint shaderType,
+		const GLchar *src,
 		ox::StringViewCR shaderName) noexcept {
 	GLShader shader(glCreateShader(shaderType));
 	glShaderSource(shader, 1, &src, nullptr);
@@ -83,13 +83,13 @@ static ox::Result<GLShader> buildShader(
 		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 ox::Error(1, "shader compile error");
+		return OxError(1, "shader compile error");
 	}
 	return shader;
 }
 
-ox::Result<GLProgram> buildShaderProgram(ProgramSource const &src) noexcept {
-	OX_REQUIRE_M(program, buildShaderProgram(
+ox::Result<GLProgram> buildShaderProgram(ProgramSource const&src) noexcept {
+	oxRequireM(program, buildShaderProgram(
 			src.vertShader,
 			src.fragShader,
 			src.geomShader));
@@ -98,11 +98,11 @@ ox::Result<GLProgram> buildShaderProgram(ProgramSource const &src) noexcept {
 }
 
 void setupShaderParams(
-		GLProgram const &shader,
-		ox::Vector<ShaderVarSet> const &vars,
+		GLProgram const&shader,
+		ox::Vector<ShaderVarSet> const&vars,
 		GLsizei vertexRowLen) noexcept {
 	// setup vars
-	for (size_t lenWritten = 0; auto const &v : vars) {
+	for (size_t lenWritten = 0; auto const&v : vars) {
 		auto const attr = static_cast<GLuint>(glGetAttribLocation(shader, v.name.c_str()));
 		glEnableVertexAttribArray(attr);
 		glVertexAttribPointer(
@@ -113,27 +113,27 @@ void setupShaderParams(
 	}
 }
 
-void setupShaderParams(GLProgram const &shader, ox::Vector<ShaderVarSet> const &vars) noexcept {
+void setupShaderParams(GLProgram const&shader, ox::Vector<ShaderVarSet> const&vars) noexcept {
 	// get row len
 	GLsizei vertexRowLen{};
-	for (auto const &v : vars) {
+	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 {
+		ox::CStringView const&vert,
+		ox::CStringView const&frag,
+		ox::CStringView const&geo) noexcept {
 	GLProgram prgm(glCreateProgram());
-	OX_REQUIRE(vs, buildShader(GL_VERTEX_SHADER, vert.c_str(), "vshad"));
+	oxRequire(vs, buildShader(GL_VERTEX_SHADER, vert.c_str(), "vshad"));
 	glAttachShader(prgm, vs);
 	if (geo.c_str() && geo.bytes() != 0) {
-		OX_REQUIRE(gs, buildShader(GL_GEOMETRY_SHADER, geo.c_str(), "gshad"));
+		oxRequire(gs, buildShader(GL_GEOMETRY_SHADER, geo.c_str(), "gshad"));
 		glAttachShader(prgm, gs);
 	}
-	OX_REQUIRE(fs, buildShader(GL_FRAGMENT_SHADER, frag.c_str(), "fshad"));
+	oxRequire(fs, buildShader(GL_FRAGMENT_SHADER, frag.c_str(), "fshad"));
 	glAttachShader(prgm, fs);
 	glLinkProgram(prgm);
 	return prgm;
@@ -162,30 +162,16 @@ FrameBuffer generateFrameBuffer(int width, int height) noexcept {
 	// 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);
+	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);
+	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);
+	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
@@ -203,16 +189,7 @@ void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	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);
+	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
@@ -224,7 +201,7 @@ void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	glBindRenderbuffer(GL_RENDERBUFFER, 0);
 }
 
-void resizeInitFrameBuffer(FrameBuffer &fb, int const width, int const height) noexcept {
+void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	if (!fb) {
 		fb = generateFrameBuffer(width, height);
 		return;
@@ -232,18 +209,18 @@ void resizeInitFrameBuffer(FrameBuffer &fb, int const width, int const height) n
 	resizeFrameBuffer(fb, width, height);
 }
 
-void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const &sz) noexcept {
+void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const&sz) noexcept {
 	resizeInitFrameBuffer(fb, sz.width, sz.height);
 }
 
-void sendVbo(BufferSet const &bs) noexcept {
-	auto const bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.vertices)::value_type) * bs.vertices.size());
+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 {
-	auto const bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.elements)::value_type) * bs.elements.size());
+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);
 }

deps/imgui/CMakeLists.txt

@@ -6,7 +6,7 @@ endif()
 # DrinkingTea: end
 
 add_library(
-	imgui
+	imgui OBJECT
 		imgui.cpp
 		imgui_demo.cpp
 		imgui_draw.cpp
@@ -19,12 +19,4 @@ add_library(
 target_include_directories(
 	imgui SYSTEM PUBLIC
 		.
-)
-
-install(
-	TARGETS
-		imgui
-	DESTINATION
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
-)
+)

deps/nfde/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.5)
 project(nativefiledialog-extended VERSION 1.1.1)
 
 set(nfd_ROOT_PROJECT OFF)
@@ -10,11 +10,7 @@ if(NOT DEFINED BUILD_SHARED_LIBS)
 	option(BUILD_SHARED_LIBS "Build a shared library instead of static" OFF)
 endif()
 option(NFD_BUILD_TESTS "Build tests for nfd" ${nfd_ROOT_PROJECT})
-# DrinkingTea: begin
-if(NOT DEFINED NFD_INSTALL)
-	option(NFD_INSTALL "Generate install target for nfd" ${nfd_ROOT_PROJECT})
-endif()
-# DrinkingTea: end
+option(NFD_INSTALL "Generate install target for nfd" ${nfd_ROOT_PROJECT})
 
 set(nfd_PLATFORM Undefined)
 if(WIN32)
@@ -25,9 +21,7 @@ elseif(UNIX AND NOT APPLE)
   set(nfd_PLATFORM PLATFORM_UNIX)
 endif()
 
-# DrinkingTea: begin
-#message("nfd Platform: ${nfd_PLATFORM}")
-# DrinkingTea: end
+message("nfd Platform: ${nfd_PLATFORM}")
 
 set(nfd_COMPILER Undefined)
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
@@ -39,9 +33,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "C
   set(nfd_COMPILER COMPILER_GNU)
 endif()
 
-# DrinkingTea: begin
-#message("nfd Compiler: ${nfd_COMPILER}")
-# DrinkingTea: end
+message("nfd Compiler: ${nfd_COMPILER}")
 
 # Use latest C++ by default (should be the best one), but let user override it
 if(NOT DEFINED CMAKE_CXX_STANDARD)

deps/ox/.liccor.yml

@@ -2,7 +2,7 @@
 source:
 - src
 copyright_notice: |-
-  Copyright 2015 - 2025 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/deps/jsoncpp/CMakeLists.txt

@@ -12,7 +12,7 @@
 # CMake versions greater than the JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION policies will
 # continue to generate policy warnings "CMake Warning (dev)...Policy CMP0XXX is not set:"
 #
-set(JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION "3.13.2")
+set(JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION "3.8.0")
 set(JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION "3.13.2")
 cmake_minimum_required(VERSION ${JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION})
 if("${CMAKE_VERSION}" VERSION_LESS "${JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION}")

deps/ox/ox-docs.md

@@ -28,7 +28,10 @@ All components have a platform indicator next to them:
 Ox provides ```ox::Error``` to report errors.
 ```ox::Error``` is a struct that has overloaded operators to behave like an
 integer error code, plus some extra fields to enhance debuggability.
-```ox::Error```s will also include the file and line of the error.
+If instantiated through the ```OxError(x)``` macro, it will also include the
+file and line of the error.
+The ```OxError(x)``` macro should only be used for the initial instantiation of
+an ```ox::Error```.
 
 In addition to ```ox::Error``` there is also the template ```ox::Result<T>```.
 ```ox::Result``` simply wraps the type T value in a struct that also includes
@@ -46,7 +49,7 @@ ox::Result<int> foo(int i) noexcept {
 	if (i < 10) {
 		return i + 1; // implicitly calls ox::Result<T>::Result(T)
 	}
-	return ox::Error(1); // implicitly calls ox::Result<T>::Result(ox::Error)
+	return OxError(1); // implicitly calls ox::Result<T>::Result(ox::Error)
 }
 
 int caller1() {
@@ -94,12 +97,12 @@ ox::Result<uint64_t> caller8(int i) {
 ```
 
 Lastly, there are a few macros available to help in passing ```ox::Error```s
-back up the call stack, ```OX_RETURN_ERROR```, ```OX_THROW_ERROR```, and
-```OX_REQUIRE```.
+back up the call stack, ```oxReturnError```, ```oxThrowError```, and
+```oxRequire```.
 
-```OX_RETURN_ERROR``` is by far the more helpful of the two.
-```OX_RETURN_ERROR``` will return an ```ox::Error``` if it is not 0 and
-```OX_THROW_ERROR``` will throw an ```ox::Error``` if it is not 0.
+```oxReturnError``` is by far the more helpful of the two.
+```oxReturnError``` will return an ```ox::Error``` if it is not 0 and
+```oxThrowError``` will throw an ```ox::Error``` if it is not 0.
 
 Since ```ox::Error``` is always nodiscard, you must do something with them.
 In rare cases, you may not have anything you can do with them or you may know
@@ -110,13 +113,13 @@ This should be used sparingly.
 ```cpp
 void studioCode() {
 	auto [val, err] = foo(1);
-	OX_THROW_ERROR(err);
+	oxThrowError(err);
 	doStuff(val);
 }
 
 ox::Error engineCode() noexcept {
 	auto [val, err] = foo(1);
-	OX_RETURN_ERROR(err);
+	oxReturnError(err);
 	doStuff(val);
 	return {};
 }
@@ -133,19 +136,19 @@ Both macros will also take the ```ox::Result``` directly:
 ```cpp
 void studioCode() {
 	auto valerr = foo(1);
-	OX_THROW_ERROR(valerr);
+	oxThrowError(valerr);
 	doStuff(valerr.value);
 }
 
 ox::Error engineCode() noexcept {
 	auto valerr = foo(1);
-	OX_RETURN_ERROR(valerr);
+	oxReturnError(valerr);
 	doStuff(valerr.value);
 	return {};
 }
 ```
 
-Ox also has the ```OX_REQUIRE``` macro, which will initialize a value if there is no error, and return if there is.
+Ox also has the ```oxRequire``` macro, which will initialize a value if there is no error, and return if there is.
 It aims to somewhat emulate the ```?``` operator in Rust and Swift.
 
 Rust ```?``` operator:
@@ -160,233 +163,23 @@ fn f2() -> Result<i32, i32> {
 }
 ```
 
-```OX_REQUIRE```:
+```oxRequire```:
 ```cpp
 ox::Result<int> f() noexcept {
 	// do stuff
 }
 
 ox::Result<int> f2() noexcept {
-	OX_REQUIRE(i, f()); // const auto [out, OX_CONCAT(oxRequire_err_, __LINE__)] = x; OX_RETURN_ERROR(OX_CONCAT(oxRequire_err_, __LINE__))
+	oxRequire(i, f()); // const auto [out, oxConcat(oxRequire_err_, __LINE__)] = x; oxReturnError(oxConcat(oxRequire_err_, __LINE__))
 	return i + 4;
 }
 ```
-```OX_REQUIRE``` is not quite as versatile, but it should still cleanup a lot of otherwise less ideal code.
+```oxRequire``` is not quite as versatile, but it should still cleanup a lot of otherwise less ideal code.
 
-```OX_REQUIRE``` by default creates a const, but there is also an ```OX_REQUIRE_M``` (OX_REQUIRE Mutable)
+```oxRequire``` by default creates a const, but there is also an ```oxRequireM``` (oxRequire Mutable)
 variant for creating a non-const value.
 
-* ```OX_REQUIRE_M``` - OX_REQUIRE Mutable
-
-### Ox String Types
-
-Ox has six different major string types.
-These types are divided into two categories: store types and view types.
-
-String stores maintain a copy of the string data, whereas view types only
-maintain a reference to the data.
-Views should be used where you otherwise might use a const reference to a
-string store type.
-
-Having all of these different string types may sound like an interoperability
-nightmare, but taking string view types extensively where applicable makes the
-imagined interoperability issues virtually non-existent.
-
-#### String Store Types
-
-##### String / BasicString
-
-```ox::String```, or really ```ox::BasicString```, is Ox's version of
-```std::string```.
-Like ```std::string```, ```String``` allocates to store the string data.
-Also like ```std::string```, ```String``` allows for small string
-optimization for strings under 8 bytes.
-Unlike ```std::string```, the template that ```String``` is based on,
-```BasicString```, takes a parameter that allows adjusting to different size
-small string buffers.
-```ox::String``` is an alias to ```ox::BasicString<8>```.
-
-```cpp
-// s can hold up to 100 bytes, plus one for a null terminator before allocating
-ox::BasicString<100> s;
-```
-Also unlike ```std::string```, ```ox::String``` has an explicit C-string conversion
-constructor.
-This prevents accidental instantiations of ```String```.
-
-Consider the following:
-
-```cpp
-void fStd(std::string const&);
-void fOx(ox::String const&);
-
-int main() {
-    // implicit and silent instantiation of std::string, which includes an
-    // allocation
-    fStd("123456789");
-    // Will fail to compile:
-    fOx("123456789");
-    // But explicit String instantiation will work:
-    fOx(ox::String{"123456789"});
-}
-```
-
-##### IString
-
-```IString```, or "inline string", is like ```BasicString```, but it will cut
-off strings that exceed that limit.
-
-```cpp
-ox::IString<5> s; // s can hold up to 5 characters, plus a null terminator
-s = "12345";      // valid
-s = "123456";     // will compile and run, but will get cut off at '5'
-```
-
-This is useful for certain string categories that have fixed lengths, like UUID
-strings or for numbers.
-
-Ox makes use of ```IString``` in the following ways:
-
-```cpp
-using UUIDStr = ox::IString<36>;
-
-// and
-
-template<Integer_c Integer>
-[[nodiscard]]
-constexpr auto intToStr(Integer v) noexcept {
-	constexpr auto Cap = [] {
-		auto out = 0;
-		switch (sizeof(Integer)) {
-			case 1:
-				out = 3;
-				break;
-			case 2:
-				out = 5;
-				break;
-			case 4:
-				out = 10;
-				break;
-			case 8:
-				out = 21;
-				break;
-		}
-		return out + ox::is_signed_v<Integer>;
-	}();
-	ox::IString<Cap> out;
-	std::ignore = out.resize(out.cap());
-	ox::CharBuffWriter w{{out.data(), out.cap()}};
-	std::ignore = writeItoa(v, w);
-	std::ignore = out.resize(w.tellp());
-	return out;
-}
-```
-
-##### StringParam
-
-```StringParam``` is a weird type.
-Because ```String::String(const char*)``` is explicit, it becomes a pain for
-functions to take ```String```s.
-
-```cpp
-struct Type {
-    ox::String m_s;
-    explicit Type(ox::String p): m_s(std::move(p)) {
-    }
-};
-
-void f() {
-    ox::String s{"asdf"};
-    Type t1{"asdf"};             // invalid - will not compile
-    Type t2{s};                  // invalid - will not compile
-    Type t3{std::move(s)};       // valid
-    Type t4{ox::String{"asdf"}}; // valid
-}
-```
-
-```StringParam``` has implicit conversion constructors, and will appropriately
-move from r-value ```String```s or create a ```String``` if not passed
-ownership of an existing ```String```.
-Think of ```StringParam``` as a way to opt-in to implicit instantiation with
-strings.
-
-```StringParam``` can access the string as a view through the ```view()```
-function, and the ```String``` inside can be accessed by moving from the
-```StringParam```.
-
-```cpp
-struct Type {
-    ox::String m_s;
-    explicit Type(ox::StringParam p): m_s(std::move(p)) {
-    }
-};
-
-void f() {
-    ox::String s{"asdf"};
-    Type t1{"asdf"};             // valid
-    Type t2{s};                  // valid
-    Type t3{std::move(s)};       // valid
-    Type t4{ox::String{"asdf"}}; // valid
-}
-```
-
-#### String View Types
-
-##### StringView
-
-```ox::StringView``` is Ox's version of ```std::string_view```.
-```StringView``` contains a pointer to a string, along with its size.
-
-This should be the normal type taken when a function needs a string that will
-exist until it returns.
-
-##### CStringView
-
-```CStringView``` is like ```StringView```, but it comes with the promise that
-the string ends with a null terminator.
-Accordingly, it has a ```c_str()``` function in addition to the ```data()```
-function that ```StringView``` has.
-
-```CStringView``` should be used when wrapping a C API that only takes C
-strings.
-
-##### StringLiteral
-
-```StringLiteral``` is a string view type, but it kind of straddles the line
-between view and store types.
-Creating a ```StringLiteral``` is a promise that you are passing a string
-literal into the constructor.
-This means you can treat it like a store, that can be safely used as a copy of
-the data.
-Functions that take ```StringLiteral```s are allowed to assume that the data
-will have no lifetime concerns and hold onto it without any need to make a
-copy.
-It has a consteval constructor to enforce the promise that it is a compile time
-string.
-
-```cpp
-void f(ox::StringLiteral const&);
-
-int main() {
-    f("123456789");                     // valid
-    f(ox::String{"123456789"}.c_str()); // invalid - will not compile
-}
-```
-
-#### Other Variants
-
-There are a few convenience aliases as well.
-
-* StringCR = String const&
-* StringViewCR = StringView const&
-* CStringViewCR = CStringView const&
-* CString = const char*
-
-String views do not generally need const references, but it does make debugging
-easier, as we can skip the constructor call if a string view already exists.
-
-These kind of aliases probably should not exist for most types, but strings are
-fundamental and ease of use is desirable.
+* ```oxRequireM``` - oxRequire Mutable
 
 ### Logging and Output
 
@@ -475,19 +268,19 @@ constexpr ox::Error model(T *h, ox::CommonPtrWith<NostalgiaPalette> auto *pal) n
 	h->template setTypeInfo<NostalgiaPalette>();
 	// it is also possible to provide the type name and type version as function arguments
 	//h->setTypeInfo("net.drinkingtea.nostalgia.core.NostalgiaPalette", 1);
-	OX_RETURN_ERROR(h->field("colors", &pal->colors));
+	oxReturnError(h->field("colors", &pal->colors));
 	return {};
 }
 
 template<typename T>
 constexpr ox::Error model(T *h, ox::CommonPtrWith<NostalgiaGraphic> auto *ng) noexcept {
 	h->template setTypeInfo<NostalgiaGraphic>();
-	OX_RETURN_ERROR(h->field("bpp", &ng->bpp));
-	OX_RETURN_ERROR(h->field("rows", &ng->rows));
-	OX_RETURN_ERROR(h->field("columns", &ng->columns));
-	OX_RETURN_ERROR(h->field("defaultPalette", &ng->defaultPalette));
-	OX_RETURN_ERROR(h->field("pal", &ng->pal));
-	OX_RETURN_ERROR(h->field("pixels", &ng->pixels));
+	oxReturnError(h->field("bpp", &ng->bpp));
+	oxReturnError(h->field("rows", &ng->rows));
+	oxReturnError(h->field("columns", &ng->columns));
+	oxReturnError(h->field("defaultPalette", &ng->defaultPalette));
+	oxReturnError(h->field("pal", &ng->pal));
+	oxReturnError(h->field("pixels", &ng->pixels));
 	return {};
 }
 ```
@@ -522,9 +315,9 @@ class FileAddress {
 template<typename T>
 constexpr Error model(T *h, ox::CommonPtrWith<FileAddress::Data> auto *obj) noexcept {
 	h->template setTypeInfo<FileAddress::Data>();
-	OX_RETURN_ERROR(h->fieldCString("path", &obj->path));
-	OX_RETURN_ERROR(h->fieldCString("constPath", &obj->path));
-	OX_RETURN_ERROR(h->field("inode", &obj->inode));
+	oxReturnError(h->fieldCString("path", &obj->path));
+	oxReturnError(h->fieldCString("constPath", &obj->path));
+	oxReturnError(h->field("inode", &obj->inode));
 	return {};
 }
 
@@ -534,13 +327,13 @@ constexpr Error model(T *io, ox::CommonPtrWith<FileAddress> auto *fa) noexcept {
 	// cannot read from object in Reflect operation
 	if constexpr(ox_strcmp(T::opType(), OpType::Reflect) == 0) {
 		int8_t type = 0;
-		OX_RETURN_ERROR(io->field("type", &type));
-		OX_RETURN_ERROR(io->field("data", UnionView(&fa->m_data, 0)));
+		oxReturnError(io->field("type", &type));
+		oxReturnError(io->field("data", UnionView(&fa->m_data, 0)));
 	} else {
 		auto type = static_cast<int8_t>(fa->m_type);
-		OX_RETURN_ERROR(io->field("type", &type));
+		oxReturnError(io->field("type", &type));
 		fa->m_type = static_cast<FileAddressType>(type);
-		OX_RETURN_ERROR(io->field("data", UnionView(&fa->m_data, static_cast<int>(fa->m_type))));
+		oxReturnError(io->field("data", UnionView(&fa->m_data, static_cast<int>(fa->m_type))));
 	}
 	return {};
 }
@@ -550,13 +343,13 @@ constexpr Error model(T *io, ox::CommonPtrWith<FileAddress> auto *fa) noexcept {
 There are also macros in ```<ox/model/def.hpp>``` for simplifying the declaration of models:
 
 ```cpp
-OX_MODEL_BEGIN(NostalgiaGraphic)
-	OX_MODEL_FIELD(bpp)
-	OX_MODEL_FIELD(rows)
-	OX_MODEL_FIELD(columns)
-	OX_MODEL_FIELD(defaultPalette)
-	OX_MODEL_FIELD(pal)
-	OX_MODEL_FIELD(pixels)
+oxModelBegin(NostalgiaGraphic)
+	oxModelField(bpp)
+	oxModelField(rows)
+	oxModelField(columns)
+	oxModelField(defaultPalette)
+	oxModelField(pal)
+	oxModelField(pixels)
 oxModelEnd()
 ```
 
@@ -599,7 +392,7 @@ ox::Result<NostalgiaPalette> loadPalette1(ox::BufferView const&buff) noexcept {
 
 ox::Result<NostalgiaPalette> loadPalette2(ox::BufferView const&buff) noexcept {
 	NostalgiaPalette pal;
-	OX_RETURN_ERROR(ox::readMC(buff, pal));
+	oxReturnError(ox::readMC(buff, pal));
 	return pal;
 }
 ```
@@ -612,7 +405,7 @@ ox::Result<NostalgiaPalette> loadPalette2(ox::BufferView const&buff) noexcept {
 ox::Result<ox::Buffer> writeSpritePalette1(NostalgiaPalette const&pal) noexcept {
 	ox::Buffer buffer(ox::units::MB);
 	std::size_t sz = 0;
-	OX_RETURN_ERROR(ox::writeMC(buffer.data(), buffer.size(), pal, &sz));
+	oxReturnError(ox::writeMC(buffer.data(), buffer.size(), pal, &sz));
 	buffer.resize(sz);
 	return buffer;
 }
@@ -635,7 +428,7 @@ ox::Result<NostalgiaPalette> loadPalette1(ox::BufferView const&buff) noexcept {
 
 ox::Result<NostalgiaPalette> loadPalette2(ox::BufferView const&buff) noexcept {
 	NostalgiaPalette pal;
-	OX_RETURN_ERROR(ox::readOC(buff, &pal));
+	oxReturnError(ox::readOC(buff, &pal));
 	return pal;
 }
 ```
@@ -647,7 +440,7 @@ ox::Result<NostalgiaPalette> loadPalette2(ox::BufferView const&buff) noexcept {
 
 ox::Result<ox::Buffer> writeSpritePalette1(NostalgiaPalette const&pal) noexcept {
 	ox::Buffer buffer(ox::units::MB);
-	OX_RETURN_ERROR(ox::writeOC(buffer.data(), buffer.size(), pal));
+	oxReturnError(ox::writeOC(buffer.data(), buffer.size(), pal));
 	return buffer;
 }
 
@@ -669,7 +462,7 @@ ox::Result<NostalgiaPalette> loadPalette1(ox::BufferView const&buff) noexcept {
 
 ox::Result<NostalgiaPalette> loadPalette2(ox::BufferView const&buff) noexcept {
 	NostalgiaPalette pal;
-	OX_RETURN_ERROR(ox::readClaw(buff, pal));
+	oxReturnError(ox::readClaw(buff, pal));
 	return pal;
 }
 ```

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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,21 +15,21 @@ ClArgs::ClArgs(int argc, const char **args) noexcept: ClArgs({args, static_cast<
 
 ClArgs::ClArgs(ox::SpanView<const char*> args) noexcept {
 	for (auto i = 0u; i < args.size(); ++i) {
-		auto arg = StringView{args[i]};
+		auto arg = StringView(args[i]);
 		if (arg[0] == '-') {
-			while (arg[0] == '-' && arg.size()) {
+			while (arg[0] == '-' && arg.len()) {
 				arg = substr(arg, 1);
 			}
 			m_bools[arg] = true;
 			// parse additional arguments
 			if (i < args.size() && args[i + 1]) {
-				auto const val = StringView{args[i + 1]};
-				if (val.size() && val[0] != '-') {
+				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::strToInt(val); r.error == 0) {
+					if (auto r = ox::atoi(val.c_str()); r.error == 0) {
 						m_ints[arg] = r.value;
 					}
 					++i;
@@ -40,32 +40,32 @@ ClArgs::ClArgs(ox::SpanView<const char*> args) noexcept {
 }
 
 bool ClArgs::getBool(ox::StringViewCR arg, bool defaultValue) const noexcept {
-	auto const [value, err] = m_ints.at(arg);
+	auto [value, err] = m_ints.at(arg);
 	return !err ? *value : defaultValue;
 }
 
 String ClArgs::getString(ox::StringViewCR arg, ox::StringView defaultValue) const noexcept {
-	auto const [value, err] = m_strings.at(arg);
+	auto [value, err] = m_strings.at(arg);
 	return !err ? ox::String(*value) : ox::String(defaultValue);
 }
 
 int ClArgs::getInt(ox::StringViewCR arg, int defaultValue) const noexcept {
-	auto const [value, err] = m_ints.at(arg);
+	auto [value, err] = m_ints.at(arg);
 	return !err ? *value : defaultValue;
 }
 
 Result<bool> ClArgs::getBool(ox::StringViewCR arg) const noexcept {
-	OX_REQUIRE(out, m_bools.at(arg));
+	oxRequire(out, m_bools.at(arg));
 	return *out;
 }
 
 Result<String> ClArgs::getString(ox::StringViewCR argName) const noexcept {
-	OX_REQUIRE(out, m_strings.at(argName));
+	oxRequire(out, m_strings.at(argName));
 	return *out;
 }
 
 Result<int> ClArgs::getInt(ox::StringViewCR arg) const noexcept {
-	OX_REQUIRE(out, m_ints.at(arg));
+	oxRequire(out, m_ints.at(arg));
 	return *out;
 }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/claw/claw.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/claw/format.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/claw/read.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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,13 +12,13 @@
 
 namespace ox {
 
-Result<StringView> readClawTypeId(BufferView const buff) noexcept {
+ox::Result<ox::StringView> readClawTypeId(ox::BufferView buff) noexcept {
 	auto buffRaw = buff.data();
 	auto buffLen = buff.size();
 	size_t outSz{};
 	const auto s1End = ox::strchr(buffRaw, ';', buffLen);
 	if (!s1End) {
-		return ox::Error(1, "Could not read Claw header");
+		return OxError(1, "Could not read Claw header");
 	}
 	auto const fmtSz = static_cast<std::size_t>(s1End - buffRaw) + 1;
 	buffRaw += fmtSz;
@@ -26,7 +26,7 @@ Result<StringView> readClawTypeId(BufferView const buff) noexcept {
 	outSz += fmtSz;
 	auto const s2End = ox::strchr(buffRaw, ';', buffLen);
 	if (!s2End) {
-		return ox::Error(2, "Could not read Claw header");
+		return OxError(2, "Could not read Claw header");
 	}
 	auto const s2Size = static_cast<std::size_t>(s2End - buffRaw) + 1;
 	buffRaw += s2Size;
@@ -34,7 +34,7 @@ Result<StringView> readClawTypeId(BufferView const buff) noexcept {
 	outSz += s2Size;
 	auto const s3End = ox::strchr(buffRaw, ';', buffLen) + 1;
 	if (!s3End) {
-		return ox::Error(3, "Could not read Claw header");
+		return OxError(3, "Could not read Claw header");
 	}
 	auto const s3Size = static_cast<std::size_t>(s3End - buffRaw);
 	buffRaw += s3Size;
@@ -43,12 +43,12 @@ Result<StringView> readClawTypeId(BufferView const buff) noexcept {
 	return {{buff.data() + fmtSz, outSz - fmtSz - 1}};
 }
 
-Result<ClawHeader> readClawHeader(BufferView const buff) noexcept {
+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 ox::Error(1, "Could not read Claw header");
+		return OxError(1, "Could not read Claw header");
 	}
 	auto const s1Size = static_cast<std::size_t>(s1End - buffRaw);
 	StringView const fmt(buffRaw, s1Size);
@@ -57,7 +57,7 @@ Result<ClawHeader> readClawHeader(BufferView const buff) noexcept {
 
 	auto const s2End = ox::strchr(buffRaw, ';', buffLen);
 	if (!s2End) {
-		return ox::Error(2, "Could not read Claw header");
+		return OxError(2, "Could not read Claw header");
 	}
 	auto const s2Size = static_cast<std::size_t>(s2End - buffRaw);
 	StringView const typeName(buffRaw, s2Size);
@@ -66,7 +66,7 @@ Result<ClawHeader> readClawHeader(BufferView const buff) noexcept {
 
 	auto const s3End = ox::strchr(buffRaw, ';', buffLen);
 	if (!s3End) {
-		return ox::Error(3, "Could not read Claw header");
+		return OxError(3, "Could not read Claw header");
 	}
 	auto const s3Size = static_cast<std::size_t>(s3End - buffRaw);
 	StringView const versionStr(buffRaw, s3Size);
@@ -78,52 +78,53 @@ Result<ClawHeader> readClawHeader(BufferView const buff) noexcept {
 	} else if (fmt == "O1") {
 		hdr.fmt = ClawFormat::Organic;
 	} else {
-		return ox::Error(4, "Claw format does not match any supported format/version combo");
+		return OxError(4, "Claw format does not match any supported format/version combo");
 	}
 	hdr.typeName = typeName;
-	std::ignore = ox::strToInt(versionStr).copyTo(hdr.typeVersion);
+	std::ignore = ox::atoi(versionStr).copyTo(hdr.typeVersion);
 	hdr.data = buffRaw;
 	hdr.dataSize = buffLen;
 	return hdr;
 }
 
-Result<BufferView> stripClawHeader(BufferView const buff) noexcept {
-	OX_REQUIRE(header, readClawHeader(buff));
+Result<BufferView> stripClawHeader(ox::BufferView buff) noexcept {
+	oxRequire(header, readClawHeader(buff));
 	return {{header.data, header.dataSize}};
 }
 
 Result<ModelObject> readClaw(TypeStore &ts, BufferView buff) noexcept {
-	OX_REQUIRE(header, readClawHeader(buff));
+	oxRequire(header, readClawHeader(buff));
 	auto const [t, tdErr] = ts.getLoad(
 			header.typeName, header.typeVersion, header.typeParams);
 	if (tdErr) {
-		return ox::Error(3, "Could not load type descriptor");
+		return OxError(3, "Could not load type descriptor");
 	}
 	ModelObject obj;
-	OX_RETURN_ERROR(obj.setType(t));
+	oxReturnError(obj.setType(t));
 	switch (header.fmt) {
 		case ClawFormat::Metal:
 		{
 			ox::BufferReader br({header.data, header.dataSize});
 			MetalClawReader reader(br);
-			OX_RETURN_ERROR(model(reader.interface(), &obj));
+			ModelHandlerInterface handler(&reader);
+			oxReturnError(model(&handler, &obj));
 			return obj;
 		}
 		case ClawFormat::Organic:
 		{
 #ifdef OX_USE_STDLIB
 			OrganicClawReader reader({header.data, header.dataSize});
-			ModelHandlerInterface handler(reader);
-			OX_RETURN_ERROR(model(&handler, &obj));
+			ModelHandlerInterface handler(&reader);
+			oxReturnError(model(&handler, &obj));
 			return obj;
 #else
 			break;
 #endif
 		}
 		case ClawFormat::None:
-			return ox::Error(1);
+			return OxError(1);
 	}
-	return ox::Error(1);
+	return OxError(1);
 }
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -40,19 +40,20 @@ Result<BufferView> stripClawHeader(ox::BufferView buff) noexcept;
 
 template<typename T>
 Error readClaw(ox::BufferView buff, T &val) {
-	OX_REQUIRE(header, readClawHeader(buff));
+	oxRequire(header, readClawHeader(buff));
 	if (header.typeName != getModelTypeName<T>()) {
-		return ox::Error(Error_ClawTypeMismatch, "Claw Read: Type mismatch");
+		return OxError(Error_ClawTypeMismatch, "Claw Read: Type mismatch");
 	}
 	if (header.typeVersion != getModelTypeVersion<T>()) {
-		return ox::Error(Error_ClawTypeVersionMismatch, "Claw Read: Type Version mismatch");
+		return OxError(Error_ClawTypeVersionMismatch, "Claw Read: Type Version mismatch");
 	}
 	switch (header.fmt) {
 		case ClawFormat::Metal:
 		{
 			ox::BufferReader br({header.data, header.dataSize});
 			MetalClawReader reader(br);
-			return model(reader.interface(), &val);
+			ModelHandlerInterface handler(&reader);
+			return model(&handler, &val);
 		}
 		case ClawFormat::Organic:
 		{
@@ -64,15 +65,15 @@ Error readClaw(ox::BufferView buff, T &val) {
 #endif
 		}
 		case ClawFormat::None:
-			return ox::Error(1);
+			return OxError(1);
 	}
-	return ox::Error(1);
+	return OxError(1);
 }
 
 template<typename T>
 Result<T> readClaw(ox::BufferView buff) {
 	Result<T> val;
-	OX_RETURN_ERROR(readClaw(buff, val.value));
+	oxReturnError(readClaw(buff, val.value));
 	return val;
 }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/claw/test/tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -62,45 +62,45 @@ struct TestStruct {
 
 template<typename T>
 constexpr ox::Error model(T *io, ox::CommonPtrWith<TestUnion> auto *obj) {
-	OX_RETURN_ERROR(io->template setTypeInfo<TestUnion>());
-	OX_RETURN_ERROR(io->field("Bool", &obj->Bool));
-	OX_RETURN_ERROR(io->field("Int", &obj->Int));
-	OX_RETURN_ERROR(io->fieldCString("String", &obj->String));
-	return ox::Error(0);
+	oxReturnError(io->template setTypeInfo<TestUnion>());
+	oxReturnError(io->field("Bool", &obj->Bool));
+	oxReturnError(io->field("Int", &obj->Int));
+	oxReturnError(io->fieldCString("String", &obj->String));
+	return OxError(0);
 }
 
 template<typename T>
 constexpr ox::Error model(T *io, ox::CommonPtrWith<TestStructNest> auto *obj) {
-	OX_RETURN_ERROR(io->template setTypeInfo<TestStructNest>());
-	OX_RETURN_ERROR(io->field("Bool", &obj->Bool));
-	OX_RETURN_ERROR(io->field("Int", &obj->Int));
-	OX_RETURN_ERROR(io->field("String", &obj->String));
-	return ox::Error(0);
+	oxReturnError(io->template setTypeInfo<TestStructNest>());
+	oxReturnError(io->field("Bool", &obj->Bool));
+	oxReturnError(io->field("Int", &obj->Int));
+	oxReturnError(io->field("String", &obj->String));
+	return OxError(0);
 }
 
 template<typename T>
 constexpr ox::Error model(T *io, ox::CommonPtrWith<TestStruct> auto *obj) {
-	OX_RETURN_ERROR(io->template setTypeInfo<TestStruct>());
-	OX_RETURN_ERROR(io->field("Bool", &obj->Bool));
-	OX_RETURN_ERROR(io->field("Int", &obj->Int));
-	OX_RETURN_ERROR(io->field("Int1", &obj->Int1));
-	OX_RETURN_ERROR(io->field("Int2", &obj->Int2));
-	OX_RETURN_ERROR(io->field("Int3", &obj->Int3));
-	OX_RETURN_ERROR(io->field("Int4", &obj->Int4));
-	OX_RETURN_ERROR(io->field("Int5", &obj->Int5));
-	OX_RETURN_ERROR(io->field("Int6", &obj->Int6));
-	OX_RETURN_ERROR(io->field("Int7", &obj->Int7));
-	OX_RETURN_ERROR(io->field("Int8", &obj->Int8));
+	oxReturnError(io->template setTypeInfo<TestStruct>());
+	oxReturnError(io->field("Bool", &obj->Bool));
+	oxReturnError(io->field("Int", &obj->Int));
+	oxReturnError(io->field("Int1", &obj->Int1));
+	oxReturnError(io->field("Int2", &obj->Int2));
+	oxReturnError(io->field("Int3", &obj->Int3));
+	oxReturnError(io->field("Int4", &obj->Int4));
+	oxReturnError(io->field("Int5", &obj->Int5));
+	oxReturnError(io->field("Int6", &obj->Int6));
+	oxReturnError(io->field("Int7", &obj->Int7));
+	oxReturnError(io->field("Int8", &obj->Int8));
 	int unionIdx = 0;
 	if constexpr(T::opType() != ox::OpType::Reflect) {
 		unionIdx = obj->unionIdx;
 	}
-	OX_RETURN_ERROR(io->field("Union", ox::UnionView{&obj->Union, unionIdx}));
-	OX_RETURN_ERROR(io->field("String", &obj->String));
-	OX_RETURN_ERROR(io->field("List", obj->List, 4));
-	OX_RETURN_ERROR(io->field("EmptyStruct", &obj->EmptyStruct));
-	OX_RETURN_ERROR(io->field("Struct", &obj->Struct));
-	return ox::Error(0);
+	oxReturnError(io->field("Union", ox::UnionView{&obj->Union, unionIdx}));
+	oxReturnError(io->field("String", &obj->String));
+	oxReturnError(io->field("List", obj->List, 4));
+	oxReturnError(io->field("EmptyStruct", &obj->EmptyStruct));
+	oxReturnError(io->field("Struct", &obj->Struct));
+	return OxError(0);
 }
 
 static std::map<ox::StringView, ox::Error(*)()> tests = {
@@ -109,24 +109,24 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 			"ClawHeaderReader",
 			[] {
 				constexpr auto hdr = ox::StringLiteral("O1;com.drinkingtea.ox.claw.test.Header;2;");
-				auto [ch, err] = ox::readClawHeader({hdr.c_str(), hdr.size() + 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");
 				oxAssert(ch.typeVersion == 2, "Type version wrong");
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 		{
 			"ClawHeaderReader2",
 			[] {
 				constexpr auto hdr = ox::StringLiteral("M2;com.drinkingtea.ox.claw.test.Header2;3;");
-				auto [ch, err] = ox::readClawHeader({hdr.c_str(), hdr.size() + 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");
 				oxAssert(ch.typeVersion == 3, "Type version wrong");
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 		{
@@ -134,8 +134,8 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 			[] {
 				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");
-				OX_REQUIRE(actual, ox::readClawTypeId({hdr.data(), hdr.size() + 1}));
-				ox::expect(actual, expected);
+				oxRequire(actual, ox::readClawTypeId({hdr.data(), hdr.len() + 1}));
+				oxExpect(actual, expected);
 				return ox::Error{};
 			}
 		},
@@ -145,8 +145,8 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 				// This test doesn't confirm much, but it does show that the writer
 				// doesn't segfault
 				TestStruct ts;
-				OX_RETURN_ERROR(ox::writeClaw(ts, ox::ClawFormat::Metal));
-				return ox::Error(0);
+				oxReturnError(ox::writeClaw(ts, ox::ClawFormat::Metal));
+				return OxError(0);
 			}
 		},
 		{
@@ -191,7 +191,7 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 				oxAssert(testIn.Struct.String      == testOut.Struct.String, "Struct.String value mismatch");
 				oxAssert(testIn.Struct.Bool        == testOut.Struct.Bool, "Struct.Bool value mismatch");
 
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/claw/write.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -39,7 +39,7 @@ struct TypeInfoCatcher {
 	}
 
 	constexpr Error field(...) noexcept {
-		return {};
+		return OxError(0);
 	}
 
 	static constexpr auto opType() {
@@ -76,21 +76,21 @@ template<typename T>
 ox::Error writeClawHeader(Writer_c auto &writer, const T *t, ClawFormat fmt) noexcept {
 	switch (fmt) {
 		case ClawFormat::Metal:
-			OX_RETURN_ERROR(write(writer, "M2;"));
+			oxReturnError(write(writer, "M2;"));
 			break;
 		case ClawFormat::Organic:
-			OX_RETURN_ERROR(write(writer, "O1;"));
+			oxReturnError(write(writer, "O1;"));
 			break;
 		default:
-			return ox::Error(1);
+			return OxError(1);
 	}
-	OX_RETURN_ERROR(write(writer, detail::getTypeName(t)));
-	OX_RETURN_ERROR(writer.put(';'));
+	oxReturnError(write(writer, detail::getTypeName(t)));
+	oxReturnError(writer.put(';'));
 	const auto tn = detail::getTypeVersion(t);
 	if (tn > -1) {
-		OX_RETURN_ERROR(ox::writeItoa(tn, writer));
+		oxReturnError(ox::writeItoa(tn, writer));
 	}
-	OX_RETURN_ERROR(writer.put(';'));
+	oxReturnError(writer.put(';'));
 	return {};
 }
 
@@ -102,19 +102,19 @@ Result<Buffer> writeClaw(
 		std::size_t buffReserveSz = 2 * units::KB) noexcept {
 	Buffer out(buffReserveSz);
 	BufferWriter bw(&out, 0);
-	OX_RETURN_ERROR(detail::writeClawHeader(bw, &t, fmt));
+	oxReturnError(detail::writeClawHeader(bw, &t, fmt));
 #ifdef OX_USE_STDLIB
 	if (fmt == ClawFormat::Metal) {
-		OX_RETURN_ERROR(writeMC(bw, t));
+		oxReturnError(writeMC(bw, t));
 	} else if (fmt == ClawFormat::Organic) {
-		OX_REQUIRE(data, writeOC(t));
-		OX_RETURN_ERROR(bw.write(data.data(), data.size()));
+		oxRequire(data, writeOC(t));
+		oxReturnError(bw.write(data.data(), data.size()));
 	}
 #else
 	if (fmt != ClawFormat::Metal) {
-		return ox::Error(1, "OC is not supported in this build");
+		return OxError(1, "OC is not supported in this build");
 	}
-	OX_RETURN_ERROR(writeMC(bw, t));
+	oxReturnError(writeMC(bw, t));
 #endif
 	out.resize(bw.tellp());
 	return out;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/event/signal.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/event/signal.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -57,7 +57,7 @@ class Signal {
 
 			void call(Args... args) final {
 				if constexpr(detail::isError<decltype(f(args...))>::value) {
-					OX_THROW_ERROR(f(args...));
+					oxThrowError(f(args...));
 				} else {
 					f(args...);
 				}
@@ -76,7 +76,7 @@ class Signal {
 
 			void call(Args... args) final {
 				if constexpr(detail::isError<decltype((m_receiver->*(m_methodPtr))(args...))>::value) {
-					OX_THROW_ERROR((m_receiver->*(m_methodPtr))(args...));
+					oxThrowError((m_receiver->*(m_methodPtr))(args...));
 				} else {
 					f(args...);
 				}
@@ -107,7 +107,7 @@ class Signal {
 
 			void call(Args... args) final {
 				if constexpr(detail::isError<decltype((m_receiver->*(m_methodPtr))(args...))>::value) {
-					OX_THROW_ERROR((m_receiver->*(m_methodPtr))(args...));
+					oxThrowError((m_receiver->*(m_methodPtr))(args...));
 				} else {
 					(m_receiver->*(m_methodPtr))(args...);
 				}
@@ -122,7 +122,7 @@ class Signal {
 			}
 		};
 
-		mutable Vector<UPtr<BaseSlot>> m_slots;
+		mutable Vector<UniquePtr<BaseSlot>> m_slots;
 
 	public:
 		~Signal() noexcept;
@@ -143,11 +143,6 @@ class Signal {
 
 		Error disconnectObject(const void *receiver) const noexcept;
 
-		[[nodiscard]]
-		size_t connectionCnt() const noexcept {
-			return m_slots.size();
-		}
-
 		void emit(Args... args) const;
 
 		Error emitCheckError(Args... args) const noexcept;
@@ -198,11 +193,11 @@ Error Signal<Args...>::disconnectObject(const void *receiver) const noexcept {
 	for (auto i = 0u; i < m_slots.size(); ++i) {
 		const auto &slot = m_slots[i];
 		if (slot->receiver() == receiver) {
-			OX_RETURN_ERROR(m_slots.erase(i));
+			oxReturnError(m_slots.erase(i));
 			--i;
 		}
 	}
-	return ox::Error(1, "Signal::disconnectObject: Receiver was not found among this Signal's slots");
+	return OxError(1, "Signal::disconnectObject: Receiver was not found among this Signal's slots");
 }
 
 template<class... Args>
@@ -218,9 +213,9 @@ Error Signal<Args...>::emitCheckError(Args... args) const noexcept {
 		for (auto &f : m_slots) {
 			f->call(args...);
 		}
-		return {};
+		return OxError(0);
 	} catch (const ox::Exception &ex) {
-		return ox::Error(ex.errCode, ex.msg, ex.src);
+		return ox::Error(ex.file, ex.line, ex.errCode, ex.msg);
 	}
 }
 
@@ -303,7 +298,7 @@ class Signal<Error(Args...)> {
 			}
 		};
 
-		mutable Vector<UPtr<BaseSlot>> m_slots;
+		mutable Vector<UniquePtr<BaseSlot>> m_slots;
 
 	public:
 		~Signal() noexcept;
@@ -324,11 +319,6 @@ class Signal<Error(Args...)> {
 
 		Error disconnectObject(const void *receiver) const noexcept;
 
-		[[nodiscard]]
-		size_t connectionCnt() const noexcept {
-			return m_slots.size();
-		}
-
 		void emit(Args... args) const noexcept;
 
 		Error emitCheckError(Args... args) const noexcept;
@@ -391,11 +381,11 @@ Error Signal<Error(Args...)>::disconnectObject(const void *receiver) const noexc
 	for (auto i = 0u; i < m_slots.size(); ++i) {
 		const auto &slot = m_slots[i];
 		if (slot->receiver() == receiver) {
-			OX_RETURN_ERROR(m_slots.erase(i));
+			oxReturnError(m_slots.erase(i));
 			--i;
 		}
 	}
-	return ox::Error(1, "Signal::disconnectObject: Receiver was not found among this Signal's slots");
+	return OxError(1, "Signal::disconnectObject: Receiver was not found among this Signal's slots");
 }
 
 template<class... Args>
@@ -408,9 +398,9 @@ void Signal<Error(Args...)>::emit(Args... args) const noexcept {
 template<class... Args>
 Error Signal<Error(Args...)>::emitCheckError(Args... args) const noexcept {
 	for (auto &f : m_slots) {
-		OX_RETURN_ERROR(f->call(ox::forward<Args>(args)...));
+		oxReturnError(f->call(ox::forward<Args>(args)...));
 	}
-	return {};
+	return OxError(0);
 }
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -17,7 +17,7 @@ struct TestStruct: public ox::SignalHandler {
 	int value = 0;
 	ox::Error method(int i) noexcept {
 		value = i;
-		return ox::Error(0);
+		return OxError(0);
 	}
 };
 
@@ -27,13 +27,13 @@ std::map<ox::StringView, std::function<ox::Error()>> tests = {
 		[] {
 			ox::Signal<ox::Error(int)> signal;
 			signal.connect([](int i) -> ox::Error {
-				return ox::Error(i != 5);
+				return OxError(i != 5);
 			});
 			TestStruct ts;
 			signal.connect(&ts, &TestStruct::method);
-			OX_RETURN_ERROR(signal.emitCheckError(5));
-			OX_RETURN_ERROR(ox::Error(ts.value != 5));
-			return ox::Error(0);
+			oxReturnError(signal.emitCheckError(5));
+			oxReturnError(OxError(ts.value != 5));
+			return OxError(0);
 		}
 	},
 };

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/fs/filestore/filestoretemplate.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -207,12 +207,12 @@ Error FileStoreTemplate<size_t>::format(void *buffer, std::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");
-		return ox::Error(1, "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");
-		return ox::Error(1, "Could not read data section of FileStoreData");
+		return OxError(1, "Could not read data section of FileStoreData");
 	}
 	new (data) FileStoreData;
 	return {};
@@ -223,24 +223,24 @@ Error FileStoreTemplate<size_t>::setSize(std::size_t size) {
 	if (m_buffSize >= size) {
 		return m_buffer->setSize(static_cast<size_t>(size));
 	}
-	return ox::Error(1);
+	return OxError(1);
 }
 
 template<typename size_t>
 Error FileStoreTemplate<size_t>::incLinks(uint64_t id) {
-	OX_REQUIRE_M(item, find(static_cast<size_t>(id)).validate());
+	oxRequireM(item, find(static_cast<size_t>(id)).validate());
 	++item->links;
-	return {};
+	return OxError(0);
 }
 
 template<typename size_t>
 Error FileStoreTemplate<size_t>::decLinks(uint64_t id) {
-	OX_REQUIRE_M(item, find(static_cast<size_t>(id)).validate());
+	oxRequireM(item, find(static_cast<size_t>(id)).validate());
 	--item->links;
 	if (item->links == 0) {
-		OX_RETURN_ERROR(remove(item));
+		oxReturnError(remove(item));
 	}
-	return {};
+	return OxError(0);
 }
 
 template<typename size_t>
@@ -249,7 +249,7 @@ Error FileStoreTemplate<size_t>::write(uint64_t id64, const void *data, FsSize_t
 	oxTracef("ox.fs.FileStoreTemplate.write", "Attempting to write to inode {}", id);
 	auto existing = find(id);
 	if (!canWrite(existing, dataSize)) {
-		OX_RETURN_ERROR(compact());
+		oxReturnError(compact());
 		existing = find(id);
 	}
 
@@ -269,7 +269,7 @@ Error FileStoreTemplate<size_t>::write(uint64_t id64, const void *data, FsSize_t
 		// if first malloc failed, compact and try again
 		if (!dest.valid()) {
 			oxTrace("ox.fs.FileStoreTemplate.write", "Allocation failed, compacting");
-			OX_RETURN_ERROR(compact());
+			oxReturnError(compact());
 			dest = m_buffer->malloc(dataSize).value;
 		}
 		if (dest.valid()) {
@@ -298,16 +298,16 @@ Error FileStoreTemplate<size_t>::write(uint64_t id64, const void *data, FsSize_t
 						        dest->id.get(), dest.offset(), destData.size());
 						fsData->rootNode = dest.offset();
 						oxTracef("ox.fs.FileStoreTemplate.write", "Root inode: {}", dest->id.get());
-						return {};
+						return OxError(0);
 					}
 				} else {
 					oxTrace("ox.fs.FileStoreTemplate.write.fail", "Could not place item due to absence of FileStore header.");
 				}
 			}
 		}
-		OX_RETURN_ERROR(m_buffer->free(dest));
+		oxReturnError(m_buffer->free(dest));
 	}
-	return ox::Error(1);
+	return OxError(1);
 }
 
 template<typename size_t>
@@ -322,7 +322,7 @@ Error FileStoreTemplate<size_t>::read(uint64_t id, void *out, FsSize_t outSize,
 	// error check
 	if (!src.valid()) {
 		oxTracef("ox.fs.FileStoreTemplate.read.fail", "Could not find requested item: {}", id);
-		return ox::Error(1, "Could not find requested item");
+		return OxError(1, "Could not find requested item");
 	}
 
 	auto srcData = m_buffer->template dataOf<uint8_t>(src);
@@ -335,7 +335,7 @@ Error FileStoreTemplate<size_t>::read(uint64_t id, void *out, FsSize_t outSize,
 		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(), outSize);
-		return ox::Error(1, "Invalid inode");
+		return OxError(1, "Invalid inode");
 	}
 
 	ox::memcpy(out, srcData, srcData.size());
@@ -353,7 +353,7 @@ Error FileStoreTemplate<size_t>::read(uint64_t id, FsSize_t readStart, FsSize_t
 	// error check
 	if (!src.valid()) {
 		oxTracef("ox.fs.FileStoreTemplate.read.fail", "Could not find requested item: {}", id);
-		return ox::Error(1);
+		return OxError(1);
 	}
 
 	auto srcData = m_buffer->template dataOf<uint8_t>(src);
@@ -366,7 +366,7 @@ Error FileStoreTemplate<size_t>::read(uint64_t id, FsSize_t readStart, FsSize_t
 		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 ox::Error(1);
+		return OxError(1);
 	}
 
 	ox::memcpy(out, srcData.get() + readStart, readSize);
@@ -386,7 +386,7 @@ Error FileStoreTemplate<size_t>::read(uint64_t id, FsSize_t readStart,
 	// error check
 	if (!src.valid()) {
 		oxTracef("ox.fs.FileStoreTemplate.read.fail", "Could not find requested item: {}", id);
-		return ox::Error(1);
+		return OxError(1);
 	}
 
 	auto srcData = m_buffer->template dataOf<uint8_t>(src);
@@ -399,7 +399,7 @@ Error FileStoreTemplate<size_t>::read(uint64_t id, FsSize_t readStart,
 		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 ox::Error(1);
+		return OxError(1);
 	}
 
 	ox::memcpy(out, srcData.get() + readStart, readSize);
@@ -422,30 +422,30 @@ ptrarith::Ptr<uint8_t, std::size_t> FileStoreTemplate<size_t>::read(uint64_t id)
 
 template<typename size_t>
 Error FileStoreTemplate<size_t>::resize() {
-	OX_RETURN_ERROR(compact());
+	oxReturnError(compact());
 	const auto newSize = static_cast<std::size_t>(size() - available());
 	oxTracef("ox.fs.FileStoreTemplate.resize", "resize to: {}", newSize);
-	OX_RETURN_ERROR(m_buffer->setSize(newSize));
+	oxReturnError(m_buffer->setSize(newSize));
 	oxTracef("ox.fs.FileStoreTemplate.resize", "resized to: {}", m_buffer->size());
-	return {};
+	return OxError(0);
 }
 
 template<typename size_t>
 Error FileStoreTemplate<size_t>::resize(std::size_t size, void *newBuff) {
 	if (m_buffer->size() > size) {
-		return ox::Error{1, "new buffer is too small for existing data"};
+		return OxError(1);
 	}
 	m_buffSize = static_cast<size_t>(size);
 	if (newBuff) {
-		m_buffer = static_cast<Buffer*>(newBuff);
-		OX_RETURN_ERROR(m_buffer->setSize(static_cast<size_t>(size)));
+		m_buffer = reinterpret_cast<Buffer*>(newBuff);
+		oxReturnError(m_buffer->setSize(static_cast<size_t>(size)));
 	}
-	return {};
+	return OxError(0);
 }
 
 template<typename size_t>
 Result<StatInfo> FileStoreTemplate<size_t>::stat(uint64_t id) const {
-	OX_REQUIRE(inode, find(static_cast<size_t>(id)).validate());
+	oxRequire(inode, find(static_cast<size_t>(id)).validate());
 	return StatInfo {
 		id,
 		inode->links,
@@ -477,16 +477,16 @@ char *FileStoreTemplate<size_t>::buff() {
 template<typename size_t>
 Error FileStoreTemplate<size_t>::walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) {
 	for (auto i = m_buffer->iterator(); i.valid(); i.next()) {
-		OX_RETURN_ERROR(cb(i->fileType, i.ptr().offset(), i.ptr().end()));
+		oxReturnError(cb(i->fileType, i.ptr().offset(), i.ptr().end()));
 	}
-	return {};
+	return OxError(0);
 }
 
 template<typename size_t>
 Result<typename FileStoreTemplate<size_t>::InodeId_t> FileStoreTemplate<size_t>::generateInodeId() {
 	auto fsData = fileStoreData();
 	if (!fsData) {
-		return ox::Error(1);
+		return OxError(1);
 	}
 	for (auto i = 0; i < 100; i++) {
 		auto inode = static_cast<typename FileStoreTemplate<size_t>::InodeId_t>(fsData->random.gen() % MaxValue<InodeId_t>);
@@ -494,7 +494,7 @@ Result<typename FileStoreTemplate<size_t>::InodeId_t> FileStoreTemplate<size_t>:
 			return inode;
 		}
 	}
-	return ox::Error(2);
+	return OxError(2);
 }
 
 template<typename size_t>
@@ -503,10 +503,10 @@ Error FileStoreTemplate<size_t>::compact() {
 	return m_buffer->compact([this, &isFirstItem](uint64_t oldAddr, ItemPtr item) -> Error {
 		if (isFirstItem) {
 			isFirstItem = false;
-			return {};
+			return OxError(0);
 		}
 		if (!item.valid()) {
-			return ox::Error(1);
+			return OxError(1);
 		}
 		oxTracef("ox.fs.FileStoreTemplate.compact.moveItem", "Moving Item: {} from {} to {}", item->id.get(), oldAddr, item.offset());
 		// update rootInode if this is it
@@ -524,7 +524,7 @@ Error FileStoreTemplate<size_t>::compact() {
 				parent->right = item;
 			}
 		}
-		return {};
+		return OxError(0);
 	});
 }
 
@@ -544,15 +544,15 @@ template<typename size_t>
 Error FileStoreTemplate<size_t>::placeItem(ItemPtr item) {
 	auto fsData = fileStoreData();
 	if (!fsData) {
-		return ox::Error(1);
+		return OxError(1);
 	}
-	OX_REQUIRE_M(root, m_buffer->ptr(fsData->rootNode).validate());
+	oxRequireM(root, m_buffer->ptr(fsData->rootNode).validate());
 	if (root->id == item->id) {
 		fsData->rootNode = item;
 		item->left = root->left;
 		item->right = root->right;
 		oxTracef("ox.fs.FileStoreTemplate.placeItem", "Overwrote Root Item: {}", item->id.get());
-		return {};
+		return OxError(0);
 	} else {
 		return placeItem(root, item);
 	}
@@ -562,7 +562,7 @@ 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.");
-		return ox::Error(2);
+		return OxError(2);
 	}
 	if (item->id > root->id) {
 		auto right = m_buffer->ptr(root->right);
@@ -573,7 +573,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr root, ItemPtr item, int depth
 				item->right = right->right;
 			}
 			oxTracef("ox.fs.FileStoreTemplate.placeItem", "Placed Item: {}", item->id.get());
-			return {};
+			return OxError(0);
 		} else {
 			return placeItem(right, item, depth + 1);
 		}
@@ -586,13 +586,13 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr root, ItemPtr item, int depth
 				item->right = left->right;
 			}
 			oxTracef("ox.fs.FileStoreTemplate.placeItem", "Placed Item: {}", item->id.get());
-			return {};
+			return OxError(0);
 		} else {
 			return placeItem(left, item, depth + 1);
 		}
 	} else {
 		oxTrace("ox.fs.FileStoreTemplate.placeItem.fail", "Cannot insert an item on itself.");
-		return ox::Error(1, "Cannot insert an item on itself.");
+		return OxError(1, "Cannot insert an item on itself.");
 	}
 }
 
@@ -600,9 +600,9 @@ template<typename size_t>
 Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr item) {
 	auto fsData = fileStoreData();
 	if (!fsData) {
-		return ox::Error(1);
+		return OxError(1);
 	}
-	OX_REQUIRE_M(root, m_buffer->ptr(fsData->rootNode).validate());
+	oxRequireM(root, m_buffer->ptr(fsData->rootNode).validate());
 	if (root->id == item->id) {
 		item->left = root->left;
 		item->right = root->right;
@@ -624,7 +624,7 @@ Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr item) {
 		} else {
 			fsData->rootNode = 0;
 		}
-		return {};
+		return OxError(0);
 	} else {
 		return unplaceItem(root, item);
 	}
@@ -634,7 +634,7 @@ 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.");
-		return ox::Error(1, "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);
@@ -653,25 +653,25 @@ Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr root, ItemPtr item, int dep
 			return unplaceItem(left, item, depth + 1);
 		}
 	} else {
-		return ox::Error(1);
+		return OxError(1);
 	}
 	if (item->right) {
-		OX_RETURN_ERROR(placeItem(m_buffer->ptr(item->right)));
+		oxReturnError(placeItem(m_buffer->ptr(item->right)));
 	}
 	if (item->left) {
-		OX_RETURN_ERROR(placeItem(m_buffer->ptr(item->left)));
+		oxReturnError(placeItem(m_buffer->ptr(item->left)));
 	}
-	return {};
+	return OxError(0);
 }
 
 template<typename size_t>
 Error FileStoreTemplate<size_t>::remove(ItemPtr item) {
 	if (item.valid()) {
-		OX_RETURN_ERROR(unplaceItem(item));
-		OX_RETURN_ERROR(m_buffer->free(item));
-		return {};
+		oxReturnError(unplaceItem(item));
+		oxReturnError(m_buffer->free(item));
+		return OxError(0);
 	}
-	return ox::Error(1);
+	return OxError(1);
 }
 
 template<typename size_t>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/fs/filesystem/directory.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -52,10 +52,10 @@ struct OX_PACKED DirectoryEntry {
 			if (d.valid()) {
 				d->inode = inode;
 				auto const maxStrSz = bufferSize - 1 - sizeof(*this);
-				ox::strncpy(d->name, name.data(), ox::min(maxStrSz, name.size()));
+				ox::strncpy(d->name, name.data(), ox::min(maxStrSz, name.len()));
 				return {};
 			}
-			return ox::Error(1);
+			return OxError(1);
 		}
 
 		ptrarith::Ptr<DirectoryEntryData, InodeId_t> data() noexcept {
@@ -141,11 +141,11 @@ 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);
-	OX_RETURN_ERROR(m_fs.write(m_inodeId, nullptr, Size, static_cast<uint8_t>(FileType::Directory)));
+	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()) {
 		m_size = 0;
-		return ox::Error(1);
+		return OxError(1);
 	}
 	new (buff) Buffer(Size);
 	m_size = Size;
@@ -158,21 +158,21 @@ Error Directory<FileStore, InodeId_t>::mkdir(PathIterator path, bool parents) {
 		oxTrace("ox.fs.Directory.mkdir", path.fullPath());
 		// determine if already exists
 		ox::StringView name;
-		OX_RETURN_ERROR(path.get(name));
+		oxReturnError(path.get(name));
 		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
 			if (!parents && path.hasNext()) {
-				return ox::Error(1);
+				return OxError(1);
 			}
 			childInode = m_fs.generateInodeId();
 			oxTracef("ox.fs.Directory.mkdir", "Generated Inode ID: {}", childInode.value);
 			oxLogError(childInode.error);
-			OX_RETURN_ERROR(childInode.error);
+			oxReturnError(childInode.error);
 			// initialize the directory
 			Directory<FileStore, InodeId_t> child(m_fs, childInode.value);
-			OX_RETURN_ERROR(child.init());
+			oxReturnError(child.init());
 			auto err = write(PathIterator(name), childInode.value);
 			if (err) {
 				oxLogError(err);
@@ -183,7 +183,7 @@ Error Directory<FileStore, InodeId_t>::mkdir(PathIterator path, bool parents) {
 		}
 		Directory<FileStore, InodeId_t> child(m_fs, childInode.value);
 		if (path.hasNext()) {
-			OX_RETURN_ERROR(child.mkdir(path.next(), parents));
+			oxReturnError(child.mkdir(path.next(), parents));
 		}
 	}
 	return {};
@@ -196,45 +196,45 @@ Error Directory<FileStore, InodeId_t>::write(PathIterator path, uint64_t inode64
 	if (path.next().hasNext()) { // not yet at target directory, recurse to next one
 		oxTracef("ox.fs.Directory.write", "Attempting to write to next sub-Directory: {} of {}",
 		         name, path.fullPath());
-		OX_RETURN_ERROR(path.get(name));
-		OX_REQUIRE(nextChild, findEntry(name));
+		oxReturnError(path.get(name));
+		oxRequire(nextChild, findEntry(name));
 		oxTracef("ox.fs.Directory.write", "{}: {}", name, nextChild);
 		if (nextChild) {
 			return Directory(m_fs, nextChild).write(path.next(), inode);
 		} else {
 			oxTracef("ox.fs.Directory.write", "{} not found and not allowed to create it.", name);
-			return ox::Error(1, "File not found and not allowed to create it.");
+			return OxError(1, "File not found and not allowed to create it.");
 		}
 	} else {
 		oxTrace("ox.fs.Directory.write", path.fullPath());
-		OX_RETURN_ERROR(path.next(name));
+		oxReturnError(path.next(name));
 		// insert the new entry on this directory
 		// get the name
 		// find existing version of directory
 		oxTracef("ox.fs.Directory.write", "Searching for directory inode {}", m_inodeId);
-		OX_REQUIRE(oldStat, m_fs.stat(m_inodeId));
+		oxRequire(oldStat, m_fs.stat(m_inodeId));
 		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");
-			return ox::Error(1, "Could not read existing version of Directory");
+			return OxError(1, "Could not read existing version of Directory");
 		}
-		const auto pathSize = name.size() + 1;
+		const auto pathSize = name.len() + 1;
 		const auto entryDataSize = DirectoryEntry<InodeId_t>::DirectoryEntryData::spaceNeeded(pathSize);
 		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");
-			return ox::Error(1, "Could not allocate memory for copy of Directory");
+			return OxError(1, "Could not allocate memory for copy of Directory");
 		}
-		OX_RETURN_ERROR(cpy->setSize(newSize));
+		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");
-			return ox::Error(1, "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);
-		OX_RETURN_ERROR(val->init(inode, name, val.size()));
+		oxReturnError(val->init(inode, name, val.size()));
 		return m_fs.write(m_inodeId, cpy.get(), cpy->size(), static_cast<uint8_t>(FileType::Directory));
 	}
 }
@@ -242,7 +242,7 @@ Error Directory<FileStore, InodeId_t>::write(PathIterator path, uint64_t inode64
 template<typename FileStore, typename InodeId_t>
 Error Directory<FileStore, InodeId_t>::remove(PathIterator path) noexcept {
 	ox::StringView name;
-	OX_RETURN_ERROR(path.get(name));
+	oxReturnError(path.get(name));
 	oxTrace("ox.fs.Directory.remove", name);
 	auto buff = m_fs.read(m_inodeId).template to<Buffer>();
 	if (buff.valid()) {
@@ -251,7 +251,7 @@ Error Directory<FileStore, InodeId_t>::remove(PathIterator path) noexcept {
 			auto data = i->data();
 			if (data.valid()) {
 				if (name == data->name) {
-					OX_RETURN_ERROR(buff->free(i));
+					oxReturnError(buff->free(i));
 				}
 			} else {
 				oxTrace("ox.fs.Directory.remove", "INVALID DIRECTORY ENTRY");
@@ -259,7 +259,7 @@ Error Directory<FileStore, InodeId_t>::remove(PathIterator path) noexcept {
 		}
 	} else {
 		oxTrace("ox.fs.Directory.remove.fail", "Could not find directory buffer");
-		return ox::Error(1, "Could not find directory buffer");
+		return OxError(1, "Could not find directory buffer");
 	}
 	return {};
 }
@@ -271,13 +271,13 @@ Error Directory<FileStore, InodeId_t>::ls(F cb) noexcept {
 	auto buff = m_fs.read(m_inodeId).template to<Buffer>();
 	if (!buff.valid()) {
 		oxTrace("ox.fs.Directory.ls.fail", "Could not directory buffer");
-		return ox::Error(1, "Could not directory buffer");
+		return OxError(1, "Could not 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()) {
-			OX_RETURN_ERROR(cb(data->name, data->inode));
+			oxReturnError(cb(data->name, data->inode));
 		} else {
 			oxTrace("ox.fs.Directory.ls", "INVALID DIRECTORY ENTRY");
 		}
@@ -291,7 +291,7 @@ Result<typename FileStore::InodeId_t> Directory<FileStore, InodeId_t>::findEntry
 	auto buff = m_fs.read(m_inodeId).template to<Buffer>();
 	if (!buff.valid()) {
 		oxTrace("ox.fs.Directory.findEntry.fail", "Could not findEntry directory buffer");
-		return ox::Error(2, "Could not findEntry directory buffer");
+		return OxError(2, "Could not findEntry directory buffer");
 	}
 	oxTracef("ox.fs.Directory.findEntry", "Found directory buffer, size: {}", buff.size());
 	for (auto i = buff->iterator(); i.valid(); i.next()) {
@@ -307,15 +307,15 @@ Result<typename FileStore::InodeId_t> Directory<FileStore, InodeId_t>::findEntry
 		}
 	}
 	oxTrace("ox.fs.Directory.findEntry.fail", "Entry not present");
-	return ox::Error(1, "Entry not present");
+	return OxError(1, "Entry not present");
 }
 
 template<typename FileStore, typename InodeId_t>
 Result<typename FileStore::InodeId_t> Directory<FileStore, InodeId_t>::find(PathIterator path) const noexcept {
 	// determine if already exists
 	ox::StringView name;
-	OX_RETURN_ERROR(path.get(name));
-	OX_REQUIRE(v, findEntry(name));
+	oxReturnError(path.get(name));
+	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,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -31,10 +31,10 @@ FileAddress::FileAddress(uint64_t inode) noexcept {
 FileAddress::FileAddress(ox::StringViewCR path) noexcept {
 	auto pathSize = path.bytes();
 	m_data.path = new char[pathSize + 1];
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(m_data.path, path.data(), pathSize);
+OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 	m_data.path[pathSize] = 0;
-	OX_ALLOW_UNSAFE_BUFFERS_END
+OX_CLANG_NOWARN_END
 	m_type = FileAddressType::Path;
 }
 
@@ -48,11 +48,9 @@ FileAddress &FileAddress::operator=(const FileAddress &other) noexcept {
 		case FileAddressType::Path:
 		{
 			if (other.m_data.path) {
-				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				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_ALLOW_UNSAFE_BUFFERS_END
 			} else {
 				m_data.constPath = "";
 				m_type = FileAddressType::ConstPath;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -24,6 +24,9 @@ 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>
@@ -86,7 +89,7 @@ class FileAddress {
 				case FileAddressType::Inode:
 					return m_data.inode;
 				default:
-					return ox::Error(1);
+					return OxError(1);
 			}
 		}
 
@@ -97,7 +100,7 @@ class FileAddress {
 				case FileAddressType::ConstPath:
 					return ox::CStringView(m_data.constPath);
 				default:
-					return ox::Error(1);
+					return OxError(1);
 			}
 		}
 
@@ -151,29 +154,29 @@ constexpr const char *getModelTypeName<FileAddress>() noexcept {
 
 template<typename T>
 constexpr Error model(T *h, CommonPtrWith<FileAddress::Data> auto *obj) noexcept {
-	OX_RETURN_ERROR(h->template setTypeInfo<FileAddress::Data>());
-	OX_RETURN_ERROR(h->fieldCString("path", &obj->path));
-	OX_RETURN_ERROR(h->fieldCString("constPath", &obj->path));
-	OX_RETURN_ERROR(h->field("inode", &obj->inode));
+	oxReturnError(h->template setTypeInfo<FileAddress::Data>());
+	oxReturnError(h->fieldCString("path", &obj->path));
+	oxReturnError(h->fieldCString("constPath", &obj->path));
+	oxReturnError(h->field("inode", &obj->inode));
 	return {};
 }
 
 template<typename T>
 constexpr Error model(T *h, CommonPtrWith<FileAddress> auto *fa) noexcept {
-	OX_RETURN_ERROR(h->template setTypeInfo<FileAddress>());
+	oxReturnError(h->template setTypeInfo<FileAddress>());
 	if constexpr(T::opType() == OpType::Reflect) {
 		int8_t type = -1;
-		OX_RETURN_ERROR(h->field("type", &type));
-		OX_RETURN_ERROR(h->field("data", UnionView(&fa->m_data, type)));
+		oxReturnError(h->field("type", &type));
+		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);
-		OX_RETURN_ERROR(h->field("type", &type));
+		oxReturnError(h->field("type", &type));
 		fa->m_type = static_cast<FileAddressType>(type);
-		OX_RETURN_ERROR(h->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 const type = static_cast<int8_t>(fa->m_type);
-		OX_RETURN_ERROR(h->field("type", &type));
-		OX_RETURN_ERROR(h->field("data", UnionView(&fa->m_data, static_cast<int>(fa->m_type))));
+		oxReturnError(h->field("type", &type));
+		oxReturnError(h->field("data", UnionView(&fa->m_data, static_cast<int>(fa->m_type))));
 	}
 	return {};
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -21,7 +21,7 @@ Result<const char*> MemFS::directAccess(const FileAddress &addr) const noexcept
 		case FileAddressType::Path:
 			return directAccess(StringView(addr.getPath().value));
 		default:
-			return ox::Error(1);
+			return OxError(1);
 	}
 }
 
@@ -33,73 +33,46 @@ Error FileSystem::read(const FileAddress &addr, void *buffer, std::size_t size)
 		case FileAddressType::Path:
 			return readFilePath(StringView(addr.getPath().value), buffer, size);
 		default:
-			return ox::Error(1);
+			return OxError(1);
 	}
 }
 
-Result<Buffer> FileSystem::read(FileAddress const &addr, size_t const size) noexcept {
-	Result<Buffer> out;
-	out.value.resize(size);
-	switch (addr.type()) {
-		case FileAddressType::Inode:
-			OX_RETURN_ERROR(readFileInode(addr.getInode().value, out.value.data(), size));
-			break;
-		case FileAddressType::ConstPath:
-		case FileAddressType::Path:
-			OX_RETURN_ERROR(readFilePath(StringView{addr.getPath().value}, out.value.data(), size));
-			break;
-		default:
-			return ox::Error{1};
-	}
-	return out;
-}
-
-Result<Buffer> FileSystem::read(StringViewCR path, size_t const size) noexcept {
-	Result<Buffer> out;
-	out.value.resize(size);
-	OX_RETURN_ERROR(readFilePath(path, out.value.data(), size));
-	return out;
-}
-
 Result<Buffer> FileSystem::read(const FileAddress &addr) noexcept {
-	OX_REQUIRE(s, stat(addr));
+	oxRequire(s, stat(addr));
 	Buffer buff(static_cast<std::size_t>(s.size));
-	OX_RETURN_ERROR(read(addr, buff.data(), buff.size()));
+	oxReturnError(read(addr, buff.data(), buff.size()));
 	return buff;
 }
 
 Result<Buffer> FileSystem::read(StringViewCR path) noexcept {
-	OX_REQUIRE(s, statPath(path));
+	oxRequire(s, statPath(path));
 	Buffer buff(static_cast<std::size_t>(s.size));
-	OX_RETURN_ERROR(readFilePath(path, buff.data(), buff.size()));
+	oxReturnError(readFilePath(path, buff.data(), buff.size()));
 	return buff;
 }
 
-Error FileSystem::read(
-		FileAddress const &addr,
-		std::size_t const readStart,
-		std::size_t const readSize,
-		void *buffer,
-		std::size_t *size) noexcept {
+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 readFileInodeRange(addr.getInode().value, readStart, readSize, buffer, size);
+			return read(addr.getInode().value, readStart, readSize, buffer, size);
 		case FileAddressType::ConstPath:
 		case FileAddressType::Path:
-			return readFilePathRange(addr.getPath().value, readStart, readSize, buffer, size);
+			return OxError(2, "Unsupported for path lookups");
 		default:
-			return ox::Error(1);
+			return OxError(1);
 	}
 }
 
-Result<size_t> FileSystem::read(
-		StringViewCR path,
-		std::size_t const readStart,
-		std::size_t const readSize,
-		Span<char> buff) noexcept {
-	size_t szOut{buff.size()};
-	OX_RETURN_ERROR(readFilePathRange(path, readStart, readSize, buff.data(), &szOut));
-	return szOut;
+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(StringView(addr.getPath().value), recursive);
+		default:
+			return OxError(1);
+	}
 }
 
 Error FileSystem::write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType) noexcept {
@@ -110,7 +83,7 @@ Error FileSystem::write(const FileAddress &addr, const void *buffer, uint64_t si
 		case FileAddressType::Path:
 			return writeFilePath(StringView(addr.getPath().value), buffer, size, fileType);
 		default:
-			return ox::Error(1);
+			return OxError(1);
 	}
 }
 
@@ -122,7 +95,7 @@ Result<FileStat> FileSystem::stat(const FileAddress &addr) const noexcept {
 		case FileAddressType::Path:
 			return statPath(StringView(addr.getPath().value));
 		default:
-			return ox::Error(1);
+			return OxError(1);
 	}
 }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -20,7 +20,7 @@
 namespace ox {
 
 namespace detail {
-inline void fsBuffFree(char *buff) noexcept {
+static inline void fsBuffFree(char *buff) noexcept {
 	safeDelete(buff);
 }
 }
@@ -41,45 +41,25 @@ class FileSystem {
 
 		Error read(const FileAddress &addr, void *buffer, std::size_t size) noexcept;
 
-		Result<Buffer> read(FileAddress const &addr, size_t size) noexcept;
-
-		Result<Buffer> read(StringViewCR path, size_t size) noexcept;
-
 		Result<Buffer> read(const FileAddress &addr) noexcept;
 
 		Result<Buffer> read(StringViewCR path) noexcept;
 
-		Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
+		inline Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
 			return readFilePath(path, buffer, buffSize);
 		}
 
-		Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
+		inline Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
 			return readFileInode(inode, buffer, buffSize);
 		}
 
-		Error read(
-			FileAddress const &addr,
-			size_t readStart,
-			size_t readSize,
-			void *buffer,
-			size_t *size) noexcept;
-
-		/**
-		 *
-		 * @param path
-		 * @param readStart
-		 * @param readSize
-		 * @param buff
-		 * @return error or number of bytes read
-		 */
-		Result<size_t> read(
-			StringViewCR path, size_t readStart, size_t readSize, ox::Span<char> buff) noexcept;
+		Error read(const FileAddress &addr, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept;
 
 		virtual Result<Vector<String>> ls(StringViewCR dir) const noexcept = 0;
 
-		Error remove(StringViewCR path, bool recursive = false) noexcept {
-			return removePath(path, recursive);
-		}
+		virtual Error remove(StringViewCR path, bool recursive) noexcept = 0;
+
+		Error remove(const FileAddress &addr, bool recursive = false) noexcept;
 
 		virtual Error resize(uint64_t size, void *buffer) noexcept = 0;
 
@@ -87,7 +67,7 @@ class FileSystem {
 			return writeFilePath(path, buffer, size, FileType::NormalFile);
 		}
 
-		Error write(StringViewCR path, ox::SpanView<char> const&buff) noexcept {
+		Error write(StringViewCR path, ox::Span<char> const&buff) noexcept {
 			return write(path, buff.data(), buff.size(), FileType::NormalFile);
 		}
 
@@ -95,42 +75,42 @@ class FileSystem {
 			return write(inode, buffer, size, FileType::NormalFile);
 		}
 
-		Error write(uint64_t inode, ox::SpanView<char> const&buff) noexcept {
+		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;
 
-		Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept {
+		inline Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept {
 			return writeFilePath(path, buffer, size, fileType);
 		}
 
-		Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
+		inline Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
 			return writeFileInode(inode, buffer, size, fileType);
 		}
 
-		Result<FileStat> stat(uint64_t inode) const noexcept {
+		inline Result<FileStat> stat(uint64_t inode) const noexcept {
 			return statInode(inode);
 		}
 
-		Result<FileStat> stat(StringViewCR path) const noexcept {
+		inline Result<FileStat> stat(StringViewCR path) const noexcept {
 			return statPath(path);
 		}
 
 		Result<FileStat> stat(const FileAddress &addr) const noexcept;
 
 		[[nodiscard]]
-		bool exists(uint64_t inode) const noexcept {
+		inline bool exists(uint64_t inode) const noexcept {
 			return statInode(inode).ok();
 		}
 
 		[[nodiscard]]
-		bool exists(ox::StringView path) const noexcept {
+		inline bool exists(ox::StringView path) const noexcept {
 			return statPath(path).ok();
 		}
 
 		[[nodiscard]]
-		bool exists(FileAddress const&addr) const noexcept {
+		inline bool exists(FileAddress const&addr) const noexcept {
 			return stat(addr).ok();
 		}
 
@@ -160,12 +140,7 @@ class FileSystem {
 
 		virtual Error readFileInode(uint64_t inode, void *buffer, std::size_t size) noexcept = 0;
 
-		virtual Error readFilePathRange(
-			StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept = 0;
-
-		virtual Error readFileInodeRange(uint64_t inode, size_t readStart, size_t readSize, void *buffer, size_t *size) noexcept = 0;
-
-		virtual Error removePath(StringViewCR path, bool recursive) 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(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept = 0;
 
@@ -177,11 +152,11 @@ class MemFS: public FileSystem {
 	public:
 		Result<const char*> directAccess(const FileAddress &addr) const noexcept;
 
-		Result<const char*> directAccess(StringViewCR path) const noexcept {
+		inline Result<const char*> directAccess(StringViewCR path) const noexcept {
 			return directAccessPath(path);
 		}
 
-		Result<const char*> directAccess(uint64_t inode) const noexcept {
+		inline Result<const char*> directAccess(uint64_t inode) const noexcept {
 			return directAccessInode(inode);
 		}
 
@@ -234,11 +209,6 @@ class FileSystemTemplate: public MemFS {
 
 		Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
 
-		Error readFilePathRange(
-			StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept override;
-
-		Error removePath(StringViewCR path, bool recursive) noexcept override;
-
 		Result<const char*> directAccessInode(uint64_t) const noexcept override;
 
 		Result<Vector<String>> ls(StringViewCR dir) const noexcept override;
@@ -246,6 +216,8 @@ class FileSystemTemplate: public MemFS {
 		template<typename F>
 		Error ls(StringViewCR path, F cb) const;
 
+		Error remove(StringViewCR path, bool recursive) noexcept override;
+
 		/**
 		 * Resizes FileSystem to minimum possible size.
 		 */
@@ -312,69 +284,69 @@ FileSystemTemplate<FileStore, Directory>::~FileSystemTemplate() noexcept {
 
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::format(void *buff, uint64_t buffSize) noexcept {
-	OX_RETURN_ERROR(FileStore::format(buff, static_cast<size_t>(buffSize)));
+	oxReturnError(FileStore::format(buff, static_cast<size_t>(buffSize)));
 	FileStore fs(buff, static_cast<size_t>(buffSize));
 
 	constexpr auto rootDirInode = MaxValue<typename FileStore::InodeId_t> / 2;
 	Directory rootDir(fs, rootDirInode);
-	OX_RETURN_ERROR(rootDir.init());
+	oxReturnError(rootDir.init());
 
 	FileSystemData fd;
 	fd.rootDirInode = rootDirInode;
 	oxTracef("ox.fs.FileSystemTemplate.format", "rootDirInode: {}", fd.rootDirInode.get());
-	OX_RETURN_ERROR(fs.write(InodeFsData, &fd, sizeof(fd)));
+	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");
-		return ox::Error(1);
+		return OxError(1);
 	}
 
-	return {};
+	return OxError(0);
 }
 
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::mkdir(StringViewCR path, bool recursive) noexcept {
 	oxTracef("ox.fs.FileSystemTemplate.mkdir", "path: {}, recursive: {}", path, recursive);
-	OX_REQUIRE_M(rootDir, this->rootDir());
+	oxRequireM(rootDir, this->rootDir());
 	return rootDir.mkdir(path, recursive);
 }
 
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::move(StringViewCR src, StringViewCR dest) noexcept {
-	OX_REQUIRE(fd, fileSystemData());
+	oxRequire(fd, fileSystemData());
 	Directory rootDir(m_fs, fd.rootDirInode);
-	OX_REQUIRE_M(inode, rootDir.find(src));
-	OX_RETURN_ERROR(rootDir.write(dest, inode));
-	OX_RETURN_ERROR(rootDir.remove(src));
-	return {};
+	oxRequireM(inode, rootDir.find(src));
+	oxReturnError(rootDir.write(dest, inode));
+	oxReturnError(rootDir.remove(src));
+	return OxError(0);
 }
 
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::readFilePath(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
 	oxTrace("ox.fs.FileSystemTemplate.readFilePath", path);
-	OX_REQUIRE(fd, fileSystemData());
+	oxRequire(fd, fileSystemData());
 	Directory rootDir(m_fs, fd.rootDirInode);
-	OX_REQUIRE(s, stat(path));
+	oxRequire(s, stat(path));
 	if (s.size > buffSize) {
-		return ox::Error(1, "Buffer to small to load file");
+		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(StringViewCR path) const noexcept {
-	OX_REQUIRE(fd, fileSystemData());
+	oxRequire(fd, fileSystemData());
 	Directory rootDir(m_fs, fd.rootDirInode);
-	OX_REQUIRE(inode, rootDir.find(path));
+	oxRequire(inode, rootDir.find(path));
 	return directAccessInode(inode);
 }
 
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::readFileInode(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
 	oxTracef("ox.fs.FileSystemTemplate.readFileInode", "{}", inode);
-	OX_REQUIRE(s, stat(inode));
+	oxRequire(s, stat(inode));
 	if (s.size > buffSize) {
-		return ox::Error(1, "Buffer to small to load file");
+		return OxError(1, "Buffer to small to load file");
 	}
 	return readFileInodeRange(inode, 0, static_cast<size_t>(s.size), buffer, &buffSize);
 }
@@ -384,37 +356,11 @@ Error FileSystemTemplate<FileStore, Directory>::readFileInodeRange(uint64_t inod
 	return m_fs.read(inode, readStart, readSize, reinterpret_cast<uint8_t*>(buffer), size);
 }
 
-template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::readFilePathRange(
-	StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept {
-	OX_REQUIRE(s, stat(path));
-	return readFileInodeRange(s.inode, readStart, readSize, buffer, buffSize);
-}
-
-template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::removePath(StringViewCR path, bool recursive) noexcept {
-	OX_REQUIRE(fd, fileSystemData());
-	Directory rootDir(m_fs, fd.rootDirInode);
-	OX_REQUIRE(inode, rootDir.find(path));
-	OX_REQUIRE(st, statInode(inode));
-	if (st.fileType == FileType::NormalFile || recursive) {
-		if (auto err = rootDir.remove(path)) {
-			// removal failed, try putting the index back
-			oxLogError(rootDir.write(path, inode));
-			return err;
-		}
-	} else {
-		oxTrace("FileSystemTemplate.remove.fail", "Tried to remove directory without recursive setting.");
-		return ox::Error(1);
-	}
-	return {};
-}
-
 template<typename FileStore, typename Directory>
 Result<const char*> FileSystemTemplate<FileStore, Directory>::directAccessInode(uint64_t inode) const noexcept {
 	auto data = m_fs.read(inode);
 	if (!data.valid()) {
-		return ox::Error(1, "Data not valid");
+		return OxError(1, "Data not valid");
 	}
 	return reinterpret_cast<char*>(data.get());
 }
@@ -422,9 +368,9 @@ Result<const char*> FileSystemTemplate<FileStore, Directory>::directAccessInode(
 template<typename FileStore, typename Directory>
 Result<Vector<String>> FileSystemTemplate<FileStore, Directory>::ls(StringViewCR path) const noexcept {
 	Vector<String> out;
-	OX_RETURN_ERROR(ls(path, [&out](StringViewCR name, typename FileStore::InodeId_t) {
+	oxReturnError(ls(path, [&out](StringViewCR name, typename FileStore::InodeId_t) {
 		out.emplace_back(name);
-		return ox::Error{};
+		return OxError(0);
 	}));
 	return out;
 }
@@ -433,11 +379,30 @@ template<typename FileStore, typename Directory>
 template<typename F>
 Error FileSystemTemplate<FileStore, Directory>::ls(StringViewCR path, F cb) const {
 	oxTracef("ox.fs.FileSystemTemplate.ls", "path: {}", path);
-	OX_REQUIRE(s, stat(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(StringViewCR path, bool recursive) noexcept {
+	oxRequire(fd, fileSystemData());
+	Directory rootDir(m_fs, fd.rootDirInode);
+	oxRequire(inode, rootDir.find(path));
+	oxRequire(st, statInode(inode));
+	if (st.fileType == FileType::NormalFile || recursive) {
+		if (auto err = rootDir.remove(path)) {
+			// removal failed, try putting the index back
+			oxLogError(rootDir.write(path, inode));
+			return err;
+		}
+	} else {
+		oxTrace("FileSystemTemplate.remove.fail", "Tried to remove directory without recursive setting.");
+		return OxError(1);
+	}
+	return OxError(0);
+}
+
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::resize() noexcept {
 	return m_fs.resize();
@@ -445,7 +410,7 @@ Error FileSystemTemplate<FileStore, Directory>::resize() noexcept {
 
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::resize(uint64_t size, void *buffer) noexcept {
-	OX_RETURN_ERROR(m_fs.resize(static_cast<size_t>(size), buffer));
+	oxReturnError(m_fs.resize(static_cast<size_t>(size), buffer));
 	return {};
 }
 
@@ -458,23 +423,23 @@ Error FileSystemTemplate<FileStore, Directory>::writeFilePath(
 	oxTrace("ox.fs.FileSystemTemplate.writeFilePath", path);
 	auto [inode, err] = find(path);
 	if (err) {
-		OX_RETURN_ERROR(m_fs.generateInodeId().moveTo(inode));
-		OX_REQUIRE_M(rootDir, this->rootDir());
-		OX_RETURN_ERROR(rootDir.write(path, inode));
+		oxReturnError(m_fs.generateInodeId().moveTo(inode));
+		oxRequireM(rootDir, this->rootDir());
+		oxReturnError(rootDir.write(path, inode));
 	}
-	OX_RETURN_ERROR(writeFileInode(inode, buffer, size, fileType));
+	oxReturnError(writeFileInode(inode, buffer, size, fileType));
 	return {};
 }
 
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
-	oxTrace("ox.fs.FileSystemTemplate.writeFileInode", ox::intToStr(inode));
+	oxTrace("ox.fs.FileSystemTemplate.writeFileInode", ox::itoa(inode));
 	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>::statInode(uint64_t inode) const noexcept {
-	OX_REQUIRE(s, m_fs.stat(inode));
+	oxRequire(s, m_fs.stat(inode));
 	FileStat out;
 	out.inode = s.inode;
 	out.links = s.links;
@@ -485,7 +450,7 @@ Result<FileStat> FileSystemTemplate<FileStore, Directory>::statInode(uint64_t in
 
 template<typename FileStore, typename Directory>
 Result<FileStat> FileSystemTemplate<FileStore, Directory>::statPath(StringViewCR path) const noexcept {
-	OX_REQUIRE(inode, find(path));
+	oxRequire(inode, find(path));
 	return stat(inode);
 }
 
@@ -522,25 +487,25 @@ bool FileSystemTemplate<FileStore, Directory>::valid() const noexcept {
 template<typename FileStore, typename Directory>
 Result<typename FileSystemTemplate<FileStore, Directory>::FileSystemData> FileSystemTemplate<FileStore, Directory>::fileSystemData() const noexcept {
 	FileSystemData fd;
-	OX_RETURN_ERROR(m_fs.read(InodeFsData, &fd, sizeof(fd)));
+	oxReturnError(m_fs.read(InodeFsData, &fd, sizeof(fd)));
 	return fd;
 }
 
 template<typename FileStore, typename Directory>
 Result<uint64_t> FileSystemTemplate<FileStore, Directory>::find(StringViewCR path) const noexcept {
-	OX_REQUIRE(fd, fileSystemData());
+	oxRequire(fd, fileSystemData());
 	// return root as a special case
 	if (path == "/") {
 		return static_cast<uint64_t>(fd.rootDirInode);
 	}
 	Directory rootDir(m_fs, fd.rootDirInode);
-	OX_REQUIRE(out, rootDir.find(path));
+	oxRequire(out, rootDir.find(path));
 	return static_cast<uint64_t>(out);
 }
 
 template<typename FileStore, typename Directory>
 Result<Directory> FileSystemTemplate<FileStore, Directory>::rootDir() const noexcept {
-	OX_REQUIRE(fd, fileSystemData());
+	oxRequire(fd, fileSystemData());
 	return Directory(m_fs, fd.rootDirInode);
 }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -39,7 +39,7 @@ Error PassThroughFS::mkdir(StringViewCR path, bool recursive) noexcept {
 			success = true;
 		} else {
 			success = std::filesystem::create_directories(p, ec);
-			OX_RETURN_ERROR(ox::Error(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: mkdir failed"));
+			oxReturnError(OxError(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: mkdir failed"));
 		}
 	} else {
 		std::error_code ec;
@@ -48,26 +48,26 @@ Error PassThroughFS::mkdir(StringViewCR path, bool recursive) noexcept {
 			success = true;
 		} else {
 			success = std::filesystem::create_directory(p, ec);
-			OX_RETURN_ERROR(ox::Error(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: mkdir failed"));
+			oxReturnError(OxError(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: mkdir failed"));
 		}
 	}
-	return ox::Error(success ? 0 : 1);
+	return OxError(success ? 0 : 1);
 }
 
 Error PassThroughFS::move(StringViewCR src, StringViewCR dest) noexcept {
 	std::error_code ec;
 	std::filesystem::rename(m_path / stripSlash(src), m_path / stripSlash(dest), ec);
 	if (ec.value()) {
-		return ox::Error(1);
+		return OxError(1);
 	}
-	return {};
+	return OxError(0);
 }
 
 Result<Vector<String>> PassThroughFS::ls(StringViewCR dir) const noexcept {
 	Vector<String> out;
 	std::error_code ec;
 	const auto di = std::filesystem::directory_iterator(m_path / stripSlash(dir), ec);
-	OX_RETURN_ERROR(ox::Error(static_cast<ox::ErrorCode>(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()));
@@ -75,14 +75,22 @@ Result<Vector<String>> PassThroughFS::ls(StringViewCR dir) const noexcept {
 	return out;
 }
 
+Error PassThroughFS::remove(StringViewCR path, bool recursive) noexcept {
+	if (recursive) {
+		return OxError(std::filesystem::remove_all(m_path / stripSlash(path)) != 0);
+	} else {
+		return OxError(std::filesystem::remove(m_path / stripSlash(path)) != 0);
+	}
+}
+
 Error PassThroughFS::resize(uint64_t, void*) noexcept {
 	// unsupported
-	return ox::Error(1, "resize is not supported by PassThroughFS");
+	return OxError(1, "resize is not supported by PassThroughFS");
 }
 
 Result<FileStat> PassThroughFS::statInode(uint64_t) const noexcept {
 	// unsupported
-	return ox::Error(1, "statInode(uint64_t) is not supported by PassThroughFS");
+	return OxError(1, "statInode(uint64_t) is not supported by PassThroughFS");
 }
 
 Result<FileStat> PassThroughFS::statPath(StringViewCR path) const noexcept {
@@ -93,9 +101,7 @@ Result<FileStat> PassThroughFS::statPath(StringViewCR path) const noexcept {
 	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.statInode.size", "{} {}", path, size);
-	if (auto err = ec.value()) {
-		return ox::Error{static_cast<ox::ErrorCode>(err), "PassThroughFS: stat failed"};
-	}
+	oxReturnError(OxError(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: stat failed"));
 	return FileStat{0, 0, size, type};
 }
 
@@ -106,14 +112,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);
-	OX_RETURN_ERROR(ox::Error(static_cast<ox::ErrorCode>(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);
-	OX_RETURN_ERROR(ox::Error(static_cast<ox::ErrorCode>(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;
 }
 
@@ -122,7 +128,7 @@ char *PassThroughFS::buff() noexcept {
 }
 
 Error PassThroughFS::walk(Error(*)(uint8_t, uint64_t, uint64_t)) noexcept {
-	return ox::Error(1, "walk(Error(*)(uint8_t, uint64_t, uint64_t)) is not supported by PassThroughFS");
+	return OxError(1, "walk(Error(*)(uint8_t, uint64_t, uint64_t)) is not supported by PassThroughFS");
 }
 
 bool PassThroughFS::valid() const noexcept {
@@ -141,51 +147,24 @@ Error PassThroughFS::readFilePath(StringViewCR path, void *buffer, std::size_t b
 		file.seekg(0, std::ios::beg);
 		if (size > buffSize) {
 			oxTracef("ox.fs.PassThroughFS.read.error", "Read failed: Buffer too small: {}", path);
-			return ox::Error(1);
+			return OxError(1);
 		}
 		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 ox::Error(2);
+		return OxError(2);
 	}
-	return {};
+	return OxError(0);
 }
 
 Error PassThroughFS::readFileInode(uint64_t, void*, std::size_t) noexcept {
 	// unsupported
-	return ox::Error(1, "readFileInode(uint64_t, void*, std::size_t) is not supported by PassThroughFS");
-}
-
-Error PassThroughFS::readFilePathRange(
-	StringViewCR path, size_t const readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept {
-	try {
-		std::ifstream file(m_path / stripSlash(path), std::ios::binary | std::ios::ate);
-		auto const size = static_cast<size_t>(file.tellg());
-		readSize = ox::min(readSize, size);
-		file.seekg(static_cast<off_t>(readStart), std::ios::beg);
-		if (readSize > *buffSize) {
-			oxTracef("ox.fs.PassThroughFS.read.error", "Read failed: Buffer too small: {}", path);
-			return ox::Error{1};
-		}
-		file.read(static_cast<char*>(buffer), static_cast<std::streamsize>(readSize));
-		return {};
-	} catch (std::fstream::failure const &f) {
-		oxTracef("ox.fs.PassThroughFS.read.error", "Read of {} failed: {}", path, f.what());
-		return ox::Error{2};
-	}
+	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 ox::Error(1, "read(uint64_t, std::size_t, std::size_t, void*, std::size_t*) is not supported by PassThroughFS");
-}
-
-Error PassThroughFS::removePath(StringViewCR path, bool const recursive) noexcept {
-	if (recursive) {
-		return ox::Error{std::filesystem::remove_all(m_path / stripSlash(path)) == 0};
-	} else {
-		return ox::Error{!std::filesystem::remove(m_path / stripSlash(path))};
-	}
+	return OxError(1, "read(uint64_t, std::size_t, std::size_t, void*, std::size_t*) is not supported by PassThroughFS");
 }
 
 Error PassThroughFS::writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType) noexcept {
@@ -195,18 +174,19 @@ Error PassThroughFS::writeFilePath(StringViewCR path, const void *buffer, uint64
 		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 ox::Error(1);
+		return OxError(1);
 	}
-	return {};
+	return OxError(0);
 }
 
 Error PassThroughFS::writeFileInode(uint64_t, const void*, uint64_t, FileType) noexcept {
 	// unsupported
-	return ox::Error(1, "writeFileInode(uint64_t, void*, uint64_t, uint8_t) is not supported by PassThroughFS");
+	return OxError(1, "writeFileInode(uint64_t, void*, uint64_t, uint8_t) is not supported by PassThroughFS");
 }
 
 std::string_view PassThroughFS::stripSlash(StringView path) noexcept {
-	for (auto i = 0u; i < path.size() && path[0] == '/'; i++) {
+	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,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -45,6 +45,8 @@ class PassThroughFS: public FileSystem {
 		template<typename F>
 		Error ls(StringViewCR dir, F cb) const noexcept;
 
+		Error remove(StringViewCR path, bool recursive) noexcept override;
+
 		Error resize(uint64_t size, void *buffer) noexcept override;
 
 		Result<FileStat> statInode(uint64_t inode) const noexcept override;
@@ -71,13 +73,8 @@ class PassThroughFS: public FileSystem {
 
 		Error readFileInode(uint64_t inode, void *buffer, std::size_t size) noexcept override;
 
-		Error readFilePathRange(
-			StringViewCR path, size_t readStart, size_t readSize, void *buffer, size_t *buffSize) noexcept override;
-
 		Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
 
-		Error removePath(StringViewCR path, bool recursive) noexcept override;
-
 		Error writeFilePath(StringViewCR 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;
@@ -95,11 +92,11 @@ template<typename F>
 Error PassThroughFS::ls(StringViewCR dir, F cb) const noexcept {
 	std::error_code ec;
 	const auto di = std::filesystem::directory_iterator(m_path / stripSlash(dir), ec);
-	OX_RETURN_ERROR(ox::Error(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: ls failed"));
+	oxReturnError(OxError(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: ls failed"));
 	for (auto &p : di) {
-		OX_RETURN_ERROR(cb(p.path().filename().c_str(), 0));
+		oxReturnError(cb(p.path().filename().c_str(), 0));
 	}
-	return {};
+	return OxError(0);
 }
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -36,9 +36,9 @@ Error PathIterator::dirPath(char *out, std::size_t outSize) {
 	if (idx >= 0 && size < outSize) {
 		ox::memcpy(out, m_path, size);
 		out[size] = 0;
-		return {};
+		return OxError(0);
 	} else {
-		return ox::Error(1);
+		return OxError(1);
 	}
 }
 
@@ -47,11 +47,11 @@ Error PathIterator::get(StringView &fileName) {
 	std::size_t size = 0;
 	if (m_iterator >= m_maxSize) {
 		oxTracef("ox.fs.PathIterator.get", "m_iterator ({}) >= m_maxSize ({})", m_iterator, m_maxSize);
-		return ox::Error(1);
+		return OxError(1);
 	}
 	if (!ox::strlen(&m_path[m_iterator])) {
 		oxTrace("ox.fs.PathIterator.get", "!ox::strlen(&m_path[m_iterator])");
-		return ox::Error(1);
+		return OxError(1);
 	}
 	auto start = m_iterator;
 	if (m_path[start] == '/') {
@@ -67,14 +67,14 @@ Error PathIterator::get(StringView &fileName) {
 	size = end - start;
 	// cannot fit the output in the output parameter
 	if (size >= MaxFileNameLength || size == 0) {
-		return ox::Error(1);
+		return OxError(1);
 	}
 	fileName = ox::substr(m_path, start, start + size);
 	// truncate trailing /
 	if (size && fileName[size - 1] == '/') {
 		fileName = ox::substr(m_path, start, start + size - 1);
 	}
-	oxAssert(fileName[fileName.size()-1] != '/', "name ends in /");
+	oxAssert(fileName[fileName.len()-1] != '/', "name ends in /");
 	return {};
 }
 
@@ -83,9 +83,9 @@ Error PathIterator::get(StringView &fileName) {
  */
 Error PathIterator::next(StringView &fileName) {
 	std::size_t size = 0;
-	auto retval = ox::Error(1);
+	auto retval = OxError(1);
 	if (m_iterator < m_maxSize && ox::strlen(&m_path[m_iterator])) {
-		retval = {};
+		retval = OxError(0);
 		if (m_path[m_iterator] == '/') {
 			m_iterator++;
 		}
@@ -100,25 +100,25 @@ Error PathIterator::next(StringView &fileName) {
 		size = end - start;
 		// cannot fit the output in the output parameter
 		if (size >= MaxFileNameLength) {
-			return ox::Error(1);
+			return OxError(1);
 		}
 		fileName = ox::substr(m_path, start, start + size);
 		// truncate trailing /
-		while (fileName.size() && fileName[fileName.size() - 1] == '/') {
+		while (fileName.len() && fileName[fileName.len() - 1] == '/') {
 			fileName = ox::substr(m_path, start, start + size);
 		}
 		m_iterator += size;
-		oxAssert(fileName.size() == 0 || fileName[fileName.size()-1] != '/', "name ends in /");
+		oxAssert(fileName.len() == 0 || fileName[fileName.len()-1] != '/', "name ends in /");
 	}
 	return retval;
 }
 
 Result<std::size_t> PathIterator::nextSize() const {
 	std::size_t size = 0;
-	auto retval = ox::Error(1);
+	auto retval = OxError(1);
 	auto it = m_iterator;
 	if (it < m_maxSize && ox::strlen(&m_path[it])) {
-		retval = {};
+		retval = OxError(0);
 		if (m_path[it] == '/') {
 			it++;
 		}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/fs/filesystem/types.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/fs/fs.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/fs/ptrarith/nodebuffer.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -284,14 +284,14 @@ Result<typename NodeBuffer<size_t, Item>::ItemPtr> NodeBuffer<size_t, Item>::mal
 				addr = m_header.firstItem;
 			} else {
 				oxTrace("ox.ptrarith.NodeBuffer.malloc.fail", "NodeBuffer is in invalid state.");
-				return ox::Error(1, "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);
 		auto out = ItemPtr(this, m_header.size, addr, fullSize);
 		if (!out.valid()) {
 			oxTrace("ox.ptrarith.NodeBuffer.malloc.fail", "Unknown");
-			return ox::Error(1, "NodeBuffer::malloc: unknown failure");
+			return OxError(1, "NodeBuffer::malloc: unknown failure");
 		}
 		ox::memset(out, 0, fullSize);
 		new (out) Item;
@@ -304,7 +304,7 @@ Result<typename NodeBuffer<size_t, Item>::ItemPtr> NodeBuffer<size_t, Item>::mal
 			first->prev = out.offset();
 		} else {
 			oxTrace("ox.ptrarith.NodeBuffer.malloc.fail", "NodeBuffer malloc failed due to invalid first element pointer.");
-			return ox::Error(1, "NodeBuffer malloc failed due to invalid first element pointer.");
+			return OxError(1, "NodeBuffer malloc failed due to invalid first element pointer.");
 		}
 
 		if (oldLast.valid()) {
@@ -314,7 +314,7 @@ Result<typename NodeBuffer<size_t, Item>::ItemPtr> NodeBuffer<size_t, Item>::mal
 			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.");
-				return ox::Error(1, "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();
 		}
@@ -323,7 +323,7 @@ Result<typename NodeBuffer<size_t, Item>::ItemPtr> NodeBuffer<size_t, Item>::mal
 		return out;
 	}
 	oxTracef("ox.ptrarith.NodeBuffer.malloc.fail", "Insufficient space: {} needed, {} available", fullSize, available());
-	return ox::Error(1);
+	return OxError(1);
 }
 
 template<typename size_t, typename Item>
@@ -346,15 +346,15 @@ Error NodeBuffer<size_t, Item>::free(ItemPtr item) noexcept {
 	} else {
 		if (!prev.valid()) {
 			oxTracef("ox.ptrarith.NodeBuffer.free.fail", "NodeBuffer free failed due to invalid prev element pointer: {}", prev.offset());
-			return ox::Error(1);
+			return OxError(1);
 		}
 		if (!next.valid()) {
 			oxTracef("ox.ptrarith.NodeBuffer.free.fail", "NodeBuffer free failed due to invalid next element pointer: {}", next.offset());
-			return ox::Error(1);
+			return OxError(1);
 		}
 	}
 	m_header.bytesUsed -= item.size();
-	return {};
+	return OxError(0);
 }
 
 template<typename size_t, typename Item>
@@ -365,12 +365,12 @@ Error NodeBuffer<size_t, Item>::setSize(std::size_t size) noexcept {
 	oxTracef("ox.ptrarith.NodeBuffer.setSize", "end: {}", end);
 	if (end > size) {
 		// resizing to less than buffer size
-		return ox::Error(1);
+		return OxError(1);
 	} else {
 		m_header.size = static_cast<size_t>(size);
 		auto data = reinterpret_cast<uint8_t*>(this) + end;
 		ox::memset(data, 0, size - end);
-		return {};
+		return OxError(0);
 	}
 }
 
@@ -401,14 +401,14 @@ Error NodeBuffer<size_t, Item>::compact(F cb) noexcept {
 	auto dest = ptr(sizeof(*this));
 	while (dest.offset() <= src.offset()) {
 		if (!src.valid()) {
-			return ox::Error(1);
+			return OxError(1);
 		}
 		if (!dest.valid()) {
-			return ox::Error(2);
+			return OxError(2);
 		}
 		// move node
 		ox::memcpy(dest, src, src->fullSize());
-		OX_RETURN_ERROR(cb(src, dest));
+		oxReturnError(cb(src, dest));
 		// update surrounding nodes
 		auto prev = ptr(dest->prev);
 		if (prev.valid()) {
@@ -422,7 +422,7 @@ Error NodeBuffer<size_t, Item>::compact(F cb) noexcept {
 		src = ptr(dest->next);
 		dest = uninitializedPtr(dest.offset() + dest->fullSize());
 	}
-	return {};
+	return OxError(0);
 }
 
 template<typename size_t, typename Item>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -254,7 +254,7 @@ constexpr Result<Ptr<T, size_t, minOffset>> Ptr<T, size_t, minOffset>::validate(
 	 if (valid()) {
 	 	return *this;
 	 }
-	 return ox::Error(1);
+	 return OxError(1);
 }
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -52,19 +52,19 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				oxAssert(buffer->free(a1), "Free failed.");
 				oxAssert(buffer->free(a2), "Free failed.");
 				oxAssert(buffer->setSize(buffer->size() - buffer->available()), "Resize failed.");
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 		{
 			"PathIterator::next1",
 			[](ox::StringView) {
 				auto constexpr path = ox::StringLiteral("/usr/share/charset.gbag");
-				ox::PathIterator it(path.c_str(), path.size());
+				ox::PathIterator it(path.c_str(), path.len());
 				ox::StringView buff;
 				oxAssert(it.next(buff) == 0 && buff == "usr", "PathIterator shows wrong next");
 				oxAssert(it.next(buff) == 0 && buff == "share", "PathIterator shows wrong next");
 				oxAssert(it.next(buff) == 0 && buff == "charset.gbag", "PathIterator shows wrong next");
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 		{
@@ -74,20 +74,20 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				ox::PathIterator it(path);
 				ox::StringView buff;
 				oxAssert(it.next(buff), "PathIterator::next returned error");
-				ox::expect(buff, "usr");
+				oxExpect(buff, "usr");
 				oxAssert(it.next(buff), "PathIterator::next returned error");
-				ox::expect(buff, "share");
-				return ox::Error(0);
+				oxExpect(buff, "share");
+				return OxError(0);
 			}
 		},
 		{
 			"PathIterator::next3",
 			[](ox::StringView) {
 				auto const path = ox::String("/");
-				ox::PathIterator it(path.c_str(), path.size());
+				ox::PathIterator it(path.c_str(), path.len());
 				ox::StringView buff;
 				oxAssert(it.next(buff) == 0 && buff == "\0", "PathIterator shows wrong next");
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 		{
@@ -99,42 +99,38 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				oxAssert(it.next(buff) == 0 && buff == "usr", "PathIterator shows wrong next");
 				oxAssert(it.next(buff) == 0 && buff == "share", "PathIterator shows wrong next");
 				oxAssert(it.next(buff) == 0 && buff == "charset.gbag", "PathIterator shows wrong next");
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 		{
 			"PathIterator::next5",
 			[](ox::StringView) {
 				auto const path = ox::String("usr/share/");
-				ox::PathIterator it(path.c_str(), path.size());
+				ox::PathIterator it(path.c_str(), path.len());
 				ox::StringView buff;
 				oxAssert(it.next(buff) == 0 && buff == "usr", "PathIterator shows wrong next");
 				oxAssert(it.next(buff) == 0 && buff == "share", "PathIterator shows wrong next");
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 		{
 			"PathIterator::dirPath",
 			[] (ox::StringView) {
 				auto constexpr path = ox::StringLiteral("/usr/share/charset.gbag");
-				ox::PathIterator it(path.c_str(), path.size());
-				auto buff = static_cast<char*>(ox_alloca(path.size() + 1));
-				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-				oxAssert(it.dirPath(buff, path.size()) == 0 && ox::strcmp(buff, "/usr/share/") == 0, "PathIterator shows incorrect dir path");
-				OX_ALLOW_UNSAFE_BUFFERS_END
-				return ox::Error(0);
+				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");
+				return OxError(0);
 			}
 		},
 		{
 			"PathIterator::hasNext",
 			[](ox::StringView) {
 				const auto path = "/file1";
-				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				ox::PathIterator it(path, ox::strlen(path));
-				OX_ALLOW_UNSAFE_BUFFERS_END
 				oxAssert(it.hasNext(), "PathIterator shows incorrect hasNext");
 				oxAssert(!it.next().hasNext(), "PathIterator shows incorrect hasNext");
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 		{
@@ -146,7 +142,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 
 				auto subPtr = p.subPtr<uint64_t>(50);
 				oxAssert(subPtr.valid(), "Ptr::subPtr: Ptr subPtr is invalid.");
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 		{
@@ -159,7 +155,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				auto first = list->firstItem();
 				oxAssert(first.valid(), "NodeBuffer::insert: Could not access first item");
 				oxAssert(first->size() == 50, "NodeBuffer::insert: First item size invalid");
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 		{
@@ -167,22 +163,20 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			[](ox::StringView) {
 				constexpr auto buffLen = 5000;
 				constexpr auto str1 = "Hello, World!";
-				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				constexpr auto str1Len = ox::strlen(str1) + 1;
 				constexpr auto str2 = "Hello, Moon!";
 				constexpr auto str2Len = ox::strlen(str2) + 1;
-				OX_ALLOW_UNSAFE_BUFFERS_END
 				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);
-				oxAssert(fileStore.write(4, str1, str1Len, 1), "FileStore::write 1 failed.");
-				oxAssert(fileStore.write(5, str2, str2Len, 1), "FileStore::write 2 failed.");
+				oxAssert(fileStore.write(4, const_cast<char*>(str1), str1Len, 1), "FileStore::write 1 failed.");
+				oxAssert(fileStore.write(5, const_cast<char*>(str2), str2Len, 1), "FileStore::write 2 failed.");
 
 				char str1Read[str1Len];
 				size_t str1ReadSize = 0;
 				oxAssert(fileStore.read(4, reinterpret_cast<void*>(str1Read), str1Len, &str1ReadSize), "FileStore::read 1 failed.");
 
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 		{
@@ -209,7 +203,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				oxTrace("ox.fs.test.Directory") << "write 3";
 				oxAssert(dir.write("/file2", 2), "Directory write of file2 failed");
 
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 		{
@@ -226,7 +220,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				oxAssert(fs.stat("/l1d1/l2d1/l3d1").error, "mkdir failed");
 				oxAssert(fs.mkdir("/l1d1/l2d2", true), "mkdir failed");
 				oxAssert(fs.stat("/l1d1/l2d2").error, "mkdir failed");
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 	},

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -20,7 +20,7 @@ static ox::Result<Buff> loadFsBuff(const char *path) noexcept {
 	std::ifstream file(path, std::ios::binary | std::ios::ate);
 	if (!file.good()) {
 		oxErrorf("Could not find OxFS file: {}", path);
-		return ox::Error(1, "Could not find OxFS file");
+		return OxError(1, "Could not find OxFS file");
 	}
 	try {
 		const auto size = static_cast<std::size_t>(file.tellg());
@@ -30,54 +30,52 @@ static ox::Result<Buff> loadFsBuff(const char *path) noexcept {
 		return Buff{buff, size};
 	} catch (const std::ios_base::failure &e) {
 		oxErrorf("Could not read OxFS file: {}", e.what());
-		return ox::Error(2, "Could not read OxFS file");
+		return OxError(2, "Could not read OxFS file");
 	}
 }
 
-static ox::Result<ox::UPtr<ox::FileSystem>> loadFs(const char *path) noexcept {
-	OX_REQUIRE(buff, loadFsBuff(path));
+static ox::Result<ox::UniquePtr<ox::FileSystem>> loadFs(const char *path) noexcept {
+	oxRequire(buff, loadFsBuff(path));
 	return {ox::make_unique<ox::FileSystem32>(buff.data, buff.size)};
 }
 
 static ox::Error runLs(ox::FileSystem *fs, ox::Span<const char*> args) noexcept {
 	if (args.size() < 2) {
 		oxErr("Must provide a directory to ls\n");
-		return ox::Error(1);
+		return OxError(1);
 	}
-	OX_REQUIRE(files, fs->ls(args[1]));
+	oxRequire(files, fs->ls(args[1]));
 	for (const auto &file : files) {
 		oxOutf("{}\n", file);
 	}
-	return {};
+	return OxError(0);
 }
 
 static ox::Error runRead(ox::FileSystem *fs, ox::Span<const char*> args) noexcept {
 	if (args.size() < 2) {
 		oxErr("Must provide a path to a file to read\n");
-		return ox::Error(1);
+		return OxError(1);
 	}
-	OX_REQUIRE(buff, fs->read(ox::StringView(args[1])));
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+	oxRequire(buff, fs->read(ox::StringView(args[1])));
 	std::ignore = fwrite(buff.data(), sizeof(decltype(buff)::value_type), buff.size(), stdout);
-	OX_ALLOW_UNSAFE_BUFFERS_END
-	return {};
+	return OxError(0);
 }
 
 static ox::Error run(int argc, const char **argv) noexcept {
 	if (argc < 3) {
 		oxErr("OxFS file and subcommand arguments are required\n");
-		return ox::Error(1);
+		return OxError(1);
 	}
 	auto const args = ox::Span{argv, static_cast<size_t>(argc)};
 	auto const fsPath = args[1];
 	ox::String subCmd(args[2]);
-	OX_REQUIRE(fs, loadFs(fsPath));
+	oxRequire(fs, loadFs(fsPath));
 	if (subCmd == "ls") {
 		return runLs(fs.get(), args + 2);
 	} else if (subCmd == "read") {
 		return runRead(fs.get(), args + 2);
 	}
-	return ox::Error(1);
+	return OxError(1);
 }
 
 int main(int argc, const char **argv) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -34,7 +34,7 @@ class CirculerBuffer {
 		constexpr ox::Error put(char v) noexcept {
 			return write(&v, 1);
 			if (1 > avail()) {
-				return ox::Error(1, "Insufficient space in buffer");
+				return OxError(1, "Insufficient space in buffer");
 			}
 			m_buff[m_writePt] = v;
 			++m_writePt;
@@ -43,7 +43,7 @@ class CirculerBuffer {
 
 		constexpr ox::Error write(const char *buff, std::size_t sz) noexcept {
 			if (sz > avail()) {
-				return ox::Error(1, "Insufficient space in buffer");
+				return OxError(1, "Insufficient space in buffer");
 			}
 OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			// write seg 1
@@ -63,7 +63,7 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 
 		constexpr ox::Error seekp(std::size_t bytesFwd) noexcept {
 			if (bytesFwd > avail()) {
-				return ox::Error(1, "Insufficient space in buffer to seek that far ahead");
+				return OxError(1, "Insufficient space in buffer to seek that far ahead");
 			}
 			m_writePt += bytesFwd;
 			if (m_writePt > m_buff.size()) {
@@ -73,7 +73,7 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 		}
 
 		constexpr ox::Error seekp(int, ios_base::seekdir) noexcept {
-			return ox::Error(1, "Unimplemented");
+			return OxError(1, "Unimplemented");
 		}
 
 		[[nodiscard]]

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -14,7 +14,7 @@
     { \
 		const auto loggerErr = (loggerName).initConn(appName); \
 		if (loggerErr) { \
-			oxErrf("Could not connect to logger: {} ({}:{})\n", toStr(loggerErr), loggerErr.src.file_name(), loggerErr.src.line()); \
+			oxErrf("Could not connect to logger: {} ({}:{})\n", toStr(loggerErr), loggerErr.file, loggerErr.line); \
 		} else { \
 			ox::trace::setLogger(&(loggerName)); \
 		} \

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -64,7 +64,7 @@ ox::Error LoggerConn::initConn(ox::StringViewCR appName) noexcept {
 	addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
 	addr.sin_port = htons(5590);
 	m_socket = static_cast<int>(socket(AF_INET, SOCK_STREAM, IPPROTO_TCP));
-	OX_RETURN_ERROR(ox::Error(static_cast<ox::ErrorCode>(connect(static_cast<Socket>(m_socket), reinterpret_cast<sockaddr*>(&addr), sizeof(addr)))));
+	oxReturnError(OxError(static_cast<ox::ErrorCode>(connect(static_cast<Socket>(m_socket), reinterpret_cast<sockaddr*>(&addr), sizeof(addr)))));
 	return sendInit({.appName = ox::BasicString<128>(appName)});
 }
 
@@ -75,7 +75,7 @@ ox::Error LoggerConn::send(const char *buff, std::size_t len) const noexcept {
 		const auto sent = ::send(static_cast<Socket>(m_socket), buff, static_cast<LenType>(len), 0);
 		if (sent < 0) {
 			std::ignore = std::fprintf(stderr, "Could not send msg\n");
-			return ox::Error(1, "Could not send msg");
+			return OxError(1, "Could not send msg");
 		}
 		totalSent += static_cast<std::size_t>(sent);
 	}
@@ -91,28 +91,23 @@ ox::Error LoggerConn::sendInit(const InitTraceMsg &msg) noexcept {
 }
 
 void LoggerConn::msgSend() noexcept {
-	try {
+	while (true) {
+		std::unique_lock lk(m_waitMut);
+		m_waitCond.wait(lk);
+		if (!m_running) {
+			break;
+		}
+		std::lock_guard const buffLk(m_buffMut);
 		while (true) {
-			std::unique_lock lk(m_waitMut);
-			m_waitCond.wait(lk);
-			if (!m_running) {
+			Array<char, units::KB> tmp;
+			const auto read = m_buff.read(tmp.data(), tmp.size());
+			if (!read) {
 				break;
 			}
-			std::lock_guard const buffLk(m_buffMut);
-			while (true) {
-				Array<char, units::KB> tmp;
-				const auto read = m_buff.read(tmp.data(), tmp.size());
-				if (!read) {
-					break;
-				}
-				oxAssert(read <= tmp.size(), "logger trying to read too much data");
-				//std::printf("LoggerConn: sending %lu bytes\n", read);
-				std::ignore = send(tmp.data(), read);
-			}
+			oxAssert(read <= tmp.size(), "logger trying to read too much data");
+			//std::printf("LoggerConn: sending %lu bytes\n", read);
+			std::ignore = send(tmp.data(), read);
 		}
-	} catch (std::exception const &e) {
-		oxErrf("Exception in logger thread: {}\n", e.what());
-		oxAssert(false, "logger thread exception");
 	}
 }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -45,13 +45,13 @@ class LoggerConn: public trace::Logger {
 		ox::Error send(trace::MsgId msgId, const auto &msg) noexcept {
 			ox::Array<char, 10 * ox::units::KB> buff;
 			std::size_t sz = 0;
-			OX_RETURN_ERROR(ox::writeMC(&buff[0], buff.size(), msg, &sz));
+			oxReturnError(ox::writeMC(&buff[0], buff.size(), msg, &sz));
 			//std::printf("sz: %lu\n", sz);
-			OX_REQUIRE(szBuff, serialize(static_cast<uint32_t>(sz)));
+			oxRequire(szBuff, serialize(static_cast<uint32_t>(sz)));
 			std::unique_lock buffLk(m_buffMut);
-			OX_RETURN_ERROR(m_buff.put(static_cast<char>(msgId)));
-			OX_RETURN_ERROR(m_buff.write(szBuff.data(), szBuff.size()));
-			OX_RETURN_ERROR(m_buff.write(buff.data(), sz));
+			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 {};

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

@@ -1,5 +1,6 @@
 add_library(
 	OxMetalClaw
+		presenceindicator.cpp
 		read.cpp
 		write.cpp
 )

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/mc/intops.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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,25 +18,25 @@
 
 namespace ox::mc {
 
-template<Integer_c T>
+template<typename T>
 static constexpr auto Bits = sizeof(T) << 3;
 
 /**
  * Returns highest bit other than possible signed bit.
  * Bit numbering starts at 0.
  */
-template<Integer_c I>
+template<typename I>
 [[nodiscard]]
-constexpr size_t highestBit(I const val) noexcept {
+constexpr std::size_t highestBit(I val) noexcept {
 	unsigned shiftStart = sizeof(I) * 8 - 1;
-	// find the most significant non-sign indicator bit
-	size_t highestBit = 0;
+	// find most significant non-sign indicator bit
+	std::size_t highestBit = 0;
 	// start at one bit lower if signed
 	if constexpr(is_signed_v<I>) {
 		--shiftStart;
 	}
 	for (auto i = shiftStart; i > 0; --i) {
-		auto const bitValue = (val >> i) & 1;
+		const auto bitValue = (val >> i) & 1;
 		if (bitValue) {
 			highestBit = i;
 			break;
@@ -45,7 +45,7 @@ constexpr size_t highestBit(I const val) noexcept {
 	return highestBit;
 }
 
-static_assert(highestBit(static_cast<int8_t>(0b10000000)) == 0);
+static_assert(highestBit(int8_t(0b10000000)) == 0);
 static_assert(highestBit(~static_cast<int8_t>(-1)) == 0);
 static_assert(highestBit(~static_cast<int8_t>(-2)) == 0);
 static_assert(highestBit(~static_cast<int8_t>(-3)) == 1);
@@ -53,39 +53,40 @@ static_assert(highestBit(1) == 0);
 static_assert(highestBit(2) == 1);
 static_assert(highestBit(4) == 2);
 static_assert(highestBit(8) == 3);
-static_assert(highestBit(static_cast<uint64_t>(1) << 31) == 31);
-static_assert(highestBit(static_cast<uint64_t>(1) << 63) == 63);
+static_assert(highestBit(uint64_t(1) << 31) == 31);
+static_assert(highestBit(uint64_t(1) << 63) == 63);
 
 struct McInt {
-	Array<uint8_t, 9> data{};
+	ox::Array<uint8_t, 9> data{};
 	// length of integer in bytes
-	size_t length = 0;
+	std::size_t length = 0;
 };
 
-template<Integer_c I>
+template<typename I>
 [[nodiscard]]
-constexpr McInt encodeInteger(I const pInput) noexcept {
-	auto const input = ResizedInt_t<I, 64>{pInput};
+constexpr McInt encodeInteger(I pInput) noexcept {
+	auto const input = ox::ResizedInt_t<I, 64>{pInput};
 	McInt out;
-	auto const inputNegative = is_signed_v<I> && input < 0;
-	// move input to uint64_t to allow consistent bit manipulation and to avoid
+	const auto inputNegative = is_signed_v<I> && input < 0;
+	// move input to uint64_t to allow consistent bit manipulation, and to avoid
 	// overflow concerns
-	auto const val = std::bit_cast<uint64_t>(input);
+	uint64_t val = 0;
+	ox::memcpy(&val, &input, sizeof(input));
 	if (val) {
 		// bits needed to represent number factoring in space possibly
 		// needed for signed bit
-		auto const highBit = inputNegative ? highestBit(~val) : highestBit(val);
-		auto const bits = highBit + 1 + (is_signed_v<I> ? 1 : 0);
+		const auto highBit = inputNegative ? highestBit(~val) : highestBit(val);
+		const auto bits = highBit + 1 + (is_signed_v<I> ? 1 : 0);
 		// bytes needed to store value
-		size_t bytes = bits / 8 + (bits % 8 != 0);
-		auto const bitsAvailable = bytes * 8; // bits available to integer value
-		auto const bitsNeeded = bits + bytes;
+		std::size_t bytes = bits / 8 + (bits % 8 != 0);
+		const auto bitsAvailable = bytes * 8; // bits available to integer value
+		const auto bitsNeeded = bits + bytes;
 		// factor in bits needed for bytesIndicator (does not affect bytesIndicator)
 		// bits for integer + bits needed to represent bytes > bits available
 		if (bitsNeeded > bitsAvailable && bytes != 9) {
 			++bytes;
 		}
-		auto const bytesIndicator = onMask<uint8_t>(bytes - 1);
+		const auto bytesIndicator = onMask<uint8_t>(bytes - 1);
 		// ensure we are copying from little endian representation
 		LittleEndian<uint64_t> leVal = val;
 		if (inputNegative) {
@@ -93,21 +94,17 @@ constexpr McInt encodeInteger(I const pInput) noexcept {
 		}
 		if (bytes == 9) {
 			out.data[0] = bytesIndicator;
-			OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			ox::memcpy(&out.data[1], &leVal, 8);
-			OX_ALLOW_UNSAFE_BUFFERS_END
 			if (inputNegative) {
 				out.data[1] |= 0b1000'0000;
 			}
 		} else {
-			auto const valBits = bytes * 8;
-			uint64_t const negBit = inputNegative ? 1 : 0;
-			auto const intermediate =
+			const auto valBits = bytes * 8;
+			uint64_t negBit = inputNegative ? 1 : 0;
+			auto intermediate =
 				static_cast<uint64_t>(leVal.raw() | (negBit << (valBits - 1))) << bytes |
 				static_cast<uint64_t>(bytesIndicator);
-			OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			ox::memcpy(&out.data[0], &intermediate, sizeof(intermediate));
-			OX_ALLOW_UNSAFE_BUFFERS_END
 		}
 		out.length = bytes;
 	}
@@ -119,8 +116,8 @@ constexpr McInt encodeInteger(I const pInput) noexcept {
  * length integer.
  */
 [[nodiscard]]
-constexpr size_t countBytes(unsigned const b) noexcept {
-	size_t i = 0;
+constexpr std::size_t countBytes(unsigned b) noexcept {
+	std::size_t i = 0;
 	while ((b >> i) & 1) ++i;
 	return i + 1;
 }
@@ -135,65 +132,61 @@ static_assert(countBytes(0b0011'1111) == 7);
 static_assert(countBytes(0b0111'1111) == 8);
 static_assert(countBytes(0b1111'1111) == 9);
 
-template<Integer_c I>
-constexpr Result<I> decodeInteger(Reader_c auto &rdr, size_t &bytesRead) noexcept {
+template<typename I>
+constexpr Result<I> decodeInteger(Reader_c auto&rdr, std::size_t *bytesRead) noexcept {
 	uint8_t firstByte = 0;
-	OX_RETURN_ERROR(rdr.read(&firstByte, 1));
-	OX_RETURN_ERROR(rdr.seekg(-1, ox::ios_base::cur));
-	auto const bytes = countBytes(firstByte);
+	oxReturnError(rdr.read(&firstByte, 1));
+	oxReturnError(rdr.seekg(-1, ox::ios_base::cur));
+	const auto bytes = countBytes(firstByte);
 	if (bytes == 9) {
-		bytesRead = bytes;
+		*bytesRead = bytes;
 		I out = 0;
-		OX_RETURN_ERROR(rdr.seekg(1, ox::ios_base::cur));
-		OX_RETURN_ERROR(rdr.read(&out, sizeof(I)));
+		oxReturnError(rdr.seekg(1, ox::ios_base::cur));
+		oxReturnError(rdr.read(&out, sizeof(I)));
 		return fromLittleEndian<I>(out);
 	}
-	bytesRead = bytes;
+	*bytesRead = bytes;
 	uint64_t decoded = 0;
-	OX_RETURN_ERROR(rdr.read(&decoded, bytes));
+	oxReturnError(rdr.read(&decoded, bytes));
 	decoded >>= bytes;
 	// move sign bit
 	if constexpr(is_signed_v<I>) {
-		auto const negBit = bytes * 8 - bytes - 1;
-		// move sign
-		auto const negative = (decoded >> negBit) == 1;
-		if (negative) {
-			// 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
-			Array<uint32_t, 2> d = {};
-			//d[0] = decoded & 0xffff'ffff;
-			//d[1] = decoded >> 32;
-		 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-			ox::memcpy(&d[0], &decoded, sizeof(decoded));
-		 	OX_ALLOW_UNSAFE_BUFFERS_END
-			auto bit = negBit;
-			for (; bit < ox::min<size_t>(Bits<I>, 32); ++bit) {
-				d[0] |= 1 << bit;
-			}
-			bit -= 32;
-			for (; bit < Bits<I>; ++bit) {
-				d[1] |= 1 << bit;
-			}
-			I out = 0;
-			if constexpr(ox::defines::BigEndian) {
-				auto const d0Tmp = d[0];
-				d[0] = d[1];
-				d[1] = d0Tmp;
-			}
-		 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-			ox::memcpy(&out, &d[0], sizeof(out));
-			OX_ALLOW_UNSAFE_BUFFERS_END
-			return out;
-		}
+		 const auto negBit = bytes * 8 - bytes - 1;
+		 // move sign
+		 const auto negative = (decoded >> negBit) == 1;
+		 if (negative) {
+			 // 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 = {};
+			 //d[0] = decoded & 0xffff'ffff;
+			 //d[1] = decoded >> 32;
+			 ox::memcpy(&d[0], &decoded, sizeof(decoded));
+			 auto bit = negBit;
+			 for (; bit < ox::min<std::size_t>(Bits<I>, 32); ++bit) {
+				 d[0] |= 1 << bit;
+			 }
+			 bit -= 32;
+			 for (; bit < Bits<I>; ++bit) {
+				 d[1] |= 1 << bit;
+			 }
+			 I out = 0;
+			 if constexpr(ox::defines::BigEndian) {
+				 const auto d0Tmp = d[0];
+				 d[0] = d[1];
+				 d[1] = d0Tmp;
+			 }
+			 ox::memcpy(&out, &d[0], sizeof(out));
+			 return out;
+		 }
 	}
 	return static_cast<I>(decoded);
 }
 
-template<Integer_c I>
-Result<I> decodeInteger(McInt const &m) noexcept {
-	size_t bytesRead{};
+template<typename I>
+Result<I> decodeInteger(McInt m) noexcept {
+	std::size_t bytesRead{};
 	BufferReader br({reinterpret_cast<const char*>(m.data.data()), 9});
-	return decodeInteger<I>(br, bytesRead);
+	return decodeInteger<I>(br, &bytesRead);
 }
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/mc/presenceindicator.cpp

@@ -0,0 +1,17 @@
+/*
+ * 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 "err.hpp"
+#include "presenceindicator.hpp"
+
+namespace ox {
+
+template class FieldBitmapWriterBase<uint8_t*>;
+template class FieldBitmapWriterBase<const uint8_t*>;
+
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -11,7 +11,6 @@
 #include <ox/std/array.hpp>
 #include <ox/std/bit.hpp>
 #include <ox/std/error.hpp>
-#include <ox/std/span.hpp>
 #include <ox/std/types.hpp>
 #include <ox/std/reader.hpp>
 
@@ -22,101 +21,143 @@ namespace ox {
 template<Reader_c Reader>
 class FieldBitmapReader {
 	protected:
-		mutable size_t m_mapBlockIdx = ~size_t{};
-		mutable uint64_t m_mapBlock{};
-		size_t m_mapStart{};
+		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:
-			m_mapStart(reader.tellg()),
-			m_reader(reader) {
-		}
+		explicit constexpr FieldBitmapReader(Reader &reader) noexcept;
 
-		constexpr Result<bool> get(size_t idx) const noexcept {
-			constexpr auto blockBits = sizeof(m_mapBlock);
-			auto const blockIdx = idx / blockBits;
-			if (m_mapBlockIdx != blockIdx) [[unlikely]] {
-				OX_RETURN_ERROR(loadMapBlock(blockIdx));
-			}
-			idx %= blockBits;
-			return (m_mapBlock >> idx) & 1;
-		}
+		constexpr Result<bool> get(std::size_t i) const noexcept;
 
 	private:
-		constexpr Error loadMapBlock(size_t const idx) const noexcept {
-			OX_REQUIRE(g, m_reader.tellg());
-			OX_RETURN_ERROR(m_reader.seekg(static_cast<int>(m_mapStart + idx), ox::ios_base::beg));
-			Array<char, sizeof(m_mapBlock)> mapBlock{};
-			OX_RETURN_ERROR(m_reader.read(mapBlock.data(), sizeof(m_mapBlock)));
-			// Warning: narrow-conv
-			OX_RETURN_ERROR(m_reader.seekg(static_cast<int>(g), ox::ios_base::beg));
-			m_mapBlock = 0;
-			for (uint64_t i{}; auto b : mapBlock) {
-				m_mapBlock |= static_cast<uint64_t>(std::bit_cast<uint8_t>(b)) << i;
-				i += 8;
-			}
-			m_mapBlockIdx = idx;
-			return {};
-		}
+		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) {
+}
 
-class FieldBitmapWriter {
+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:
-		Span<char> m_map;
-		size_t m_mapLen{};
+		T m_map = nullptr;
+		std::size_t m_mapLen = 0;
 
 	public:
-		explicit constexpr FieldBitmapWriter(Span<char> const &map) noexcept:
-			m_map(map),
-			m_mapLen(m_map.size()) {
-		}
+		constexpr FieldBitmapWriterBase(T map, std::size_t maxLen) noexcept;
 
-		constexpr auto setBuffer(Span<char> const &map) noexcept {
-			m_map = map;
-			m_mapLen = map.size();
-		}
+		constexpr auto setBuffer(T map, std::size_t maxLen) noexcept;
 
-		constexpr Result<bool> get(size_t const i) const noexcept {
-			if (i / 8 < m_mapLen) {
-				return (std::bit_cast<uint8_t>(m_map[i / 8]) >> (i % 8)) & 1;
-			}
-			return Error{McPresenceMapOverflow};
-		}
+		constexpr Result<bool> get(std::size_t i) const noexcept;
 
-		constexpr Error setFields(int const fields) noexcept {
-			m_mapLen = static_cast<size_t>((fields / 8 + 1) - (fields % 8 == 0));
-			if (m_mapLen > m_map.size()) [[unlikely]] {
-				return Error{McPresenceMapOverflow};
-			}
-			return {};
-		}
+		constexpr void setFields(int) noexcept;
 
-		constexpr void setMaxLen(int const maxLen) noexcept {
-			m_mapLen = static_cast<size_t>(maxLen);
-		}
+		constexpr void setMaxLen(int) noexcept;
 
-		constexpr int64_t getMaxLen() const noexcept {
-			return static_cast<int64_t>(m_mapLen);
-		}
-
-		constexpr Error set(size_t const i, bool const on) noexcept {
-			if (i / 8 < m_mapLen) {
-				char &actual = m_map[i / 8];
-				uint8_t v = std::bit_cast<uint8_t>(actual);
-				if (on) {
-					v |= 1 << (i % 8);
-				} else {
-					v &= ~static_cast<uint8_t>(1 << (i % 8));
-				}
-				actual = std::bit_cast<char>(v);
-				return {};
-			}
-			return Error{McPresenceMapOverflow};
-		}
+		[[nodiscard]]
+		constexpr int64_t getMaxLen() const noexcept;
 
 };
 
+template<typename T>
+constexpr FieldBitmapWriterBase<T>::FieldBitmapWriterBase(T map, std::size_t maxLen) noexcept {
+	m_map = map;
+	m_mapLen = maxLen;
+}
+
+template<typename T>
+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(McPresenceMapOverflow);
+	}
+}
+
+template<typename T>
+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 FieldBitmapWriterBase<T>::setMaxLen(int maxLen) noexcept {
+	m_mapLen = static_cast<std::size_t>(maxLen);
+}
+
+template<typename T>
+constexpr int64_t FieldBitmapWriterBase<T>::getMaxLen() const noexcept {
+	return static_cast<int64_t>(m_mapLen);
+}
+
+extern template class FieldBitmapWriterBase<uint8_t*>;
+extern template class FieldBitmapWriterBase<const uint8_t*>;
+
+class FieldBitmap: public FieldBitmapWriterBase<uint8_t*> {
+
+	public:
+		constexpr FieldBitmap(uint8_t *map, std::size_t maxLen) noexcept;
+
+		constexpr Error set(std::size_t i, bool on) noexcept;
+
+};
+
+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 {
+	if (i / 8 < m_mapLen) {
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+		if (on) {
+			m_map[i / 8] |= 1 << (i % 8);
+		} else {
+			m_map[i / 8] &= ~static_cast<uint8_t>(1 << (i % 8));
+		}
+OX_ALLOW_UNSAFE_BUFFERS_END
+		return {};
+	} else {
+		return OxError(McPresenceMapOverflow);
+	}
+}
+
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/mc/read.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -32,58 +32,58 @@ class MetalClawReaderTemplate: public ModelHandlerBase<MetalClawReaderTemplate<R
 
 	private:
 		FieldBitmapReader<Reader> m_fieldPresence;
-		size_t m_fields{};
-		size_t m_field{};
-		Optional<int> const m_unionIdx{};
+		std::size_t m_fields = 0;
+		std::size_t m_field = 0;
+		ox::Optional<int> m_unionIdx;
 		Reader &m_reader;
 
 	public:
 		explicit constexpr MetalClawReaderTemplate(
 				Reader &reader,
-				Optional<int> const &unionIdx = {}) noexcept;
+				ox::Optional<int> const&unionIdx = {}) noexcept;
 
 		constexpr ~MetalClawReaderTemplate() noexcept;
 
-		constexpr Error field(CString, int8_t *val) noexcept;
-		constexpr Error field(CString, int16_t *val) noexcept;
-		constexpr Error field(CString, int32_t *val) noexcept;
-		constexpr Error field(CString, int64_t *val) noexcept;
+		constexpr Error field(const char*, int8_t *val) noexcept;
+		constexpr Error field(const char*, int16_t *val) noexcept;
+		constexpr Error field(const char*, int32_t *val) noexcept;
+		constexpr Error field(const char*, int64_t *val) noexcept;
 
-		constexpr Error field(CString, uint8_t *val) noexcept;
-		constexpr Error field(CString, uint16_t *val) noexcept;
-		constexpr Error field(CString, uint32_t *val) noexcept;
-		constexpr Error field(CString, uint64_t *val) noexcept;
+		constexpr Error field(const char*, uint8_t *val) noexcept;
+		constexpr Error field(const char*, uint16_t *val) noexcept;
+		constexpr Error field(const char*, uint32_t *val) noexcept;
+		constexpr Error field(const char*, uint64_t *val) noexcept;
 
-		constexpr Error field(CString, bool *val) noexcept;
+		constexpr Error field(const char*, bool *val) noexcept;
 
 		// array handler
-		constexpr Error field(CString, auto *val, size_t valLen) noexcept;
+		constexpr Error field(const char*, auto *val, std::size_t len) noexcept;
 
 		// map handler
 		template<typename T>
-		constexpr Error field(CString, HashMap<String, T> *val) noexcept;
+		constexpr Error field(const char*, HashMap<String, T> *val) noexcept;
 
 		// array handler, with callback to allow handling individual elements
 		template<typename T, typename CB>
-		constexpr Error field(CString, CB cb) noexcept;
+		constexpr Error field(const char*, CB cb) noexcept;
 
 		template<typename T>
-		constexpr Error field(CString, T *val) noexcept;
+		constexpr Error field(const char*, T *val) noexcept;
 
 		template<typename U, bool force>
-		constexpr Error field(CString, UnionView<U, force> val) noexcept;
+		constexpr Error field(const char*, UnionView<U, force> val) noexcept;
 
-		template<size_t SmallStringSize>
-		constexpr Error field(CString, BasicString<SmallStringSize> *val) noexcept;
+		template<std::size_t SmallStringSize>
+		constexpr Error field(const char*, BasicString<SmallStringSize> *val) noexcept;
 
-		template<size_t L>
-		constexpr Error field(CString, IString<L> *val) noexcept;
+		template<std::size_t L>
+		constexpr Error field(const char*, IString<L> *val) noexcept;
 
-		constexpr Error fieldCString(CString, char *val, size_t buffLen) noexcept;
+		constexpr Error fieldCString(const char*, char *val, std::size_t buffLen) noexcept;
 
-		constexpr Error fieldCString(CString, char **val) noexcept;
+		constexpr Error fieldCString(const char*, char **val) noexcept;
 
-		constexpr Error fieldCString(CString, char **val, size_t buffLen) noexcept;
+		constexpr Error fieldCString(const char*, char **val, std::size_t buffLen) noexcept;
 
 		/**
 		 * Reads an array length from the current location in the buffer.
@@ -101,13 +101,13 @@ class MetalClawReaderTemplate: public ModelHandlerBase<MetalClawReaderTemplate<R
 				const char *name = T::TypeName,
 				int version = T::TypeVersion,
 				const Vector<String>& = {},
-				size_t fields = ModelFieldCount_v<T>) noexcept;
+				std::size_t fields = ModelFieldCount_v<T>) noexcept;
 
 		/**
 		 * Returns a MetalClawReader to parse a child object.
 		 */
 		[[nodiscard]]
-		constexpr MetalClawReaderTemplate<Reader> child(const char *name, Optional<int> unionIdx = {}) 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.
@@ -122,20 +122,20 @@ class MetalClawReaderTemplate: public ModelHandlerBase<MetalClawReaderTemplate<R
 		constexpr bool fieldPresent(int fieldNo) const noexcept;
 
 		[[nodiscard]]
-		constexpr int whichFieldPresent(const char *name, ModelUnion const&) const noexcept;
+		constexpr int whichFieldPresent(const char *name, const ModelUnion&) const noexcept;
 
 		constexpr void nextField() noexcept;
 
 	private:
 		template<typename I>
-		constexpr Error readInteger(I &val) noexcept;
+		constexpr Error readInteger(I *val) noexcept;
 
 };
 
 template<Reader_c Reader>
 constexpr MetalClawReaderTemplate<Reader>::MetalClawReaderTemplate(
 		Reader &reader,
-		Optional<int> const &unionIdx) noexcept:
+		ox::Optional<int> const&unionIdx) noexcept:
 		m_fieldPresence(reader),
 		m_unionIdx(unionIdx),
 		m_reader(reader) {
@@ -149,79 +149,78 @@ constexpr MetalClawReaderTemplate<Reader>::~MetalClawReaderTemplate() noexcept {
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, int8_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int8_t *val) noexcept {
+	return readInteger(val);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, int16_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int16_t *val) noexcept {
+	return readInteger(val);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, int32_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int32_t *val) noexcept {
+	return readInteger(val);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, int64_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int64_t *val) noexcept {
+	return readInteger(val);
 }
 
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, uint8_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint8_t *val) noexcept {
+	return readInteger(val);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, uint16_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint16_t *val) noexcept {
+	return readInteger(val);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, uint32_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint32_t *val) noexcept {
+	return readInteger(val);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, uint64_t *val) noexcept {
-	return readInteger(*val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint64_t *val) noexcept {
+	return readInteger(val);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, bool *val) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		auto const result = m_fieldPresence.get(static_cast<size_t>(m_field));
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, bool *val) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
+		auto const result = m_fieldPresence.get(static_cast<std::size_t>(m_field));
 		*val = result.value;
-		OX_RETURN_ERROR(result);
+		oxReturnError(result);
 	}
 	++m_field;
-	return {};
+	return OxError(0);
 }
 
 // array handler
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(
-	const char *name, auto *val, size_t const valLen) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, auto *val, std::size_t valLen) 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
-			size_t bytesRead = 0;
-			OX_REQUIRE(len, mc::decodeInteger<ArrayLength>(m_reader, bytesRead));
+			std::size_t bytesRead = 0;
+			oxRequire(len, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
 			// read the list
 			if (valLen >= len) {
 				auto reader = child({});
 				auto &handler = *reader.interface();
-				OX_RETURN_ERROR(handler.setTypeInfo("List", 0, {}, static_cast<size_t>(len)));
-				for (size_t i = 0; i < len; ++i) {
+				oxReturnError(handler.setTypeInfo("List", 0, {}, static_cast<std::size_t>(len)));
+				for (std::size_t i = 0; i < len; ++i) {
 OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-					OX_RETURN_ERROR(handler.field({}, &val[i]));
+					oxReturnError(handler.field({}, &val[i]));
 OX_ALLOW_UNSAFE_BUFFERS_END
 				}
 			} else {
 				oxTracef("ox.mc.read.field(T)", "{}, length: {}", name, valLen);
-				return ox::Error(McOutputBuffEnded);
+				return OxError(McOutputBuffEnded);
 			}
 		}
 	}
@@ -231,57 +230,57 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 
 template<Reader_c Reader>
 template<typename T>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, HashMap<String, T> *val) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, HashMap<String, T> *val) 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
-			OX_REQUIRE(g, m_reader.tellg());
-			size_t bytesRead = 0;
-			OX_REQUIRE(len, mc::decodeInteger<ArrayLength>(m_reader, bytesRead));
-			OX_RETURN_ERROR(m_reader.seekg(g));
+			oxRequire(g, m_reader.tellg());
+			std::size_t bytesRead = 0;
+			oxRequire(len, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
+			oxReturnError(m_reader.seekg(g));
 			// read the list
 			auto reader = child("");
 			auto &handler = *reader.interface();
-			OX_RETURN_ERROR(handler.setTypeInfo("List", 0, {}, static_cast<size_t>(len)));
+			oxReturnError(handler.setTypeInfo("List", 0, {}, static_cast<std::size_t>(len)));
 			// this loop body needs to be in a lambda because of the potential alloca call
 			constexpr auto loopBody = [](auto &handler, auto &val) {
-				OX_REQUIRE(keyLen, handler.stringLength(nullptr));
+				oxRequire(keyLen, handler.stringLength(nullptr));
 				auto wkey = ox_malloca(keyLen + 1, char, 0);
 				auto wkeyPtr = wkey.get();
-				OX_RETURN_ERROR(handler.fieldCString("", &wkeyPtr, keyLen + 1));
+				oxReturnError(handler.fieldCString("", &wkeyPtr, keyLen + 1));
 				return handler.field("", &val[wkeyPtr]);
 			};
-			for (size_t i = 0; i < len; ++i) {
-				OX_RETURN_ERROR(loopBody(handler, *val));
+			for (std::size_t i = 0; i < len; ++i) {
+				oxReturnError(loopBody(handler, *val));
 			}
 		}
 	}
 	++m_field;
-	return {};
+	return OxError(0);
 }
 
 template<Reader_c Reader>
 template<typename T>
 constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, T *val) noexcept {
 	if constexpr(isVector_v<T>) {
-		if (!m_unionIdx.has_value() || static_cast<size_t>(*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<size_t>(m_field))) {
-				OX_REQUIRE(len, arrayLength(name, false));
-				OX_RETURN_ERROR(ox::resizeVector(*val, len));
+			if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+				oxRequire(len, arrayLength(name, false));
+				oxReturnError(ox::resizeVector(*val, len));
 				return field(name, val->data(), val->size());
 			}
-			OX_RETURN_ERROR(ox::resizeVector(*val, 0));
+			oxReturnError(ox::resizeVector(*val, 0));
 		}
 		++m_field;
 		return {};
 	} else if constexpr(isArray_v<T>) {
-		if (!m_unionIdx.has_value() || static_cast<size_t>(*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<size_t>(m_field))) {
-				OX_REQUIRE(len, arrayLength(name, false));
+			if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+				oxRequire(len, arrayLength(name, false));
 				if (len > val->size()) {
-					return ox::Error(1, "Input array is too long");
+					return OxError(1, "Input array is too long");
 				}
 			}
 			return field(name, val->data(), val->size());
@@ -289,10 +288,10 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, T *val)
 		++m_field;
 		return {};
 	} else {
-		if ((!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) && val) {
-			if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+		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("");
-				OX_RETURN_ERROR(model(reader.interface(), val));
+				oxReturnError(model(reader.interface(), val));
 			}
 		}
 		++m_field;
@@ -302,11 +301,11 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, T *val)
 
 template<Reader_c Reader>
 template<typename U, bool force>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, UnionView<U, force> val) noexcept {
-	if ((!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) && val.get()) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, UnionView<U, force> val) noexcept {
+	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("", ox::Optional<int>(ox::in_place, val.idx()));
-			OX_RETURN_ERROR(model(reader.interface(), val.get()));
+			oxReturnError(model(reader.interface(), val.get()));
 		}
 	}
 	++m_field;
@@ -314,39 +313,39 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(CString, UnionView<U, for
 }
 
 template<Reader_c Reader>
-template<size_t SmallStringSize>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, BasicString<SmallStringSize> *val) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+template<std::size_t SmallStringSize>
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, BasicString<SmallStringSize> *val) 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
-			size_t bytesRead = 0;
-			OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, bytesRead));
+			std::size_t bytesRead = 0;
+			oxRequire(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
 			const auto cap = size;
 			*val = BasicString<SmallStringSize>(cap);
 			auto data = val->data();
 			// read the string
-			OX_RETURN_ERROR(m_reader.read(data, size));
+			oxReturnError(m_reader.read(data, size));
 		} else {
 			*val = "";
 		}
 	}
 	++m_field;
-	return {};
+	return OxError(0);
 }
 
 template<Reader_c Reader>
-template<size_t L>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, IString<L> *val) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+template<std::size_t L>
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, IString<L> *val) 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
-			size_t bytesRead = 0;
-			OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, bytesRead));
+			std::size_t bytesRead = 0;
+			oxRequire(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
 			*val = IString<L>();
-			OX_RETURN_ERROR(val->resize(size));
+			oxReturnError(val->resize(size));
 			auto const data = val->data();
 			// read the string
-			OX_RETURN_ERROR(m_reader.read(data, size));
+			oxReturnError(m_reader.read(data, size));
 		} else {
 			*val = "";
 		}
@@ -356,50 +355,49 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(CString, IString<L> *val)
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(
-	CString, char *val, size_t const buffLen) noexcept {
-	if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+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
-		size_t bytesRead = 0;
-		OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, bytesRead));
+		std::size_t bytesRead = 0;
+		oxRequire(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
 		if (size > buffLen) {
-			return ox::Error(McOutputBuffEnded);
+			return OxError(McOutputBuffEnded);
 		}
 		// re-allocate in case too small
 		auto data = val;
 		// read the string
-		OX_RETURN_ERROR(m_reader.read(data, size));
+		oxReturnError(m_reader.read(data, size));
 		data[size] = 0;
 	}
 	++m_field;
-	return {};
+	return OxError(0);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(CString, char **val) noexcept {
-	if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char **val) noexcept {
+	if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
 		// read the length
-		size_t bytesRead = 0;
-		OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, bytesRead));
+		std::size_t bytesRead = 0;
+		oxRequire(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
 		// re-allocate in case too small
 		safeDelete(*val);
 		*val = new char[size + 1];
 		auto data = ox::Span{*val, size + 1};
 		// read the string
-		OX_RETURN_ERROR(m_reader.read(data.data(), size));
+		oxReturnError(m_reader.read(data.data(), size));
 		data[size] = 0;
 	}
 	++m_field;
-	return {};
+	return OxError(0);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(CString, char **val, size_t buffLen) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char **val, std::size_t buffLen) 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
-			size_t bytesRead = 0;
-			OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, bytesRead));
+			std::size_t bytesRead = 0;
+			oxRequire(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
 			// re-allocate if too small
 			if (buffLen < size + 1) {
 				safeDelete(*val);
@@ -408,7 +406,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(CString, char **va
 			}
 			auto data = ox::Span{*val, size + 1};
 			// read the string
-			OX_RETURN_ERROR(m_reader.read(data.data(), size));
+			oxReturnError(m_reader.read(data.data(), size));
 			data[size] = 0;
 		} else {
 			auto data = *val;
@@ -418,34 +416,34 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(CString, char **va
 		}
 	}
 	++m_field;
-	return {};
+	return OxError(0);
 }
 
 template<Reader_c Reader>
-constexpr Result<ArrayLength> MetalClawReaderTemplate<Reader>::arrayLength(CString, bool const pass) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Result<ArrayLength> MetalClawReaderTemplate<Reader>::arrayLength(const char*, bool pass) 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
-			size_t bytesRead = 0;
-			OX_REQUIRE(g, m_reader.tellg());
-			OX_REQUIRE(out, mc::decodeInteger<ArrayLength>(m_reader, bytesRead));
+			std::size_t bytesRead = 0;
+			oxRequire(g, m_reader.tellg());
+			oxRequire(out, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
 			if (!pass) {
-				OX_RETURN_ERROR(m_reader.seekg(g));
+				oxReturnError(m_reader.seekg(g));
 			}
 			return out;
 		}
 	}
-	return ox::Error(1);
+	return OxError(1);
 }
 
 template<Reader_c Reader>
-constexpr Result<StringLength> MetalClawReaderTemplate<Reader>::stringLength(CString) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+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
-			size_t bytesRead = 0;
-			auto len = mc::decodeInteger<StringLength>(m_reader, bytesRead);
-			OX_RETURN_ERROR(m_reader.seekg(-static_cast<int64_t>(bytesRead), ox::ios_base::cur));
+			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;
 		}
 	}
@@ -454,48 +452,48 @@ constexpr Result<StringLength> MetalClawReaderTemplate<Reader>::stringLength(CSt
 
 template<Reader_c Reader>
 template<typename I>
-constexpr Error MetalClawReaderTemplate<Reader>::readInteger(I &val) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
-			size_t bytesRead = 0;
-			auto const result = mc::decodeInteger<I>(m_reader, bytesRead);
-			OX_RETURN_ERROR(result);
-			val = result.value;
+constexpr Error MetalClawReaderTemplate<Reader>::readInteger(I *val) 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))) {
+			std::size_t bytesRead = 0;
+			auto const result = mc::decodeInteger<I>(m_reader, &bytesRead);
+			oxReturnError(result);
+			*val = result.value;
 		} else {
-			val = 0;
+			*val = 0;
 		}
 	}
 	++m_field;
-	return {};
+	return OxError(0);
 }
 
 template<Reader_c Reader>
 template<typename T, typename CB>
-constexpr Error MetalClawReaderTemplate<Reader>::field(CString, CB cb) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, CB cb) 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
-			size_t bytesRead = 0;
-			OX_REQUIRE(len, mc::decodeInteger<ArrayLength>(m_reader, bytesRead));
+			std::size_t bytesRead = 0;
+			oxRequire(len, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
 			// read the list
 			auto reader = child("");
 			auto &handler = *reader.interface();
-			OX_RETURN_ERROR(handler.setTypeInfo("List", 0, {}, static_cast<size_t>(len)));
-			for (size_t i = 0; i < len; ++i) {
+			oxReturnError(handler.setTypeInfo("List", 0, {}, static_cast<std::size_t>(len)));
+			for (std::size_t i = 0; i < len; ++i) {
 				T val;
-				OX_RETURN_ERROR(handler.field("", &val));
-				OX_RETURN_ERROR(cb(i, &val));
+				oxReturnError(handler.field("", &val));
+				oxReturnError(cb(i, &val));
 			}
 		}
 	}
 	++m_field;
-	return {};
+	return OxError(0);
 }
 
 template<Reader_c Reader>
 template<typename T>
 constexpr ox::Error MetalClawReaderTemplate<Reader>::setTypeInfo(
-		CString, int, const Vector<String>&, size_t const fields) noexcept {
+		const char*, int, const Vector<String>&, std::size_t fields) noexcept {
 	m_fields = fields;
 	// Warning: narrow-conv
 	return m_reader.seekg(
@@ -505,24 +503,24 @@ constexpr ox::Error MetalClawReaderTemplate<Reader>::setTypeInfo(
 
 template<Reader_c Reader>
 constexpr MetalClawReaderTemplate<Reader> MetalClawReaderTemplate<Reader>::child(
-		CString,
-		Optional<int> const unionIdx) noexcept {
+		const char*,
+		ox::Optional<int> unionIdx) noexcept {
 	return MetalClawReaderTemplate<Reader>(m_reader, unionIdx);
 }
 
 template<Reader_c Reader>
-constexpr bool MetalClawReaderTemplate<Reader>::fieldPresent(CString) const noexcept {
-	return m_fieldPresence.get(static_cast<size_t>(m_field)).value;
+constexpr bool MetalClawReaderTemplate<Reader>::fieldPresent(const char*) const noexcept {
+	return m_fieldPresence.get(static_cast<std::size_t>(m_field)).value;
 }
 
 template<Reader_c Reader>
-constexpr bool MetalClawReaderTemplate<Reader>::fieldPresent(int const fieldNo) const noexcept {
-	return m_fieldPresence.get(static_cast<size_t>(fieldNo)).value;
+constexpr bool MetalClawReaderTemplate<Reader>::fieldPresent(int fieldNo) const noexcept {
+	return m_fieldPresence.get(static_cast<std::size_t>(fieldNo)).value;
 }
 
 template<Reader_c Reader>
 [[nodiscard]]
-constexpr int MetalClawReaderTemplate<Reader>::whichFieldPresent(CString, ModelUnion const &u) const noexcept {
+constexpr int MetalClawReaderTemplate<Reader>::whichFieldPresent(const char*, const ModelUnion &u) const noexcept {
 	FieldBitmapReader<Reader> p(m_reader);
 	for (auto i = 0u; i < u.fieldCount(); ++i) {
 		if (p.get(i)) {
@@ -540,16 +538,17 @@ constexpr void MetalClawReaderTemplate<Reader>::nextField() noexcept {
 using MetalClawReader = MetalClawReaderTemplate<ox::BufferReader>;
 
 template<typename T>
-Error readMC(ox::BufferView const buff, T &val) noexcept {
+Error readMC(ox::BufferView buff, T &val) noexcept {
 	BufferReader br(buff);
 	MetalClawReader reader(br);
-	return model(reader.interface(), &val);
+	ModelHandlerInterface<MetalClawReader, ox::OpType::Read> handler(&reader);
+	return model(&handler, &val);
 }
 
 template<typename T>
 Result<T> readMC(ox::BufferView buff) noexcept {
 	Result<T> val;
-	OX_RETURN_ERROR(readMC(buff, val.value));
+	oxReturnError(readMC(buff, val.value));
 	return val;
 }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -62,47 +62,47 @@ struct TestStruct {
 
 template<typename T>
 constexpr ox::Error model(T *io, ox::CommonPtrWith<TestUnion> auto *obj) noexcept {
-	OX_RETURN_ERROR(io->template setTypeInfo<TestUnion>());
-	OX_RETURN_ERROR(io->field("Bool", &obj->Bool));
-	OX_RETURN_ERROR(io->field("Int", &obj->Int));
-	OX_RETURN_ERROR(io->fieldCString("CString", &obj->CString));
-	return ox::Error(0);
+	oxReturnError(io->template setTypeInfo<TestUnion>());
+	oxReturnError(io->field("Bool", &obj->Bool));
+	oxReturnError(io->field("Int", &obj->Int));
+	oxReturnError(io->fieldCString("CString", &obj->CString));
+	return OxError(0);
 }
 
-OX_MODEL_BEGIN(TestStructNest)
-	OX_MODEL_FIELD(Bool)
-	OX_MODEL_FIELD(Int)
-	OX_MODEL_FIELD(IString)
-OX_MODEL_END()
+oxModelBegin(TestStructNest)
+	oxModelField(Bool)
+	oxModelField(Int)
+	oxModelField(IString)
+oxModelEnd()
 
 template<typename T>
 constexpr ox::Error model(T *io, ox::CommonPtrWith<TestStruct> auto *obj) noexcept {
-	OX_RETURN_ERROR(io->template setTypeInfo<TestStruct>());
-	OX_RETURN_ERROR(io->field("Bool", &obj->Bool));
-	OX_RETURN_ERROR(io->field("Int", &obj->Int));
-	OX_RETURN_ERROR(io->field("Int1", &obj->Int1));
-	OX_RETURN_ERROR(io->field("Int2", &obj->Int2));
-	OX_RETURN_ERROR(io->field("Int3", &obj->Int3));
-	OX_RETURN_ERROR(io->field("Int4", &obj->Int4));
-	OX_RETURN_ERROR(io->field("Int5", &obj->Int5));
-	OX_RETURN_ERROR(io->field("Int6", &obj->Int6));
-	OX_RETURN_ERROR(io->field("Int7", &obj->Int7));
-	OX_RETURN_ERROR(io->field("Int8", &obj->Int8));
-	OX_RETURN_ERROR(io->field("unionIdx", &obj->unionIdx));
+	oxReturnError(io->template setTypeInfo<TestStruct>());
+	oxReturnError(io->field("Bool", &obj->Bool));
+	oxReturnError(io->field("Int", &obj->Int));
+	oxReturnError(io->field("Int1", &obj->Int1));
+	oxReturnError(io->field("Int2", &obj->Int2));
+	oxReturnError(io->field("Int3", &obj->Int3));
+	oxReturnError(io->field("Int4", &obj->Int4));
+	oxReturnError(io->field("Int5", &obj->Int5));
+	oxReturnError(io->field("Int6", &obj->Int6));
+	oxReturnError(io->field("Int7", &obj->Int7));
+	oxReturnError(io->field("Int8", &obj->Int8));
+	oxReturnError(io->field("unionIdx", &obj->unionIdx));
 	if constexpr(T::opType() == ox::OpType::Reflect) {
-		OX_RETURN_ERROR(io->field("Union", ox::UnionView{&obj->Union, 0}));
+		oxReturnError(io->field("Union", ox::UnionView{&obj->Union, 0}));
 	} else {
-		OX_RETURN_ERROR(io->field("Union", ox::UnionView{&obj->Union, obj->unionIdx}));
+		oxReturnError(io->field("Union", ox::UnionView{&obj->Union, obj->unionIdx}));
 	}
-	OX_RETURN_ERROR(io->field("String", &obj->String));
-	OX_RETURN_ERROR(io->field("IString", &obj->IString));
-	OX_RETURN_ERROR(io->field("List", obj->List, 4));
-	OX_RETURN_ERROR(io->field("Vector", &obj->Vector));
-	OX_RETURN_ERROR(io->field("Vector2", &obj->Vector2));
-	OX_RETURN_ERROR(io->field("Map", &obj->Map));
-	OX_RETURN_ERROR(io->field("Struct", &obj->Struct));
-	OX_RETURN_ERROR(io->field("EmptyStruct", &obj->EmptyStruct));
-	return ox::Error(0);
+	oxReturnError(io->field("String", &obj->String));
+	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("Struct", &obj->Struct));
+	oxReturnError(io->field("EmptyStruct", &obj->EmptyStruct));
+	return OxError(0);
 }
 
 std::map<ox::StringView, ox::Error(*)()> tests = {
@@ -114,9 +114,9 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				// doesn't segfault
 				ox::Array<char, 1024> buff;
 				TestStruct ts;
-				OX_RETURN_ERROR(ox::writeMC(buff.data(), buff.size(), ts));
-				OX_RETURN_ERROR(ox::writeMC(ts));
-				return ox::Error(0);
+				oxReturnError(ox::writeMC(buff.data(), buff.size(), ts));
+				oxReturnError(ox::writeMC(ts));
+				return OxError(0);
 			}
 		},
 
@@ -157,7 +157,8 @@ std::map<ox::StringView, 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");
-				ox::expect(testIn.IString,               testOut.IString);
+				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");
@@ -175,7 +176,7 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				oxAssert(testIn.Struct.Int          == testOut.Struct.Int,          "Struct.Int 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 ox::Error(0);
+				return OxError(0);
 			}
 		},
 
@@ -188,28 +189,28 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				static constexpr auto check = [](McInt val, const ox::Vector<uint8_t, 9> &expected) {
 					if (val.length != expected.size()) {
 						std::cout << "val.length: " << val.length << ", expected: " << expected.size() << '\n';
-						return ox::Error(1);
+						return OxError(1);
 					}
 					for (std::size_t i = 0; i < expected.size(); i++) {
 						if (expected[i] != val.data[i]) {
 							std::cout << "decoded: " << static_cast<uint32_t>(val.data[i]) << ", expected: " << static_cast<uint32_t>(expected[i]) << '\n';
 							std::cout << "decoded: " << i << ": " << static_cast<uint32_t>(val.data[i]) << '\n';
-							return ox::Error(1);
+							return OxError(1);
 						}
 					}
-					return ox::Error(0);
+					return OxError(0);
 				};
 				constexpr auto check64 = [](McInt val, auto expected) {
 					if (val.length != 9) {
 						std::cout << "val.length: " << val.length << '\n';
-						return ox::Error(1);
+						return OxError(1);
 					}
 					ox::LittleEndian<decltype(expected)> decoded = *reinterpret_cast<decltype(expected)*>(&val.data[1]);
 					if (expected != decoded) {
 						std::cout << "decoded: " << decoded << ", expected: " << expected << '\n';
-						return ox::Error(1);
+						return OxError(1);
 					}
-					return ox::Error(0);
+					return OxError(0);
 				};
 				// signed positive
 				oxAssert(check(encodeInteger(int64_t(1)), {0b000'0001'0}), "Encode 1 fail");
@@ -246,7 +247,7 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				// code deduplication
 				oxAssert(check64(encodeInteger(MaxValue<int64_t>), MaxValue<int64_t>), "Encode MaxValue<int64_t> fail");
 				oxAssert(check64(encodeInteger(MaxValue<uint64_t>), MaxValue<uint64_t>), "Encode MaxValue<uint64_t> fail");
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 
@@ -259,12 +260,12 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				using ox::mc::decodeInteger;
 				static constexpr auto check = [](auto val) {
 					auto result = decodeInteger<decltype(val)>(encodeInteger(val));
-					OX_RETURN_ERROR(result.error);
+					oxReturnError(result.error);
 					if (result.value != val) {
 						std::cout << "Bad value: " << result.value << ", expected: " << val << '\n';
-						return ox::Error(1);
+						return OxError(1);
 					}
-					return ox::Error(0);
+					return OxError(0);
 				};
 				oxAssert(check(uint32_t(14)), "Decode of 14 failed.");
 				oxAssert(check(int8_t(-1)), "Decode of -1 failed.");
@@ -290,7 +291,7 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				oxAssert(check(0xffffffff), "Decode of 0xffffffff failed.");
 				oxAssert(check(0xffffffffffff), "Decode of 0xffffffffffff failed.");
 				oxAssert(check(0xffffffffffffffff), "Decode of U64 max failed.");
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 
@@ -318,7 +319,7 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				const auto [type, typeErr] = ox::buildTypeDef(typeStore, testIn);
 				oxAssert(typeErr, "Descriptor write failed");
 				ox::ModelObject testOut;
-				OX_RETURN_ERROR(testOut.setType(type));
+				oxReturnError(testOut.setType(type));
 				oxAssert(ox::readMC(dataBuff, testOut), "Data read failed");
 				oxAssert(testOut.at("Int").unwrap()->get<int>() == testIn.Int, "testOut.Int failed");
 				oxAssert(testOut.at("Bool").unwrap()->get<bool>() == testIn.Bool, "testOut.Bool failed");
@@ -343,7 +344,7 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				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 ox::Error(0);
+				return OxError(0);
 			}
 		},
 
@@ -370,7 +371,7 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				 const auto [type, typeErr] = ox::buildTypeDef(typeStore, testIn);
 				 oxAssert(typeErr, "Descriptor write failed");
 				 ox::BufferReader br({dataBuff, dataBuffLen});
-				 OX_RETURN_ERROR(ox::walkModel<ox::MetalClawReader>(type, br,
+				 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();
@@ -453,10 +454,10 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 							case ox::PrimitiveType::Union:
 								break;
 						}
-						return ox::Error(0);
+						return OxError(0);
 					}
 				));
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/mc/write.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/mc/write.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -29,71 +29,71 @@
 namespace ox {
 
 template<Writer_c Writer>
-class MetalClawWriter: public ModelHandlerBase<MetalClawWriter<Writer>, OpType::Write> {
+class MetalClawWriter {
 
 	private:
-		Vector<char, 16> m_presenceMapBuff{};
-		FieldBitmapWriter m_fieldPresence{m_presenceMapBuff};
-		int m_field{};
-		Optional<int> m_unionIdx;
-		size_t m_writerBeginP{};
+		ox::Vector<uint8_t, 16> m_presenceMapBuff{};
+		FieldBitmap m_fieldPresence;
+		int m_field = 0;
+		ox::Optional<int> m_unionIdx;
+		std::size_t m_writerBeginP{};
 		Writer &m_writer;
 
 	public:
-		constexpr explicit MetalClawWriter(Writer &writer, Optional<int> const &unionIdx = {}) noexcept;
+		constexpr explicit MetalClawWriter(Writer &writer, ox::Optional<int> const&unionIdx = {}) noexcept;
 
 		constexpr ~MetalClawWriter() noexcept = default;
 
-		constexpr Error field(CString, int8_t const *val) noexcept;
-		constexpr Error field(CString, int16_t const *val) noexcept;
-		constexpr Error field(CString, int32_t const *val) noexcept;
-		constexpr Error field(CString, int64_t const *val) noexcept;
+		constexpr Error field(const char*, const int8_t *val) noexcept;
+		constexpr Error field(const char*, const int16_t *val) noexcept;
+		constexpr Error field(const char*, const int32_t *val) noexcept;
+		constexpr Error field(const char*, const int64_t *val) noexcept;
 
-		constexpr Error field(CString, uint8_t const *val) noexcept;
-		constexpr Error field(CString, uint16_t const *val) noexcept;
-		constexpr Error field(CString, uint32_t const *val) noexcept;
-		constexpr Error field(CString, uint64_t const *val) noexcept;
+		constexpr Error field(const char*, const uint8_t *val) noexcept;
+		constexpr Error field(const char*, const uint16_t *val) noexcept;
+		constexpr Error field(const char*, const uint32_t *val) noexcept;
+		constexpr Error field(const char*, const uint64_t *val) noexcept;
 
-		constexpr Error field(CString, bool const *val) noexcept;
+		constexpr Error field(const char*, const bool *val) noexcept;
 
 		template<typename T>
-		constexpr Error field(CString, T const *val, size_t len) noexcept;
+		constexpr Error field(const char*, const T *val, std::size_t len) noexcept;
 
 		template<typename T>
-		constexpr Error field(CString name, HashMap<String, T> const *val) noexcept;
+		constexpr Error field(const char *name, const HashMap<String, T> *val) noexcept;
 
-		template<size_t SmallStringSize>
-		constexpr Error field(CString, BasicString<SmallStringSize> const *val) noexcept;
+		template<std::size_t SmallStringSize>
+		constexpr Error field(const char*, const BasicString<SmallStringSize> *val) noexcept;
 
-		template<size_t L>
-		constexpr Error field(CString, IString<L> const *val) noexcept;
+		template<std::size_t L>
+		constexpr Error field(const char*, const IString<L> *val) noexcept;
 
-		constexpr Error fieldCString(CString name, CString const*val, size_t buffLen) noexcept;
+		constexpr Error fieldCString(const char *name, const char *const*val, std::size_t buffLen) noexcept;
 
-		constexpr Error fieldCString(CString name, CString *val) noexcept;
+		constexpr Error fieldCString(const char *name, const char **val) noexcept;
 
-		constexpr Error fieldCString(CString name, CString const*val) noexcept;
+		constexpr Error fieldCString(const char *name, const char *const*val) noexcept;
 
-		constexpr Error fieldCString(CString name, CString val, size_t strLen) noexcept;
+		constexpr Error fieldCString(const char *name, const char *val, std::size_t len) noexcept;
 
 		template<typename T>
-		constexpr Error field(CString, T const *val) noexcept;
+		constexpr Error field(const char*, const T *val) noexcept;
 
 		template<typename U, bool force = false>
-		constexpr Error field(CString, UnionView<U, force> val) noexcept;
+		constexpr Error field(const char*, UnionView<U, force> val) noexcept;
 
 		template<typename T = std::nullptr_t>
-		constexpr Error setTypeInfo(
-				CString name = T::TypeName,
+		constexpr ox::Error setTypeInfo(
+				const char *name = T::TypeName,
 				int version = T::TypeVersion,
-		        Vector<String> const& = {},
-				size_t fields = ModelFieldCount_v<T>) noexcept;
+		        const Vector<String>& = {},
+				std::size_t fields = ModelFieldCount_v<T>) noexcept;
 
 		/**
 		 * stringLength is not implemented in MetalClawWriter
 		 */
 		[[nodiscard]]
-		constexpr auto stringLength(CString) noexcept {
+		constexpr auto stringLength(const char*) noexcept {
 			return 0;
 		}
 
@@ -101,23 +101,28 @@ class MetalClawWriter: public ModelHandlerBase<MetalClawWriter<Writer>, OpType::
 		 * stringLength is not implemented in MetalClawWriter
 		 */
 		[[nodiscard]]
-		constexpr auto arrayLength(CString, bool = true) noexcept {
+		constexpr auto arrayLength(const char*, bool = true) noexcept {
 			return 0;
 		}
 
-		constexpr Error finalize() noexcept;
+		[[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.has_value() || *m_unionIdx == m_field)) {
 				auto mi = mc::encodeInteger(val);
-				OX_RETURN_ERROR(m_writer.write(reinterpret_cast<CString>(mi.data.data()), mi.length));
+				oxReturnError(m_writer.write(reinterpret_cast<const char*>(mi.data.data()), mi.length));
 				fieldSet = true;
 			}
-			OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
+			oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 			++m_field;
-			return {};
+			return OxError(0);
 		}
 
 };
@@ -126,147 +131,144 @@ extern template class ModelHandlerInterface<MetalClawWriter<BufferWriter>>;
 extern template class ModelHandlerInterface<MetalClawWriter<CharBuffWriter>>;
 
 template<Writer_c Writer>
-constexpr MetalClawWriter<Writer>::MetalClawWriter(Writer &writer, Optional<int> const &unionIdx) noexcept:
+constexpr MetalClawWriter<Writer>::MetalClawWriter(Writer &writer, ox::Optional<int> const&unionIdx) noexcept:
+	m_fieldPresence(m_presenceMapBuff.data(), m_presenceMapBuff.size()),
 	m_unionIdx(unionIdx),
 	m_writerBeginP(writer.tellp()),
 	m_writer(writer) {
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, int8_t const *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const int8_t *val) noexcept {
 	return appendInteger(*val);
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, int16_t const *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const int16_t *val) noexcept {
 	return appendInteger(*val);
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, int32_t const *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const int32_t *val) noexcept {
 	return appendInteger(*val);
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, int64_t const *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const int64_t *val) noexcept {
 	return appendInteger(*val);
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, uint8_t const *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const uint8_t *val) noexcept {
 	return appendInteger(*val);
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, uint16_t const *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const uint16_t *val) noexcept {
 	return appendInteger(*val);
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, uint32_t const *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const uint32_t *val) noexcept {
 	return appendInteger(*val);
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, uint64_t const *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const uint64_t *val) noexcept {
 	return appendInteger(*val);
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, bool const *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const bool *val) noexcept {
 	if (!m_unionIdx.has_value() || *m_unionIdx == m_field) {
-		OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), *val));
+		oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), *val));
 	}
 	++m_field;
-	return {};
+	return OxError(0);
 }
 
 template<Writer_c Writer>
-template<size_t SmallStringSize>
-constexpr Error MetalClawWriter<Writer>::field(CString, BasicString<SmallStringSize> const *val) noexcept {
+template<std::size_t SmallStringSize>
+constexpr Error MetalClawWriter<Writer>::field(const char*, const BasicString<SmallStringSize> *val) noexcept {
 	bool fieldSet = false;
-	if (val->size() && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
+	if (val->len() && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
 		// write the length
-		auto const strLen = mc::encodeInteger(val->size());
-		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<CString>(strLen.data.data()), strLen.length));
+		const auto strLen = mc::encodeInteger(val->len());
+		oxReturnError(m_writer.write(reinterpret_cast<const char*>(strLen.data.data()), strLen.length));
 		// write the string
-		OX_RETURN_ERROR(m_writer.write(val->c_str(), static_cast<size_t>(val->size())));
+		oxReturnError(m_writer.write(val->c_str(), static_cast<std::size_t>(val->len())));
 		fieldSet = true;
 	}
-	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
+	oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return {};
+	return OxError(0);
 }
 
 template<Writer_c Writer>
-template<size_t L>
-constexpr Error MetalClawWriter<Writer>::field(CString name, IString<L> const *val) noexcept {
-	return fieldCString(name, val->data(), val->size());
+template<std::size_t L>
+constexpr Error MetalClawWriter<Writer>::field(const char *name, const IString<L> *val) noexcept {
+	return fieldCString(name, val->data(), val->len());
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::fieldCString(CString, CString const *val, size_t) noexcept {
+constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *const*val, std::size_t) noexcept {
 	bool fieldSet = false;
 	if (!m_unionIdx.has_value() || *m_unionIdx == m_field) {
-		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-		// this strlen is tolerated because sometimes 0 gets passed to
-		// the size param, which is a lie
-		// this code should be cleaned up at some point...
-		auto const strLen = *val ? ox::strlen(*val) : 0;
-		OX_ALLOW_UNSAFE_BUFFERS_END
+		const auto strLen = *val ? ox::strlen(*val) : 0;
 		// write the length
-		auto const strLenBuff = mc::encodeInteger(strLen);
-		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<CString>(strLenBuff.data.data()), strLenBuff.length));
+		const auto strLenBuff = mc::encodeInteger(strLen);
+		oxReturnError(m_writer.write(reinterpret_cast<const char*>(strLenBuff.data.data()), strLenBuff.length));
 		// write the string
-		OX_RETURN_ERROR(m_writer.write(*val, static_cast<size_t>(strLen)));
+		oxReturnError(m_writer.write(*val, static_cast<std::size_t>(strLen)));
 		fieldSet = true;
 	}
-	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
+	oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return {};
+	return OxError(0);
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::fieldCString(CString const name, CString *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::fieldCString(const char *name, const char **val) noexcept {
 	return fieldCString(name, val, {});
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::fieldCString(CString const name, CString const *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::fieldCString(const char *name, const char *const*val) noexcept {
 	return fieldCString(name, val, {});
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::fieldCString(CString, CString const val, size_t const strLen) noexcept {
+constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *val, std::size_t strLen) noexcept {
 	bool fieldSet = false;
 	if (strLen && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
 		// write the length
-		auto const strLenBuff = mc::encodeInteger(strLen);
-		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<CString>(strLenBuff.data.data()), strLenBuff.length));
+		const auto strLenBuff = mc::encodeInteger(strLen);
+		oxReturnError(m_writer.write(reinterpret_cast<const char*>(strLenBuff.data.data()), strLenBuff.length));
 		// write the string
-		OX_RETURN_ERROR(m_writer.write(val, static_cast<size_t>(strLen)));
+		oxReturnError(m_writer.write(val, static_cast<std::size_t>(strLen)));
 		fieldSet = true;
 	}
-	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
+	oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return {};
+	return OxError(0);
 }
 
 template<Writer_c Writer>
 template<typename T>
-constexpr Error MetalClawWriter<Writer>::field(CString, T const *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(const char*, const T *val) noexcept {
 	if constexpr(isVector_v<T> || isArray_v<T>) {
 		return field(nullptr, val->data(), val->size());
 	} else {
 		bool fieldSet = false;
 		if (val && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
 			auto const writeIdx = m_writer.tellp();
-			MetalClawWriter writer(m_writer);
-			OX_RETURN_ERROR(model(writer.interface(), val));
-			OX_RETURN_ERROR(writer.finalize());
+			MetalClawWriter<Writer> writer(m_writer);
+			ModelHandlerInterface<MetalClawWriter<Writer>> handler{&writer};
+			oxReturnError(model(&handler, val));
+			oxReturnError(writer.finalize());
 			fieldSet = writeIdx != m_writer.tellp();
 		}
-		OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
+		oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 		++m_field;
 		return {};
 	}
@@ -274,124 +276,129 @@ constexpr Error MetalClawWriter<Writer>::field(CString, T const *val) noexcept {
 
 template<Writer_c Writer>
 template<typename U, bool force>
-constexpr Error MetalClawWriter<Writer>::field(CString, UnionView<U, force> val) noexcept {
+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(m_writer, Optional<int>(in_place, val.idx()));
-		OX_RETURN_ERROR(model(writer.interface(), val.get()));
-		OX_RETURN_ERROR(writer.finalize());
+		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();
 	}
-	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
+	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(CString, T const *val, size_t const len) noexcept {
+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
-		auto const arrLen = mc::encodeInteger(len);
-		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<CString>(arrLen.data.data()), arrLen.length));
+		const auto arrLen = mc::encodeInteger(len);
+		oxReturnError(m_writer.write(reinterpret_cast<const char*>(arrLen.data.data()), arrLen.length));
 		auto const writeIdx = m_writer.tellp();
-		MetalClawWriter writer(m_writer);
-		OX_RETURN_ERROR(writer.interface()->template setTypeInfo<T>("List", 0, {}, static_cast<size_t>(len)));
+		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 (size_t i{}; i < len; ++i) {
+		for (std::size_t i = 0; i < len; ++i) {
 OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-			OX_RETURN_ERROR(writer.interface()->field("", &val[i]));
+			oxReturnError(handler.field("", &val[i]));
 OX_ALLOW_UNSAFE_BUFFERS_END
 		}
-		OX_RETURN_ERROR(writer.finalize());
+		oxReturnError(writer.finalize());
 		fieldSet = writeIdx != m_writer.tellp();
 	}
-	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
+	oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return {};
+	return OxError(0);
 }
 
 template<Writer_c Writer>
 template<typename T>
-constexpr Error MetalClawWriter<Writer>::field(CString, HashMap<String, T> const *val) noexcept {
-	auto const &keys = val->keys();
-	auto const len = keys.size();
+constexpr Error MetalClawWriter<Writer>::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.has_value() || *m_unionIdx == m_field)) {
 		// write the length
-		auto const arrLen = mc::encodeInteger(len);
-		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<CString>(arrLen.data.data()), arrLen.length));
+		const auto arrLen = mc::encodeInteger(len);
+		oxReturnError(m_writer.write(reinterpret_cast<const char*>(arrLen.data.data()), arrLen.length));
 		// write map
-		MetalClawWriter writer(m_writer);
+		MetalClawWriter<Writer> writer(m_writer);
+		ModelHandlerInterface handler{&writer};
 		// double len for both key and value
-		OX_RETURN_ERROR(writer.interface()->setTypeInfo("Map", 0, {}, len * 2));
+		oxReturnError(handler.setTypeInfo("Map", 0, {}, len * 2));
 		// this loop body needs to be in a lambda because of the potential alloca call
-		constexpr auto loopBody = [](auto &handler, auto const &key, auto const &val) -> Error {
-			auto const keyLen = key.size();
+		constexpr auto loopBody = [](auto &handler, auto const&key, auto const&val) -> ox::Error {
+			const auto keyLen = key.len();
 			auto wkey = ox_malloca(keyLen + 1, char, 0);
 			memcpy(wkey.get(), key.c_str(), keyLen + 1);
-			OX_RETURN_ERROR(handler.fieldCString("", wkey.get(), keyLen));
-			OX_REQUIRE_M(value, val.at(key));
+			oxReturnError(handler.fieldCString("", wkey.get(), keyLen));
+			oxRequireM(value, val.at(key));
 			return handler.field("", value);
 		};
 		// write the array
-		for (size_t i{}; i < len; ++i) {
-			auto const &key = keys[i];
-			OX_RETURN_ERROR(loopBody(*writer.interface(), key, *val));
+		for (std::size_t i = 0; i < len; ++i) {
+			auto const&key = keys[i];
+			oxReturnError(loopBody(handler, key, *val));
 		}
-		OX_RETURN_ERROR(writer.finalize());
+		oxReturnError(writer.finalize());
 		fieldSet = true;
 	}
-	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<size_t>(m_field), fieldSet));
+	oxReturnError(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return {};
+	return OxError(0);
 }
 
 template<Writer_c Writer>
 template<typename T>
-constexpr Error MetalClawWriter<Writer>::setTypeInfo(
-		CString,
+constexpr ox::Error MetalClawWriter<Writer>::setTypeInfo(
+		const char*,
 		int,
-		Vector<String> const&,
-		size_t const fields) noexcept {
-	auto const fieldPresenceLen = (fields - 1) / 8 + 1;
-	OX_RETURN_ERROR(m_writer.write(nullptr, fieldPresenceLen));
+		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);
-	return m_fieldPresence.setFields(static_cast<int>(fields));
+	m_fieldPresence.setBuffer(m_presenceMapBuff.data(), m_presenceMapBuff.size());
+	m_fieldPresence.setFields(static_cast<int>(fields));
+	return {};
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::finalize() noexcept {
-	auto const end = m_writer.tellp();
-	OX_RETURN_ERROR(m_writer.seekp(m_writerBeginP));
-	OX_RETURN_ERROR(m_writer.write(
-		m_presenceMapBuff.data(),
-		m_presenceMapBuff.size()));
-	OX_RETURN_ERROR(m_writer.seekp(end));
+ox::Error MetalClawWriter<Writer>::finalize() noexcept {
+	const auto end = m_writer.tellp();
+	oxReturnError(m_writer.seekp(m_writerBeginP));
+	oxReturnError(m_writer.write(
+			reinterpret_cast<const char*>(m_presenceMapBuff.data()),
+			m_presenceMapBuff.size()));
+	oxReturnError(m_writer.seekp(end));
 	return {};
 }
 
-Result<Buffer> writeMC(Writer_c auto &writer, auto const &val) noexcept {
+Result<Buffer> writeMC(Writer_c auto &writer, const auto &val) noexcept {
 	MetalClawWriter mcWriter(writer);
-	OX_RETURN_ERROR(model(mcWriter.interface(), &val));
-	OX_RETURN_ERROR(mcWriter.finalize());
+	ModelHandlerInterface handler{&mcWriter};
+	oxReturnError(model(&handler, &val));
+	oxReturnError(mcWriter.finalize());
 	return {};
 }
 
-Result<Buffer> writeMC(auto const &val, size_t const buffReserveSz = 2 * units::KB) noexcept {
+Result<Buffer> writeMC(auto const&val, std::size_t buffReserveSz = 2 * units::KB) noexcept {
 	Buffer buff(buffReserveSz);
 	BufferWriter bw(&buff, 0);
-	OX_RETURN_ERROR(writeMC(bw, val));
+	oxReturnError(writeMC(bw, val));
 	buff.resize(bw.tellp());
 	return buff;
 }
 
-Error writeMC(char *buff, size_t const buffLen, auto const &val, size_t *sizeOut = nullptr) noexcept {
+Error writeMC(char *buff, std::size_t buffLen, auto const&val, std::size_t *sizeOut = nullptr) noexcept {
 	CharBuffWriter bw{{buff, buffLen}};
-	OX_RETURN_ERROR(writeMC(bw, val));
+	oxReturnError(writeMC(bw, val));
 	if (sizeOut) {
 		*sizeOut = bw.tellp();
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -11,9 +11,9 @@
 #include <ox/std/concepts.hpp>
 
 // oxModelFwdDecl is necessary because Apple-Clang is broken...
-#define OX_MODEL_FWD_DECL(modelName) constexpr ox::Error model(auto *io, ox::CommonPtrWith<modelName> auto *o) noexcept
-#define OX_MODEL_BEGIN(modelName) constexpr ox::Error model(auto *io, [[maybe_unused]] ox::CommonPtrWith<modelName> auto *o) noexcept { OX_RETURN_ERROR(io->template setTypeInfo<modelName>());
-#define OX_MODEL_END() return {}; }
-#define OX_MODEL_FIELD(fieldName) OX_RETURN_ERROR(io->field(#fieldName, &o->fieldName));
-#define OX_MODEL_FIELD_RENAME(objFieldName, serFieldName) OX_RETURN_ERROR(io->field(#serFieldName, &o->objFieldName));
-#define OX_MODEL_FRIEND(modelName) friend constexpr ox::Error model(auto *io, ox::CommonPtrWith<modelName> auto *o) noexcept
+#define oxModelFwdDecl(modelName) constexpr ox::Error model(auto *io, ox::CommonPtrWith<modelName> auto *o) noexcept
+#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(objFieldName, serFieldName) oxReturnError(io->field(#serFieldName, &o->objFieldName));
+#define oxModelFriend(modelName) friend constexpr ox::Error model(auto *io, ox::CommonPtrWith<modelName> auto *o) noexcept

deps/ox/src/ox/model/descread.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/model/desctypes.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/model/desctypes.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -43,7 +43,7 @@ static constexpr auto buildTypeId(
 		for (const auto &p : typeParams) {
 			tp += p + ",";
 		}
-		tp.resize(tp.size() - 1);
+		tp.resize(tp.len() - 1);
 		tp += "#";
 	}
 	return ox::sfmt("{}{};{}", name, tp, version);
@@ -76,20 +76,20 @@ struct Subscript {
 
 template<typename T>
 constexpr Error model(T *io, CommonPtrWith<Subscript> auto *type) noexcept {
-	OX_RETURN_ERROR(io->template setTypeInfo<Subscript>());
+	oxReturnError(io->template setTypeInfo<Subscript>());
 	if constexpr(T::opType() == OpType::Reflect) {
 		uint32_t st = 0;
-		OX_RETURN_ERROR(io->field("subscriptType", &st));
+		oxReturnError(io->field("subscriptType", &st));
 	} else if constexpr(T::opType() == OpType::Write) {
 		auto pt = type ? static_cast<uint8_t>(type->subscriptType) : 0;
-		OX_RETURN_ERROR(io->field("subscriptType", &pt));
+		oxReturnError(io->field("subscriptType", &pt));
 	} else {
 		auto pt = type ? static_cast<uint32_t>(type->subscriptType) : 0;
-		OX_RETURN_ERROR(io->field("subscriptType", &pt));
+		oxReturnError(io->field("subscriptType", &pt));
 		type->subscriptType = static_cast<Subscript::SubscriptType>(pt);
 	}
-	OX_RETURN_ERROR(io->field("length", &type->length));
-	OX_RETURN_ERROR(io->field("smallSzLen", &type->smallSzLen));
+	oxReturnError(io->field("length", &type->length));
+	oxReturnError(io->field("smallSzLen", &type->smallSzLen));
 	return {};
 }
 
@@ -185,37 +185,37 @@ constexpr auto buildTypeId(const DescriptorType &t) noexcept {
 
 template<typename T>
 constexpr Error model(T *io, CommonPtrWith<DescriptorType> auto *type) noexcept {
-	OX_RETURN_ERROR(io->template setTypeInfo<DescriptorType>());
-	OX_RETURN_ERROR(io->field("typeName", &type->typeName));
-	OX_RETURN_ERROR(io->field("typeVersion", &type->typeVersion));
+	oxReturnError(io->template setTypeInfo<DescriptorType>());
+	oxReturnError(io->field("typeName", &type->typeName));
+	oxReturnError(io->field("typeVersion", &type->typeVersion));
 	if constexpr(T::opType() == OpType::Reflect) {
 		uint8_t pt = 0;
-		OX_RETURN_ERROR(io->field("primitiveType", &pt));
+		oxReturnError(io->field("primitiveType", &pt));
 	} else if constexpr(T::opType() == OpType::Write) {
 		auto pt = type ? static_cast<uint8_t>(type->primitiveType) : 0;
-		OX_RETURN_ERROR(io->field("primitiveType", &pt));
+		oxReturnError(io->field("primitiveType", &pt));
 	} else {
 		auto pt = type ? static_cast<uint8_t>(type->primitiveType) : 0;
-		OX_RETURN_ERROR(io->field("primitiveType", &pt));
+		oxReturnError(io->field("primitiveType", &pt));
 		type->primitiveType = static_cast<PrimitiveType>(pt);
 	}
-	OX_RETURN_ERROR(io->field("typeParams", &type->typeParams));
-	OX_RETURN_ERROR(io->field("fieldList", &type->fieldList));
-	OX_RETURN_ERROR(io->field("length", &type->length));
-	OX_RETURN_ERROR(io->field("preloadable", &type->preloadable));
+	oxReturnError(io->field("typeParams", &type->typeParams));
+	oxReturnError(io->field("fieldList", &type->fieldList));
+	oxReturnError(io->field("length", &type->length));
+	oxReturnError(io->field("preloadable", &type->preloadable));
 	return {};
 }
 
 template<typename T>
 constexpr Error model(T *io, CommonPtrWith<DescriptorField> auto *field) noexcept {
-	OX_RETURN_ERROR(io->template setTypeInfo<DescriptorField>());
-	OX_RETURN_ERROR(io->field("typeId", &field->typeId));
-	OX_RETURN_ERROR(io->field("fieldName", &field->fieldName));
-	OX_RETURN_ERROR(io->field("subscriptLevels", &field->subscriptLevels));
-	OX_RETURN_ERROR(io->field("subscriptStack", &field->subscriptStack));
+	oxReturnError(io->template setTypeInfo<DescriptorField>());
+	oxReturnError(io->field("typeId", &field->typeId));
+	oxReturnError(io->field("fieldName", &field->fieldName));
+	oxReturnError(io->field("subscriptLevels", &field->subscriptLevels));
+	oxReturnError(io->field("subscriptStack", &field->subscriptStack));
 	// defaultValue is unused now, but leave placeholder for backwards compatibility
 	int defaultValue = 0;
-	OX_RETURN_ERROR(io->field("defaultValue", &defaultValue));
+	oxReturnError(io->field("defaultValue", &defaultValue));
 	return {};
 }
 
@@ -244,7 +244,7 @@ constexpr Error model(TypeDescReader<T> *io, CommonPtrWith<DescriptorField> auto
 	// defaultValue is unused now, but placeholder for backwards compatibility
 	int defaultValue = 0;
 	oxReturnError(io->field("defaultValue", &defaultValue));
-	return {};
+	return OxError(0);
 }
 #endif
 

deps/ox/src/ox/model/descwrite.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/model/descwrite.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -51,7 +51,7 @@ constexpr auto buildSubscriptStack(const T**, SubscriptStack *s) noexcept {
 }
 
 template<typename T>
-constexpr auto buildSubscriptStack(const UPtr<T>*, SubscriptStack *s) noexcept {
+constexpr auto buildSubscriptStack(const UniquePtr<T>*, SubscriptStack *s) noexcept {
 	s->push_back({.subscriptType = Subscript::SubscriptType::Ptr});
 }
 
@@ -187,7 +187,7 @@ constexpr ox::Error TypeDescWriter::setTypeInfo(
 	PrimitiveType pt;
 	if constexpr(is_union_v<T>) {
 		pt = PrimitiveType::Union;
-	} else if constexpr(isBasicString_v<T> || isIString_v<T>) {
+	} else if constexpr(isBasicString_v<T> || isBString_v<T>) {
 		pt = PrimitiveType::String;
 	} else {
 		pt = PrimitiveType::Struct;
@@ -205,9 +205,9 @@ constexpr Error TypeDescWriter::field(StringViewCR name, T const*, std::size_t,
 		const auto t = type(p);
 		oxAssert(t != nullptr, "field(const char *name, T *val, std::size_t): Type not found or generated");
 		m_type->fieldList.emplace_back(t, String(name), detail::indirectionLevels_v<T> + 1, subscriptStack, buildTypeId(*t));
-		return {};
+		return OxError(0);
 	}
-	return ox::Error(1);
+	return OxError(1);
 }
 
 // array handler
@@ -220,9 +220,9 @@ constexpr Error TypeDescWriter::field(StringViewCR name, T const*, std::size_t)
 		auto const lvls = detail::indirectionLevels_v<T> + 1;
 		SubscriptStack subscriptStack{lvls};
 		m_type->fieldList.emplace_back(t, String(name), lvls, subscriptStack, buildTypeId(*t));
-		return {};
+		return OxError(0);
 	}
-	return ox::Error(1);
+	return OxError(1);
 }
 
 template<typename T, bool force>
@@ -231,9 +231,9 @@ constexpr Error TypeDescWriter::field(StringViewCR name, UnionView<T, force> val
 		const auto t = type(val);
 		oxAssert(t != nullptr, "field(const char *name, T val): Type not found or generated");
 		m_type->fieldList.emplace_back(t, String(name), 0, SubscriptStack{}, ox::String(t->typeName));
-		return {};
+		return OxError(0);
 	}
-	return ox::Error(1);
+	return OxError(1);
 }
 
 template<typename T>
@@ -254,7 +254,7 @@ constexpr Error TypeDescWriter::field(StringViewCR name, const T *val) noexcept
 			return {};
 		}
 	}
-	return ox::Error(1);
+	return OxError(1);
 }
 
 template<typename ...Args>
@@ -357,7 +357,7 @@ constexpr const DescriptorType *TypeDescWriter::type(const char*) const noexcept
 template<std::size_t sz>
 constexpr const DescriptorType *TypeDescWriter::type(const IString<sz>*) const noexcept {
 	constexpr auto PT = PrimitiveType::String;
-	return getType(types::IString, 0, PT, 0);
+	return getType(types::BString, 0, PT, 0);
 }
 
 constexpr const DescriptorType *TypeDescWriter::getType(StringViewCR tn, int typeVersion, PrimitiveType pt, int b,
@@ -380,15 +380,15 @@ constexpr const DescriptorType *TypeDescWriter::getType(StringViewCR tn, int typ
 template<typename T>
 constexpr Result<DescriptorType*> buildTypeDef(TypeStore &typeStore) noexcept {
 	TypeDescWriter writer(&typeStore);
-	ModelHandlerInterface<TypeDescWriter, ox::OpType::Reflect> handler(writer);
+	ModelHandlerInterface<TypeDescWriter, ox::OpType::Reflect> handler(&writer);
 	if (std::is_constant_evaluated()) {
 		std::allocator<T> a;
 		T *t = a.allocate(1);
-		OX_RETURN_ERROR(model(&handler, t));
+		oxReturnError(model(&handler, t));
 		a.deallocate(t, 1);
 	} else {
 		auto t = ox_malloca(sizeof(T), T);
-		OX_RETURN_ERROR(model(&handler, t.get()));
+		oxReturnError(model(&handler, t.get()));
 	}
 	return writer.definition();
 }
@@ -396,8 +396,8 @@ constexpr Result<DescriptorType*> buildTypeDef(TypeStore &typeStore) noexcept {
 template<typename T>
 constexpr Result<DescriptorType*> buildTypeDef(TypeStore &typeStore, T &val) noexcept {
 	TypeDescWriter writer(&typeStore);
-	ModelHandlerInterface<TypeDescWriter, ox::OpType::Reflect> handler(writer);
-	OX_RETURN_ERROR(model(&handler, &val));
+	ModelHandlerInterface<TypeDescWriter, ox::OpType::Reflect> handler(&writer);
+	oxReturnError(model(&handler, &val));
 	return writer.definition();
 }
 

deps/ox/src/ox/model/fieldcounter.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -31,25 +31,25 @@ class FieldCounter {
 		template<typename U>
 		constexpr ox::Error field(StringViewCR, U) noexcept {
 			++fields;
-			return {};
+			return OxError(0);
 		}
 
 		template<typename U>
 		constexpr ox::Error field(StringViewCR, U, std::size_t) noexcept {
 			++fields;
-			return {};
+			return OxError(0);
 		}
 
 		template<typename U, typename Handler>
 		constexpr Error field(StringViewCR, Handler) {
 			++fields;
-			return {};
+			return OxError(0);
 		}
 
 		template<typename ...Args>
 		constexpr Error fieldCString(Args&&...) noexcept {
 			++fields;
-			return {};
+			return OxError(0);
 		}
 
 		static constexpr auto opType() noexcept {

deps/ox/src/ox/model/metadata.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/model/model.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/model/modelhandleradaptor.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -17,177 +17,176 @@ namespace ox {
 template<typename Handler, OpType opType_v = Handler::opType()>
 class ModelHandlerInterface {
 	private:
-		Handler &m_handler;
+		Handler *m_handler = nullptr;
 
 	public:
-		constexpr explicit ModelHandlerInterface(Handler &handler) noexcept: m_handler(handler) {
+		constexpr explicit ModelHandlerInterface(Handler *handler) noexcept: m_handler(handler) {
 		}
 
 		template<typename T = std::nullptr_t>
 		constexpr ox::Error setTypeInfo(
-			CString name = T::TypeName,
+			const char* name = T::TypeName,
 			int version = T::TypeVersion,
-			Vector<String> const &typeParams = {}) noexcept {
-			return m_handler.template setTypeInfo<T>(name, version, typeParams, ModelFieldCount_v<T>);
+			const Vector<String>& typeParams = {}) noexcept {
+			return m_handler->template setTypeInfo<T>(name, version, typeParams, ModelFieldCount_v<T>);
 		}
 
 		template<typename T = std::nullptr_t>
 		constexpr ox::Error setTypeInfo(
-			CString name,
+			const char *name,
 			int version,
-			Vector<String> const &typeParams,
-			size_t fields) noexcept {
-			return m_handler.template setTypeInfo<T>(name, version, typeParams, fields);
+			const Vector<String>& typeParams,
+			std::size_t fields) noexcept {
+			return m_handler->template setTypeInfo<T>(name, version, typeParams, fields);
 		}
 
-		template<size_t len>
-		constexpr Error fieldCString(CString name, char val[len]) noexcept {
-			return m_handler.fieldCString(name, &val[0], len);
+		template<std::size_t len>
+		constexpr Error fieldCString(const char *name, char val[len]) noexcept {
+			return m_handler->fieldCString(name, &val[0], len);
 		}
 
-		template<size_t len>
-		constexpr Error fieldCString(CString name, char const val[len]) noexcept requires(opType_v != OpType::Read) {
+		template<std::size_t len>
+		constexpr Error fieldCString(const char *name, const char val[len]) noexcept requires(opType_v != OpType::Read) {
 			if constexpr(opType_v != OpType::Read) {
-				return m_handler.fieldCString(name, &val[0], len);
+				return m_handler->fieldCString(name, &val[0], len);
 			} else {
 				return {};
 			}
 		}
 
-		constexpr Error fieldCString(CString name, char **val) noexcept {
-			return m_handler.fieldCString(name, val);
+		constexpr Error fieldCString(const char *name, char **val) noexcept {
+			return m_handler->fieldCString(name, val);
 		}
 
-		constexpr Error fieldCString(CString name, char const *const*val) noexcept requires(opType_v != OpType::Read) {
+		constexpr Error fieldCString(const char *name, const char *const*val) noexcept requires(opType_v != OpType::Read) {
 			// this check looks pointless, but it's to address a Clang bug
 			if constexpr(opType_v != OpType::Read) {
-				return m_handler.fieldCString(name, val);
+				return m_handler->fieldCString(name, val);
 			} else {
 				return {};
 			}
 		}
 
-		constexpr Error fieldCString(CString name, char const **val) noexcept requires(opType_v != OpType::Read) {
+		constexpr Error fieldCString(const char *name, const char **val) noexcept requires(opType_v != OpType::Read) {
 			// this check looks pointless, but it's to address a Clang bug
 			if constexpr(opType_v != OpType::Read) {
-				return m_handler.fieldCString(name, val);
+				return m_handler->fieldCString(name, val);
 			} else {
 				return {};
 			}
 		}
 
-		constexpr Error fieldCString(CString name, char **val, size_t buffLen) noexcept {
-			return m_handler.fieldCString(name, val, buffLen);
+		constexpr Error fieldCString(const char *name, char **val, std::size_t buffLen) noexcept {
+			return m_handler->fieldCString(name, val, buffLen);
 		}
 
-		constexpr Error fieldCString(CString name, char const **val, size_t buffLen) noexcept requires(opType_v != OpType::Read) {
+		constexpr Error fieldCString(const char *name, const char **val, std::size_t buffLen) noexcept requires(opType_v != OpType::Read) {
 			// this check looks pointless, but it's to address a Clang bug
 			if constexpr(opType_v != OpType::Read) {
-				return m_handler.fieldCString(name, val, buffLen);
+				return m_handler->fieldCString(name, val, buffLen);
 			} else {
 				return {};
 			}
 		}
 
-		constexpr Error fieldCString(CString name, char *val, size_t buffLen) noexcept {
-			return m_handler.fieldCString(name, val, buffLen);
+		constexpr Error fieldCString(const char *name, char *val, std::size_t buffLen) noexcept {
+			return m_handler->fieldCString(name, val, buffLen);
 		}
 
-		constexpr Error fieldModelValue(char const *name, CommonPtrWith<ModelValue> auto *v) noexcept {
+		constexpr Error fieldModelValue(const char *name, CommonPtrWith<ModelValue> auto *v) noexcept {
 			switch (v->type()) {
 				case ModelValue::Type::Undefined:
 					break;
 				case ModelValue::Type::Bool:
-					return m_handler.field(name, &v->template get<bool>());
+					return m_handler->field(name, &v->template get<bool>());
 				case ModelValue::Type::UnsignedInteger8:
-					return m_handler.field(name, &v->template get<uint8_t>());
+					return m_handler->field(name, &v->template get<uint8_t>());
 				case ModelValue::Type::UnsignedInteger16:
-					return m_handler.field(name, &v->template get<uint16_t>());
+					return m_handler->field(name, &v->template get<uint16_t>());
 				case ModelValue::Type::UnsignedInteger32:
-					return m_handler.field(name, &v->template get<uint32_t>());
+					return m_handler->field(name, &v->template get<uint32_t>());
 				case ModelValue::Type::UnsignedInteger64:
-					return m_handler.field(name, &v->template get<uint64_t>());
+					return m_handler->field(name, &v->template get<uint64_t>());
 				case ModelValue::Type::SignedInteger8:
-					return m_handler.field(name, &v->template get<int8_t>());
+					return m_handler->field(name, &v->template get<int8_t>());
 				case ModelValue::Type::SignedInteger16:
-					return m_handler.field(name, &v->template get<int16_t>());
+					return m_handler->field(name, &v->template get<int16_t>());
 				case ModelValue::Type::SignedInteger32:
-					return m_handler.field(name, &v->template get<int32_t>());
+					return m_handler->field(name, &v->template get<int32_t>());
 				case ModelValue::Type::SignedInteger64:
-					return m_handler.field(name, &v->template get<int64_t>());
+					return m_handler->field(name, &v->template get<int64_t>());
 				case ModelValue::Type::String:
-					return m_handler.field(name, &v->template get<String>());
+					return m_handler->field(name, &v->template get<String>());
 				case ModelValue::Type::Object:
-					return m_handler.field(name, &v->template get<ModelObject>());
+					return m_handler->field(name, &v->template get<ModelObject>());
 				case ModelValue::Type::Union:
 				{
 					auto &u = v->template get<ModelUnion>();
 					if constexpr(opType_v == OpType::Read) {
-						u.setActiveField(whichFieldPresent(m_handler, name, u));
-						return m_handler.field(name, UnionView<ModelUnion, true>(&u, u.unionIdx()));
+						u.setActiveField(m_handler->whichFieldPresent(name, u));
+						return m_handler->field(name, UnionView<ModelUnion, true>(&u, u.unionIdx()));
 					} else {
-						return m_handler.field(name, UnionView<ModelUnion const, true>(&u, u.unionIdx()));
+						return m_handler->field(name, UnionView<const ModelUnion, true>(&u, u.unionIdx()));
 					}
 				}
 				case ModelValue::Type::Vector:
-					return m_handler.field(name, &v->template get<ModelValueVector>());
+					return m_handler->field(name, &v->template get<ModelValueVector>());
 				case ModelValue::Type::InlineArray:
-					return m_handler.field(name, &v->template get<ModelValueArray>());
+					return m_handler->field(name, &v->template get<ModelValueArray>());
 			}
 			oxErrf("invalid type: {}: {}\n", name, static_cast<int>(v->type()));
-			ox::panic("invalid type");
-			return ox::Error(1, "invalid type");
+			oxPanic(OxError(1), "invalid type");
+			return OxError(1, "invalid type");
 		}
 
 		// array handler, with callback to allow handling individual elements
 		template<typename T, typename Callback>
-		constexpr Error field(CString name, Callback cb) noexcept {
-			return m_handler.template field<T, Callback>(name, cb);
+		constexpr Error field(const char *name, Callback cb) noexcept {
+			return m_handler->template field<T, Callback>(name, cb);
 		}
 
 		template<typename T>
-		constexpr Error field(CString name, const T *v) noexcept {
+		constexpr Error field(const char *name, const T *v) noexcept {
 			if constexpr(ox::is_same_v<T, ModelValue>) {
 				return fieldModelValue(name, v);
 			} else {
-				return m_handler.field(name, v);
+				return m_handler->field(name, v);
 			}
 		}
 
 		template<typename T>
-		constexpr Error field(CString name, T *v) noexcept {
+		constexpr Error field(const char *name, T *v) noexcept {
 			if constexpr(ox::is_same_v<T, ModelValue>) {
 				return fieldModelValue(name, v);
 			} else {
-				return m_handler.field(name, v);
+				return m_handler->field(name, v);
 			}
 		}
 
 		template<typename U, bool force = false>
-		constexpr Error field(CString name, UnionView<U, force> val) noexcept {
-			return m_handler.field(name, val);
+		constexpr Error field(const char *name, UnionView<U, force> val) noexcept {
+			return m_handler->field(name, val);
 		}
 
-		constexpr Error field(CString name, auto *val, size_t len) noexcept {
-			return m_handler.field(name, val, len);
+		constexpr Error field(const char *name, auto *val, std::size_t len) noexcept {
+			return m_handler->field(name, val, len);
 		}
 
 		/**
 		 * Reads an array length from the current location in the buffer.
-		 * @param name
 		 * @param pass indicates that the parsing should iterate past the array length
 		 */
 		 [[nodiscard]]
-		constexpr auto arrayLength(CString name, bool pass = true) noexcept {
-			return m_handler.arrayLength(name, pass);
+		constexpr auto arrayLength(const char *name, bool pass = true) noexcept {
+			return m_handler->arrayLength(name, pass);
 		}
 
 		/**
 		 * Reads an string length from the current location in the buffer.
 		 */
 		[[nodiscard]]
-		constexpr auto stringLength(CString name) noexcept {
-			return m_handler.stringLength(name);
+		constexpr auto stringLength(const char *name) noexcept {
+			return m_handler->stringLength(name);
 		}
 
 		[[nodiscard]]
@@ -199,33 +198,22 @@ class ModelHandlerInterface {
 		constexpr auto handler() noexcept {
 			return m_handler;
 		}
-
-	private:
-		template<typename H>
-		static constexpr int whichFieldPresent(H &h, CString name, ModelUnion const &u) noexcept
-			requires(H::opType() == OpType::Read) {
-			return h.whichFieldPresent(name, u);
-		}
-
-		template<typename H>
-		static constexpr int whichFieldPresent(H&, CString, ModelUnion const&) noexcept
-			requires(H::opType() != OpType::Read) {
-			return 0;
-		}
-
 };
 
-template<typename Handler, OpType opType_v = Handler::opType()>
+template<typename Handler, ox::OpType opType_v = Handler::opType()>
 class ModelHandlerBase {
 	private:
-		ModelHandlerInterface<Handler, opType_v> m_interface{*static_cast<Handler*>(this)};
+		ModelHandlerInterface<Handler, opType_v> m_interface;
 	public:
+		constexpr ModelHandlerBase() noexcept: m_interface(static_cast<Handler*>(this)) {}
+		constexpr ModelHandlerBase(const ModelHandlerBase&) noexcept: m_interface(static_cast<Handler*>(this)) {}
+		constexpr ModelHandlerBase(ModelHandlerBase&&) noexcept: m_interface(static_cast<Handler*>(this)) {}
 		[[nodiscard]]
 		constexpr auto interface() noexcept {
 			return &m_interface;
 		}
 		[[nodiscard]]
-		static constexpr OpType opType() noexcept {
+		static constexpr ox::OpType opType() noexcept {
 			return opType_v;
 		}
 };

deps/ox/src/ox/model/modelops.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -56,19 +56,19 @@ class MemberList {
 		template<typename T>
 		constexpr Error field(const char*, T *v) noexcept {
 			vars[m_i++] = static_cast<void*>(v);
-			return {};
+			return OxError(0);
 		}
 
 		template<typename T>
 		constexpr Error field(const char*, T *v, int) noexcept {
 			vars[m_i++] = static_cast<void*>(v);
-			return {};
+			return OxError(0);
 		}
 
 		template<typename U, bool force = false>
 		constexpr Error field(const char*, UnionView<U, force> u) noexcept {
 			vars[m_i++] = static_cast<void*>(u.get());
-			return {};
+			return OxError(0);
 		}
 
 		template<typename T>
@@ -107,7 +107,7 @@ class Copier {
 				auto &dst = *cbit_cast<FT*>(m_dst->vars[m_i]);
 				dst = src;
 				++m_i;
-				return {};
+				return OxError(0);
 			}
 		}
 
@@ -119,7 +119,7 @@ class Copier {
 				dst = src;
 			}
 			++m_i;
-			return {};
+			return OxError(0);
 		}
 
 		template<typename U, bool force = false>
@@ -128,7 +128,7 @@ class Copier {
 			auto &src = *u.get();
 			dst = src;
 			++m_i;
-			return {};
+			return OxError(0);
 		}
 
 		template<typename T = void>
@@ -168,7 +168,7 @@ class Mover {
 				dst = std::move(src);
 				src = FT{};
 				++m_i;
-				return {};
+				return OxError(0);
 			}
 		}
 
@@ -181,7 +181,7 @@ class Mover {
 				src = FT{};
 			}
 			++m_i;
-			return {};
+			return OxError(0);
 		}
 
 		template<typename U, bool force = false>
@@ -190,7 +190,7 @@ class Mover {
 			auto &src = *u.get();
 			dst = std::move(src);
 			++m_i;
-			return {};
+			return OxError(0);
 		}
 
 		template<typename T = void>
@@ -228,10 +228,10 @@ class Equals {
 			const auto &dst = std::bit_cast<FT>(*m_other->vars[m_i]);
 			++m_i;
 			if (dst == src) {
-				return {};
+				return OxError(0);
 			} else {
 				this->value = false;
-				return ox::Error(1);
+				return OxError(1);
 			}
 		}
 
@@ -242,11 +242,11 @@ class Equals {
 				const auto &dst = cbit_cast<FT*>(m_other->vars[m_i])[i];
 				if (!(dst == src)) {
 					this->value = false;
-					return ox::Error(1);
+					return OxError(1);
 				}
 			}
 			++m_i;
-			return {};
+			return OxError(0);
 		}
 
 		template<typename U, bool force = false>
@@ -255,10 +255,10 @@ class Equals {
 			const auto &src = *u.get();
 			++m_i;
 			if (dst == src) {
-				return {};
+				return OxError(0);
 			} else {
 				this->value = false;
-				return ox::Error(1);
+				return OxError(1);
 			}
 		}
 

deps/ox/src/ox/model/modelvalue.cpp

@@ -1,28 +1,23 @@
 /*
- * Copyright 2015 - 2025 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/std/hashmap.hpp>
-
 #include "modelvalue.hpp"
 
 namespace ox {
 
-static_assert([]() -> Error {
-	ModelValue v;
-	OX_RETURN_ERROR(v.setType<int32_t>());
+static_assert([]() -> ox::Error {
+	ox::ModelValue v;
+	oxReturnError(v.setType<int32_t>());
 	if (v.type() != ModelValue::Type::SignedInteger32) {
-		return Error(1, "type is wrong");
+		return OxError(1, "type is wrong");
 	}
 	//oxReturnError(v.set<int32_t>(5));
 	return {};
-}() == Error{});
-
-// a dummy function to prevent linker errors in a library that has no other symbols
-void modelDummyFunc() noexcept {}
+}() == OxError(0));
 
 }

deps/ox/src/ox/model/modelvalue.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -100,7 +100,7 @@ class ModelValue {
 				return Type::Union;
 			} else if constexpr(is_same_v<U, ModelObject>) {
 				return Type::Object;
-			} else if constexpr(isBasicString_v<U> || isIString_v<U>) {
+			} else if constexpr(isBasicString_v<U> || isBString_v<U>) {
 				return Type::String;
 			} else if constexpr(is_same_v<U, ModelValueVector>) {
 				return Type::Vector;
@@ -168,7 +168,7 @@ class ModelValue {
 		constexpr const auto &get() const noexcept {
 			constexpr auto type = getType<T>();
 			if (m_type != type) [[unlikely]] {
-				ox::panic("invalid cast");
+				oxPanic(OxError(1), "invalid cast");
 			}
 			return getValue<type>(*this);
 		}
@@ -178,7 +178,7 @@ class ModelValue {
 		constexpr auto &get() noexcept {
 			constexpr auto type = getType<T>();
 			if (m_type != type) [[unlikely]] {
-				ox::panic("invalid cast");
+				oxPanic(OxError(1), "invalid cast");
 			}
 			return getValue<type>(*this);
 		}
@@ -187,7 +187,7 @@ class ModelValue {
 		constexpr Type type() const noexcept;
 
 		constexpr Error setType(
-				DescriptorType const *type,
+				DescriptorType const*type,
 				SubscriptStack const& = {},
 				int subscriptLevels = 0) noexcept;
 
@@ -200,6 +200,8 @@ class ModelValue {
 		template<typename T>
 		constexpr Error set(T &&v) noexcept;
 
+		constexpr ModelValue &operator=(ModelValue &val) noexcept;
+
 		constexpr ModelValue &operator=(const ModelValue &val) noexcept;
 
 		constexpr ModelValue &operator=(ModelValue &&val) noexcept;
@@ -240,7 +242,7 @@ class ModelValueArray {
 			m_vec.resize(sz);
 			if (sz > oldSz) {
 				for (auto i = oldSz; i < sz; ++i) {
-					OX_RETURN_ERROR(m_vec[i].setType(m_type, m_subscriptStack, m_typeSubscriptLevels));
+					oxReturnError(m_vec[i].setType(m_type, m_subscriptStack, m_typeSubscriptLevels));
 				}
 			}
 			return {};
@@ -273,7 +275,7 @@ class ModelValueArray {
 		}
 
 		constexpr Error setType(
-				DescriptorType const *type,
+				DescriptorType const*type,
 				SubscriptStack subscriptStack,
 				int subscriptLevels) noexcept {
 			oxAssert(subscriptLevels <= static_cast<int>(subscriptStack.size()), "subscript level mismatch");
@@ -399,7 +401,7 @@ class ModelValueVector {
 			m_vec.resize(sz);
 			if (sz > oldSz) {
 				for (auto i = oldSz; i < sz; ++i) {
-					OX_RETURN_ERROR(m_vec[i].setType(m_type, m_subscriptStack, m_typeSubscriptLevels));
+					oxReturnError(m_vec[i].setType(m_type, m_subscriptStack, m_typeSubscriptLevels));
 				}
 			}
 			return {};
@@ -416,7 +418,7 @@ class ModelValueVector {
 		}
 
 		constexpr Error setType(
-				DescriptorType const *type,
+				DescriptorType const*type,
 				SubscriptStack subscriptStack,
 				int subscriptLevels) noexcept {
 			oxAssert(subscriptLevels <= static_cast<int>(subscriptStack.size()), "subscript level mismatch");
@@ -517,9 +519,9 @@ class ModelObject {
 			ModelValue value;
 		};
 	protected:
-		OX_MODEL_FRIEND(ModelObject);
+		oxModelFriend(ModelObject);
 		friend ModelValue;
-		Vector<UPtr<Field>> m_fieldsOrder;
+		Vector<UniquePtr<Field>> m_fieldsOrder;
 		HashMap<String, ModelValue*> m_fields;
 		const DescriptorType *m_type = nullptr;
 
@@ -632,18 +634,18 @@ class ModelObject {
 			if (m_fields.contains(k)) {
 				return *m_fields.at(k).value;
 			}
-			return ox::Error(1);
+			return OxError(1);
 		}
 
 		template<typename T>
 		constexpr Error set(const String &k, T &&val) noexcept {
-			OX_REQUIRE(t, m_fields.at(k));
+			oxRequire(t, m_fields.at(k));
 			*t = ox::forward<T>(val);
 			return {};
 		}
 
 		constexpr ox::Result<ModelValue*> at(StringView const&k) noexcept {
-			OX_REQUIRE(v, m_fields.at(k));
+			oxRequire(v, m_fields.at(k));
 			return *v;
 		}
 
@@ -668,13 +670,13 @@ class ModelObject {
 
 		constexpr Error setType(const DescriptorType *type) noexcept {
 			if (type->primitiveType != PrimitiveType::Struct && type->primitiveType != PrimitiveType::Union) {
-				return ox::Error(1, "Cannot load a non-struct type to ModelObject");
+				return OxError(1, "Cannot load a non-struct type to ModelObject");
 			}
 			m_type = type;
 			for (const auto &f : type->fieldList) {
 				auto field = make_unique<Field>();
 				field->name = f.fieldName;
-				OX_RETURN_ERROR(field->value.setType(f.type, f.subscriptStack, f.subscriptLevels));
+				oxReturnError(field->value.setType(f.type, f.subscriptStack, f.subscriptLevels));
 				m_fields[field->name] = &field->value;
 				m_fieldsOrder.emplace_back(std::move(field));
 			}
@@ -692,7 +694,7 @@ class ModelUnion {
 		};
 		friend constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept;
 		friend ModelValue;
-		Vector<UPtr<Field>> m_fieldsOrder;
+		Vector<UniquePtr<Field>> m_fieldsOrder;
 		HashMap<String, Field*> m_fields;
 		const DescriptorType *m_type = nullptr;
 		int m_unionIdx = -1;
@@ -718,18 +720,18 @@ class ModelUnion {
 			m_unionIdx = other.m_unionIdx;
 		}
 
-		static constexpr Result<UPtr<ModelUnion>> make(const DescriptorType *type) noexcept {
-			UPtr<ModelUnion> out(new ModelUnion);
-			OX_RETURN_ERROR(out->setType(type));
+		static constexpr Result<UniquePtr<ModelUnion>> make(const DescriptorType *type) noexcept {
+			UniquePtr<ModelUnion> out(new ModelUnion);
+			oxReturnError(out->setType(type));
 			return out;
 		}
 
-		static constexpr Result<UPtr<ModelUnion>> make(const ModelUnion &other) noexcept {
-			return UPtr<ModelUnion>(new ModelUnion(other));
+		static constexpr Result<UniquePtr<ModelUnion>> make(const ModelUnion &other) noexcept {
+			return UniquePtr<ModelUnion>(new ModelUnion(other));
 		}
 
 		constexpr ox::Result<ModelValue*> at(StringView const&k) noexcept {
-			OX_REQUIRE(v, m_fields.at(k));
+			oxRequire(v, m_fields.at(k));
 			return &(*v)->value;
 		}
 
@@ -761,7 +763,7 @@ class ModelUnion {
 
 		[[nodiscard]]
 		constexpr Result<const ModelValue*> get(StringView const&k) const noexcept {
-			OX_REQUIRE(t, m_fields.at(k));
+			oxRequire(t, m_fields.at(k));
 			return &(*t)->value;
 		}
 
@@ -788,7 +790,7 @@ class ModelUnion {
 
 		constexpr Error setType(const DescriptorType *type) noexcept {
 			if (type->primitiveType != PrimitiveType::Struct && type->primitiveType != PrimitiveType::Union) {
-				return ox::Error(1, "Cannot load a non-struct type to ModelUnion");
+				return OxError(1, "Cannot load a non-struct type to ModelUnion");
 			}
 			m_fields.clear();
 			m_fieldsOrder.clear();
@@ -797,7 +799,7 @@ class ModelUnion {
 				auto field = make_unique<Field>();
 				field->name = f.fieldName;
 				field->idx = i;
-				OX_RETURN_ERROR(field->value.setType(f.type, SubscriptStack{static_cast<size_t>(f.subscriptLevels)}, f.subscriptLevels));
+				oxReturnError(field->value.setType(f.type, SubscriptStack{static_cast<size_t>(f.subscriptLevels)}, f.subscriptLevels));
 				m_fields[field->name] = field.get();
 				m_fieldsOrder.emplace_back(std::move(field));
 				++i;
@@ -819,7 +821,7 @@ class ModelUnion {
 
 template<typename PlatSpec>
 [[nodiscard]]
-constexpr std::size_t sizeOf(ModelValueArray const *v) noexcept {
+constexpr std::size_t sizeOf(ModelValueArray const*v) noexcept {
 	return sizeOf<PlatSpec>(&(*v)[0]) * v->size();
 }
 
@@ -965,21 +967,21 @@ constexpr std::size_t alignOf(const ModelValue &t) noexcept {
 }
 
 constexpr Error model(auto *h, CommonPtrWith<ModelObject> auto *obj) noexcept {
-	OX_RETURN_ERROR(h->template setTypeInfo<ModelObject>(
+	oxReturnError(h->template setTypeInfo<ModelObject>(
 			obj->typeName().c_str(), obj->typeVersion(), {}, obj->m_fieldsOrder.size()));
 	for (auto &f : obj->m_fieldsOrder) {
-		OX_RETURN_ERROR(h->field(f->name.c_str(), &f->value));
+		oxReturnError(h->field(f->name.c_str(), &f->value));
 	}
-	return {};
+	return OxError(0);
 }
 
 constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept {
-	OX_RETURN_ERROR(h->template setTypeInfo<ModelUnion>(
+	oxReturnError(h->template setTypeInfo<ModelUnion>(
 			obj->typeName().c_str(), obj->typeVersion(), {}, obj->m_fieldsOrder.size()));
 	for (auto &f : obj->m_fieldsOrder) {
-		OX_RETURN_ERROR(h->field(f->name.c_str(), &f->value));
+		oxReturnError(h->field(f->name.c_str(), &f->value));
 	}
-	return {};
+	return OxError(0);
 }
 
 constexpr ModelValue::ModelValue(const ModelValue &other) noexcept {
@@ -995,7 +997,7 @@ constexpr ModelValue::ModelValue(const ModelValue &other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			m_data = other.m_data;
+			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = new String(other.get<String>());
@@ -1028,8 +1030,8 @@ constexpr ModelValue::ModelValue(ModelValue &&other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			m_data = other.m_data;
-			other.m_data.ui64 = 0;
+			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
+			ox::memset(&other.m_data, 0, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = other.m_data.str;
@@ -1085,18 +1087,18 @@ constexpr Error ModelValue::setType(
 		if (subscript.subscriptType == Subscript::SubscriptType::InlineArray) {
 			m_type = Type::InlineArray;
 			m_data.array = new ModelValueArray;
-			OX_RETURN_ERROR(m_data.array->setType(type, subscriptStack, subscriptLevels - 1));
-			OX_RETURN_ERROR(m_data.array->setSize(static_cast<size_t>(subscript.length)));
+			oxReturnError(m_data.array->setType(type, subscriptStack, subscriptLevels - 1));
+			oxReturnError(m_data.array->setSize(static_cast<size_t>(subscript.length)));
 		} else {
 			m_type = Type::Vector;
 			m_data.vec = new ModelValueVector;
-			OX_RETURN_ERROR(m_data.vec->setType(type, subscriptStack, subscriptLevels - 1));
+			oxReturnError(m_data.vec->setType(type, subscriptStack, subscriptLevels - 1));
 		}
 		return {};
 	} else if (type->typeName == types::Bool) {
 		m_type = Type::Bool;
 	} else if (type->typeName == types::BasicString ||
-	           type->typeName == types::IString ||
+	           type->typeName == types::BString ||
 	           type->typeName == types::String) {
 		m_type = Type::String;
 		m_data.str = new String;
@@ -1119,15 +1121,15 @@ constexpr Error ModelValue::setType(
 	} else if (type->primitiveType == PrimitiveType::Struct) {
 		m_type = Type::Object;
 		m_data.obj = new ModelObject;
-		OX_RETURN_ERROR(m_data.obj->setType(type));
+		oxReturnError(m_data.obj->setType(type));
 	} else if (type->primitiveType == PrimitiveType::Union) {
 		m_type = Type::Union;
-		OX_REQUIRE_M(u, ModelUnion::make(type));
+		oxRequireM(u, ModelUnion::make(type));
 		m_data.uni = u.release();
-		OX_RETURN_ERROR(m_data.uni->setType(type));
+		oxReturnError(m_data.uni->setType(type));
 	}
 	oxAssert(m_type != Type::Undefined, "No type set");
-	return {};
+	return OxError(0);
 }
 
 template<typename T>
@@ -1139,11 +1141,11 @@ constexpr Error ModelValue::setType() noexcept {
 	//             rather than using getValue<type>()
 	if constexpr(type == Type::Object) {
 		m_data.obj = new ModelObject;
-		OX_RETURN_ERROR(m_data.obj->setType(type));
+		oxReturnError(m_data.obj->setType(type));
 	} else if constexpr(type == Type::Union) {
-		OX_REQUIRE_M(u, ModelUnion::make(type));
+		oxRequireM(u, ModelUnion::make(type));
 		m_data.uni = u.release();
-		OX_RETURN_ERROR(m_data.uni->setType(type));
+		oxReturnError(m_data.uni->setType(type));
 	} else if constexpr(type == Type::String) {
 		m_data.str = new String;
 	} else if constexpr(type == Type::Vector) {
@@ -1174,7 +1176,7 @@ template<typename T>
 constexpr Error ModelValue::set(const T &v) noexcept {
 	constexpr auto type = getType<T>();
 	if (m_type != type) [[unlikely]] {
-		return Error(1, "type mismatch");
+		return OxError(1, "type mismatch");
 	}
 	auto &value = getValue<type>(*this);
 	if constexpr(type == Type::Vector || type == Type::Object ||
@@ -1182,14 +1184,14 @@ constexpr Error ModelValue::set(const T &v) noexcept {
 		safeDelete(&value);
 	}
 	value = v;
-	return {};
+	return OxError(0);
 }
 
 template<typename T>
 constexpr Error ModelValue::set(T &&v) noexcept {
 	constexpr auto type = getType<T>();
 	if (m_type != type) [[unlikely]] {
-		return ox::Error(1, "type mismatch");
+		return OxError(1, "type mismatch");
 	}
 	auto &value = getValue<type>(*this);
 	if constexpr(type == Type::Vector || type == Type::Object ||
@@ -1197,7 +1199,11 @@ constexpr Error ModelValue::set(T &&v) noexcept {
 		safeDelete(&value);
 	}
 	value = std::move(v);
-	return {};
+	return OxError(0);
+}
+
+constexpr ModelValue &ModelValue::operator=(ModelValue &other) noexcept {
+	return this->operator=(const_cast<const ModelValue&>(other));
 }
 
 constexpr ModelValue &ModelValue::operator=(const ModelValue &other) noexcept {
@@ -1217,7 +1223,7 @@ constexpr ModelValue &ModelValue::operator=(const ModelValue &other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			m_data = other.m_data;
+			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = new String(other.get<String>());
@@ -1255,8 +1261,8 @@ constexpr ModelValue &ModelValue::operator=(ModelValue &&other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			m_data = other.m_data;
-			other.m_data = {};
+			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
+			ox::memset(&other.m_data, 0, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = other.m_data.str;

deps/ox/src/ox/model/optype.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/model/test/tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -17,8 +17,8 @@ struct TestType {
 	static constexpr auto TypeVersion = 1;
 };
 
-OX_MODEL_BEGIN(TestType)
-OX_MODEL_END()
+oxModelBegin(TestType)
+oxModelEnd()
 
 struct TestType2 {
 };
@@ -38,12 +38,12 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 			"ModelValue",
 			[] {
 				ox::ModelValue v;
-				OX_RETURN_ERROR(v.setType<int32_t>());
+				oxReturnError(v.setType<int32_t>());
 				//v.m_type = ox::ModelValue::getType<int32_t>();
 				if (v.type() != ox::ModelValue::Type::SignedInteger32) {
-					return ox::Error(1, "type is wrong");
+					return OxError(1, "type is wrong");
 				}
-				OX_RETURN_ERROR(v.set<int32_t>(5));
+				oxReturnError(v.set<int32_t>(5));
 				return ox::Error{};
 			}
 		},

deps/ox/src/ox/model/typenamecatcher.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -38,17 +38,17 @@ struct TypeNameCatcher {
 
 	template<typename T>
 	constexpr Error field(const char*, T*, std::size_t) noexcept {
-		return {};
+		return OxError(0);
 	}
 
 	template<typename T>
 	constexpr Error field(const char*, T) noexcept {
-		return {};
+		return OxError(0);
 	}
 
 	template<typename ...Args>
 	constexpr Error fieldCString(Args&&...) noexcept {
-		return {};
+		return OxError(0);
 	}
 
 	static constexpr auto opType() noexcept {
@@ -77,17 +77,17 @@ struct TypeInfoCatcher {
 
 	template<typename T>
 	constexpr Error field(const char*, T*, std::size_t) noexcept {
-		return {};
+		return OxError(0);
 	}
 
 	template<typename T>
 	constexpr Error field(const char*, T) noexcept {
-		return {};
+		return OxError(0);
 	}
 
 	template<typename T>
 	constexpr Error fieldCString(const char*, T) noexcept {
-		return {};
+		return OxError(0);
 	}
 
 	static constexpr auto opType() noexcept {
@@ -140,16 +140,16 @@ constexpr Str getModelTypeName() noexcept {
 	return out;
 }
 
-template<typename T, typename Str = const char*>
+template<typename T>
 [[nodiscard]]
 consteval auto requireModelTypeName() noexcept {
-	constexpr auto name = getModelTypeName<T, Str>();
-	static_assert(ox::StringView{name}.size(), "Type lacks required TypeName");
+	constexpr auto name = getModelTypeName<T>();
+	static_assert(ox::StringView{name}.len(), "Type lacks required TypeName");
 	return name;
 }
 
 template<typename T, typename Str = const char*>
-constexpr auto ModelTypeName_v = requireModelTypeName<T, Str>();
+constexpr auto ModelTypeName_v = getModelTypeName<T, Str>();
 
 template<typename T, typename Str = const char*>
 constexpr auto ModelTypeVersion_v = requireModelTypeVersion<T>();
@@ -159,7 +159,7 @@ constexpr auto ModelTypeId_v = [] {
 	constexpr auto name = ModelTypeName_v<T, ox::StringView>;
 	constexpr auto version = ModelTypeVersion_v<T>;
 	constexpr auto versionStr = ox::sfmt<ox::IString<19>>("{}", version);
-	return ox::sfmt<ox::IString<name.size() + versionStr.size() + 1>>("{};{}", name, versionStr);
+	return ox::sfmt<ox::IString<name.len() + versionStr.len() + 1>>("{};{}", name, versionStr);
 }();
 
 }

deps/ox/src/ox/model/types.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -31,18 +31,18 @@
 namespace ox {
 
 namespace types {
-constexpr StringLiteral BasicString = "net.drinkingtea.ox.BasicString";
-constexpr StringLiteral IString     = "net.drinkingtea.ox.IString";
-constexpr StringLiteral String      = "B.string";
-constexpr StringLiteral Bool        = "B.bool";
-constexpr StringLiteral Uint8       = "B.uint8";
-constexpr StringLiteral Uint16      = "B.uint16";
-constexpr StringLiteral Uint32      = "B.uint32";
-constexpr StringLiteral Uint64      = "B.uint64";
-constexpr StringLiteral Int8        = "B.int8";
-constexpr StringLiteral Int16       = "B.int16";
-constexpr StringLiteral Int32       = "B.int32";
-constexpr StringLiteral Int64       = "B.int64";
+constexpr StringView BasicString = "net.drinkingtea.ox.BasicString";
+constexpr StringView BString     = "net.drinkingtea.ox.BString";
+constexpr StringView String      = "B.string";
+constexpr StringView Bool        = "B.bool";
+constexpr StringView Uint8       = "B.uint8";
+constexpr StringView Uint16      = "B.uint16";
+constexpr StringView Uint32      = "B.uint32";
+constexpr StringView Uint64      = "B.uint64";
+constexpr StringView Int8        = "B.int8";
+constexpr StringView Int16       = "B.int16";
+constexpr StringView Int32       = "B.int32";
+constexpr StringView Int64       = "B.int64";
 }
 
 template<typename T>
@@ -63,17 +63,17 @@ static_assert(isBasicString_v<ox::BasicString<8ul>>);
 static_assert(isBasicString_v<ox::String>);
 
 template<typename T>
-consteval bool isIString(const T*) noexcept {
+consteval bool isBString(const T*) noexcept {
 	return false;
 }
 
 template<std::size_t SmallVecSize>
-consteval bool isIString(const BasicString<SmallVecSize>*) noexcept {
+consteval bool isBString(const BasicString<SmallVecSize>*) noexcept {
 	return true;
 }
 
 template<typename T>
-constexpr bool isIString_v = isIString(static_cast<const T*>(nullptr));
+constexpr bool isBString_v = isBasicString(static_cast<const T*>(nullptr));
 
 static_assert(isBasicString_v<ox::BasicString<0ul>>);
 static_assert(isBasicString_v<ox::BasicString<8ul>>);
@@ -161,7 +161,7 @@ template<typename T>
 constexpr bool isSmartPtr_v = false;
 
 template<typename T>
-constexpr bool isSmartPtr_v<::ox::UPtr<T>> = true;
+constexpr bool isSmartPtr_v<::ox::UniquePtr<T>> = true;
 
 #if __has_include(<array>)
 template<typename T>
@@ -169,12 +169,12 @@ constexpr bool isSmartPtr_v<::std::unique_ptr<T>> = true;
 #endif
 
 
-template<typename Union, bool force = false> requires(force || is_union_v<Union>)
+template<typename Union, bool force = false>
 class UnionView {
 
 	protected:
 		int m_idx = -1;
-		Union *m_union = nullptr;
+		typename enable_if<is_union_v<Union> || force, Union>::type *m_union = nullptr;
 
 	public:
 		constexpr UnionView(Union *u, int idx) noexcept: m_idx(idx), m_union(u) {

deps/ox/src/ox/model/typestore.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -21,7 +21,7 @@ namespace ox {
 
 class TypeStore {
 	private:
-		HashMap<String, UPtr<DescriptorType>> m_cache;
+		HashMap<String, UniquePtr<DescriptorType>> m_cache;
 
 	public:
 		constexpr TypeStore() noexcept = default;
@@ -31,7 +31,7 @@ class TypeStore {
 		constexpr Result<const DescriptorType*> get(const auto &name, int typeVersion,
 		                                            const TypeParamPack &typeParams) const noexcept {
 			const auto typeId = buildTypeId(name, typeVersion, typeParams);
-			OX_REQUIRE(out, m_cache.at(typeId));
+			oxRequire(out, m_cache.at(typeId));
 			return out->get();
 		}
 
@@ -40,7 +40,7 @@ class TypeStore {
 			constexpr auto typeName = ModelTypeName_v<T>;
 			constexpr auto typeVersion = ModelTypeVersion_v<T>;
 			const auto typeId = buildTypeId(typeName, typeVersion, {});
-			OX_REQUIRE(out, m_cache.at(typeId));
+			oxRequire(out, m_cache.at(typeId));
 			return out->get();
 		}
 
@@ -56,19 +56,15 @@ class TypeStore {
 			auto [val, err] = m_cache.at(typeId);
 			if (err) {
 				if (!std::is_constant_evaluated()) {
-					OX_REQUIRE_M(dt, loadDescriptor(typeId));
+					oxRequireM(dt, loadDescriptor(typeId));
 					for (auto &f : dt->fieldList) {
-						if (typeId == f.typeId) {
-							f.type = dt.get();
-						} else {
-							OX_RETURN_ERROR(this->getLoad(f.typeId).moveTo(f.type));
-						}
+						oxReturnError(this->getLoad(f.typeId).moveTo(f.type));
 					}
 					auto &out = m_cache[typeId];
 					out = std::move(dt);
 					return out.get();
 				} else {
-					return ox::Error(1, "Type not available");
+					return OxError(1, "Type not available");
 				}
 			}
 			return val->get();
@@ -86,12 +82,12 @@ class TypeStore {
 			return getLoad(typeName, typeVersion);
 		}
 
-		constexpr void set(const auto &typeId, UPtr<DescriptorType> dt) noexcept {
+		constexpr void set(const auto &typeId, UniquePtr<DescriptorType> dt) noexcept {
 			m_cache[typeId] = std::move(dt);
 		}
 
 		constexpr void set(const auto &typeId, DescriptorType *dt) noexcept {
-			m_cache[typeId] = UPtr<DescriptorType>(dt);
+			m_cache[typeId] = UniquePtr<DescriptorType>(dt);
 		}
 
 		[[nodiscard]]
@@ -105,11 +101,11 @@ class TypeStore {
 		}
 
 	protected:
-		virtual Result<UPtr<DescriptorType>> loadDescriptor(ox::StringView) noexcept {
-			return ox::Error(1);
+		virtual Result<UniquePtr<DescriptorType>> loadDescriptor(ox::StringView) noexcept {
+			return OxError(1);
 		}
 
-		Result<UPtr<DescriptorType>> loadDescriptor(ox::StringViewCR name, int version,
+		Result<UniquePtr<DescriptorType>> loadDescriptor(ox::StringViewCR name, int version,
 		                                                 const ox::TypeParamPack &typeParams) noexcept {
 			const auto typeId = buildTypeId(name, version, typeParams);
 			return loadDescriptor(typeId);

deps/ox/src/ox/model/walk.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -50,7 +50,7 @@ constexpr DataWalker<Reader, T>::DataWalker(DescriptorType *type, T fieldHandler
 
 template<typename Reader, typename T>
 constexpr Result<const DescriptorType*> DataWalker<Reader, T>::type() const noexcept {
-	OX_REQUIRE(out, m_typeStack.back());
+	oxRequire(out, m_typeStack.back());
 	return *out;
 }
 
@@ -87,9 +87,9 @@ static constexpr Error parseField(const DescriptorField &field, Reader *rdr, Dat
 	walker->pushNamePath(field.fieldName);
 	if (field.subscriptLevels) {
 		// add array handling
-		OX_REQUIRE(arrayLen, rdr->arrayLength(field.fieldName.c_str(), true));
+		oxRequire(arrayLen, rdr->arrayLength(field.fieldName.c_str(), true));
 		auto child = rdr->child(field.fieldName.c_str());
-		OX_RETURN_ERROR(child.setTypeInfo(field.type->typeName.c_str(), field.type->typeVersion, field.type->typeParams, arrayLen));
+		oxReturnError(child.setTypeInfo(field.type->typeName.c_str(), field.type->typeVersion, field.type->typeParams, arrayLen));
 		DescriptorField f(field); // create mutable copy
 		--f.subscriptLevels;
 		String subscript;
@@ -98,7 +98,7 @@ static constexpr Error parseField(const DescriptorField &field, Reader *rdr, Dat
 			subscript += static_cast<uint64_t>(i);
 			subscript += "]";
 			walker->pushNamePath(subscript);
-			OX_RETURN_ERROR(parseField(f, &child, walker));
+			oxReturnError(parseField(f, &child, walker));
 			walker->popNamePath();
 		}
 		rdr->nextField();
@@ -108,40 +108,40 @@ static constexpr Error parseField(const DescriptorField &field, Reader *rdr, Dat
 			case PrimitiveType::SignedInteger:
 			case PrimitiveType::Bool:
 			case PrimitiveType::String:
-				OX_RETURN_ERROR(walker->read(field, rdr));
+				oxReturnError(walker->read(field, rdr));
 				break;
 			case PrimitiveType::Struct:
 			case PrimitiveType::Union:
 				if (rdr->fieldPresent(field.fieldName.c_str())) {
 					auto child = rdr->child(field.fieldName.c_str());
 					walker->pushType(field.type);
-					OX_RETURN_ERROR(model(&child, walker));
+					oxReturnError(model(&child, walker));
 					walker->popType();
 					rdr->nextField();
 				} else {
 					// skip and discard absent field
 					int discard;
-					OX_RETURN_ERROR(rdr->field(field.fieldName.c_str(), &discard));
+					oxReturnError(rdr->field(field.fieldName.c_str(), &discard));
 				}
 				break;
 		}
 	}
 	walker->popNamePath();
-	return {};
+	return OxError(0);
 }
 
 template<typename Reader, typename FH>
 constexpr Error model(Reader *rdr, DataWalker<Reader, FH> *walker) noexcept {
-	OX_REQUIRE(type, walker->type());
+	oxRequire(type, walker->type());
 	auto typeName = type->typeName.c_str();
 	auto typeVersion = type->typeVersion;
 	auto typeParams = type->typeParams;
 	auto &fields = type->fieldList;
-	OX_RETURN_ERROR(rdr->setTypeInfo(typeName, typeVersion, typeParams, fields.size()));
+	oxReturnError(rdr->setTypeInfo(typeName, typeVersion, typeParams, fields.size()));
 	for (const auto &field : fields) {
-		OX_RETURN_ERROR(parseField(field, rdr, walker));
+		oxReturnError(parseField(field, rdr, walker));
 	}
-	return {};
+	return OxError(0);
 }
 
 template<typename Reader, typename Handler>

deps/ox/src/ox/oc/oc.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/oc/read.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -13,31 +13,31 @@
 
 namespace ox {
 
-OrganicClawReader::OrganicClawReader(const uint8_t *buff, size_t const buffSize) {
+OrganicClawReader::OrganicClawReader(const uint8_t *buff, std::size_t buffSize) {
 	auto json = reinterpret_cast<const char*>(buff);
-	auto jsonLen = ox::strnlen_s(json, buffSize);
+	auto jsonLen = ox::strnlen(json, buffSize);
 	Json::CharReaderBuilder parserBuilder;
 	auto parser = std::unique_ptr<Json::CharReader>(parserBuilder.newCharReader());
 	if (!parser->parse(json, json + jsonLen, &m_json, nullptr)) {
-		throw Exception(1, "Could not parse JSON");
+		throw OxException(1, "Could not parse JSON");
 	}
 }
 
-OrganicClawReader::OrganicClawReader(CString const json, size_t const jsonLen) {
+OrganicClawReader::OrganicClawReader(const char *json, std::size_t jsonLen) {
 	Json::CharReaderBuilder parserBuilder;
 	auto parser = std::unique_ptr<Json::CharReader>(parserBuilder.newCharReader());
 	if (!parser->parse(json, json + jsonLen, &m_json, nullptr)) {
-		throw Exception(1, "Could not parse JSON");
+		throw OxException(1, "Could not parse JSON");
 	}
 }
 
-OrganicClawReader::OrganicClawReader(Json::Value json, int const unionIdx) noexcept:
+OrganicClawReader::OrganicClawReader(Json::Value json, int unionIdx) noexcept:
 	m_json(std::move(json)),
 	m_unionIdx(unionIdx) {
 }
 
-Error OrganicClawReader::field(CString const key, bool *val) noexcept {
-	Error err{};
+Error OrganicClawReader::field(const char *key, bool *val) noexcept {
+	auto err = OxError(0);
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty()) {
@@ -45,16 +45,16 @@ Error OrganicClawReader::field(CString const key, bool *val) noexcept {
 		} else if (jv.isBool()) {
 			*val = jv.asBool();
 		} else {
-			err = Error(1, "Type mismatch");
+			err = OxError(1, "Type mismatch");
 		}
 	}
 	++m_fieldIt;
 	return err;
 }
 
-Error OrganicClawReader::fieldCString(CString const key, char *val, size_t const buffLen) noexcept {
-	Error err{};
-	CString begin = nullptr, end = nullptr;
+Error OrganicClawReader::fieldCString(const char *key, char *val, std::size_t buffLen) noexcept {
+	auto err = OxError(0);
+	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	if (targetValid()) {
 		if (jv.empty()) {
@@ -64,25 +64,25 @@ Error OrganicClawReader::fieldCString(CString const key, char *val, size_t const
 			}
 		} else if (jv.isString()) {
 			jv.getString(&begin, &end);
-			const auto strSize = static_cast<size_t>(end - begin);
+			const auto strSize = static_cast<std::size_t>(end - begin);
 			auto data = val;
 			if (strSize >= buffLen) {
-				err = Error(2, "String size exceeds capacity of destination");
+				err = OxError(2, "String size exceeds capacity of destination");
 			} else {
-				memcpy(data, begin, static_cast<size_t>(strSize));
+				ox::memcpy(data, begin, static_cast<std::size_t>(strSize));
 				data[strSize] = 0;
 			}
 		} else {
-			err = Error(1, "Type mismatch");
+			err = OxError(1, "Type mismatch");
 		}
 	}
 	++m_fieldIt;
 	return err;
 }
 
-Error OrganicClawReader::fieldCString(CString const key, char **val) noexcept {
-	Error err{};
-	CString begin = nullptr, end = nullptr;
+Error OrganicClawReader::fieldCString(const char *key, char **val) noexcept {
+	auto err = OxError(0);
+	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	auto &data = *val;
 	if (targetValid()) {
@@ -92,22 +92,22 @@ Error OrganicClawReader::fieldCString(CString const key, char **val) noexcept {
 			}
 		} else if (jv.isString()) {
 			jv.getString(&begin, &end);
-			const auto strSize = static_cast<size_t>(end - begin);
+			const auto strSize = static_cast<std::size_t>(end - begin);
 			safeDelete(*val);
 			*val = new char[strSize + 1];
-			memcpy(data, begin, static_cast<size_t>(strSize));
+			ox::memcpy(data, begin, static_cast<std::size_t>(strSize));
 			data[strSize] = 0;
 		} else {
-			err = Error(1, "Type mismatch");
+			err = OxError(1, "Type mismatch");
 		}
 	}
 	++m_fieldIt;
 	return err;
 }
 
-Error OrganicClawReader::fieldCString(CString const key, char **val, size_t const buffLen) noexcept {
-	Error err{};
-	CString begin = nullptr, end = nullptr;
+Error OrganicClawReader::fieldCString(const char *key, char **val, std::size_t buffLen) noexcept {
+	auto err = OxError(0);
+	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	if (targetValid()) {
 		if (jv.empty()) {
@@ -117,29 +117,29 @@ Error OrganicClawReader::fieldCString(CString const key, char **val, size_t cons
 			}
 		} else if (jv.isString()) {
 			jv.getString(&begin, &end);
-			const auto strSize = static_cast<size_t>(end - begin);
+			const auto strSize = static_cast<std::size_t>(end - begin);
 			auto data = val;
 			if (strSize >= buffLen) {
 				safeDelete(*val);
 				*val = new char[strSize + 1];
 			}
-			memcpy(data, begin, static_cast<size_t>(strSize));
+			ox::memcpy(data, begin, static_cast<std::size_t>(strSize));
 			data[strSize] = nullptr;
 		} else {
-			err = Error(1, "Type mismatch");
+			err = OxError(1, "Type mismatch");
 		}
 	}
 	++m_fieldIt;
 	return err;
 }
 
-Error OrganicClawReader::field(CString const key, UUID *val) noexcept {
+Error OrganicClawReader::field(const char *key, UUID *val) noexcept {
 	UUIDStr str;
-	OX_RETURN_ERROR(field(key, &str));
+	oxReturnError(field(key, &str));
 	return UUID::fromString(str).moveTo(*val);
 }
 
-Result<size_t> OrganicClawReader::arrayLength(CString const key, bool) noexcept {
+Result<std::size_t> OrganicClawReader::arrayLength(const char *key, bool) noexcept {
 	const auto &jv = value(key);
 	if (jv.empty()) {
 		return 0;
@@ -147,32 +147,32 @@ Result<size_t> OrganicClawReader::arrayLength(CString const key, bool) noexcept
 	if (jv.isArray()) {
 		return jv.size();
 	}
-	return Error(1, "Type mismatch");
+	return OxError(1, "Type mismatch");
 }
 
 [[nodiscard]]
-size_t OrganicClawReader::stringLength(CString const key) noexcept {
-	CString begin = nullptr, end = nullptr;
+std::size_t OrganicClawReader::stringLength(const char *key) noexcept {
+	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	if (jv.empty()) {
 		return 0;
 	}
 	if (jv.isString()) {
 		jv.getString(&begin, &end);
-		return static_cast<size_t>(end - begin);
+		return static_cast<std::size_t>(end - begin);
 	}
-	return Error(1, "Type mismatch");
+	return OxError(1, "Type mismatch");
 }
 
-OrganicClawReader OrganicClawReader::child(CString const key, int const unionIdx) noexcept {
+OrganicClawReader OrganicClawReader::child(const char *key, int unionIdx) noexcept {
 	return OrganicClawReader(value(key), unionIdx);
 }
 
-bool OrganicClawReader::fieldPresent(CString const key) noexcept {
+bool OrganicClawReader::fieldPresent(const char *key) noexcept {
 	return !m_json[key].empty();
 }
 
-int OrganicClawReader::whichFieldPresent(CString const name, ModelUnion const &u) const noexcept {
+int OrganicClawReader::whichFieldPresent(const char *name, const ModelUnion &u) const noexcept {
 	const auto &obj = m_json[name];
 	if (!obj.isObject()) {
 		return -1;
@@ -184,7 +184,7 @@ int OrganicClawReader::whichFieldPresent(CString const name, ModelUnion const &u
 	return u.getKeyIdx(keys.front().c_str());
 }
 
-Json::Value &OrganicClawReader::value(CString const key) noexcept {
+Json::Value &OrganicClawReader::value(const char *key) noexcept {
 	if (m_json.isArray()) {
 		return m_json[m_fieldIt];
 	} else {

deps/ox/src/ox/oc/read.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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 @@
 
 #pragma once
 
-#include <ox/std/def.hpp>
-
-OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 #include <json/json.h>
-OX_ALLOW_UNSAFE_BUFFERS_END
 
 #include <ox/model/fieldcounter.hpp>
 #include <ox/model/modelhandleradaptor.hpp>
@@ -34,76 +30,75 @@ class OrganicClawReader {
 	private:
 		Json::Value m_json;
 		Json::ArrayIndex m_fieldIt = 0;
-		int const m_unionIdx = -1;
+		int m_unionIdx = -1;
 
 	public:
 		OrganicClawReader() noexcept = default;
 
-		OrganicClawReader(uint8_t const *buff, size_t buffSize);
+		OrganicClawReader(const uint8_t *buff, std::size_t buffSize);
 
-		OrganicClawReader(CString json, size_t buffSize);
+		OrganicClawReader(const char *json, std::size_t buffSize);
 
 		explicit OrganicClawReader(Json::Value json, int unionIdx = -1) noexcept;
 
-		Error field(CString key, bool *val) noexcept;
+		Error field(const char *key, bool *val) noexcept;
 
 		// array handler
 		template<typename T>
-		Error field(CString key, T *val, size_t len) noexcept;
+		Error field(const char *key, T *val, std::size_t len) noexcept;
 
 		template<typename T>
-		Error field(CString, HashMap<String, T> *val) noexcept;
+		Error field(const char*, HashMap<String, T> *val) noexcept;
 
 		template<typename T>
-		Error field(CString key, T *val) noexcept;
+		Error field(const char *key, T *val) noexcept;
 
 		template<typename U, bool force = false>
-		Error field(CString key, UnionView<U, force> val) noexcept;
+		Error field(const char *key, UnionView<U, force> val) noexcept;
 
-		template<size_t L>
-		Error field(CString key, BasicString<L> *val) noexcept;
+		template<std::size_t L>
+		Error field(const char *key, BasicString<L> *val) noexcept;
 
-		template<size_t L>
-		Error field(CString key, IString<L> *val) noexcept;
+		template<std::size_t L>
+		Error field(const char *key, IString<L> *val) noexcept;
 
-		Error fieldCString(CString key, char *val, size_t buffLen) noexcept;
+		Error fieldCString(const char *key, char *val, std::size_t buffLen) noexcept;
 
-		Error fieldCString(CString key, char **val) noexcept;
+		Error fieldCString(const char *key, char **val) noexcept;
 
-		Error fieldCString(CString key, char **val, size_t buffLen) noexcept;
+		Error fieldCString(const char *key, char **val, std::size_t buffLen) noexcept;
 
-		Error field(CString key, UUID *val) noexcept;
+		Error field(const char *key, UUID *val) noexcept;
 
 		/**
 		 * Reads an array length from the current location in the buffer.
-		 * @param key
 		 * @param pass indicates that the parsing should iterate past the array length
 		 */
-		Result<size_t> arrayLength(CString key, bool pass = true) noexcept;
+		Result<std::size_t> arrayLength(const char *key, bool pass = true) noexcept;
 
 		/**
 		 * Reads an string length from the current location in the buffer.
 		 */
 		[[nodiscard]]
-		size_t stringLength(CString key) noexcept;
+		std::size_t stringLength(const char *name) noexcept;
 
 		template<typename T = void>
-		constexpr Error setTypeInfo() noexcept {
+		constexpr ox::Error setTypeInfo() noexcept {
 			return {};
 		}
 
 		template<typename T = void>
-		constexpr Error setTypeInfo(CString) noexcept {
+		constexpr ox::Error setTypeInfo(const char*) noexcept {
 			return {};
 		}
 
 		template<typename T = void>
-		constexpr Error setTypeInfo(CString, int, const Vector<String>& = {}) noexcept {
+		constexpr ox::Error setTypeInfo(const char*, int, const Vector<String>& = {}) noexcept {
 			return {};
 		}
 
 		template<typename T = void>
-		constexpr Error setTypeInfo(CString, int, const Vector<String>& = {}, size_t = {}) noexcept {
+		constexpr ox::Error setTypeInfo(const char*, int, const Vector<String>& = {}, std::size_t = {}) noexcept {
 			return {};
 		}
 
@@ -111,16 +106,16 @@ class OrganicClawReader {
 		 * Returns a OrganicClawReader to parse a child object.
 		 */
 		[[nodiscard]]
-		OrganicClawReader child(CString key, int unionIdx = -1) noexcept;
+		OrganicClawReader child(const char *key, int unionIdx = -1) noexcept;
 
 		// compatibility stub
 		constexpr void nextField() noexcept {}
 
 		[[nodiscard]]
-		bool fieldPresent(CString key) noexcept;
+		bool fieldPresent(const char *key) noexcept;
 
 		[[nodiscard]]
-		int whichFieldPresent(CString name, const ModelUnion &u) const noexcept;
+		int whichFieldPresent(const char *name, const ModelUnion &u) const noexcept;
 
 		[[nodiscard]]
 		static constexpr auto opType() noexcept {
@@ -129,7 +124,7 @@ class OrganicClawReader {
 
 	private:
 		[[nodiscard]]
-		Json::Value &value(CString key) noexcept;
+		Json::Value &value(const char *key) noexcept;
 
 		[[nodiscard]]
 		bool targetValid() const noexcept;
@@ -137,102 +132,98 @@ class OrganicClawReader {
 };
 
 template<typename T>
-Error OrganicClawReader::field(CString key, T *val) noexcept {
-	Error err{};
+Error OrganicClawReader::field(const char *key, T *val) noexcept {
+	auto err = OxError(0);
 	try {
 		if constexpr (is_integer_v<T>) {
 			if (targetValid()) {
-				auto const &jv = value(key);
+				auto const&jv = value(key);
 				auto const rightType = sizeof(T) == 8 ?
-					(is_signed_v<T> ? jv.isInt64() : jv.isUInt64()) :
-					(is_signed_v<T> ? jv.isInt() : jv.isUInt());
+				                       (ox::is_signed_v<T> ? jv.isInt64() : jv.isUInt64()) :
+				                       (ox::is_signed_v<T> ? jv.isInt() : jv.isUInt());
 				if (jv.empty()) {
 					*val = 0;
 				} else if (rightType) {
-					if constexpr(is_signed_v<T>) {
-						*val = static_cast<T>(jv.asInt64());
-					} else {
-						*val = static_cast<T>(jv.asUInt64());
-					}
+					*val = static_cast<T>(jv.asUInt());
 				} else {
-					err = Error{1, "Type mismatch"};
+					err = OxError(1, "Type mismatch");
 				}
 			}
 		} else if constexpr (isVector_v<T>) {
-			auto const &srcVal = value(key);
-			auto const srcSize = srcVal.size();
-			OX_RETURN_ERROR(resizeVector(*val, srcSize));
+			const auto&srcVal = value(key);
+			const auto srcSize = srcVal.size();
+			oxReturnError(ox::resizeVector(*val, srcSize));
 			err = field(key, val->data(), val->size());
 		} else if constexpr (isArray_v<T>) {
-			auto const &srcVal = value(key);
-			auto const srcSize = srcVal.size();
+			const auto&srcVal = value(key);
+			const auto srcSize = srcVal.size();
 			if (srcSize > val->size()) {
-				err = Error{1, "Input array is too long"};
+				err = OxError(1, "Input array is too long");
 			} else {
 				err = field(key, val->data(), val->size());
 			}
 		} else if (targetValid()) {
-			auto const &jv = value(key);
+			const auto&jv = value(key);
 			if (jv.empty() || jv.isObject()) {
 				auto reader = child(key);
-				ModelHandlerInterface handler(reader);
+				ModelHandlerInterface handler(&reader);
 				err = model(&handler, val);
 			} else {
-				err = Error{1, "Type mismatch"};
+				err = OxError(1, "Type mismatch");
 			}
 		}
-	} catch (Json::LogicError const &e) {
-		err = Error{1, "error reading JSON data"};
+	} catch (Json::LogicError const&) {
+		err = OxError(1, "error reading JSON data");
 	}
 	++m_fieldIt;
 	return err;
 }
 
 template<typename U, bool force>
-Error OrganicClawReader::field(CString const key, UnionView<U, force> val) noexcept {
-	Error err{};
+Error OrganicClawReader::field(const char *key, UnionView<U, force> val) noexcept {
+	auto err = OxError(0);
 	if (targetValid()) {
-		auto const &jv = value(key);
+		const auto &jv = value(key);
 		if (jv.empty() || jv.isObject()) {
 			auto reader = child(key, val.idx());
-			ModelHandlerInterface handler(reader);
+			ModelHandlerInterface handler(&reader);
 			err = model(&handler, val.get());
 		} else {
-			err = Error{1, "Type mismatch"};
+			err = OxError(1, "Type mismatch");
 		}
 	}
 	++m_fieldIt;
 	return err;
 }
 
-template<size_t L>
-Error OrganicClawReader::field(CString const key, BasicString<L> *val) noexcept {
-	Error err{};
+template<std::size_t L>
+Error OrganicClawReader::field(const char *key, BasicString<L> *val) noexcept {
+	auto err = OxError(0);
 	if (targetValid()) {
-		auto const &jv = value(key);
+		const auto &jv = value(key);
 		if (jv.empty()) {
 			*val = BasicString<L>{};
 		} else if (jv.isString()) {
 			*val = jv.asString().c_str();
 		} else {
-			err = Error{1, "Type mismatch"};
+			err = OxError(1, "Type mismatch");
 		}
 	}
 	++m_fieldIt;
 	return err;
 }
 
-template<size_t L>
-Error OrganicClawReader::field(CString const key, IString<L> *val) noexcept {
-	Error err{};
+template<std::size_t L>
+Error OrganicClawReader::field(const char *key, IString<L> *val) noexcept {
+	auto err = OxError(0);
 	if (targetValid()) {
-		auto const &jv = value(key);
+		const auto &jv = value(key);
 		if (jv.empty()) {
 			*val = IString<L>{};
 		} else if (jv.isString()) {
 			*val = jv.asString().c_str();
 		} else {
-			err = Error{1, "Type mismatch"};
+			err = OxError(1, "Type mismatch");
 		}
 	}
 	++m_fieldIt;
@@ -241,73 +232,73 @@ Error OrganicClawReader::field(CString const key, IString<L> *val) noexcept {
 
 // array handler
 template<typename T>
-Error OrganicClawReader::field(CString const key, T *val, size_t valLen) noexcept {
-	auto const &srcVal = value(key);
+Error OrganicClawReader::field(const char *key, T *val, std::size_t valLen) noexcept {
+	const auto &srcVal = value(key);
 	if (!srcVal.isNull() && !srcVal.isArray()) {
-		return Error{1, "Type mismatch"};
+		return OxError(1, "Type mismatch");
 	}
 	auto srcSize = srcVal.size();
 	if (srcSize > valLen) {
-		return Error{1};
+		return OxError(1);
 	}
 	OrganicClawReader r(srcVal);
-	ModelHandlerInterface handler{r};
+	ModelHandlerInterface handler{&r};
 	for (decltype(srcSize) i = 0; i < srcSize; ++i) {
 OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-		OX_RETURN_ERROR(handler.field("", &val[i]));
+		oxReturnError(handler.field("", &val[i]));
 OX_ALLOW_UNSAFE_BUFFERS_END
 	}
-	return {};
+	return OxError(0);
 }
 
 template<typename T>
-Error OrganicClawReader::field(CString const key, HashMap<String, T> *val) noexcept {
-	auto const &srcVal = value(key);
+Error OrganicClawReader::field(const char *key, HashMap<String, T> *val) noexcept {
+	const auto &srcVal = value(key);
 	if (!srcVal.isObject()) {
-		return Error{1, "Type mismatch"};
+		return OxError(1, "Type mismatch");
 	}
 	auto keys = srcVal.getMemberNames();
 	auto srcSize = srcVal.size();
 	OrganicClawReader r(srcVal);
-	ModelHandlerInterface handler{r};
+	ModelHandlerInterface handler{&r};
 	for (decltype(srcSize) i = 0; i < srcSize; ++i) {
-		auto const k = keys[i].c_str();
-		OX_RETURN_ERROR(handler.field(k, &val->operator[](k)));
+		const auto k = keys[i].c_str();
+		oxReturnError(handler.field(k, &val->operator[](k)));
 	}
-	return {};
+	return OxError(0);
 }
 
-Error readOC(BufferView const buff, auto &val) noexcept {
+Error readOC(BufferView buff, auto &val) noexcept {
 	// OrganicClawReader constructor can throw, but readOC should return its errors.
 	try {
 		Json::Value doc;
 		Json::CharReaderBuilder parserBuilder;
-		auto parser = UPtr<Json::CharReader>(parserBuilder.newCharReader());
+		auto parser = UniquePtr<Json::CharReader>(parserBuilder.newCharReader());
 OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 		if (!parser->parse(buff.data(), buff.data() + buff.size(), &doc, nullptr)) {
 OX_ALLOW_UNSAFE_BUFFERS_END
-			return Error{1, "Could not parse JSON"};
+			return OxError(1, "Could not parse JSON");
 		}
 		OrganicClawReader reader(buff.data(), buff.size());
-		ModelHandlerInterface handler(reader);
+		ModelHandlerInterface handler(&reader);
 		return model(&handler, &val);
-	} catch (Error const &err) {
+	} catch (const Error &err) {
 		return err;
 	} catch (...) {
-		return Error{1, "Unknown Error"};
+		return OxError(1, "Unknown Error");
 	}
 }
 
 template<typename T>
 Result<T> readOC(BufferView buff) noexcept {
 	Result<T> val;
-	OX_RETURN_ERROR(readOC(buff, val.value));
+	oxReturnError(readOC(buff, val.value));
 	return val;
 }
 
 template<typename T>
-Result<T> readOC(StringViewCR json) noexcept {
-	return readOC<T>(BufferView{json.data(), json.size()});
+Result<T> readOC(ox::StringView json) noexcept {
+	return readOC<T>(ox::BufferView{json.data(), json.len()});
 }
 
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -74,45 +74,45 @@ struct TestStruct {
 };
 
 constexpr ox::Error model(auto *io, ox::CommonPtrWith<TestUnion> auto *obj) noexcept {
-	OX_RETURN_ERROR(io->template setTypeInfo<TestUnion>());
-	OX_RETURN_ERROR(io->field("Bool", &obj->Bool));
-	OX_RETURN_ERROR(io->field("Int", &obj->Int));
-	OX_RETURN_ERROR(io->fieldCString("String", &obj->String));
-	return ox::Error(0);
+	oxReturnError(io->template setTypeInfo<TestUnion>());
+	oxReturnError(io->field("Bool", &obj->Bool));
+	oxReturnError(io->field("Int", &obj->Int));
+	oxReturnError(io->fieldCString("String", &obj->String));
+	return OxError(0);
 }
 
 constexpr ox::Error model(auto *io, ox::CommonPtrWith<TestStructNest> auto *obj) noexcept {
-	OX_RETURN_ERROR(io->template setTypeInfo<TestStructNest>());
-	OX_RETURN_ERROR(io->field("Bool", &obj->Bool));
-	OX_RETURN_ERROR(io->field("Int", &obj->Int));
-	OX_RETURN_ERROR(io->field("String", &obj->String));
-	return ox::Error(0);
+	oxReturnError(io->template setTypeInfo<TestStructNest>());
+	oxReturnError(io->field("Bool", &obj->Bool));
+	oxReturnError(io->field("Int", &obj->Int));
+	oxReturnError(io->field("String", &obj->String));
+	return OxError(0);
 }
 
 constexpr ox::Error model(auto *io, ox::CommonPtrWith<TestStruct> auto *obj) noexcept {
-	OX_RETURN_ERROR(io->template setTypeInfo<TestStruct>());
-	OX_RETURN_ERROR(io->field("Bool", &obj->Bool));
-	OX_RETURN_ERROR(io->field("Int", &obj->Int));
-	OX_RETURN_ERROR(io->field("Int1", &obj->Int1));
-	OX_RETURN_ERROR(io->field("Int2", &obj->Int2));
-	OX_RETURN_ERROR(io->field("Int3", &obj->Int3));
-	OX_RETURN_ERROR(io->field("Int4", &obj->Int4));
-	OX_RETURN_ERROR(io->field("Int5", &obj->Int5));
-	OX_RETURN_ERROR(io->field("Int6", &obj->Int6));
-	OX_RETURN_ERROR(io->field("Int7", &obj->Int7));
-	OX_RETURN_ERROR(io->field("Int8", &obj->Int8));
-	OX_RETURN_ERROR(io->field("unionIdx", &obj->unionIdx));
+	oxReturnError(io->template setTypeInfo<TestStruct>());
+	oxReturnError(io->field("Bool", &obj->Bool));
+	oxReturnError(io->field("Int", &obj->Int));
+	oxReturnError(io->field("Int1", &obj->Int1));
+	oxReturnError(io->field("Int2", &obj->Int2));
+	oxReturnError(io->field("Int3", &obj->Int3));
+	oxReturnError(io->field("Int4", &obj->Int4));
+	oxReturnError(io->field("Int5", &obj->Int5));
+	oxReturnError(io->field("Int6", &obj->Int6));
+	oxReturnError(io->field("Int7", &obj->Int7));
+	oxReturnError(io->field("Int8", &obj->Int8));
+	oxReturnError(io->field("unionIdx", &obj->unionIdx));
 	if (io->opType() == ox::OpType::Reflect) {
-		OX_RETURN_ERROR(io->field("Union", ox::UnionView{&obj->Union, 0}));
+		oxReturnError(io->field("Union", ox::UnionView{&obj->Union, 0}));
 	} else {
-		OX_RETURN_ERROR(io->field("Union", ox::UnionView{&obj->Union, obj->unionIdx}));
+		oxReturnError(io->field("Union", ox::UnionView{&obj->Union, obj->unionIdx}));
 	}
-	OX_RETURN_ERROR(io->field("String", &obj->String));
-	OX_RETURN_ERROR(io->field("List", obj->List, 4));
-	OX_RETURN_ERROR(io->field("Map", &obj->Map));
-	OX_RETURN_ERROR(io->field("EmptyStruct", &obj->EmptyStruct));
-	OX_RETURN_ERROR(io->field("Struct", &obj->Struct));
-	return ox::Error(0);
+	oxReturnError(io->field("String", &obj->String));
+	oxReturnError(io->field("List", obj->List, 4));
+	oxReturnError(io->field("Map", &obj->Map));
+	oxReturnError(io->field("EmptyStruct", &obj->EmptyStruct));
+	oxReturnError(io->field("Struct", &obj->Struct));
+	return OxError(0);
 }
 
 TestStruct::TestStruct(TestStruct &&other) noexcept {
@@ -184,7 +184,7 @@ const std::map<ox::StringView, ox::Error(*)()> tests = {
 				oxAssert(testIn.Struct.String      == testOut.Struct.String, "Struct.String value mismatch");
 				oxAssert(testIn.Struct.Bool        == testOut.Struct.Bool, "Struct.Bool value mismatch");
 
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 
@@ -210,7 +210,7 @@ const std::map<ox::StringView, ox::Error(*)()> tests = {
 		   auto type = ox::buildTypeDef(typeStore, testIn);
 		   oxAssert(type.error, "Descriptor write failed");
 		   ox::ModelObject testOut;
-		   OX_RETURN_ERROR(testOut.setType(type.value));
+		   oxReturnError(testOut.setType(type.value));
 		   oxAssert(ox::readOC(dataBuff, testOut), "Data read failed");
 		   oxAssert(testOut.get("Int").unwrap()->get<int>() == testIn.Int, "testOut.Int failed");
 		   oxAssert(testOut.get("Bool").unwrap()->get<bool>() == testIn.Bool, "testOut.Bool failed");
@@ -234,7 +234,7 @@ const std::map<ox::StringView, ox::Error(*)()> tests = {
 		   oxAssert(testOutStructCopy.get("String").unwrap()->get<ox::String>() == testIn.Struct.String.c_str(), "testOut.Struct.String (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 ox::Error(0);
+		   return OxError(0);
 		   }
 		},
 
@@ -259,7 +259,7 @@ const std::map<ox::StringView, ox::Error(*)()> tests = {
 				ox::TypeStore typeStore;
 				auto type = ox::buildTypeDef(typeStore, testIn);
 				oxAssert(type.error, "Descriptor write failed");
-				OX_RETURN_ERROR(ox::walkModel<ox::OrganicClawReader>(type.value, oc.data(), oc.size(),
+				oxReturnError(ox::walkModel<ox::OrganicClawReader>(type.value, oc.data(), oc.size(),
 					[](const ox::Vector<ox::FieldName>&, const ox::Vector<ox::String>&, const ox::DescriptorField &f,
 					   ox::OrganicClawReader *rdr) -> ox::Error {
 						auto fieldName = f.fieldName.c_str();
@@ -341,10 +341,10 @@ const std::map<ox::StringView, ox::Error(*)()> tests = {
 							case ox::PrimitiveType::Union:
 								break;
 						}
-						return ox::Error(0);
+						return OxError(0);
 					}
 				));
-				return ox::Error(0);
+				return OxError(0);
 			}
 		},
 	}

deps/ox/src/ox/oc/write.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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,29 +10,29 @@
 
 namespace ox {
 
-OrganicClawWriter::OrganicClawWriter(int const unionIdx) noexcept: m_unionIdx(unionIdx) {
+OrganicClawWriter::OrganicClawWriter(int unionIdx) noexcept: m_unionIdx(unionIdx) {
 }
 
-OrganicClawWriter::OrganicClawWriter(Json::Value json, int const unionIdx) noexcept:
+OrganicClawWriter::OrganicClawWriter(Json::Value json, int unionIdx) noexcept:
 	m_json(std::move(json)),
 	m_unionIdx(unionIdx) {
 }
 
-Error OrganicClawWriter::fieldCString(const char *key, const char *const *val, int const len) noexcept {
+Error OrganicClawWriter::fieldCString(const char *key, const char *const*val, int len) noexcept {
 	if (targetValid() && len) {
 		value(key) = *val;
 	}
 	++m_fieldIt;
-	return {};
+	return OxError(0);
 }
 
-Error OrganicClawWriter::fieldCString(const char *key, const char *const *val) noexcept {
+Error OrganicClawWriter::fieldCString(const char *key, const char *const*val) noexcept {
 	return fieldCString(key, const_cast<const char**>(val), static_cast<int>(ox::strlen(val)));
 }
 
-Error OrganicClawWriter::field(const char *key, UUID const *uuid) noexcept {
+Error OrganicClawWriter::field(const char *key, const UUID *uuid) noexcept {
 	const auto uuidStr = uuid->toString();
-	if (targetValid() && uuidStr.size()) {
+	if (targetValid() && uuidStr.len()) {
 		value(key) = uuidStr.c_str();
 	}
 	++m_fieldIt;

deps/ox/src/ox/oc/write.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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 @@
 
 #pragma once
 
-#include <ox/std/def.hpp>
-
-OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 #include <json/json.h>
-OX_ALLOW_UNSAFE_BUFFERS_END
 
 #include <ox/model/fieldcounter.hpp>
 #include <ox/model/modelhandleradaptor.hpp>
@@ -28,85 +24,85 @@ namespace ox {
 
 class OrganicClawWriter {
 
-	friend Result<Buffer> writeOC(const auto &val) noexcept;
-	friend Result<String> writeOCString(const auto &val) noexcept;
+	friend Result<ox::Buffer> writeOC(const auto &val) noexcept;
+	friend Result<ox::String> writeOCString(const auto &val) noexcept;
 
 	protected:
 		Json::Value m_json{Json::Value(Json::objectValue)};
 		Json::ArrayIndex m_fieldIt = 0;
-		int const m_unionIdx = -1;
+		int m_unionIdx = -1;
 
 	public:
 		explicit OrganicClawWriter(int unionIdx = -1) noexcept;
 
 		explicit OrganicClawWriter(Json::Value json, int unionIdx = -1) noexcept;
 
-		Error field(CString const key, int8_t const *val) noexcept {
+		Error field(const char *key, const int8_t *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return OxError(0);
 		}
 
-		Error field(CString const key, int16_t const *val) noexcept {
+		Error field(const char *key, const int16_t *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return OxError(0);
 		}
 
-		Error field(CString const key, int32_t const *val) noexcept {
+		Error field(const char *key, const int32_t *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return OxError(0);
 		}
 
-		Error field(CString const key, int64_t const *val) noexcept {
+		Error field(const char *key, const int64_t *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return OxError(0);
 		}
 
 
-		Error field(CString const key, uint8_t const *val) noexcept {
+		Error field(const char *key, const uint8_t *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return OxError(0);
 		}
 
-		Error field(CString const key, uint16_t const *val) noexcept {
+		Error field(const char *key, const uint16_t *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return OxError(0);
 		}
 
-		Error field(CString const key, uint32_t const *val) noexcept {
+		Error field(const char *key, const uint32_t *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return OxError(0);
 		}
 
-		Error field(CString const key, uint64_t const *val) noexcept {
+		Error field(const char *key, const uint64_t *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return {};
+			return OxError(0);
 		}
 
-		Error field(char const*key, bool const *val) noexcept {
+		Error field(char const*key, bool const*val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
@@ -118,16 +114,16 @@ class OrganicClawWriter {
 		Error field(char const*, UnionView<U, force> val) noexcept;
 
 		template<typename T>
-		Error field(char const*key, HashMap<String, T> const *val) noexcept {
+		Error field(char const*key, HashMap<String, T> const*val) noexcept {
 			if (targetValid()) {
 				const auto &keys = val->keys();
 				OrganicClawWriter w;
-				ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{w};
-				for (size_t i = 0; i < keys.size(); ++i) {
+				ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{&w};
+				for (std::size_t i = 0; i < keys.size(); ++i) {
 					const auto k = keys[i].c_str();
 					if (k) [[likely]] {
-						OX_REQUIRE_M(value, val->at(k));
-						OX_RETURN_ERROR(handler.field(k, value));
+						oxRequireM(value, val->at(k));
+						oxReturnError(handler.field(k, value));
 					}
 				}
 				value(key) = w.m_json;
@@ -136,49 +132,49 @@ class OrganicClawWriter {
 			return {};
 		}
 
-		template<size_t L>
-		Error field(char const*key, IString<L> const *val) noexcept {
-			if (targetValid() && val->size()) {
+		template<std::size_t L>
+		Error field(char const*key, IString<L> const*val) noexcept {
+			if (targetValid() && val->len()) {
 				value(key) = val->c_str();
 			}
 			++m_fieldIt;
 			return {};
 		}
 
-		template<size_t L>
-		Error field(char const*key, BasicString<L> const *val) noexcept {
-			if (targetValid() && val->size()) {
+		template<std::size_t L>
+		Error field(char const*key, BasicString<L> const*val) noexcept {
+			if (targetValid() && val->len()) {
 				value(key) = val->c_str();
 			}
 			++m_fieldIt;
-			return {};
+			return OxError(0);
 		}
 
-		Error fieldCString(CString, CString const *val, int len) noexcept;
+		Error fieldCString(const char*, const char *const*val, int len) noexcept;
 
-		Error fieldCString(CString name, CString const*val) noexcept;
+		Error fieldCString(const char *name, const char *const*val) noexcept;
 
-		Error field(CString key, UUID const *uuid) noexcept;
+		Error field(const char *key, const UUID *uuid) noexcept;
 
 		template<typename T>
-		Error field(CString, T const *val, size_t len) noexcept;
+		Error field(const char*, const T *val, std::size_t len) noexcept;
 
 		template<typename T>
-		Error field(CString, T const *val) noexcept;
+		Error field(const char*, const T *val) noexcept;
 
 		template<typename T>
-		constexpr Error setTypeInfo(
+		constexpr ox::Error setTypeInfo(
 				const char* = T::TypeName,
 				int = T::TypeVersion) noexcept {
 			return {};
 		}
 
 		template<typename T>
-		constexpr Error setTypeInfo(
+		constexpr ox::Error setTypeInfo(
 				const char*,
 				int,
-				Vector<String> const&,
-				size_t) noexcept {
+				const Vector<String>&,
+				std::size_t) noexcept {
 			return {};
 		}
 
@@ -194,91 +190,87 @@ class OrganicClawWriter {
 		}
 
 		[[nodiscard]]
-		Json::Value &value(CString key) noexcept;
+		Json::Value &value(const char *key) noexcept;
 
 };
 
 template<typename T>
-Error OrganicClawWriter::field(CString key, T const *val, size_t const len) noexcept {
+Error OrganicClawWriter::field(const char *key, const T *val, std::size_t len) noexcept {
 	if (targetValid() && len) {
 		OrganicClawWriter w((Json::Value(Json::arrayValue)));
-		ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{w};
-		for (size_t i = 0; i < len; ++i) {
+		ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{&w};
+		for (std::size_t i = 0; i < len; ++i) {
 OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-			OX_RETURN_ERROR(handler.field({}, &val[i]));
+			oxReturnError(handler.field({}, &val[i]));
 OX_ALLOW_UNSAFE_BUFFERS_END
 		}
 		value(key) = w.m_json;
 	}
 	++m_fieldIt;
-	return {};
+	return OxError(0);
 }
 
 template<typename T>
-Error OrganicClawWriter::field(CString key, T const *val) noexcept {
+Error OrganicClawWriter::field(const char *key, const T *val) noexcept {
 	if constexpr(is_integer_v<T>) {
 		if (targetValid() && (*val || m_json.isArray())) {
 			// the int type needs to be normalized because jsoncpp doesn't
 			// factor in every permutation unsigned long, etc.
-			if constexpr(is_signed_v<T>) {
-				value(key) = static_cast<Int<8 * sizeof(*val)>>(*val);
+			if constexpr(ox::is_signed_v<T>) {
+				value(key) = static_cast<ox::Int<8 * sizeof(*val)>>(*val);
 			} else {
-				value(key) = static_cast<Uint<8 * sizeof(*val)>>(*val);
+				value(key) = static_cast<ox::Uint<8 * sizeof(*val)>>(*val);
 			}
 		}
 	} else if constexpr(isVector_v<T> || isArray_v<T>) {
 		return field(key, val->data(), val->size());
 	} else if (val && targetValid()) {
 		OrganicClawWriter w;
-		ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{w};
-		OX_RETURN_ERROR(model(&handler, val));
+		ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{&w};
+		oxReturnError(model(&handler, val));
 		if (!w.m_json.empty() || m_json.isArray()) {
 			value(key) = w.m_json;
 		}
 	}
 	++m_fieldIt;
-	return {};
+	return OxError(0);
 }
 
 template<typename U, bool force>
-Error OrganicClawWriter::field(CString key, UnionView<U, force> val) noexcept {
+Error OrganicClawWriter::field(const char *key, UnionView<U, force> val) noexcept {
 	if (targetValid()) {
 		OrganicClawWriter w(val.idx());
-		ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{w};
-		OX_RETURN_ERROR(model(&handler, val.get()));
+		ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{&w};
+		oxReturnError(model(&handler, val.get()));
 		if (!w.m_json.isNull()) {
 			value(key) = w.m_json;
 		}
 	}
 	++m_fieldIt;
-	return {};
+	return OxError(0);
 }
 
-Result<Buffer> writeOC(auto const &val) noexcept {
+Result<ox::Buffer> writeOC(const auto &val) noexcept {
 	OrganicClawWriter writer;
-	ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler(writer);
-	OX_RETURN_ERROR(model(&handler, &val));
+	ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler(&writer);
+	oxReturnError(model(&handler, &val));
 	Json::StreamWriterBuilder const jsonBuilder;
-	auto const str = Json::writeString(jsonBuilder, writer.m_json);
+	const auto str = Json::writeString(jsonBuilder, writer.m_json);
 	Result<Buffer> buff;
 	buff.value.resize(str.size() + 1);
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(buff.value.data(), str.data(), str.size() + 1);
-	OX_ALLOW_UNSAFE_BUFFERS_END
 	return buff;
 }
 
-Result<String> writeOCString(auto const &val) noexcept {
+Result<ox::String> writeOCString(const auto &val) noexcept {
 	OrganicClawWriter writer;
-	ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler(writer);
-	OX_RETURN_ERROR(model(&handler, &val));
+	ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler(&writer);
+	oxReturnError(model(&handler, &val));
 	Json::StreamWriterBuilder const jsonBuilder;
-	auto const str = Json::writeString(jsonBuilder, writer.m_json);
-	Result<String> buff;
+	const auto str = Json::writeString(jsonBuilder, writer.m_json);
+	Result<ox::String> buff;
 	buff.value.resize(str.size());
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(buff.value.data(), str.data(), str.size() + 1);
-	OX_ALLOW_UNSAFE_BUFFERS_END
 	return buff;
 }
 

deps/ox/src/ox/preloader/alignmentcatcher.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -63,7 +63,7 @@ struct AlignmentCatcher: public ModelHandlerBase<AlignmentCatcher<PlatSpec>, OpT
 	template<typename T>
 	constexpr ox::Error field(StringViewCR, const T *val, std::size_t cnt) noexcept {
 		for (std::size_t i = 0; i < cnt; ++i) {
-			OX_RETURN_ERROR(field(nullptr, &val[i]));
+			oxReturnError(field(nullptr, &val[i]));
 		}
 		return {};
 	}

deps/ox/src/ox/preloader/platspecs.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/preloader/preloader.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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/src/ox/preloader/preloader.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -74,7 +74,7 @@ class Preloader: public ModelHandlerBase<Preloader<PlatSpec>, OpType::Reflect> {
 		const Preloader &operator=(const Preloader &src) = delete;
 		const Preloader &operator=(Preloader &&src) = delete;
 
-		constexpr static ox::Result<ox::UPtr<Preloader>> make(ox::ios_base::seekdir anchor = ox::ios_base::cur,
+		constexpr static ox::Result<ox::UniquePtr<Preloader>> make(ox::ios_base::seekdir anchor = ox::ios_base::cur,
 		                                                           std::size_t sz = 0) noexcept;
 
 		template<typename T>
@@ -141,9 +141,9 @@ class Preloader: public ModelHandlerBase<Preloader<PlatSpec>, OpType::Reflect> {
 };
 
 template<typename PlatSpec>
-constexpr ox::Result<ox::UPtr<Preloader<PlatSpec>>>
+constexpr ox::Result<ox::UniquePtr<Preloader<PlatSpec>>>
 Preloader<PlatSpec>::make(ox::ios_base::seekdir anchor, std::size_t sz) noexcept {
-	auto p = ox::UPtr<Preloader>(new Preloader);
+	auto p = ox::UniquePtr<Preloader>(new Preloader);
 	if (const auto err = p->m_writer.seekp(0, anchor)) {
 		return {std::move(p), err};
 	}
@@ -162,7 +162,7 @@ constexpr ox::Error Preloader<PlatSpec>::field(StringViewCR, const ox::UnionView
 	if (!unionCheckAndIt()) {
 		return {};
 	}
-	OX_RETURN_ERROR(pad(val.get()));
+	oxReturnError(pad(val.get()));
 	m_unionIdx.emplace_back(val.idx());
 	const auto err = preload<PlatSpec, U>(this, val.get());
 	m_unionIdx.pop_back();
@@ -175,13 +175,13 @@ constexpr ox::Error Preloader<PlatSpec>::field(StringViewCR name, const T *val)
 	if (!unionCheckAndIt()) {
 		return {};
 	}
-	OX_RETURN_ERROR(pad(val));
+	oxReturnError(pad(val));
 	if constexpr(ox::is_integral_v<T>) {
 		return ox::serialize(m_writer, PlatSpec::correctEndianness(*val));
 	} else if constexpr(ox::is_pointer_v<T>) {
 		const PtrType a = startAlloc(sizeOf<PlatSpec>(val), alignOf<PlatSpec>(*val), m_writer.tellp()) + PlatSpec::RomStart;
-		OX_RETURN_ERROR(field(name, *val));
-		OX_RETURN_ERROR(endAlloc());
+		oxReturnError(field(name, *val));
+		oxReturnError(endAlloc());
 		return ox::serialize(m_writer, PlatSpec::correctEndianness(a));
 	} else if constexpr(ox::isVector_v<T>) {
 		return fieldVector(name, val);
@@ -211,19 +211,19 @@ constexpr ox::Error Preloader<PlatSpec>::field(StringViewCR, const ox::BasicStri
 		.size = PlatSpec::correctEndianness(static_cast<typename PlatSpec::size_t>(sz)),
 		.cap = PlatSpec::correctEndianness(static_cast<typename PlatSpec::size_t>(sz)),
 	};
-	OX_RETURN_ERROR(pad(&vecVal));
+	oxReturnError(pad(&vecVal));
 	const auto restore = m_writer.tellp();
 	std::size_t a = 0;
 	if (sz && sz >= SmallStringSize) {
-		OX_RETURN_ERROR(ox::allocate(m_writer, sz).moveTo(a));
+		oxReturnError(ox::allocate(m_writer, sz).moveTo(a));
 	} else {
 		a = restore;
 	}
 	vecVal.items = PlatSpec::correctEndianness(static_cast<PtrType>(a) + PlatSpec::RomStart);
-	OX_RETURN_ERROR(m_writer.seekp(a));
-	OX_RETURN_ERROR(m_writer.write(val->data(), sz));
-	OX_RETURN_ERROR(m_writer.seekp(restore));
-	OX_RETURN_ERROR(serialize(m_writer, vecVal));
+	oxReturnError(m_writer.seekp(a));
+	oxReturnError(m_writer.write(val->data(), sz));
+	oxReturnError(m_writer.seekp(restore));
+	oxReturnError(serialize(m_writer, vecVal));
 	m_ptrs.emplace_back(restore + offsetof(VecMap, items), vecVal.items);
 	return {};
 }
@@ -234,12 +234,12 @@ constexpr ox::Error Preloader<PlatSpec>::field(StringViewCR name, const ox::Arra
 	if (!unionCheckAndIt()) {
 		return {};
 	}
-	OX_RETURN_ERROR(pad(&(*val)[0]));
+	oxReturnError(pad(&(*val)[0]));
 	// serialize the Array elements
 	if constexpr(sz) {
 		m_unionIdx.emplace_back(-1);
 		for (std::size_t i = 0; i < val->size(); ++i) {
-			OX_RETURN_ERROR(this->interface()->field(name, &(*val)[i]));
+			oxReturnError(this->interface()->field(name, &(*val)[i]));
 		}
 		m_unionIdx.pop_back();
 	}
@@ -253,11 +253,11 @@ constexpr ox::Error Preloader<PlatSpec>::field(StringViewCR, const T **val, std:
 		return {};
 	}
 	if (cnt) {
-		OX_RETURN_ERROR(pad(*val));
+		oxReturnError(pad(*val));
 		// serialize the array
 		m_unionIdx.emplace_back(-1);
 		for (std::size_t i = 0; i < cnt; ++i) {
-			OX_RETURN_ERROR(this->interface()->field(nullptr, &val[i]));
+			oxReturnError(this->interface()->field(nullptr, &val[i]));
 		}
 		m_unionIdx.pop_back();
 	}
@@ -267,11 +267,11 @@ constexpr ox::Error Preloader<PlatSpec>::field(StringViewCR, const T **val, std:
 template<typename PlatSpec>
 constexpr ox::Result<std::size_t> Preloader<PlatSpec>::startAlloc(size_t sz, size_t align) noexcept {
 	m_allocStack.emplace_back(static_cast<typename PlatSpec::PtrType>(m_writer.tellp()));
-	OX_RETURN_ERROR(m_writer.seekp(0, ox::ios_base::end));
+	oxReturnError(m_writer.seekp(0, ox::ios_base::end));
 	auto const padding = calcPadding(align);
-	OX_REQUIRE_M(a, ox::allocate(m_writer, sz + padding));
+	oxRequireM(a, ox::allocate(m_writer, sz + padding));
 	a += padding;
-	OX_RETURN_ERROR(m_writer.seekp(a));
+	oxReturnError(m_writer.seekp(a));
 	m_allocStart.push_back(a);
 	return a;
 }
@@ -280,11 +280,11 @@ template<typename PlatSpec>
 constexpr ox::Result<std::size_t> Preloader<PlatSpec>::startAlloc(
 		std::size_t sz, size_t align, std::size_t restore) noexcept {
 	m_allocStack.emplace_back(restore, ox::ios_base::beg);
-	OX_RETURN_ERROR(m_writer.seekp(0, ox::ios_base::end));
+	oxReturnError(m_writer.seekp(0, ox::ios_base::end));
 	auto const padding = calcPadding(align);
-	OX_REQUIRE_M(a, ox::allocate(m_writer, sz + padding));
+	oxRequireM(a, ox::allocate(m_writer, sz + padding));
 	a += padding;
-	OX_RETURN_ERROR(m_writer.seekp(a));
+	oxReturnError(m_writer.seekp(a));
 	m_allocStart.push_back(a);
 	return a;
 }
@@ -295,7 +295,7 @@ constexpr ox::Error Preloader<PlatSpec>::endAlloc() noexcept {
 		return m_writer.seekp(0, ox::ios_base::end);
 	}
 	const auto &si = *m_allocStack.back().unwrap();
-	OX_RETURN_ERROR(m_writer.seekp(static_cast<ox::ssize_t>(si.restore), si.seekdir));
+	oxReturnError(m_writer.seekp(static_cast<ox::ssize_t>(si.restore), si.seekdir));
 	m_allocStack.pop_back();
 	m_allocStart.pop_back();
 	return {};
@@ -304,12 +304,12 @@ constexpr ox::Error Preloader<PlatSpec>::endAlloc() noexcept {
 template<typename PlatSpec>
 constexpr ox::Error Preloader<PlatSpec>::offsetPtrs(std::size_t offset) noexcept {
 	for (const auto &p : m_ptrs) {
-		OX_RETURN_ERROR(m_writer.seekp(p.loc));
+		oxReturnError(m_writer.seekp(p.loc));
 		const auto val = PlatSpec::template correctEndianness<typename PlatSpec::PtrType>(
 				static_cast<typename PlatSpec::PtrType>(p.value + offset));
-		OX_RETURN_ERROR(ox::serialize(m_writer, val));
+		oxReturnError(ox::serialize(m_writer, val));
 	}
-	OX_RETURN_ERROR(m_writer.seekp(0, ox::ios_base::end));
+	oxReturnError(m_writer.seekp(0, ox::ios_base::end));
 	return {};
 }
 
@@ -354,39 +354,39 @@ constexpr ox::Error Preloader<PlatSpec>::fieldVector(
 template<typename PlatSpec>
 constexpr ox::Error Preloader<PlatSpec>::fieldVector(
 		StringViewCR, const auto *val, ox::VectorMemMap<PlatSpec> vecVal) noexcept {
-	OX_RETURN_ERROR(pad(&vecVal));
+	oxReturnError(pad(&vecVal));
 	const auto vecValPt = m_writer.tellp();
 	// serialize the Vector elements
 	if (val->size()) {
 		const auto sz = sizeOf<PlatSpec>(&(*val)[0]) * val->size();
 		const auto align = alignOf<PlatSpec>((*val)[0]);
-		OX_RETURN_ERROR(m_writer.seekp(0, ox::ios_base::end));
+		oxReturnError(m_writer.seekp(0, ox::ios_base::end));
 		auto const padding = calcPadding(align);
-		OX_REQUIRE_M(p, ox::allocate(m_writer, sz + padding));
+		oxRequireM(p, ox::allocate(m_writer, sz + padding));
 		p += padding;
-		OX_RETURN_ERROR(m_writer.seekp(p));
+		oxReturnError(m_writer.seekp(p));
 		m_unionIdx.emplace_back(-1);
 		for (std::size_t i = 0; i < val->size(); ++i) {
-			OX_RETURN_ERROR(this->interface()->field(nullptr, &val->operator[](i)));
+			oxReturnError(this->interface()->field(nullptr, &val->operator[](i)));
 		}
 		m_unionIdx.pop_back();
 		vecVal.items = PlatSpec::correctEndianness(
 				static_cast<typename PlatSpec::size_t>(p + PlatSpec::RomStart));
-		OX_RETURN_ERROR(m_writer.seekp(vecValPt));
+		oxReturnError(m_writer.seekp(vecValPt));
 	} else {
 		vecVal.items = 0;
 	}
 	// serialize the Vector
-	OX_RETURN_ERROR(serialize(m_writer, vecVal));
+	oxReturnError(serialize(m_writer, vecVal));
 	m_ptrs.emplace_back(m_writer.tellp() - PtrSize, vecVal.items);
 	return {};
 }
 
 template<typename PlatSpec>
 constexpr ox::Error Preloader<PlatSpec>::fieldArray(StringViewCR, ox::ModelValueArray const*val) noexcept {
-	OX_RETURN_ERROR(pad(&(*val)[0]));
+	oxReturnError(pad(&(*val)[0]));
 	for (auto const&v : *val) {
-		OX_RETURN_ERROR(this->interface()->field({}, &v));
+		oxReturnError(this->interface()->field({}, &v));
 	}
 	return {};
 }
@@ -405,7 +405,7 @@ constexpr size_t Preloader<PlatSpec>::calcPadding(size_t align) const noexcept {
 
 template<typename PlatSpec, typename T>
 constexpr ox::Error preload(Preloader<PlatSpec> *pl, ox::CommonPtrWith<T> auto *obj) noexcept {
-	OX_RETURN_ERROR(model(pl->interface(), obj));
+	oxReturnError(model(pl->interface(), obj));
 	return pl->pad(obj);
 }
 

deps/ox/src/ox/preloader/sizecatcher.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -74,7 +74,7 @@ template<typename T, bool force>
 constexpr ox::Error SizeCatcher<PlatSpec>::field(const char*, const UnionView<T, force> val) noexcept {
 	pad(val.get());
 	UnionSizeCatcher<PlatSpec> sc;
-	OX_RETURN_ERROR(model(sc.interface(), val.get()));
+	oxReturnError(model(sc.interface(), val.get()));
 	m_size += sc.size();
 	return {};
 }
@@ -91,7 +91,7 @@ template<typename PlatSpec>
 template<typename T>
 constexpr ox::Error SizeCatcher<PlatSpec>::field(const char*, const T **val, std::size_t cnt) noexcept {
 	for (std::size_t i = 0; i < cnt; ++i) {
-		OX_RETURN_ERROR(field("", &val[i]));
+		oxReturnError(field("", &val[i]));
 	}
 	return {};
 }

deps/ox/src/ox/preloader/unionsizecatcher.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -43,7 +43,7 @@ class UnionSizeCatcher: public ModelHandlerBase<UnionSizeCatcher<PlatSpec>, OpTy
 		template<typename T, bool force>
 		constexpr ox::Error field(StringViewCR, const UnionView<T, force> val) noexcept {
 			UnionSizeCatcher<PlatSpec> sc;
-			OX_RETURN_ERROR(model(sc.interface(), val.get()));
+			oxReturnError(model(sc.interface(), val.get()));
 			m_size += sc.size();
 			return {};
 		}
@@ -80,7 +80,7 @@ template<typename PlatSpec>
 template<typename T>
 constexpr ox::Error UnionSizeCatcher<PlatSpec>::field(StringViewCR, const T **val, std::size_t cnt) noexcept {
 	for (std::size_t i = 0; i < cnt; ++i) {
-		OX_RETURN_ERROR(field("", &val[i]));
+		oxReturnError(field("", &val[i]));
 	}
 	return {};
 }

deps/ox/src/ox/std/CMakeLists.txt

@@ -33,7 +33,6 @@ add_library(
 		concepts.cpp
 		fmt.cpp
 		heapmgr.cpp
-		istreamreader.cpp
 		math.cpp
 		memops.cpp
 		random.cpp
@@ -110,7 +109,6 @@ install(
 		error.hpp
 		fmt.hpp
 		hardware.hpp
-		hash.hpp
 		hashmap.hpp
 		heapmgr.hpp
 		ignore.hpp

deps/ox/src/ox/std/algorithm.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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
@@ -9,25 +9,13 @@
 #pragma once
 
 #include "def.hpp"
-#include "error.hpp"
 
 OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 
 namespace ox {
 
 template<typename It, typename T>
-constexpr ox::Result<size_t> findIdx(It begin, It end, T const&value) {
-	auto it = begin;
-	for (; it != end; ++it) {
-		if (*it == value) {
-			return it.offset();
-		}
-	}
-	return ox::Error{1, "item not found"};
-}
-
-template<typename It, typename T>
-constexpr It find(It begin, It end, T const&value) {
+constexpr It find(It begin, It end, const T &value) {
 	for (; begin != end; ++begin) {
 		if (*begin == value) {
 			return begin;

deps/ox/src/ox/std/anyptr.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2025 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,24 +15,20 @@
 
 namespace ox {
 
-namespace detail {
-
-template<bool unique>
-class AnyPtrT {
+class AnyPtr {
 	private:
 		struct WrapBase {
 			virtual constexpr ~WrapBase() = default;
-			virtual constexpr WrapBase *copyTo(Span<char> s) const noexcept = 0;
+			virtual constexpr WrapBase *copyTo(ox::Span<char> s) noexcept = 0;
 			virtual constexpr operator bool() const noexcept = 0;
-			virtual void free() noexcept = 0;
 		};
 
 		template<typename T>
-		struct Wrap final: WrapBase {
+		struct Wrap: public WrapBase {
 			T *data{};
-			explicit constexpr Wrap(T *pData) noexcept: data(pData) {
+			constexpr Wrap(T *pData) noexcept: data(pData) {
 			}
-			constexpr WrapBase *copyTo(Span<char> s) const noexcept override {
+			constexpr WrapBase *copyTo(ox::Span<char> s) noexcept override {
 				oxAssert(s.size() >= sizeof(Wrap), "too small buffer");
 				if (std::is_constant_evaluated()) {
 					return new Wrap(data);
@@ -43,160 +39,71 @@ class AnyPtrT {
 			constexpr operator bool() const noexcept override {
 				return data != nullptr;
 			}
-			constexpr void free() noexcept override {
-				safeDelete(data);
-				data = {};
-			}
 		};
 
-		union {
-			WrapBase *m_wrapPtr{};
-			AllocAlias<Wrap<void*>> m_wrapData;
-		} m_data;
+		WrapBase *m_wrapPtr{};
+		ox::Array<char, sizeof(Wrap<void*>)> m_wrapData;
 
 	public:
-		constexpr AnyPtrT() noexcept = default;
+		constexpr AnyPtr() noexcept = default;
 
 		template<typename T>
-		constexpr AnyPtrT(T *ptr) noexcept {
+		constexpr AnyPtr(T *ptr) noexcept {
 			if (std::is_constant_evaluated()) {
-				setWrapPtr(new Wrap<T>(ptr));
+				m_wrapPtr = new Wrap(ptr);
 			} else {
-				new(m_data.m_wrapData.data()) Wrap<T>(ptr);
+				m_wrapPtr = new(m_wrapData.data()) Wrap(ptr);
 			}
 		}
 
-		constexpr AnyPtrT(AnyPtrT const &other) noexcept requires(!unique) {
+		constexpr AnyPtr(AnyPtr const&other) noexcept {
 			if (other) {
-				setWrapPtr(other.getWrapPtr()->copyTo(m_data.m_wrapData.buff));
+				m_wrapPtr = other.m_wrapPtr->copyTo(m_wrapData);
 			}
 		}
 
-		constexpr AnyPtrT(AnyPtrT &&other) noexcept {
-			if (other) {
-				setWrapPtr(other.getWrapPtr()->copyTo(m_data.m_wrapData.buff));
-				if (std::is_constant_evaluated()) {
-					ox::safeDelete(m_data.m_wrapPtr);
-				}
-				m_data.m_wrapData = {};
-			}
-		}
-
-		constexpr ~AnyPtrT() noexcept {
-			if constexpr(unique) {
-				free();
-			}
+		constexpr ~AnyPtr() noexcept {
 			if (std::is_constant_evaluated()) {
-				ox::safeDelete(m_data.m_wrapPtr);
+				ox::safeDelete(m_wrapPtr);
 			}
 		}
 
 		template<typename T>
-		constexpr AnyPtrT &operator=(T *ptr) noexcept {
-			if constexpr(unique) {
-				free();
-			} else if (std::is_constant_evaluated()) {
-				ox::safeDelete(m_data.m_wrapPtr);
-			}
+		constexpr AnyPtr &operator=(T *ptr) noexcept {
 			if (std::is_constant_evaluated()) {
-				setWrapPtr(new Wrap(ptr));
+				ox::safeDelete(m_wrapPtr);
+				m_wrapPtr = new Wrap(ptr);
 			} else {
-				new(m_data.m_wrapData.data()) Wrap(ptr);
+				m_wrapPtr = new(m_wrapData.data()) Wrap(ptr);
 			}
 			return *this;
 		}
 
-		constexpr AnyPtrT &operator=(AnyPtrT const &ptr) noexcept requires(!unique) {
+		constexpr AnyPtr &operator=(AnyPtr const&ptr) noexcept {
 			if (this != &ptr) {
-				if (std::is_constant_evaluated()) {
-					ox::safeDelete(m_data.m_wrapPtr);
-				}
-				if (std::is_constant_evaluated()) {
-					if (ptr) {
-						ptr.getWrapPtr()->copyTo(m_data.m_wrapData.buff);
-					}
-				} else {
-					if (ptr) {
-						setWrapPtr(ptr.getWrapPtr()->copyTo(m_data.m_wrapData.buff));
-					} else {
-						setWrapPtr(nullptr);
-					}
-				}
-			}
-			return *this;
-		}
-
-		constexpr AnyPtrT &operator=(AnyPtrT &&ptr) noexcept {
-			if (this != &ptr) {
-				if constexpr(unique) {
-					free();
-				} else if (std::is_constant_evaluated()) {
-					ox::safeDelete(m_data.m_wrapPtr);
-				}
 				if (ptr) {
-					setWrapPtr(ptr.getWrapPtr()->copyTo(m_data.m_wrapData.buff));
-					if (std::is_constant_evaluated()) {
-						ox::safeDelete(ptr.m_data.m_wrapPtr);
-						setWrapPtr(nullptr);
-					}
+					ox::safeDelete(m_wrapPtr);
+					m_wrapPtr = ptr.m_wrapPtr->copyTo(m_wrapData);
 				} else {
-					m_data = {};
+					m_wrapPtr = nullptr;
 				}
 			}
 			return *this;
 		}
 
 		constexpr operator bool() const noexcept {
-			return getWrapPtr() && *getWrapPtr();
-		}
-
-		constexpr void free() noexcept {
-			if (auto p = getWrapPtr()) {
-				p->free();
-			}
-			if (std::is_constant_evaluated()) {
-				ox::safeDelete(m_data.m_wrapPtr);
-			}
-			m_data.m_wrapData = {};
+			return m_wrapPtr && *m_wrapPtr;
 		}
 
 		template<typename T>
 		[[nodiscard]]
 		constexpr T *get() const noexcept {
-			if constexpr(defines::HasRTTI) {
-				return dynamic_cast<Wrap<T> const*>(getWrapPtr())->data;
-			}
-			return static_cast<Wrap<T> const*>(getWrapPtr())->data;
+#ifdef OX_BARE_METAL
+			return static_cast<Wrap<T>*>(m_wrapPtr)->data;
+#else
+			return dynamic_cast<Wrap<T>*>(m_wrapPtr)->data;
+#endif
 		}
-
-	private:
-		constexpr void setWrapPtr(WrapBase *ptr) noexcept {
-			if (std::is_constant_evaluated()) {
-				m_data.m_wrapPtr = ptr;
-			}
-		}
-
-		constexpr WrapBase *getWrapPtr() noexcept {
-			if (std::is_constant_evaluated()) {
-				return m_data.m_wrapPtr;
-			} else {
-				return std::launder(reinterpret_cast<WrapBase*>(m_data.m_wrapData.data()));
-			}
-		}
-
-		constexpr WrapBase const *getWrapPtr() const noexcept {
-			if (std::is_constant_evaluated()) {
-				return m_data.m_wrapPtr;
-			} else {
-				return std::launder(reinterpret_cast<WrapBase const*>(m_data.m_wrapData.data()));
-			}
-		}
-
 };
 
-}
-
-using AnyPtr = detail::AnyPtrT<false>;
-using UAnyPtr = detail::AnyPtrT<true>;
-
 }