[nostalgia/studio] Set version to d2025.07.0

.gitattributes

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

.gitea/workflows/build.yaml

@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   build:
-    runs-on: nostalgia
+    runs-on: olympic
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
@@ -17,3 +17,10 @@ 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,12 +6,14 @@
 .mypy_cache
 .stfolder
 .stignore
+.vs
 util/scripts/__pycache__
 pyenv
 CMakeLists.txt.user
 ROM.oxfs
 Session.vim
 build
+cmake-build-*
 compile_commands.json
 dist
 graph_info.json

Makefile

@@ -15,7 +15,16 @@ PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}
 
 .PHONY: pkg-gba
 pkg-gba: build
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
+	${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-player
 build-player:
@@ -28,10 +37,10 @@ run-studio: build
 	${PROJECT_STUDIO}
 .PHONY: gba-run
 gba-run: pkg-gba
-	${MGBA} ${BC_VAR_PROJECT_NAME}.gba
+	${MGBA} ${BC_VAR_PROJECT_NAME_CAP}.gba
 .PHONY: debug
 debug: build
-	${BC_CMD_HOST_DEBUGGER} ./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
+	${BC_CMD_HOST_DEBUGGER} ${PROJECT_PLAYER} sample_project
 .PHONY: debug-studio
 debug-studio: build
 	${BC_CMD_HOST_DEBUGGER} ${PROJECT_STUDIO}
@@ -43,3 +52,25 @@ 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} mypy ${BC_VAR_SCRIPTS}
+	${BC_CMD_ENVRUN} ${BC_CMD_PY3} -m 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,6 +11,7 @@
 # "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
@@ -57,7 +58,11 @@ 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]
+        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')
         if target is not None:
             args.extend(['--target', target])
         err = subprocess.run(args).returncode

deps/buildcore/scripts/util.py

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

deps/glutils/include/glutils/glutils.hpp

@@ -89,7 +89,7 @@ struct GLObject: public Base {
 		return id;
 	}
 
-	constexpr operator const GLuint&() const noexcept {
+	constexpr operator GLuint const&() const noexcept {
 		return id;
 	}
 
@@ -135,7 +135,7 @@ struct FrameBuffer {
 		return fbo.id;
 	}
 
-	constexpr operator const GLuint&() const noexcept {
+	constexpr operator GLuint const&() const noexcept {
 		return fbo.id;
 	}
 
@@ -158,14 +158,14 @@ struct FrameBuffer {
 
 class FrameBufferBind {
 	private:
-		static const FrameBuffer *s_activeFb;
+		static FrameBuffer const *s_activeFb;
-		const FrameBuffer *m_restoreFb = nullptr;
+		FrameBuffer const *m_restoreFb = nullptr;
 	public:
-		explicit FrameBufferBind(const FrameBuffer &fb) noexcept;
+		explicit FrameBufferBind(FrameBuffer const &fb) noexcept;
 		~FrameBufferBind() noexcept;
 };
 
-void bind(const FrameBuffer &fb) noexcept;
+void bind(FrameBuffer const &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 &vert,
-		ox::CStringView const&frag,
+		ox::CStringView const &frag,
-		ox::CStringView const&geo = "") noexcept;
+		ox::CStringView const &geo = "") noexcept;
 
 void setupShaderParams(
-		GLProgram const&shader,
+		GLProgram const &shader,
-		ox::Vector<ShaderVarSet> const&vars,
+		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;
 
-glutils::GLVertexArray generateVertexArrayObject() noexcept;
+GLVertexArray generateVertexArrayObject() noexcept;
 
-glutils::GLBuffer generateBuffer() noexcept;
+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 {
-	glutils::GLVertexArray vao;
+	GLVertexArray vao;
-	glutils::GLBuffer vbo;
+	GLBuffer vbo;
-	glutils::GLBuffer ebo;
+	GLBuffer ebo;
-	glutils::GLTexture tex;
+	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>;
 
-const FrameBuffer *FrameBufferBind::s_activeFb = nullptr;
+FrameBuffer const *FrameBufferBind::s_activeFb = nullptr;
 
-FrameBufferBind::FrameBufferBind(const FrameBuffer &fb) noexcept: m_restoreFb(s_activeFb) {
+FrameBufferBind::FrameBufferBind(FrameBuffer const &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(const FrameBuffer &fb) noexcept {
+void bind(FrameBuffer const &fb) noexcept {
 	glBindFramebuffer(GL_FRAMEBUFFER, fb);
 	glViewport(0, 0, fb.width, fb.height);
 }
 
 
 static ox::Result<GLShader> buildShader(
-		GLuint shaderType,
+		GLuint const shaderType,
-		const GLchar *src,
+		GLchar const *src,
 		ox::StringViewCR shaderName) noexcept {
 	GLShader shader(glCreateShader(shaderType));
 	glShaderSource(shader, 1, &src, nullptr);
@@ -88,7 +88,7 @@ static ox::Result<GLShader> buildShader(
 	return shader;
 }
 
-ox::Result<GLProgram> buildShaderProgram(ProgramSource const&src) noexcept {
+ox::Result<GLProgram> buildShaderProgram(ProgramSource const &src) noexcept {
 	OX_REQUIRE_M(program, buildShaderProgram(
 			src.vertShader,
 			src.fragShader,
@@ -98,11 +98,11 @@ ox::Result<GLProgram> buildShaderProgram(ProgramSource const&src) noexcept {
 }
 
 void setupShaderParams(
-		GLProgram const&shader,
+		GLProgram const &shader,
-		ox::Vector<ShaderVarSet> const&vars,
+		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,19 +113,19 @@ 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 &vert,
-		ox::CStringView const&frag,
+		ox::CStringView const &frag,
-		ox::CStringView const&geo) noexcept {
+		ox::CStringView const &geo) noexcept {
 	GLProgram prgm(glCreateProgram());
 	OX_REQUIRE(vs, buildShader(GL_VERTEX_SHADER, vert.c_str(), "vshad"));
 	glAttachShader(prgm, vs);
@@ -162,16 +162,30 @@ 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
@@ -189,7 +203,16 @@ 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
@@ -201,7 +224,7 @@ void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	glBindRenderbuffer(GL_RENDERBUFFER, 0);
 }
 
-void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
+void resizeInitFrameBuffer(FrameBuffer &fb, int const width, int const height) noexcept {
 	if (!fb) {
 		fb = generateFrameBuffer(width, height);
 		return;
@@ -209,18 +232,18 @@ void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	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 {
+void sendVbo(BufferSet const &bs) noexcept {
-	const auto bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.vertices)::value_type) * bs.vertices.size());
+	auto const 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 {
+void sendEbo(BufferSet const &bs) noexcept {
-	const auto bufferSize = static_cast<GLsizeiptr>(sizeof(decltype(bs.elements)::value_type) * bs.elements.size());
+	auto const 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/nfde/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.19)
 project(nativefiledialog-extended VERSION 1.1.1)
 
 set(nfd_ROOT_PROJECT OFF)

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.8.0")
+set(JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION "3.13.2")
 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/src/ox/clargs/clargs.cpp

@@ -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.len()) {
+			while (arg[0] == '-' && arg.size()) {
 				arg = substr(arg, 1);
 			}
 			m_bools[arg] = true;
 			// parse additional arguments
 			if (i < args.size() && args[i + 1]) {
-				auto val = String(args[i + 1]);
+				auto const val = StringView{args[i + 1]};
-				if (val.len() && val[i] != '-') {
+				if (val.size() && val[0] != '-') {
 					if (val == "false") {
 						m_bools[arg] = false;
 					}
 					m_strings[arg] = val;
-					if (auto r = ox::atoi(val.c_str()); r.error == 0) {
+					if (auto r = ox::strToInt(val); r.error == 0) {
 						m_ints[arg] = r.value;
 					}
 					++i;
@@ -40,17 +40,17 @@ ClArgs::ClArgs(ox::SpanView<const char*> args) noexcept {
 }
 
 bool ClArgs::getBool(ox::StringViewCR arg, bool defaultValue) const noexcept {
-	auto [value, err] = m_ints.at(arg);
+	auto const [value, err] = m_ints.at(arg);
 	return !err ? *value : defaultValue;
 }
 
 String ClArgs::getString(ox::StringViewCR arg, ox::StringView defaultValue) const noexcept {
-	auto [value, err] = m_strings.at(arg);
+	auto const [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 [value, err] = m_ints.at(arg);
+	auto const [value, err] = m_ints.at(arg);
 	return !err ? *value : defaultValue;
 }
 

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

@@ -81,7 +81,7 @@ Result<ClawHeader> readClawHeader(ox::BufferView buff) noexcept {
 		return ox::Error(4, "Claw format does not match any supported format/version combo");
 	}
 	hdr.typeName = typeName;
-	std::ignore = ox::atoi(versionStr).copyTo(hdr.typeVersion);
+	std::ignore = ox::strToInt(versionStr).copyTo(hdr.typeVersion);
 	hdr.data = buffRaw;
 	hdr.dataSize = buffLen;
 	return hdr;

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

@@ -109,7 +109,7 @@ 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.len() + 1});
+				auto [ch, err] = ox::readClawHeader({hdr.c_str(), hdr.size() + 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");
@@ -121,7 +121,7 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 			"ClawHeaderReader2",
 			[] {
 				constexpr auto hdr = ox::StringLiteral("M2;com.drinkingtea.ox.claw.test.Header2;3;");
-				auto [ch, err] = ox::readClawHeader({hdr.c_str(), hdr.len() + 1});
+				auto [ch, err] = ox::readClawHeader({hdr.c_str(), hdr.size() + 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");
@@ -134,7 +134,7 @@ 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.len() + 1}));
+				OX_REQUIRE(actual, ox::readClawTypeId({hdr.data(), hdr.size() + 1}));
 				oxExpect(actual, expected);
 				return ox::Error{};
 			}

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

@@ -39,7 +39,7 @@ struct TypeInfoCatcher {
 	}
 
 	constexpr Error field(...) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	static constexpr auto opType() {

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

@@ -143,6 +143,11 @@ 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;
@@ -213,7 +218,7 @@ Error Signal<Args...>::emitCheckError(Args... args) const noexcept {
 		for (auto &f : m_slots) {
 			f->call(args...);
 		}
-		return ox::Error(0);
+		return {};
 	} catch (const ox::Exception &ex) {
 		return ox::Error(ex.errCode, ex.msg, ex.src);
 	}
@@ -319,6 +324,11 @@ 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;
@@ -400,7 +410,7 @@ Error Signal<Error(Args...)>::emitCheckError(Args... args) const noexcept {
 	for (auto &f : m_slots) {
 		OX_RETURN_ERROR(f->call(ox::forward<Args>(args)...));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 }

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

@@ -230,7 +230,7 @@ template<typename size_t>
 Error FileStoreTemplate<size_t>::incLinks(uint64_t id) {
 	OX_REQUIRE_M(item, find(static_cast<size_t>(id)).validate());
 	++item->links;
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
@@ -240,7 +240,7 @@ Error FileStoreTemplate<size_t>::decLinks(uint64_t id) {
 	if (item->links == 0) {
 		OX_RETURN_ERROR(remove(item));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
@@ -298,7 +298,7 @@ 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 ox::Error(0);
+						return {};
 					}
 				} else {
 					oxTrace("ox.fs.FileStoreTemplate.write.fail", "Could not place item due to absence of FileStore header.");
@@ -427,20 +427,20 @@ Error FileStoreTemplate<size_t>::resize() {
 	oxTracef("ox.fs.FileStoreTemplate.resize", "resize to: {}", newSize);
 	OX_RETURN_ERROR(m_buffer->setSize(newSize));
 	oxTracef("ox.fs.FileStoreTemplate.resize", "resized to: {}", m_buffer->size());
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
 Error FileStoreTemplate<size_t>::resize(std::size_t size, void *newBuff) {
 	if (m_buffer->size() > size) {
-		return ox::Error(1);
+		return ox::Error{1, "new buffer is too small for existing data"};
 	}
 	m_buffSize = static_cast<size_t>(size);
 	if (newBuff) {
-		m_buffer = reinterpret_cast<Buffer*>(newBuff);
+		m_buffer = static_cast<Buffer*>(newBuff);
 		OX_RETURN_ERROR(m_buffer->setSize(static_cast<size_t>(size)));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
@@ -479,7 +479,7 @@ 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()));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
@@ -503,7 +503,7 @@ Error FileStoreTemplate<size_t>::compact() {
 	return m_buffer->compact([this, &isFirstItem](uint64_t oldAddr, ItemPtr item) -> Error {
 		if (isFirstItem) {
 			isFirstItem = false;
-			return ox::Error(0);
+			return {};
 		}
 		if (!item.valid()) {
 			return ox::Error(1);
@@ -524,7 +524,7 @@ Error FileStoreTemplate<size_t>::compact() {
 				parent->right = item;
 			}
 		}
-		return ox::Error(0);
+		return {};
 	});
 }
 
@@ -552,7 +552,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr item) {
 		item->left = root->left;
 		item->right = root->right;
 		oxTracef("ox.fs.FileStoreTemplate.placeItem", "Overwrote Root Item: {}", item->id.get());
-		return ox::Error(0);
+		return {};
 	} else {
 		return placeItem(root, item);
 	}
@@ -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 ox::Error(0);
+			return {};
 		} else {
 			return placeItem(right, item, depth + 1);
 		}
@@ -586,7 +586,7 @@ 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 ox::Error(0);
+			return {};
 		} else {
 			return placeItem(left, item, depth + 1);
 		}
@@ -624,7 +624,7 @@ Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr item) {
 		} else {
 			fsData->rootNode = 0;
 		}
-		return ox::Error(0);
+		return {};
 	} else {
 		return unplaceItem(root, item);
 	}
@@ -661,7 +661,7 @@ Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr root, ItemPtr item, int dep
 	if (item->left) {
 		OX_RETURN_ERROR(placeItem(m_buffer->ptr(item->left)));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
@@ -669,7 +669,7 @@ Error FileStoreTemplate<size_t>::remove(ItemPtr item) {
 	if (item.valid()) {
 		OX_RETURN_ERROR(unplaceItem(item));
 		OX_RETURN_ERROR(m_buffer->free(item));
-		return ox::Error(0);
+		return {};
 	}
 	return ox::Error(1);
 }

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

@@ -52,7 +52,7 @@ 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.len()));
+				ox::strncpy(d->name, name.data(), ox::min(maxStrSz, name.size()));
 				return {};
 			}
 			return ox::Error(1);
@@ -219,7 +219,7 @@ Error Directory<FileStore, InodeId_t>::write(PathIterator path, uint64_t inode64
 			oxTrace("ox.fs.Directory.write.fail", "Could not read existing version of Directory");
 			return ox::Error(1, "Could not read existing version of Directory");
 		}
-		const auto pathSize = name.len() + 1;
+		const auto pathSize = name.size() + 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);

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

@@ -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_CLANG_NOWARN_END
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	m_type = FileAddressType::Path;
 }
 
@@ -48,9 +48,11 @@ 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

@@ -24,9 +24,6 @@ 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>

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

@@ -37,6 +37,30 @@ Error FileSystem::read(const FileAddress &addr, void *buffer, std::size_t size)
 	}
 }
 
+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));
 	Buffer buff(static_cast<std::size_t>(s.size));
@@ -51,18 +75,33 @@ Result<Buffer> FileSystem::read(StringViewCR path) noexcept {
 	return buff;
 }
 
-Error FileSystem::read(const FileAddress &addr, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept {
+Error FileSystem::read(
+		FileAddress const &addr,
+		std::size_t const readStart,
+		std::size_t const readSize,
+		void *buffer,
+		std::size_t *size) noexcept {
 	switch (addr.type()) {
 		case FileAddressType::Inode:
-			return read(addr.getInode().value, readStart, readSize, buffer, size);
+			return readFileInodeRange(addr.getInode().value, readStart, readSize, buffer, size);
 		case FileAddressType::ConstPath:
 		case FileAddressType::Path:
-			return ox::Error(2, "Unsupported for path lookups");
+			return readFilePathRange(addr.getPath().value, readStart, readSize, buffer, size);
 		default:
 			return ox::Error(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::write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType) noexcept {
 	switch (addr.type()) {
 		case FileAddressType::Inode:

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

@@ -20,7 +20,7 @@
 namespace ox {
 
 namespace detail {
-static inline void fsBuffFree(char *buff) noexcept {
+inline void fsBuffFree(char *buff) noexcept {
 	safeDelete(buff);
 }
 }
@@ -41,19 +41,39 @@ 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;
 
-		inline Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
+		Error read(StringViewCR path, void *buffer, std::size_t buffSize) noexcept {
 			return readFilePath(path, buffer, buffSize);
 		}
 
-		inline Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
+		Error read(uint64_t inode, void *buffer, std::size_t buffSize) noexcept {
 			return readFileInode(inode, buffer, buffSize);
 		}
 
-		Error read(const FileAddress &addr, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept;
+		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;
 
 		virtual Result<Vector<String>> ls(StringViewCR dir) const noexcept = 0;
 
@@ -81,36 +101,36 @@ class FileSystem {
 
 		Error write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType = FileType::NormalFile) noexcept;
 
-		inline Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept {
+		Error write(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept {
 			return writeFilePath(path, buffer, size, fileType);
 		}
 
-		inline Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
+		Error write(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
 			return writeFileInode(inode, buffer, size, fileType);
 		}
 
-		inline Result<FileStat> stat(uint64_t inode) const noexcept {
+		Result<FileStat> stat(uint64_t inode) const noexcept {
 			return statInode(inode);
 		}
 
-		inline Result<FileStat> stat(StringViewCR path) const noexcept {
+		Result<FileStat> stat(StringViewCR path) const noexcept {
 			return statPath(path);
 		}
 
 		Result<FileStat> stat(const FileAddress &addr) const noexcept;
 
 		[[nodiscard]]
-		inline bool exists(uint64_t inode) const noexcept {
+		bool exists(uint64_t inode) const noexcept {
 			return statInode(inode).ok();
 		}
 
 		[[nodiscard]]
-		inline bool exists(ox::StringView path) const noexcept {
+		bool exists(ox::StringView path) const noexcept {
 			return statPath(path).ok();
 		}
 
 		[[nodiscard]]
-		inline bool exists(FileAddress const&addr) const noexcept {
+		bool exists(FileAddress const&addr) const noexcept {
 			return stat(addr).ok();
 		}
 
@@ -140,7 +160,10 @@ class FileSystem {
 
 		virtual Error readFileInode(uint64_t inode, void *buffer, std::size_t size) noexcept = 0;
 
-		virtual Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept = 0;
+		virtual Error 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;
 
@@ -154,11 +177,11 @@ class MemFS: public FileSystem {
 	public:
 		Result<const char*> directAccess(const FileAddress &addr) const noexcept;
 
-		inline Result<const char*> directAccess(StringViewCR path) const noexcept {
+		Result<const char*> directAccess(StringViewCR path) const noexcept {
 			return directAccessPath(path);
 		}
 
-		inline Result<const char*> directAccess(uint64_t inode) const noexcept {
+		Result<const char*> directAccess(uint64_t inode) const noexcept {
 			return directAccessInode(inode);
 		}
 
@@ -211,6 +234,9 @@ 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;
@@ -303,7 +329,7 @@ Error FileSystemTemplate<FileStore, Directory>::format(void *buff, uint64_t buff
 		return ox::Error(1);
 	}
 
-	return ox::Error(0);
+	return {};
 }
 
 template<typename FileStore, typename Directory>
@@ -320,7 +346,7 @@ Error FileSystemTemplate<FileStore, Directory>::move(StringViewCR src, StringVie
 	OX_REQUIRE_M(inode, rootDir.find(src));
 	OX_RETURN_ERROR(rootDir.write(dest, inode));
 	OX_RETURN_ERROR(rootDir.remove(src));
-	return ox::Error(0);
+	return {};
 }
 
 template<typename FileStore, typename Directory>
@@ -358,6 +384,13 @@ 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());
@@ -374,7 +407,7 @@ Error FileSystemTemplate<FileStore, Directory>::removePath(StringViewCR path, bo
 		oxTrace("FileSystemTemplate.remove.fail", "Tried to remove directory without recursive setting.");
 		return ox::Error(1);
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename FileStore, typename Directory>
@@ -391,7 +424,7 @@ Result<Vector<String>> FileSystemTemplate<FileStore, Directory>::ls(StringViewCR
 	Vector<String> out;
 	OX_RETURN_ERROR(ls(path, [&out](StringViewCR name, typename FileStore::InodeId_t) {
 		out.emplace_back(name);
-		return ox::Error(0);
+		return ox::Error{};
 	}));
 	return out;
 }
@@ -435,7 +468,7 @@ Error FileSystemTemplate<FileStore, Directory>::writeFilePath(
 
 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::itoa(inode));
+	oxTrace("ox.fs.FileSystemTemplate.writeFileInode", ox::intToStr(inode));
 	return m_fs.write(inode, buffer, static_cast<size_t>(size), static_cast<uint8_t>(fileType));
 }
 

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

@@ -60,7 +60,7 @@ Error PassThroughFS::move(StringViewCR src, StringViewCR dest) noexcept {
 	if (ec.value()) {
 		return ox::Error(1);
 	}
-	return ox::Error(0);
+	return {};
 }
 
 Result<Vector<String>> PassThroughFS::ls(StringViewCR dir) const noexcept {
@@ -93,7 +93,9 @@ 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);
-	OX_RETURN_ERROR(ox::Error(static_cast<ox::ErrorCode>(ec.value()), "PassThroughFS: stat failed"));
+	if (auto err = ec.value()) {
+		return ox::Error{static_cast<ox::ErrorCode>(err), "PassThroughFS: stat failed"};
+	}
 	return FileStat{0, 0, size, type};
 }
 
@@ -146,7 +148,7 @@ Error PassThroughFS::readFilePath(StringViewCR path, void *buffer, std::size_t b
 		oxTracef("ox.fs.PassThroughFS.read.error", "Read of {} failed: {}", path, f.what());
 		return ox::Error(2);
 	}
-	return ox::Error(0);
+	return {};
 }
 
 Error PassThroughFS::readFileInode(uint64_t, void*, std::size_t) noexcept {
@@ -154,6 +156,25 @@ Error PassThroughFS::readFileInode(uint64_t, void*, std::size_t) noexcept {
 	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};
+	}
+}
+
 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");
@@ -176,7 +197,7 @@ Error PassThroughFS::writeFilePath(StringViewCR path, const void *buffer, uint64
 		oxTracef("ox.fs.PassThroughFS.read.error", "Write of {} failed: {}", path, f.what());
 		return ox::Error(1);
 	}
-	return ox::Error(0);
+	return {};
 }
 
 Error PassThroughFS::writeFileInode(uint64_t, const void*, uint64_t, FileType) noexcept {
@@ -185,8 +206,7 @@ Error PassThroughFS::writeFileInode(uint64_t, const void*, uint64_t, FileType) n
 }
 
 std::string_view PassThroughFS::stripSlash(StringView path) noexcept {
-	const auto pathLen = ox::strlen(path);
+	for (auto i = 0u; i < path.size() && path[0] == '/'; i++) {
-	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

@@ -71,6 +71,9 @@ 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;
@@ -96,7 +99,7 @@ Error PassThroughFS::ls(StringViewCR dir, F cb) const noexcept {
 	for (auto &p : di) {
 		OX_RETURN_ERROR(cb(p.path().filename().c_str(), 0));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 }

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

@@ -36,7 +36,7 @@ Error PathIterator::dirPath(char *out, std::size_t outSize) {
 	if (idx >= 0 && size < outSize) {
 		ox::memcpy(out, m_path, size);
 		out[size] = 0;
-		return ox::Error(0);
+		return {};
 	} else {
 		return ox::Error(1);
 	}
@@ -74,7 +74,7 @@ Error PathIterator::get(StringView &fileName) {
 	if (size && fileName[size - 1] == '/') {
 		fileName = ox::substr(m_path, start, start + size - 1);
 	}
-	oxAssert(fileName[fileName.len()-1] != '/', "name ends in /");
+	oxAssert(fileName[fileName.size()-1] != '/', "name ends in /");
 	return {};
 }
 
@@ -85,7 +85,7 @@ Error PathIterator::next(StringView &fileName) {
 	std::size_t size = 0;
 	auto retval = ox::Error(1);
 	if (m_iterator < m_maxSize && ox::strlen(&m_path[m_iterator])) {
-		retval = ox::Error(0);
+		retval = {};
 		if (m_path[m_iterator] == '/') {
 			m_iterator++;
 		}
@@ -104,11 +104,11 @@ Error PathIterator::next(StringView &fileName) {
 		}
 		fileName = ox::substr(m_path, start, start + size);
 		// truncate trailing /
-		while (fileName.len() && fileName[fileName.len() - 1] == '/') {
+		while (fileName.size() && fileName[fileName.size() - 1] == '/') {
 			fileName = ox::substr(m_path, start, start + size);
 		}
 		m_iterator += size;
-		oxAssert(fileName.len() == 0 || fileName[fileName.len()-1] != '/', "name ends in /");
+		oxAssert(fileName.size() == 0 || fileName[fileName.size()-1] != '/', "name ends in /");
 	}
 	return retval;
 }
@@ -118,7 +118,7 @@ Result<std::size_t> PathIterator::nextSize() const {
 	auto retval = ox::Error(1);
 	auto it = m_iterator;
 	if (it < m_maxSize && ox::strlen(&m_path[it])) {
-		retval = ox::Error(0);
+		retval = {};
 		if (m_path[it] == '/') {
 			it++;
 		}

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

@@ -354,7 +354,7 @@ Error NodeBuffer<size_t, Item>::free(ItemPtr item) noexcept {
 		}
 	}
 	m_header.bytesUsed -= item.size();
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t, typename Item>
@@ -370,7 +370,7 @@ Error NodeBuffer<size_t, Item>::setSize(std::size_t size) noexcept {
 		m_header.size = static_cast<size_t>(size);
 		auto data = reinterpret_cast<uint8_t*>(this) + end;
 		ox::memset(data, 0, size - end);
-		return ox::Error(0);
+		return {};
 	}
 }
 
@@ -422,7 +422,7 @@ Error NodeBuffer<size_t, Item>::compact(F cb) noexcept {
 		src = ptr(dest->next);
 		dest = uninitializedPtr(dest.offset() + dest->fullSize());
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t, typename Item>

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

@@ -59,7 +59,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::next1",
 			[](ox::StringView) {
 				auto constexpr path = ox::StringLiteral("/usr/share/charset.gbag");
-				ox::PathIterator it(path.c_str(), path.len());
+				ox::PathIterator it(path.c_str(), path.size());
 				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");
@@ -84,7 +84,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::next3",
 			[](ox::StringView) {
 				auto const path = ox::String("/");
-				ox::PathIterator it(path.c_str(), path.len());
+				ox::PathIterator it(path.c_str(), path.size());
 				ox::StringView buff;
 				oxAssert(it.next(buff) == 0 && buff == "\0", "PathIterator shows wrong next");
 				return ox::Error(0);
@@ -106,7 +106,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::next5",
 			[](ox::StringView) {
 				auto const path = ox::String("usr/share/");
-				ox::PathIterator it(path.c_str(), path.len());
+				ox::PathIterator it(path.c_str(), path.size());
 				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");
@@ -117,9 +117,11 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::dirPath",
 			[] (ox::StringView) {
 				auto constexpr path = ox::StringLiteral("/usr/share/charset.gbag");
-				ox::PathIterator it(path.c_str(), path.len());
+				ox::PathIterator it(path.c_str(), path.size());
-				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
+				auto buff = static_cast<char*>(ox_alloca(path.size() + 1));
-				oxAssert(it.dirPath(buff, path.len()) == 0 && ox::strcmp(buff, "/usr/share/") == 0, "PathIterator shows incorrect dir path");
+				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);
 			}
 		},
@@ -127,7 +129,9 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"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);
@@ -163,9 +167,11 @@ 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);

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

@@ -48,7 +48,7 @@ static ox::Error runLs(ox::FileSystem *fs, ox::Span<const char*> args) noexcept
 	for (const auto &file : files) {
 		oxOutf("{}\n", file);
 	}
-	return ox::Error(0);
+	return {};
 }
 
 static ox::Error runRead(ox::FileSystem *fs, ox::Span<const char*> args) noexcept {
@@ -57,8 +57,10 @@ static ox::Error runRead(ox::FileSystem *fs, ox::Span<const char*> args) noexcep
 		return ox::Error(1);
 	}
 	OX_REQUIRE(buff, fs->read(ox::StringView(args[1])));
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	std::ignore = fwrite(buff.data(), sizeof(decltype(buff)::value_type), buff.size(), stdout);
-	return ox::Error(0);
+	OX_ALLOW_UNSAFE_BUFFERS_END
+	return {};
 }
 
 static ox::Error run(int argc, const char **argv) noexcept {

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

@@ -91,6 +91,7 @@ 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);
@@ -109,6 +110,10 @@ void LoggerConn::msgSend() noexcept {
 				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/mc/intops.hpp

@@ -71,7 +71,9 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 	// move input to uint64_t to allow consistent bit manipulation, and to avoid
 	// overflow concerns
 	uint64_t val = 0;
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	ox::memcpy(&val, &input, sizeof(input));
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	if (val) {
 		// bits needed to represent number factoring in space possibly
 		// needed for signed bit
@@ -94,7 +96,9 @@ constexpr McInt encodeInteger(I 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;
 			}
@@ -104,7 +108,9 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 			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;
 	}
@@ -160,7 +166,9 @@ constexpr Result<I> decodeInteger(Reader_c auto&rdr, std::size_t *bytesRead) noe
 			ox::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<std::size_t>(Bits<I>, 32); ++bit) {
 				d[0] |= 1 << bit;
@@ -175,7 +183,9 @@ constexpr Result<I> decodeInteger(Reader_c auto&rdr, std::size_t *bytesRead) noe
 				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;
 		}
 	}

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

@@ -197,7 +197,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, bool *val) n
 		OX_RETURN_ERROR(result);
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 // array handler
@@ -256,7 +256,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, HashMap<Stri
 		}
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -330,7 +330,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, BasicString<
 		}
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -370,7 +370,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char
 		data[size] = 0;
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -388,7 +388,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char
 		data[size] = 0;
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -416,7 +416,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char
 		}
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -464,7 +464,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::readInteger(I *val) noexcept {
 		}
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -487,7 +487,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, CB cb) noexc
 		}
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>

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

@@ -157,7 +157,7 @@ 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");
-				oxDebugf("{}", testOut.IString.len());
+				oxDebugf("{}", testOut.IString.size());
 				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");

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

@@ -122,7 +122,7 @@ class MetalClawWriter {
 			}
 			OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 			++m_field;
-			return ox::Error(0);
+			return {};
 		}
 
 };
@@ -184,37 +184,42 @@ constexpr Error MetalClawWriter<Writer>::field(const char*, const bool *val) noe
 		OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), *val));
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>
 template<std::size_t SmallStringSize>
 constexpr Error MetalClawWriter<Writer>::field(const char*, const BasicString<SmallStringSize> *val) noexcept {
 	bool fieldSet = false;
-	if (val->len() && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
+	if (val->size() && (!m_unionIdx.has_value() || *m_unionIdx == m_field)) {
 		// write the length
-		const auto strLen = mc::encodeInteger(val->len());
+		const auto strLen = mc::encodeInteger(val->size());
 		OX_RETURN_ERROR(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<std::size_t>(val->len())));
+		OX_RETURN_ERROR(m_writer.write(val->c_str(), static_cast<std::size_t>(val->size())));
 		fieldSet = true;
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>
 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());
+	return fieldCString(name, val->data(), val->size());
 }
 
 template<Writer_c Writer>
 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...
 		const auto strLen = *val ? ox::strlen(*val) : 0;
+		OX_ALLOW_UNSAFE_BUFFERS_END
 		// write the length
 		const auto strLenBuff = mc::encodeInteger(strLen);
 		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<const char*>(strLenBuff.data.data()), strLenBuff.length));
@@ -224,7 +229,7 @@ constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *c
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>
@@ -250,7 +255,7 @@ constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *v
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>
@@ -314,7 +319,7 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>
@@ -334,7 +339,7 @@ constexpr Error MetalClawWriter<Writer>::field(const char*, const HashMap<String
 		OX_RETURN_ERROR(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) -> ox::Error {
-			const auto keyLen = key.len();
+			const auto keyLen = key.size();
 			auto wkey = ox_malloca(keyLen + 1, char, 0);
 			memcpy(wkey.get(), key.c_str(), keyLen + 1);
 			OX_RETURN_ERROR(handler.fieldCString("", wkey.get(), keyLen));
@@ -351,7 +356,7 @@ constexpr Error MetalClawWriter<Writer>::field(const char*, const HashMap<String
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>

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

@@ -13,7 +13,7 @@
 // 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 ox::Error(0); }
+#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

deps/ox/src/ox/model/desctypes.hpp

@@ -43,7 +43,7 @@ static constexpr auto buildTypeId(
 		for (const auto &p : typeParams) {
 			tp += p + ",";
 		}
-		tp.resize(tp.len() - 1);
+		tp.resize(tp.size() - 1);
 		tp += "#";
 	}
 	return ox::sfmt("{}{};{}", name, tp, version);
@@ -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 ox::Error(0);
+	return {};
 }
 #endif
 

deps/ox/src/ox/model/descwrite.hpp

@@ -205,7 +205,7 @@ 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 ox::Error(0);
+		return {};
 	}
 	return ox::Error(1);
 }
@@ -220,7 +220,7 @@ 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 ox::Error(0);
+		return {};
 	}
 	return ox::Error(1);
 }
@@ -231,7 +231,7 @@ 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 ox::Error(0);
+		return {};
 	}
 	return ox::Error(1);
 }

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

@@ -31,25 +31,25 @@ class FieldCounter {
 		template<typename U>
 		constexpr ox::Error field(StringViewCR, U) noexcept {
 			++fields;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename U>
 		constexpr ox::Error field(StringViewCR, U, std::size_t) noexcept {
 			++fields;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename U, typename Handler>
 		constexpr Error field(StringViewCR, Handler) {
 			++fields;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename ...Args>
 		constexpr Error fieldCString(Args&&...) noexcept {
 			++fields;
-			return ox::Error(0);
+			return {};
 		}
 
 		static constexpr auto opType() noexcept {

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

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

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

@@ -18,6 +18,6 @@ static_assert([]() -> ox::Error {
 	}
 	//oxReturnError(v.set<int32_t>(5));
 	return {};
-}() == ox::Error(0));
+}() == ox::Error{});
 
 }

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

@@ -972,7 +972,7 @@ constexpr Error model(auto *h, CommonPtrWith<ModelObject> auto *obj) noexcept {
 	for (auto &f : obj->m_fieldsOrder) {
 		OX_RETURN_ERROR(h->field(f->name.c_str(), &f->value));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept {
@@ -981,7 +981,7 @@ constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept {
 	for (auto &f : obj->m_fieldsOrder) {
 		OX_RETURN_ERROR(h->field(f->name.c_str(), &f->value));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 constexpr ModelValue::ModelValue(const ModelValue &other) noexcept {
@@ -997,7 +997,7 @@ constexpr ModelValue::ModelValue(const ModelValue &other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
+			m_data = other.m_data;
 			break;
 		case Type::String:
 			m_data.str = new String(other.get<String>());
@@ -1030,8 +1030,8 @@ constexpr ModelValue::ModelValue(ModelValue &&other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
+			m_data = other.m_data;
-			ox::memset(&other.m_data, 0, sizeof(m_data));
+			other.m_data.ui64 = 0;
 			break;
 		case Type::String:
 			m_data.str = other.m_data.str;
@@ -1129,7 +1129,7 @@ constexpr Error ModelValue::setType(
 		OX_RETURN_ERROR(m_data.uni->setType(type));
 	}
 	oxAssert(m_type != Type::Undefined, "No type set");
-	return ox::Error(0);
+	return {};
 }
 
 template<typename T>
@@ -1184,7 +1184,7 @@ constexpr Error ModelValue::set(const T &v) noexcept {
 		safeDelete(&value);
 	}
 	value = v;
-	return ox::Error(0);
+	return {};
 }
 
 template<typename T>
@@ -1199,7 +1199,7 @@ constexpr Error ModelValue::set(T &&v) noexcept {
 		safeDelete(&value);
 	}
 	value = std::move(v);
-	return ox::Error(0);
+	return {};
 }
 
 constexpr ModelValue &ModelValue::operator=(ModelValue &other) noexcept {
@@ -1223,7 +1223,7 @@ constexpr ModelValue &ModelValue::operator=(const ModelValue &other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
+			m_data = other.m_data;
 			break;
 		case Type::String:
 			m_data.str = new String(other.get<String>());
@@ -1261,8 +1261,8 @@ constexpr ModelValue &ModelValue::operator=(ModelValue &&other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
+			m_data = other.m_data;
-			ox::memset(&other.m_data, 0, sizeof(m_data));
+			other.m_data = {};
 			break;
 		case Type::String:
 			m_data.str = other.m_data.str;

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

@@ -38,17 +38,17 @@ struct TypeNameCatcher {
 
 	template<typename T>
 	constexpr Error field(const char*, T*, std::size_t) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	template<typename T>
 	constexpr Error field(const char*, T) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	template<typename ...Args>
 	constexpr Error fieldCString(Args&&...) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	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 ox::Error(0);
+		return {};
 	}
 
 	template<typename T>
 	constexpr Error field(const char*, T) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	template<typename T>
 	constexpr Error fieldCString(const char*, T) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	static constexpr auto opType() noexcept {
@@ -144,7 +144,7 @@ template<typename T, typename Str = const char*>
 [[nodiscard]]
 consteval auto requireModelTypeName() noexcept {
 	constexpr auto name = getModelTypeName<T, Str>();
-	static_assert(ox::StringView{name}.len(), "Type lacks required TypeName");
+	static_assert(ox::StringView{name}.size(), "Type lacks required TypeName");
 	return name;
 }
 
@@ -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.len() + versionStr.len() + 1>>("{};{}", name, versionStr);
+	return ox::sfmt<ox::IString<name.size() + versionStr.size() + 1>>("{};{}", name, versionStr);
 }();
 
 }

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

@@ -58,8 +58,12 @@ class TypeStore {
 				if (!std::is_constant_evaluated()) {
 					OX_REQUIRE_M(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));
 						}
+					}
 					auto &out = m_cache[typeId];
 					out = std::move(dt);
 					return out.get();

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

@@ -127,7 +127,7 @@ static constexpr Error parseField(const DescriptorField &field, Reader *rdr, Dat
 		}
 	}
 	walker->popNamePath();
-	return ox::Error(0);
+	return {};
 }
 
 template<typename Reader, typename FH>
@@ -141,7 +141,7 @@ constexpr Error model(Reader *rdr, DataWalker<Reader, FH> *walker) noexcept {
 	for (const auto &field : fields) {
 		OX_RETURN_ERROR(parseField(field, rdr, walker));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename Reader, typename Handler>

deps/ox/src/ox/oc/read.cpp

@@ -15,7 +15,7 @@ namespace ox {
 
 OrganicClawReader::OrganicClawReader(const uint8_t *buff, std::size_t buffSize) {
 	auto json = reinterpret_cast<const char*>(buff);
-	auto jsonLen = ox::strnlen(json, buffSize);
+	auto jsonLen = ox::strnlen_s(json, buffSize);
 	Json::CharReaderBuilder parserBuilder;
 	auto parser = std::unique_ptr<Json::CharReader>(parserBuilder.newCharReader());
 	if (!parser->parse(json, json + jsonLen, &m_json, nullptr)) {
@@ -37,7 +37,7 @@ OrganicClawReader::OrganicClawReader(Json::Value json, int unionIdx) noexcept:
 }
 
 Error OrganicClawReader::field(const char *key, bool *val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty()) {
@@ -53,7 +53,7 @@ Error OrganicClawReader::field(const char *key, bool *val) noexcept {
 }
 
 Error OrganicClawReader::fieldCString(const char *key, char *val, std::size_t buffLen) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	if (targetValid()) {
@@ -81,7 +81,7 @@ Error OrganicClawReader::fieldCString(const char *key, char *val, std::size_t bu
 }
 
 Error OrganicClawReader::fieldCString(const char *key, char **val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	auto &data = *val;
@@ -106,7 +106,7 @@ Error OrganicClawReader::fieldCString(const char *key, char **val) noexcept {
 }
 
 Error OrganicClawReader::fieldCString(const char *key, char **val, std::size_t buffLen) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	if (targetValid()) {

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

@@ -8,7 +8,11 @@
 
 #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>
@@ -133,7 +137,7 @@ class OrganicClawReader {
 
 template<typename T>
 Error OrganicClawReader::field(const char *key, T *val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	try {
 		if constexpr (is_integer_v<T>) {
 			if (targetValid()) {
@@ -186,7 +190,7 @@ Error OrganicClawReader::field(const char *key, T *val) noexcept {
 
 template<typename U, bool force>
 Error OrganicClawReader::field(const char *key, UnionView<U, force> val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty() || jv.isObject()) {
@@ -203,7 +207,7 @@ Error OrganicClawReader::field(const char *key, UnionView<U, force> val) noexcep
 
 template<std::size_t L>
 Error OrganicClawReader::field(const char *key, BasicString<L> *val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty()) {
@@ -220,7 +224,7 @@ Error OrganicClawReader::field(const char *key, BasicString<L> *val) noexcept {
 
 template<std::size_t L>
 Error OrganicClawReader::field(const char *key, IString<L> *val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty()) {
@@ -253,7 +257,7 @@ OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 		OX_RETURN_ERROR(handler.field("", &val[i]));
 OX_ALLOW_UNSAFE_BUFFERS_END
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename T>
@@ -270,7 +274,7 @@ Error OrganicClawReader::field(const char *key, HashMap<String, T> *val) noexcep
 		const auto k = keys[i].c_str();
 		OX_RETURN_ERROR(handler.field(k, &val->operator[](k)));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 Error readOC(BufferView buff, auto &val) noexcept {
@@ -303,7 +307,7 @@ Result<T> readOC(BufferView buff) noexcept {
 
 template<typename T>
 Result<T> readOC(ox::StringView json) noexcept {
-	return readOC<T>(ox::BufferView{json.data(), json.len()});
+	return readOC<T>(ox::BufferView{json.data(), json.size()});
 }
 
 }

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

@@ -23,7 +23,7 @@ Error OrganicClawWriter::fieldCString(const char *key, const char *const*val, in
 		value(key) = *val;
 	}
 	++m_fieldIt;
-	return ox::Error(0);
+	return {};
 }
 
 Error OrganicClawWriter::fieldCString(const char *key, const char *const*val) noexcept {
@@ -32,7 +32,7 @@ Error OrganicClawWriter::fieldCString(const char *key, const char *const*val) no
 
 Error OrganicClawWriter::field(const char *key, const UUID *uuid) noexcept {
 	const auto uuidStr = uuid->toString();
-	if (targetValid() && uuidStr.len()) {
+	if (targetValid() && uuidStr.size()) {
 		value(key) = uuidStr.c_str();
 	}
 	++m_fieldIt;

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

@@ -8,7 +8,11 @@
 
 #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>
@@ -42,7 +46,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const int16_t *val) noexcept {
@@ -50,7 +54,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const int32_t *val) noexcept {
@@ -58,7 +62,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const int64_t *val) noexcept {
@@ -66,7 +70,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 
@@ -75,7 +79,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const uint16_t *val) noexcept {
@@ -83,7 +87,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const uint32_t *val) noexcept {
@@ -91,7 +95,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const uint64_t *val) noexcept {
@@ -99,7 +103,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(char const*key, bool const*val) noexcept {
@@ -134,7 +138,7 @@ class OrganicClawWriter {
 
 		template<std::size_t L>
 		Error field(char const*key, IString<L> const*val) noexcept {
-			if (targetValid() && val->len()) {
+			if (targetValid() && val->size()) {
 				value(key) = val->c_str();
 			}
 			++m_fieldIt;
@@ -143,11 +147,11 @@ class OrganicClawWriter {
 
 		template<std::size_t L>
 		Error field(char const*key, BasicString<L> const*val) noexcept {
-			if (targetValid() && val->len()) {
+			if (targetValid() && val->size()) {
 				value(key) = val->c_str();
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error fieldCString(const char*, const char *const*val, int len) noexcept;
@@ -207,7 +211,7 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 		value(key) = w.m_json;
 	}
 	++m_fieldIt;
-	return ox::Error(0);
+	return {};
 }
 
 template<typename T>
@@ -233,7 +237,7 @@ Error OrganicClawWriter::field(const char *key, const T *val) noexcept {
 		}
 	}
 	++m_fieldIt;
-	return ox::Error(0);
+	return {};
 }
 
 template<typename U, bool force>
@@ -247,7 +251,7 @@ Error OrganicClawWriter::field(const char *key, UnionView<U, force> val) noexcep
 		}
 	}
 	++m_fieldIt;
-	return ox::Error(0);
+	return {};
 }
 
 Result<ox::Buffer> writeOC(const auto &val) noexcept {
@@ -258,7 +262,9 @@ Result<ox::Buffer> writeOC(const auto &val) noexcept {
 	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;
 }
 
@@ -270,7 +276,9 @@ Result<ox::String> writeOCString(const auto &val) noexcept {
 	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/std/array.hpp

@@ -181,13 +181,13 @@ constexpr Array<T, ArraySize> &Array<T, ArraySize>::operator=(Array &&other) noe
 
 template<typename T, std::size_t ArraySize>
 constexpr T &Array<T, ArraySize>::operator[](std::size_t i) noexcept {
-	ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Array access overflow");
+	boundsCheck(__FILE__, __LINE__, i, size(), "Array access overflow");
 	return m_items[i];
 }
 
 template<typename T, std::size_t ArraySize>
 constexpr const T &Array<T, ArraySize>::operator[](std::size_t i) const noexcept {
-	ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Array access overflow");
+	boundsCheck(__FILE__, __LINE__, i, size(), "Array access overflow");
 	return m_items[i];
 }
 

deps/ox/src/ox/std/assert.cpp

@@ -33,6 +33,9 @@ void panic(StringViewCR file, int const line, StringViewCR panicMsg, Error const
 #endif
 }
 
+#if __GNUC__
+__attribute__((weak))
+#endif
 void panic(const char *file, int const line, char const*panicMsg, Error const&err) noexcept {
 	panic(StringView{file}, line, StringView{panicMsg}, err);
 }

deps/ox/src/ox/std/basestringview.hpp

@@ -185,7 +185,7 @@ class BaseStringView {
 		}
 
 		[[nodiscard]]
-		constexpr auto len() const noexcept {
+		constexpr auto size() const noexcept {
 			return m_len;
 		}
 

deps/ox/src/ox/std/cstringview.hpp

@@ -21,13 +21,13 @@ class CStringView: public detail::BaseStringView {
 
 		constexpr CStringView(CStringView const&sv) noexcept = default;
 
-		constexpr CStringView(StringLiteral const&str) noexcept: BaseStringView(str.data(), str.len()) {}
+		constexpr CStringView(StringLiteral const&str) noexcept: BaseStringView(str.data(), str.size()) {}
 
 		template<std::size_t SmallStrSz>
-		constexpr CStringView(BasicString<SmallStrSz> const&str) noexcept: BaseStringView(str.data(), str.len()) {}
+		constexpr CStringView(BasicString<SmallStrSz> const&str) noexcept: BaseStringView(str.data(), str.size()) {}
 
 		template<std::size_t SmallStrSz>
-		constexpr CStringView(IString<SmallStrSz> const&str) noexcept: BaseStringView(str.data(), str.len()) {}
+		constexpr CStringView(IString<SmallStrSz> const&str) noexcept: BaseStringView(str.data(), str.size()) {}
 
 		constexpr CStringView(std::nullptr_t) noexcept {}
 
@@ -37,7 +37,7 @@ class CStringView: public detail::BaseStringView {
 
 		constexpr auto &operator=(CStringView const&other) noexcept {
 			if (&other != this) {
-				set(other.data(), other.len());
+				set(other.data(), other.size());
 			}
 			return *this;
 		}

deps/ox/src/ox/std/cstrops.hpp

@@ -30,9 +30,12 @@ constexpr T1 strncpy(T1 dest, T2 src, std::size_t maxLen) noexcept {
 }
 
 [[nodiscard]]
-constexpr auto strnlen(const char *str1, std::size_t maxLen) noexcept {
+constexpr size_t strnlen_s(const char *str, size_t const maxLen) noexcept {
-	std::size_t len = 0;
+	if (!str) [[unlikely]] {
-	for (; len < maxLen && str1[len]; len++);
+		return 0;
+	}
+	size_t len = 0;
+	for (; len < maxLen && str[len]; len++);
 	return len;
 }
 

deps/ox/src/ox/std/defines.hpp

@@ -41,6 +41,12 @@ constexpr auto Debug = true;
 constexpr auto Debug = false;
 #endif
 
+#if defined(OX_CHECK_BOUNDS)
+constexpr auto CheckBounds = true;
+#else
+constexpr auto CheckBounds = Debug;
+#endif
+
 #if defined(NDEBUG)
 constexpr auto NDebug = true;
 #else

deps/ox/src/ox/std/error.hpp

@@ -307,6 +307,13 @@ struct [[nodiscard]] Result {
 		return std::move(value);
 	}
 
+	constexpr Result transformError(ErrorCode const ec, CString const msg) && {
+		if (error) {
+			error = Error{ec, msg};
+		}
+		return *this;
+	}
+
 };
 
 namespace detail {
@@ -330,4 +337,17 @@ constexpr void primitiveAssert(char const*file, int line, bool pass, char const*
 	}
 }
 
+constexpr void boundsCheck(
+	char const*file,
+	int const line,
+	size_t const i,
+	size_t const sz,
+	char const*msg) noexcept {
+	if constexpr(defines::CheckBounds) {
+		if (i >= sz) [[unlikely]] {
+			panic(file, line, msg, ox::Error{1});
+		}
+	}
+}
+
 }

deps/ox/src/ox/std/hashmap.hpp

@@ -11,6 +11,7 @@
 #include "algorithm.hpp"
 #include "hash.hpp"
 #include "ignore.hpp"
+#include "optional.hpp"
 #include "stringview.hpp"
 #include "strops.hpp"
 #include "vector.hpp"
@@ -26,11 +27,12 @@ class HashMap {
 
 	private:
 		struct Pair {
+			UPtr<Pair> next;
 			K key = {};
 			T value{};
 		};
 		Vector<K> m_keys;
-		Vector<Pair*> m_pairs;
+		Vector<UPtr<Pair>> m_pairs;
 
 	public:
 		explicit constexpr HashMap(std::size_t size = 127);
@@ -73,10 +75,10 @@ class HashMap {
 		constexpr void expand();
 
 		template<typename KK>
-		constexpr Pair *const&access(Vector<Pair*> const&pairs, KK const&key) const;
+		constexpr UPtr<Pair> const &access(Vector<UPtr<Pair>> const &pairs, KK const &key) const;
 
 		template<typename KK>
-		constexpr Pair *&access(Vector<Pair*> &pairs, KK const&key);
+		constexpr UPtr<Pair> &access(Vector<UPtr<Pair>> &pairs, KK const &key);
 
 };
 
@@ -85,14 +87,13 @@ constexpr HashMap<K, T>::HashMap(std::size_t size): m_pairs(size) {
 }
 
 template<typename K, typename T>
-constexpr HashMap<K, T>::HashMap(HashMap<K, T> const&other) {
+constexpr HashMap<K, T>::HashMap(HashMap const &other) {
-	m_pairs = other.m_pairs;
+	operator=(other);
 }
 
 template<typename K, typename T>
-constexpr HashMap<K, T>::HashMap(HashMap<K, T> &&other) noexcept {
+constexpr HashMap<K, T>::HashMap(HashMap &&other) noexcept {
-	m_keys = std::move(other.m_keys);
+	operator=(std::move(other));
-	m_pairs = std::move(other.m_pairs);
 }
 
 template<typename K, typename T>
@@ -101,7 +102,7 @@ constexpr HashMap<K, T>::~HashMap() {
 }
 
 template<typename K, typename T>
-constexpr bool HashMap<K, T>::operator==(HashMap const&other) const {
+constexpr bool HashMap<K, T>::operator==(HashMap const &other) const {
 	if (m_keys != other.m_keys) {
 		return false;
 	}
@@ -115,19 +116,25 @@ constexpr bool HashMap<K, T>::operator==(HashMap const&other) const {
 }
 
 template<typename K, typename T>
-constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap<K, T> const&other) {
+constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap const &other) {
 	if (this != &other) {
 		clear();
 		m_keys = other.m_keys;
-		m_pairs = other.m_pairs;
+		m_pairs.resize(other.m_pairs.size());
+		for (auto const&k : m_keys) {
+			auto const &src = access(other.m_pairs, k);
+			auto &dst = access(m_pairs, k);
+			dst = ox::make_unique<Pair>();
+			dst->key = src->key;
+			dst->value = src->value;
+		}
 	}
 	return *this;
 }
 
 template<typename K, typename T>
-constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap<K, T> &&other) noexcept {
+constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap &&other) noexcept {
 	if (this != &other) {
-		clear();
 		m_keys = std::move(other.m_keys);
 		m_pairs = std::move(other.m_pairs);
 	}
@@ -135,60 +142,52 @@ constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap<K, T> &&other) noexcep
 }
 
 template<typename K, typename T>
-constexpr T &HashMap<K, T>::operator[](MaybeView_t<K> const&k) {
+constexpr T &HashMap<K, T>::operator[](MaybeView_t<K> const &key) {
-	auto p = &access(m_pairs, k);
+	auto p = &access(m_pairs, key);
 	if (*p == nullptr) {
 		if (static_cast<double>(m_pairs.size()) * 0.7 <
 			 static_cast<double>(m_keys.size())) {
 			expand();
-			p = &access(m_pairs, k);
+			p = &access(m_pairs, key);
 		}
-		*p = new Pair;
+		*p = ox::make_unique<Pair>();
-		(*p)->key = k;
+		(*p)->key = key;
-		m_keys.emplace_back(k);
+		m_keys.emplace_back(key);
 	}
 	return (*p)->value;
 }
 
 template<typename K, typename T>
-constexpr Result<T*> HashMap<K, T>::at(MaybeView_t<K> const&k) noexcept {
+constexpr Result<T*> HashMap<K, T>::at(MaybeView_t<K> const &key) noexcept {
-	auto p = access(m_pairs, k);
+	auto &p = access(m_pairs, key);
 	if (!p) {
-		return {nullptr, ox::Error(1, "value not found for given key")};
+		return ox::Error{1, "value not found for given key"};
 	}
 	return &p->value;
 }
 
 template<typename K, typename T>
-constexpr Result<const T*> HashMap<K, T>::at(MaybeView_t<K> const&k) const noexcept {
+constexpr Result<const T*> HashMap<K, T>::at(MaybeView_t<K> const &key) const noexcept {
-	auto p = access(m_pairs, k);
+	auto &p = access(m_pairs, key);
 	if (!p) {
-		return {nullptr, ox::Error(1, "value not found for given key")};
+		return ox::Error{1, "value not found for given key"};
 	}
 	return &p->value;
 }
 
 template<typename K, typename T>
-constexpr void HashMap<K, T>::erase(MaybeView_t<K> const&k) {
+constexpr void HashMap<K, T>::erase(MaybeView_t<K> const &key) {
-	if (!contains(k)) {
+	if (!contains(key)) {
 		return;
 	}
-	auto h = ox::hash<MaybeView_t<K>>{}(k) % m_pairs.size();
+	auto &c = access(m_pairs, key);
-	while (true) {
+	c = std::move(c->next);
-		const auto &p = m_pairs[h];
+	std::ignore = m_keys.erase(ox::find(m_keys.begin(), m_keys.end(), key));
-		if (p == nullptr || p->key == k) {
-			std::ignore = m_pairs.erase(h);
-			break;
-		} else {
-			h = ox::hash<MaybeView_t<K>>{}(k) % m_pairs.size();
-		}
-	}
-	std::ignore = m_keys.erase(ox::find(m_keys.begin(), m_keys.end(), k));
 }
 
 template<typename K, typename T>
-constexpr bool HashMap<K, T>::contains(MaybeView_t<K> const&k) const noexcept {
+constexpr bool HashMap<K, T>::contains(MaybeView_t<K> const &key) const noexcept {
-	return access(m_pairs, k) != nullptr;
+	return access(m_pairs, key).get() != nullptr;
 }
 
 template<typename K, typename T>
@@ -204,27 +203,26 @@ constexpr Vector<K> const&HashMap<K, T>::keys() const noexcept {
 template<typename K, typename T>
 constexpr Vector<T> HashMap<K, T>::values() const noexcept {
 	Vector<T> out;
-	out.reserve(m_pairs.size());
+	out.reserve(m_keys.size());
-	for (auto const&p : m_pairs) {
+	for (auto const &p : m_pairs) {
+		if (out) {
 			out.emplace_back(p->value);
 		}
+	}
 	return out;
 }
 
 template<typename K, typename T>
 constexpr void HashMap<K, T>::clear() {
-	for (std::size_t i = 0; i < m_pairs.size(); i++) {
-		delete m_pairs[i];
-	}
 	m_pairs.clear();
 	m_pairs.resize(127);
 }
 
 template<typename K, typename T>
 constexpr void HashMap<K, T>::expand() {
-	Vector<Pair*> r(m_pairs.size() * 2);
+	Vector<UPtr<Pair>> r{m_pairs.size() * 2};
 	for (std::size_t i = 0; i < m_keys.size(); ++i) {
-		auto const&k = m_keys[i];
+		auto const &k = m_keys[i];
 		access(r, k) = std::move(access(m_pairs, k));
 	}
 	m_pairs = std::move(r);
@@ -232,29 +230,39 @@ constexpr void HashMap<K, T>::expand() {
 
 template<typename K, typename T>
 template<typename KK>
-constexpr typename HashMap<K, T>::Pair *const&HashMap<K, T>::access(Vector<Pair*> const&pairs, KK const&k) const {
+constexpr UPtr<typename HashMap<K, T>::Pair> const &HashMap<K, T>::access(
-	auto h = static_cast<std::size_t>(ox::hash<KK>{}(k) % pairs.size());
+		Vector<UPtr<Pair>> const& pairs,
-	while (true) {
+		KK const &key) const {
-		auto const&p = *pairs.at(h).unwrap();
+	auto const h = static_cast<std::size_t>(ox::hash<KK>{}(key) % pairs.size());
-		if (p == nullptr || p->key == k) {
+	auto const &p = *pairs.at(h).unwrap();
+	if (p == nullptr || p->key == key) {
 		return p;
-		} else {
-			h = (h + 1) % pairs.size();
 	}
+	auto c = &p->next;
+	while (true) {
+		if (*c == nullptr || (*c)->key == key) {
+			return *c;
+		}
+		c = &(*c)->next;
 	}
 }
 
 template<typename K, typename T>
 template<typename KK>
-constexpr typename HashMap<K, T>::Pair *&HashMap<K, T>::access(Vector<Pair*> &pairs, KK const&k) {
+constexpr UPtr<typename HashMap<K, T>::Pair> &HashMap<K, T>::access(
-	auto h = static_cast<std::size_t>(ox::hash<KK>{}(k) % pairs.size());
+		Vector<UPtr<Pair>> &pairs,
-	while (true) {
+		KK const &key) {
+	auto const h = static_cast<std::size_t>(ox::hash<KK>{}(key) % pairs.size());
 	auto &p = *pairs.at(h).unwrap();
-		if (p == nullptr || p->key == k) {
+	if (p == nullptr || p->key == key) {
 		return p;
-		} else {
-			h = (h + 1) % pairs.size();
 	}
+	auto c = &p->next;
+	while (true) {
+		if (*c == nullptr || (*c)->key == key) {
+			return *c;
+		}
+		c = &(*c)->next;
 	}
 }
 

deps/ox/src/ox/std/ignore.hpp

@@ -16,7 +16,7 @@
 
 namespace std {
 
-inline constexpr struct {
+inline constexpr struct ignore_t {
 	constexpr void operator=(auto&&) const noexcept {}
 } ignore;
 

deps/ox/src/ox/std/istring.hpp

@@ -72,7 +72,7 @@ class IString {
 		 * Returns the number of characters in this string.
 		 */
 		[[nodiscard]]
-		constexpr std::size_t len() const noexcept;
+		constexpr std::size_t size() const noexcept;
 
 		/**
 		 * Returns the number of bytes used for this string.
@@ -121,7 +121,7 @@ constexpr IString<size> &IString<size>::operator=(Integer_c auto i) noexcept {
 
 template<std::size_t size>
 constexpr IString<size> &IString<size>::operator=(ox::StringViewCR str) noexcept {
-	std::size_t strLen = str.len();
+	std::size_t strLen = str.size();
 	if (cap() < strLen) {
 		strLen = cap();
 	}
@@ -171,7 +171,7 @@ constexpr char &IString<StrCap>::operator[](std::size_t i) noexcept {
 template<std::size_t StrCap>
 constexpr Error IString<StrCap>::append(const char *str, std::size_t strLen) noexcept {
 	Error err{};
-	auto const currentLen = len();
+	auto const currentLen = size();
 	if (cap() < currentLen + strLen) {
 		strLen = cap() - currentLen;
 		err = ox::Error(1, "Insufficient space for full string");
@@ -187,7 +187,7 @@ OX_CLANG_NOWARN_END
 
 template<std::size_t StrCap>
 constexpr Error IString<StrCap>::append(ox::StringView str) noexcept {
-	return append(str.data(), str.len());
+	return append(str.data(), str.size());
 }
 
 template<std::size_t StrCap>
@@ -207,7 +207,7 @@ constexpr const char *IString<StrCap>::c_str() const noexcept {
 
 
 template<std::size_t StrCap>
-constexpr std::size_t IString<StrCap>::len() const noexcept {
+constexpr std::size_t IString<StrCap>::size() const noexcept {
 	return m_size;
 }
 
@@ -245,7 +245,7 @@ struct MaybeView<ox::IString<sz>> {
 
 template<Integer_c Integer>
 [[nodiscard]]
-constexpr auto itoa(Integer v) noexcept {
+constexpr auto intToStr(Integer v) noexcept {
 	constexpr auto Cap = [] {
 		auto out = 0;
 		switch (sizeof(Integer)) {

deps/ox/src/ox/std/iterator.hpp

@@ -133,17 +133,17 @@ struct SpanIterator {
 		}
 
 		constexpr PtrType operator->() const noexcept {
-			ox::primitiveAssert(__FILE__, __LINE__, m_offset < m_max, "SpanIterator access overflow");
+			boundsCheck(__FILE__, __LINE__, m_offset, m_max, "SpanIterator access overflow");
 			return &m_t[m_offset];
 		}
 
 		constexpr RefType operator*() const noexcept {
-			ox::primitiveAssert(__FILE__, __LINE__, m_offset < m_max, "SpanIterator access overflow");
+			boundsCheck(__FILE__, __LINE__, m_offset, m_max, "SpanIterator access overflow");
 			return m_t[m_offset];
 		}
 
 		constexpr RefType operator[](std::size_t s) const noexcept {
-			ox::primitiveAssert(__FILE__, __LINE__, s < m_max, "SpanIterator access overflow");
+			boundsCheck(__FILE__, __LINE__, s, m_max, "SpanIterator access overflow");
 			return m_t[s];
 		}
 

deps/ox/src/ox/std/memory.hpp

@@ -213,8 +213,7 @@ class UniquePtr {
 			return m_t;
 		}
 
-		template<typename U, typename UDeleter>
+		constexpr void reset(UniquePtr &&other = UniquePtr()) {
-		constexpr void reset(UniquePtr<U, UDeleter> &&other = UniquePtr()) {
 			auto t = m_t;
 			m_t = other.release();
 			Deleter()(t);
@@ -260,12 +259,12 @@ constexpr bool operator==(const UniquePtr<T> &p1, const UniquePtr<T> &p2) noexce
 
 template<typename T>
 constexpr bool operator==(const UniquePtr<T> &p1, std::nullptr_t) noexcept {
-	return p1.get();
+	return p1.get() == nullptr;
 }
 
 template<typename T>
 constexpr bool operator==(std::nullptr_t, const UniquePtr<T> &p2) noexcept {
-	return p2.get();
+	return p2.get() == nullptr;
 }
 
 

deps/ox/src/ox/std/reader.cpp

@@ -30,13 +30,15 @@ constexpr std::ios_base::seekdir sdMap(ox::ios_base::seekdir in) noexcept {
 
 ox::Result<char> StreamReader::peek() const noexcept {
 	try {
+		if (m_strm.eof()) {
+			return Error{1, "EOF"};
+		}
 		char c{};
 		m_strm.get(c);
-		auto const ok = c != EOF;
+		if (m_strm.unget()) [[unlikely]] {
-		if (ok && m_strm.unget()) [[unlikely]] {
+			return ox::Error{1, "Unable to unget character"};
-			return ox::Error(1, "Unable to unget character");
 		}
-		return {static_cast<char>(c), ox::Error(!ok, "File peek failed")};
+		return static_cast<char>(c);
 	} catch (std::exception const&) {
 		return ox::Error(1, "peek failed");
 	}

deps/ox/src/ox/std/span.hpp

@@ -8,6 +8,10 @@
 
 #pragma once
 
+#if __has_include(<array>)
+#include <array>
+#endif
+
 #include "array.hpp"
 #include "bit.hpp"
 #include "def.hpp"
@@ -35,6 +39,20 @@ class Span {
 
 		constexpr Span() noexcept = default;
 
+#if __has_include(<array>)
+		template<std::size_t sz>
+		constexpr Span(std::array<T, sz> &a) noexcept:
+			m_items(a.data()),
+			m_size(a.size()) {
+		}
+
+		template<std::size_t sz>
+		constexpr Span(std::array<ox::remove_const_t<T>, sz> const&a) noexcept:
+			m_items(a.data()),
+			m_size(a.size()) {
+		}
+#endif
+
 		template<std::size_t sz>
 		constexpr Span(ox::Array<T, sz> &a) noexcept:
 			m_items(a.data()),
@@ -128,28 +146,41 @@ class Span {
 			return iterator<const T&, const T*, true>(m_items, MaxValue<size_type>, m_size);
 		}
 
-		constexpr T &operator[](std::size_t i) noexcept {
+		constexpr T &operator[](std::size_t i) const noexcept {
-			ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Span access overflow");
+			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
-			return m_items[i];
-		}
-
-		constexpr T const&operator[](std::size_t i) const noexcept {
-			ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Span access overflow");
 			return m_items[i];
 		}
 
 		constexpr Span operator+(size_t i) const noexcept {
-			ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Span access overflow");
+			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
 			return {m_items + i, m_size - i};
 		}
 
 		constexpr Span operator+=(size_t i) noexcept {
-			ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Span access overflow");
+			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
 			m_items += i;
 			m_size -= i;
 			return *this;
 		}
 
+		constexpr Span operator++(int) noexcept {
+			++m_items;
+			--m_size;
+			if (!m_size) [[unlikely]] {
+				m_items = nullptr;
+			}
+			return *this;
+		}
+
+		constexpr Span operator++() noexcept {
+			++m_items;
+			--m_size;
+			if (!m_size) [[unlikely]] {
+				m_items = nullptr;
+			}
+			return *this;
+		}
+
 		[[nodiscard]]
 		constexpr auto data() const noexcept {
 			return m_items;

deps/ox/src/ox/std/string.hpp

@@ -28,7 +28,7 @@ OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 namespace ox {
 
 template<typename Integer>
-constexpr ox::IString<21> itoa(Integer v) noexcept;
+constexpr ox::IString<21> intToStr(Integer v) noexcept;
 
 template<std::size_t SmallStringSize_v>
 class BasicString {
@@ -139,7 +139,7 @@ class BasicString {
 
 		constexpr BasicString &operator+=(Integer_c auto i) noexcept;
 
-		constexpr BasicString &operator+=(StringView src) noexcept;
+		constexpr BasicString &operator+=(StringViewCR src) noexcept;
 
 		constexpr BasicString &operator+=(BasicString const&src) noexcept;
 
@@ -176,17 +176,17 @@ class BasicString {
 		constexpr char &operator[](std::size_t i) noexcept;
 
 		constexpr Error append(const char *str, std::size_t strLen) noexcept {
-			auto currentLen = len();
+			auto currentLen = size();
 			m_buff.resize(m_buff.size() + strLen);
 			ox::listcpy(&m_buff[currentLen], str, strLen);
 			// make sure last element is a null terminator
 			m_buff[currentLen + strLen] = 0;
 			// this can't fail, but it returns an Error to match BString::append
-			return ox::Error(0);
+			return {};
 		}
 
-		constexpr Error append(ox::StringView sv) noexcept {
+		constexpr Error append(StringViewCR sv) noexcept {
-			return append(sv.data(), sv.len());
+			return append(sv.data(), sv.size());
 		}
 
 		[[nodiscard]]
@@ -213,22 +213,22 @@ class BasicString {
 
 		[[nodiscard]]
 		constexpr const char *c_str() const noexcept {
-			return static_cast<const char*>(m_buff.data());
+			return m_buff.data();
 		}
 
 		[[nodiscard]]
-		inline explicit operator const char*() const {
+		constexpr explicit operator const char*() const {
 			return c_str();
 		}
 
 #if __has_include(<string>)
 		[[nodiscard]]
-		inline std::string toStdString() const {
+		std::string toStdString() const {
 			return c_str();
 		}
 
 		[[nodiscard]]
-		inline explicit operator std::string() const {
+		explicit operator std::string() const {
 			return c_str();
 		}
 #endif
@@ -237,7 +237,7 @@ class BasicString {
 		 * Returns the number of characters in this string.
 		 */
 		[[nodiscard]]
-		constexpr std::size_t len() const noexcept;
+		constexpr std::size_t size() const noexcept;
 
 		/**
 		 * Returns the number of bytes used for this string.
@@ -277,7 +277,7 @@ constexpr BasicString<SmallStringSize_v>::BasicString(const char *str, std::size
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v>::BasicString(StringLiteral const&str) noexcept:
-	BasicString(StringView{str.data(), str.len()}) {
+	BasicString(StringView{str.data(), str.size()}) {
 }
 
 template<std::size_t SmallStringSize_v>
@@ -317,13 +317,13 @@ constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operat
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator=(int64_t i) noexcept {
-	set(ox::itoa(i));
+	set(ox::intToStr(i));
 	return *this;
 }
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator=(uint64_t i) noexcept {
-	set(ox::itoa(i));
+	set(ox::intToStr(i));
 	return *this;
 }
 
@@ -371,12 +371,12 @@ constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operat
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator+=(Integer_c auto i) noexcept {
-	auto const str = ox::itoa(i);
+	auto const str = ox::intToStr(i);
 	return this->operator+=(str.c_str());
 }
 
 template<std::size_t SmallStringSize_v>
-constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator+=(StringView s) noexcept {
+constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator+=(StringViewCR s) noexcept {
 	std::size_t strLen = s.bytes();
 	std::ignore = append(s.data(), strLen);
 	return *this;
@@ -384,14 +384,14 @@ constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operat
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator+=(BasicString const&src) noexcept {
-	std::ignore = append(src.c_str(), src.len());
+	std::ignore = append(src.c_str(), src.size());
 	return *this;
 }
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(const char *str) const noexcept {
 	const std::size_t strLen = ox::strlen(str);
-	const auto currentLen = len();
+	const auto currentLen = size();
 	BasicString<SmallStringSize_v> cpy;
 	cpy.m_buff.resize(m_buff.size() + strLen);
 	ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
@@ -414,14 +414,14 @@ constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operato
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(Integer_c auto i) const noexcept {
-	auto const str = ox::itoa(i);
+	auto const str = ox::intToStr(i);
 	return *this + str;
 }
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(StringViewCR src) const noexcept {
-	const std::size_t strLen = src.len();
+	const std::size_t strLen = src.size();
-	const auto currentLen = len();
+	const auto currentLen = size();
 	BasicString<SmallStringSize_v> cpy(currentLen + strLen);
 	cpy.m_buff.resize(m_buff.size() + strLen);
 	ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
@@ -432,8 +432,8 @@ constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operato
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(BasicString const&src) const noexcept {
-	const std::size_t strLen = src.len();
+	const std::size_t strLen = src.size();
-	const auto currentLen = len();
+	const auto currentLen = size();
 	BasicString<SmallStringSize_v> cpy(currentLen + strLen);
 	cpy.m_buff.resize(m_buff.size() + strLen);
 	ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
@@ -456,7 +456,7 @@ constexpr bool BasicString<SmallStringSize_v>::operator==(const char *other) con
 
 template<std::size_t SmallStringSize_v>
 constexpr bool BasicString<SmallStringSize_v>::operator==(OxString_c auto const&other) const noexcept {
-	return ox::StringView(*this) == ox::StringView(other);
+	return StringView(*this) == StringView(other);
 }
 
 template<std::size_t SmallStringSize_v>
@@ -521,7 +521,7 @@ constexpr std::size_t BasicString<SmallStringSize_v>::bytes() const noexcept {
 }
 
 template<std::size_t SmallStringSize_v>
-constexpr std::size_t BasicString<SmallStringSize_v>::len() const noexcept {
+constexpr std::size_t BasicString<SmallStringSize_v>::size() const noexcept {
 	return m_buff.size() - 1;
 }
 
@@ -548,28 +548,28 @@ using StringCR = String const&;
 
 
 [[nodiscard]]
-constexpr ox::String toString(ox::StringViewCR sv) noexcept {
+constexpr String toString(StringViewCR sv) noexcept {
 	return ox::String(sv);
 }
 
 
 template<typename PlatSpec, std::size_t SmallStringSize_v>
 [[nodiscard]]
-constexpr auto sizeOf(const ox::BasicString<SmallStringSize_v>*) noexcept {
+constexpr auto sizeOf(BasicString<SmallStringSize_v> const*) noexcept {
 	VectorMemMap<PlatSpec> v{.smallVecSize = SmallStringSize_v};
 	return sizeOf<PlatSpec>(&v);
 }
 
 template<typename PlatSpec, std::size_t SmallStringSize_v>
 [[nodiscard]]
-constexpr auto alignOf(const ox::BasicString<SmallStringSize_v>&) noexcept {
+constexpr auto alignOf(BasicString<SmallStringSize_v> const&) noexcept {
 	VectorMemMap<PlatSpec> v{.smallVecSize = SmallStringSize_v};
 	return alignOf<PlatSpec>(&v);
 }
 
 template<size_t sz>
-struct MaybeView<ox::BasicString<sz>> {
+struct MaybeView<BasicString<sz>> {
-	using type = ox::StringView;
+	using type = StringView;
 };
 
 }

deps/ox/src/ox/std/stringliteral.hpp

@@ -16,33 +16,28 @@ namespace ox {
  * StringLiteral is used for functions that want to ensure that they are taking
  * string literals, and not strings outside of the data section of the program
  * that might get deleted.
- * This type cannot force you to use it correctly, so don't give it something
- * that is not a literal.
- * If you do this:
- *		StringLiteral(str.c_str())
- *	the resulting segfault is on you.
  */
 class StringLiteral: public detail::BaseStringView {
 	public:
 		constexpr StringLiteral() noexcept = default;
 
-		constexpr StringLiteral(StringLiteral const&sv) noexcept = default;
+		constexpr StringLiteral(StringLiteral const &sv) noexcept = default;
 
-		constexpr explicit StringLiteral(std::nullptr_t) noexcept {}
+		consteval explicit StringLiteral(std::nullptr_t) noexcept {}
 
-		constexpr explicit StringLiteral(const char *str, std::size_t len) noexcept: BaseStringView(str, len) {}
+		consteval explicit StringLiteral(char const *str, std::size_t const len) noexcept: BaseStringView{str, len} {}
 
-		constexpr explicit StringLiteral(char const *str) noexcept: StringLiteral(str, ox::strlen(str)) {}
+		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+		consteval explicit StringLiteral(char const *str) noexcept: StringLiteral{str, ox::strlen(str)} {}
+		OX_ALLOW_UNSAFE_BUFFERS_END
 
-		constexpr StringLiteral &operator=(StringLiteral const&other) noexcept {
+		constexpr StringLiteral &operator=(StringLiteral const &other) noexcept {
-			if (&other != this) {
+			set(other.data(), other.size());
-				set(other.data(), other.len());
-			}
 			return *this;
 		}
 
 		[[nodiscard]]
-		constexpr const char *c_str() const noexcept {
+		constexpr char const *c_str() const noexcept {
 			return data();
 		}
 

deps/ox/src/ox/std/stringparam.hpp

@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include "cstringview.hpp"
 #include "string.hpp"
 
 namespace ox {
@@ -20,6 +21,8 @@ class StringParam {
 		constexpr StringParam(StringParam &&o) noexcept: m_value{std::move(o.m_value)} {}
 		constexpr StringParam(char const*value) noexcept: m_value{value} {}
 		constexpr StringParam(detail::BaseStringView const&value) noexcept: m_value{value} {}
+		template<size_t sz>
+		constexpr StringParam(ox::IString<sz> const&value) noexcept: m_value{value} {}
 		constexpr StringParam(ox::String const&value) noexcept: m_value{value} {}
 		constexpr StringParam(ox::String &&value) noexcept: m_value{std::move(value)} {}
 		constexpr operator ox::String() && noexcept { return std::move(m_value); }

deps/ox/src/ox/std/stringview.hpp

@@ -40,10 +40,10 @@ class StringView: public detail::BaseStringView {
 		constexpr StringView(BaseStringView const&str) noexcept: BaseStringView(str.data(), str.bytes()) {}
 
 		template<std::size_t SmallStrSz>
-		constexpr StringView(const BasicString<SmallStrSz> &str) noexcept: BaseStringView(str.data(), str.len()) {}
+		constexpr StringView(const BasicString<SmallStrSz> &str) noexcept: BaseStringView(str.data(), str.size()) {}
 
 		template<std::size_t SmallStrSz>
-		constexpr StringView(const IString<SmallStrSz> &str) noexcept: BaseStringView(str.data(), str.len()) {}
+		constexpr StringView(const IString<SmallStrSz> &str) noexcept: BaseStringView(str.data(), str.size()) {}
 
 		constexpr StringView(std::nullptr_t) noexcept {}
 
@@ -53,24 +53,24 @@ class StringView: public detail::BaseStringView {
 
 		constexpr auto &operator=(StringView const&other) noexcept {
 			if (&other != this) {
-				set(other.data(), other.len());
+				set(other.data(), other.size());
 			}
 			return *this;
 		}
 
 };
 
-using StringViewCR = const StringView&;
+using StringViewCR = StringView const&;
 
 constexpr auto operator==(StringViewCR s1, StringViewCR s2) noexcept {
-	if (s2.len() != s1.len()) {
+	if (s2.size() != s1.size()) {
 		return false;
 	}
-	return ox::strncmp(s1.data(), s2.data(), s1.len()) == 0;
+	return ox::strncmp(s1.data(), s2.data(), s1.size()) == 0;
 }
 
 constexpr auto operator<=>(StringViewCR s1, StringViewCR s2) noexcept {
-	const auto maxLen = ox::min(s1.len(), s2.len());
+	const auto maxLen = ox::min(s1.size(), s2.size());
 	const auto a = &s1.front();
 	const auto b = &s2.front();
 	for (std::size_t i = 0; i < maxLen && (a[i] || b[i]); ++i) {
@@ -80,16 +80,16 @@ constexpr auto operator<=>(StringViewCR s1, StringViewCR s2) noexcept {
 			return 1;
 		}
 	}
-	if (s1.len() > s2.len()) {
+	if (s1.size() > s2.size()) {
 		return 1;
-	} else if (s1.len() < s2.len()) {
+	} else if (s1.size() < s2.size()) {
 		return -1;
 	} else {
 		return 0;
 	}
 }
 
-constexpr auto write(Writer_c auto &writer, ox::StringViewCR sv) noexcept {
+constexpr auto write(Writer_c auto &writer, StringViewCR sv) noexcept {
 	return writer.write(sv.data(), sv.bytes());
 }
 
@@ -100,19 +100,24 @@ constexpr auto toStdStringView(StringViewCR sv) noexcept {
 #endif
 
 
-constexpr ox::Result<int> atoi(ox::StringViewCR str) noexcept {
+constexpr ox::Result<int> strToInt(StringViewCR str) noexcept {
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	int total = 0;
 	int multiplier = 1;
-	for (auto i = static_cast<int64_t>(str.len()) - 1; i != -1; --i) {
+	if (str.size() == 0) [[unlikely]] {
+		return Error{1, "Empty string passed to strToInt"};
+	}
+	for (auto i = static_cast<int64_t>(str.size()) - 1; i != -1; --i) {
 		auto s = static_cast<std::size_t>(i);
 		if (str[s] >= '0' && str[s] <= '9') {
 			total += (str[s] - '0') * multiplier;
 			multiplier *= 10;
 		} else {
-			return ox::Error(1);
+			return ox::Error{1};
 		}
 	}
 	return total;
+	OX_ALLOW_UNSAFE_BUFFERS_END
 }
 
 

deps/ox/src/ox/std/strops.cpp

@@ -9,6 +9,8 @@
 #include "def.hpp"
 #include "strops.hpp"
 
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+
 static_assert(ox::strcmp("asdf", "hijk") < 0, "asdf < hijk");
 static_assert(ox::strcmp("hijk", "asdf") > 0, "hijk > asdf");
 static_assert(ox::strcmp("resize", "read") > 0, "resize > read");
@@ -42,3 +44,5 @@ std::size_t strlen(const char *str) {
 }
 
 #endif
+
+OX_ALLOW_UNSAFE_BUFFERS_END

deps/ox/src/ox/std/strops.hpp

@@ -21,37 +21,47 @@ OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 namespace ox {
 
 [[nodiscard]]
-constexpr ox::StringView substr(ox::StringView const&str, std::size_t pos) noexcept {
+constexpr StringView substr(StringViewCR str, std::size_t const pos) noexcept {
-	if (str.len() >= pos) {
+	if (str.size() >= pos) {
-		return {&str[pos], str.len() - pos};
+		return {&str[pos], str.size() - pos};
 	}
 	return {};
 }
 
 [[nodiscard]]
-constexpr ox::StringView substr(ox::StringView const&str, std::size_t start, std::size_t end) noexcept {
+constexpr StringView substr(StringViewCR str, std::size_t const start, std::size_t const end) noexcept {
-	if (str.len() >= start && end >= start) {
+	if (str.size() >= start && end >= start) {
 		return {&str[start], end - start};
 	}
 	return {};
 }
 
+[[nodiscard]]
+constexpr bool beginsWith(StringViewCR base, char const beginning) noexcept {
+	return base.size() && base[0] == beginning;
+}
+
+[[nodiscard]]
+constexpr bool endsWith(StringViewCR base, char const ending) noexcept {
+	return base.size() && base[base.size() - 1] == ending;
+}
+
 [[nodiscard]]
 constexpr bool beginsWith(StringViewCR base, StringViewCR beginning) noexcept {
-	const auto beginningLen = ox::min(beginning.len(), base.len());
+	const auto beginningLen = ox::min(beginning.size(), base.size());
-	return base.len() >= beginning.len() && ox::strncmp(base.data(), beginning, beginningLen) == 0;
+	return base.size() >= beginning.size() && ox::strncmp(base.data(), beginning, beginningLen) == 0;
 }
 
 [[nodiscard]]
 constexpr bool endsWith(StringViewCR base, StringViewCR ending) noexcept {
-	const auto endingLen = ending.len();
+	const auto endingLen = ending.size();
-	return base.len() >= endingLen && ox::strcmp(base.data() + (base.len() - endingLen), ending) == 0;
+	return base.size() >= endingLen && ox::strcmp(base.data() + (base.size() - endingLen), ending) == 0;
 }
 
 [[nodiscard]]
-constexpr std::size_t find(StringViewCR str, char search) noexcept {
+constexpr std::size_t find(StringViewCR str, char const search) noexcept {
 	std::size_t i = 0;
-	for (; i < str.len(); ++i) {
+	for (; i < str.size(); ++i) {
 		if (str[i] == search) {
 			break;
 		}
@@ -62,7 +72,7 @@ constexpr std::size_t find(StringViewCR str, char search) noexcept {
 [[nodiscard]]
 constexpr std::size_t find(StringViewCR str, StringViewCR search) noexcept {
 	std::size_t i = 0;
-	for (; i < str.len(); ++i) {
+	for (; i < str.size(); ++i) {
 		if (beginsWith(substr(str, i), search)) {
 			break;
 		}
@@ -72,14 +82,14 @@ constexpr std::size_t find(StringViewCR str, StringViewCR search) noexcept {
 
 template<std::size_t smallSz = 0>
 [[nodiscard]]
-constexpr ox::Vector<ox::StringView, smallSz> split(StringViewCR str, char del) noexcept {
+constexpr ox::Vector<ox::StringView, smallSz> split(StringViewCR str, char const del) noexcept {
 	ox::Vector<ox::StringView, smallSz> out;
 	constexpr auto nextSeg = [](StringViewCR current, char del) {
 		return substr(current, find(current, del) + 1);
 	};
-	for (auto current = str; current.len(); current = nextSeg(current, del)) {
+	for (auto current = str; current.size(); current = nextSeg(current, del)) {
 		const auto next = find(current, del);
-		if (const auto s = substr(current, 0, next); s.len()) {
+		if (const auto s = substr(current, 0, next); s.size()) {
 			out.emplace_back(s);
 		}
 		current = substr(current, next);
@@ -92,11 +102,11 @@ template<std::size_t smallSz = 0>
 constexpr ox::Vector<ox::StringView, smallSz> split(StringViewCR str, StringViewCR del) noexcept {
 	ox::Vector<ox::StringView, smallSz> out;
 	constexpr auto nextSeg = [](StringViewCR current, StringViewCR del) {
-		return substr(current, find(current, del) + del.len());
+		return substr(current, find(current, del) + del.size());
 	};
-	for (auto current = str; current.len(); current = nextSeg(current, del)) {
+	for (auto current = str; current.size(); current = nextSeg(current, del)) {
 		const auto next = find(current, del);
-		if (const auto s = substr(current, 0, next); s.len()) {
+		if (const auto s = substr(current, 0, next); s.size()) {
 			out.emplace_back(s);
 		}
 		current = substr(current, next);
@@ -105,7 +115,7 @@ constexpr ox::Vector<ox::StringView, smallSz> split(StringViewCR str, StringView
 }
 
 [[nodiscard]]
-constexpr ox::Result<std::size_t> lastIndexOf(ox::StringViewCR str, int character) noexcept {
+constexpr ox::Result<std::size_t> lastIndexOf(ox::StringViewCR str, int const character) noexcept {
 	ox::Result<std::size_t> retval = ox::Error(1, "Character not found");
 	for (auto i = static_cast<int>(str.bytes() - 1); i >= 0; --i) {
 		if (str[static_cast<std::size_t>(i)] == character) {

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

@@ -145,6 +145,7 @@ OX_CLANG_NOWARN_END
 			return ox::Error{};
 		}
 	},
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	{
 		"ABCDEFG != HIJKLMN",
 		[]() {
@@ -169,6 +170,7 @@ OX_CLANG_NOWARN_END
 			return ox::Error(ox::memcmp("ABCDEFGHI", "ABCDEFG", 7) != 0);
 		}
 	},
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	{
 		"IString",
 		[]() {
@@ -181,7 +183,7 @@ OX_CLANG_NOWARN_END
 			s = "asdf";
 			oxAssert(s == "asdf", "String assign broken");
 			oxAssert(s != "aoeu", "String assign broken");
-			oxAssert(s.len() == 4, "String assign broken");
+			oxAssert(s.size() == 4, "String assign broken");
 			return ox::Error(0);
 		}
 	},
@@ -328,6 +330,16 @@ OX_CLANG_NOWARN_END
 			si["aoeu"] = 100;
 			oxAssert(si["asdf"] == 42, "asdf != 42");
 			oxAssert(si["aoeu"] == 100, "aoeu != 100");
+			si.erase("asdf");
+			oxAssert(!si.contains("asdf"), "wrongly contains asdf");
+			oxAssert(si.contains("aoeu"), "does not contains aoeu");
+			oxAssert(!si.at("asdf").ok(), "asdf != 0");
+			oxExpect(si["asdf"], 0);
+			oxAssert(si["aoeu"] == 100, "aoeu != 100");
+			auto si2 = si;
+			oxDebugf("{}", si2["asdf"]);
+			oxExpect(si2["asdf"], 0);
+			oxAssert(si2["aoeu"] == 100, "aoeu != 100");
 			ox::HashMap<int, int> ii;
 			ii[4] = 42;
 			ii[5] = 100;

deps/ox/src/ox/std/trace.hpp

@@ -166,7 +166,7 @@ class OutStream {
 		constexpr OutStream &operator<<(Integer_c auto v) noexcept;
 
 		constexpr OutStream &operator<<(char v) noexcept {
-			if (m_msg.msg.len()) {
+			if (m_msg.msg.size()) {
 				m_msg.msg += m_delimiter;
 			}
 			m_msg.msg += v;
@@ -174,7 +174,7 @@ class OutStream {
 		}
 
 		constexpr OutStream &operator<<(StringViewCR v) noexcept {
-			if (m_msg.msg.len()) {
+			if (m_msg.msg.size()) {
 				m_msg.msg += m_delimiter;
 			}
 			m_msg.msg += v;
@@ -209,7 +209,7 @@ class OutStream {
 
 	private:
 		constexpr OutStream &appendSignedInt(int64_t v) noexcept {
-			if (m_msg.msg.len()) {
+			if (m_msg.msg.size()) {
 				m_msg.msg += m_delimiter;
 			}
 			m_msg.msg += static_cast<int64_t>(v);
@@ -217,7 +217,7 @@ class OutStream {
 		}
 
 		constexpr OutStream &appendUnsignedInt(uint64_t v) noexcept {
-			if (m_msg.msg.len()) {
+			if (m_msg.msg.size()) {
 				m_msg.msg += m_delimiter;
 			}
 			m_msg.msg += static_cast<int64_t>(v);
@@ -227,7 +227,7 @@ class OutStream {
 };
 
 constexpr OutStream &OutStream::operator<<(Integer_c auto v) noexcept {
-	if (m_msg.msg.len()) {
+	if (m_msg.msg.size()) {
 		m_msg.msg += m_delimiter;
 	}
 	m_msg.msg += v;

deps/ox/src/ox/std/tracehook.cpp

@@ -39,6 +39,8 @@ enum LogChan {
 	Debug = 4,
 };
 
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+
 template<LogChan chan>
 static void log(ox::StringViewCR str) {
 	const auto sz = ox::min<std::size_t>(0x100, str.bytes());
@@ -103,5 +105,7 @@ void oxTraceHook([[maybe_unused]] const char *file, [[maybe_unused]] int line,
 #endif
 }
 
+OX_ALLOW_UNSAFE_BUFFERS_END
+
 }
 

deps/ox/src/ox/std/utility.hpp

@@ -27,6 +27,55 @@ constexpr void swap(T &a, T &b) noexcept {
 	b = std::move(temp);
 }
 
+template<typename T, typename U>
+constexpr bool cmp_equal(T const t, U const u) noexcept {
+	if constexpr(ox::is_signed_v<T> == ox::is_signed_v<U>) {
+		return t == u;
+	} else if constexpr(ox::is_signed_v<T>) {
+		return t >= 0 && static_cast<ox::Unsigned<T>>(t) == u;
+	} else {
+		return u >= 0 && t == static_cast<ox::Unsigned<U>>(u);
+	}
+}
+
+template<typename T, typename U>
+constexpr bool cmp_less(T const t, U const u) noexcept {
+	if constexpr(ox::is_signed_v<T> == ox::is_signed_v<U>) {
+		return t < u;
+	} else if constexpr(ox::is_signed_v<T>) {
+		return t < 0 || static_cast<ox::Unsigned<T>>(t) < u;
+	} else {
+		return u >= 0 && t < static_cast<ox::Unsigned<U>>(u);
+	}
+}
+
+template<typename T, typename U>
+constexpr bool cmp_not_equal(T const t, U const u) noexcept {
+	return !std::cmp_equal(t, u);
+}
+
+template<typename T, typename U>
+constexpr bool cmp_greater(T const t, U const u) noexcept {
+	return std::cmp_less(u, t);
+}
+
+template<typename T, typename U>
+constexpr bool cmp_less_equal(T const t, U const u) noexcept {
+	return !std::cmp_less(u, t);
+}
+
+template<typename T, typename U>
+constexpr bool cmp_greater_equal(T const t, U const u) noexcept {
+	return !std::cmp_less(t, u);
+}
+
+static_assert(cmp_less(-1, 5u));
+static_assert(!cmp_less(5u, -1));
+static_assert(cmp_equal(5u, 5));
+static_assert(cmp_equal(5, 5u));
+static_assert(!cmp_equal(-5, 5u));
+static_assert(!cmp_equal(4u, 5u));
+
 }
 #endif
 

deps/ox/src/ox/std/uuid.hpp

@@ -58,7 +58,7 @@ constexpr ox::Result<uint8_t> fromHex(ox::StringViewCR v) noexcept {
 	if (!detail::isHexChar(v[0]) || !detail::isHexChar(v[1])) {
 		return ox::Error(1, "Invalid UUID");
 	}
-	if (v.len() != 2) {
+	if (v.size() != 2) {
 		return ox::Error(2);
 	}
 	uint8_t out = 0;
@@ -105,6 +105,10 @@ class UUID {
 		ox::Array<uint8_t, 16> m_value{};
 
 	public:
+
+		static constexpr auto TypeName = "net.drinkingtea.ox.UUID";
+		static constexpr auto TypeVersion = 1;
+
 		static void seedGenerator(const RandomSeed &seed) noexcept;
 
 		static ox::Result<UUID> generate() noexcept;
@@ -129,18 +133,18 @@ class UUID {
 		}
 
 		static constexpr ox::Result<ox::UUID> fromString(ox::StringViewCR s) noexcept {
-			if (s.len() < 36) {
+			if (s.size() < 36) {
 				return ox::Error(1, "Insufficient data to contain a complete UUID");
 			}
 			UUID out;
 			auto valueI = 0u;
-			for (size_t i = 0; i < s.len();) {
+			for (size_t i = 0; i < s.size();) {
 				if (s[i] == '-') {
 					++i;
 					continue;
 				}
 				const auto seg = substr(s, i, i + 2);
-				if (seg.len() != 2) {
+				if (seg.size() != 2) {
 					return ox::Error(1, "Invalid UUID");
 				}
 				OX_REQUIRE(val, detail::fromHex(seg));
@@ -170,7 +174,7 @@ class UUID {
 				for (auto i = 0u; i < cnt; ++i) {
 					const auto v = value[valueI];
 					const auto h = detail::toHex(v);
-					std::ignore = writer.write(h.c_str(), h.len());
+					std::ignore = writer.write(h.c_str(), h.size());
 					++valueI;
 				}
 			};

deps/ox/src/ox/std/vector.hpp

@@ -87,7 +87,9 @@ struct VectorAllocator {
 		constexpr void deallocate(T *items, std::size_t cap) noexcept {
 			// small vector optimization cannot be done it constexpr, but it doesn't really matter in constexpr
 			if (std::is_constant_evaluated()) {
+				if (items) {
 					Allocator{}.deallocate(items, cap);
+				}
 			} else {
 				if (items && static_cast<void*>(items) != static_cast<void*>(m_data.data())) {
 					Allocator{}.deallocate(items, cap);
@@ -311,6 +313,8 @@ class Vector: detail::VectorAllocator<T, Allocator, SmallVectorSize> {
 		 */
 		constexpr Error unordered_erase(std::size_t pos) noexcept(useNoexcept);
 
+		constexpr Error remove(MaybeView_t<T> const &val);
+
 		constexpr void reserve(std::size_t cap) noexcept(useNoexcept);
 
 		constexpr void shrink_to_fit() noexcept(useNoexcept);
@@ -427,13 +431,13 @@ constexpr Vector<T, SmallVectorSize, Allocator> &Vector<T, SmallVectorSize, Allo
 
 template<typename T, std::size_t SmallVectorSize, typename Allocator>
 constexpr T &Vector<T, SmallVectorSize, Allocator>::operator[](std::size_t i) noexcept {
-	ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Vector access overflow");
+	boundsCheck(__FILE__, __LINE__, i, size(), "Vector access overflow");
 	return m_items[i];
 }
 
 template<typename T, std::size_t SmallVectorSize, typename Allocator>
 constexpr const T &Vector<T, SmallVectorSize, Allocator>::operator[](std::size_t i) const noexcept {
-	ox::primitiveAssert(__FILE__, __LINE__, i < size(), "Vector access overflow");
+	boundsCheck(__FILE__, __LINE__, i, size(), "Vector access overflow");
 	return m_items[i];
 }
 
@@ -656,7 +660,18 @@ constexpr Error Vector<T, SmallVectorSize, Allocator>::unordered_erase(std::size
 	--m_size;
 	m_items[pos] = std::move(m_items[m_size]);
 	m_items[m_size].~T();
-	return ox::Error(0);
+	return {};
+}
+
+template<typename T, std::size_t SmallVectorSize, typename Allocator>
+constexpr ox::Error Vector<T, SmallVectorSize, Allocator>::remove(MaybeView_t<T> const &val) {
+	for (size_t i{}; auto const &v : *this) {
+		if (v == val) {
+			return erase(i).error;
+		}
+		++i;
+	}
+	return ox::Error{1, "element not found"};
 }
 
 template<typename T, std::size_t SmallVectorSize, typename Allocator>

deps/teagba/include/teagba/addresses.hpp

@@ -5,103 +5,117 @@
 #pragma once
 
 #include <ox/std/array.hpp>
-#include <ox/std/types.hpp>
+#include <ox/std/units.hpp>
 
 /////////////////////////////////////////////////////////////////
 // Interrupt Handler
 
-using interrupt_handler = void (*)();
+using InterruptHandler = void(*)();
-#define REG_ISR *reinterpret_cast<interrupt_handler*>(0x0300'7FFC)
+#define REG_ISR (*reinterpret_cast<InterruptHandler*>(0x0300'7FFC))
-#define REG_IE  *reinterpret_cast<volatile uint16_t*>(0x0400'0200)
+#define REG_IE  (*reinterpret_cast<volatile uint16_t*>(0x0400'0200))
-#define REG_IF  *reinterpret_cast<volatile uint16_t*>(0x0400'0202)
+#define REG_IF  (*reinterpret_cast<volatile uint16_t*>(0x0400'0202))
-#define REG_IME *reinterpret_cast<volatile uint16_t*>(0x0400'0208)
+#define REG_IME (*reinterpret_cast<volatile uint16_t*>(0x0400'0208))
 
 /////////////////////////////////////////////////////////////////
 // Display Registers
 
-#define REG_DISPCTL  *reinterpret_cast<volatile uint32_t*>(0x0400'0000)
+#define REG_DISPCTL  (*reinterpret_cast<volatile uint32_t*>(0x0400'0000))
-#define REG_DISPSTAT *reinterpret_cast<volatile uint32_t*>(0x0400'0004)
+#define REG_DISPSTAT (*reinterpret_cast<volatile uint32_t*>(0x0400'0004))
-#define REG_VCOUNT   *reinterpret_cast<volatile uint32_t*>(0x0400'0006)
+#define REG_VCOUNT   (*reinterpret_cast<volatile uint32_t*>(0x0400'0006))
 
 /////////////////////////////////////////////////////////////////
 // Timers
 
-#define REG_TIMER0    *reinterpret_cast<volatile uint16_t*>(0x0400'0100)
+#define REG_TIMER0    (*reinterpret_cast<volatile uint16_t*>(0x0400'0100))
-#define REG_TIMER0CTL *reinterpret_cast<volatile uint16_t*>(0x0400'0102)
+#define REG_TIMER0CTL (*reinterpret_cast<volatile uint16_t*>(0x0400'0102))
 
-#define REG_TIMER1    *reinterpret_cast<volatile uint16_t*>(0x0400'0104)
+#define REG_TIMER1    (*reinterpret_cast<volatile uint16_t*>(0x0400'0104))
-#define REG_TIMER1CTL *reinterpret_cast<volatile uint16_t*>(0x0400'0106)
+#define REG_TIMER1CTL (*reinterpret_cast<volatile uint16_t*>(0x0400'0106))
 
-#define REG_TIMER2    *reinterpret_cast<volatile uint16_t*>(0x0400'0108)
+#define REG_TIMER2    (*reinterpret_cast<volatile uint16_t*>(0x0400'0108))
-#define REG_TIMER2CTL *reinterpret_cast<volatile uint16_t*>(0x0400'010a)
+#define REG_TIMER2CTL (*reinterpret_cast<volatile uint16_t*>(0x0400'010a))
 
-#define REG_TIMER3    *reinterpret_cast<volatile uint16_t*>(0x0400'010c)
+#define REG_TIMER3    (*reinterpret_cast<volatile uint16_t*>(0x0400'010c))
-#define REG_TIMER3CTL *reinterpret_cast<volatile uint16_t*>(0x0400'010e)
+#define REG_TIMER3CTL (*reinterpret_cast<volatile uint16_t*>(0x0400'010e))
 
 /////////////////////////////////////////////////////////////////
 // background registers
 
 // background control registers
 using BgCtl = uint16_t;
-#define REG_BG0CTL *reinterpret_cast<volatile BgCtl*>(0x0400'0008)
+#define REG_BG0CTL (*reinterpret_cast<volatile BgCtl*>(0x0400'0008))
-#define REG_BG1CTL *reinterpret_cast<volatile BgCtl*>(0x0400'000a)
+#define REG_BG1CTL (*reinterpret_cast<volatile BgCtl*>(0x0400'000a))
-#define REG_BG2CTL *reinterpret_cast<volatile BgCtl*>(0x0400'000c)
+#define REG_BG2CTL (*reinterpret_cast<volatile BgCtl*>(0x0400'000c))
-#define REG_BG3CTL *reinterpret_cast<volatile BgCtl*>(0x0400'000e)
+#define REG_BG3CTL (*reinterpret_cast<volatile BgCtl*>(0x0400'000e))
 
 [[nodiscard]]
-inline volatile BgCtl &regBgCtl(uintptr_t bgIdx) noexcept {
+inline volatile BgCtl &regBgCtl(uintptr_t const bgIdx) noexcept {
 	return *reinterpret_cast<volatile BgCtl*>(0x0400'0008 + 2 * bgIdx);
 }
 
 // background horizontal scrolling registers
-#define REG_BG0HOFS *reinterpret_cast<volatile uint32_t*>(0x0400'0010)
+#define REG_BG0HOFS (*reinterpret_cast<volatile int16_t*>(0x0400'0010))
-#define REG_BG1HOFS *reinterpret_cast<volatile uint32_t*>(0x0400'0014)
+#define REG_BG1HOFS (*reinterpret_cast<volatile int16_t*>(0x0400'0014))
-#define REG_BG2HOFS *reinterpret_cast<volatile uint32_t*>(0x0400'0018)
+#define REG_BG2HOFS (*reinterpret_cast<volatile int16_t*>(0x0400'0018))
-#define REG_BG3HOFS *reinterpret_cast<volatile uint32_t*>(0x0400'001c)
+#define REG_BG3HOFS (*reinterpret_cast<volatile int16_t*>(0x0400'001c))
 
 [[nodiscard]]
-inline volatile uint32_t &regBgHofs(auto bgIdx) noexcept {
+volatile int16_t &regBgHofs(auto const bgIdx) noexcept {
-	return *reinterpret_cast<volatile uint32_t*>(0x0400'0010 + 4 * bgIdx);
+	return *reinterpret_cast<volatile int16_t*>(0x0400'0010 + 4 * bgIdx);
 }
 
 // background vertical scrolling registers
-#define REG_BG0VOFS *reinterpret_cast<volatile uint32_t*>(0x0400'0012)
+#define REG_BG0VOFS (*reinterpret_cast<volatile int16_t*>(0x0400'0012))
-#define REG_BG1VOFS *reinterpret_cast<volatile uint32_t*>(0x0400'0016)
+#define REG_BG1VOFS (*reinterpret_cast<volatile int16_t*>(0x0400'0016))
-#define REG_BG2VOFS *reinterpret_cast<volatile uint32_t*>(0x0400'001a)
+#define REG_BG2VOFS (*reinterpret_cast<volatile int16_t*>(0x0400'001a))
-#define REG_BG3VOFS *reinterpret_cast<volatile uint32_t*>(0x0400'001e)
+#define REG_BG3VOFS (*reinterpret_cast<volatile int16_t*>(0x0400'001e))
 
 [[nodiscard]]
-inline volatile uint32_t &regBgVofs(auto bgIdx) noexcept {
+volatile int16_t &regBgVofs(auto const bgIdx) noexcept {
-	return *reinterpret_cast<volatile uint32_t*>(0x0400'0012 + 4 * bgIdx);
+	return *reinterpret_cast<volatile int16_t*>(0x0400'0012 + 4 * bgIdx);
+}
+
+// background scrolling registers
+
+struct OffsetPair {
+	int16_t x{}, y{};
+};
+
+#define REG_BG0OFS (*reinterpret_cast<volatile OffsetPair*>(0x0400'0010))
+#define REG_BG1OFS (*reinterpret_cast<volatile OffsetPair*>(0x0400'0014))
+#define REG_BG2OFS (*reinterpret_cast<volatile OffsetPair*>(0x0400'0018))
+#define REG_BG3OFS (*reinterpret_cast<volatile OffsetPair*>(0x0400'001c))
+
+[[nodiscard]]
+volatile OffsetPair &regBgOfs(auto const bgIdx) noexcept {
+	return *reinterpret_cast<volatile OffsetPair*>(0x0400'0010 + sizeof(OffsetPair) * bgIdx);
 }
 
 /////////////////////////////////////////////////////////////////
 // User Input
 
-#define REG_GAMEPAD *reinterpret_cast<volatile uint16_t*>(0x0400'0130)
+#define REG_GAMEPAD (*reinterpret_cast<volatile uint16_t*>(0x0400'0130))
 
 /////////////////////////////////////////////////////////////////
 // Memory Addresses
 
-#define MEM_EWRAM_BEGIN reinterpret_cast<uint8_t*>(0x0200'0000)
+#define MEM_EWRAM (*reinterpret_cast<ox::Array<uint16_t, 0x0203'FFFF - 0x0200'0000>*>(0x0200'0000))
-#define MEM_EWRAM_END   reinterpret_cast<uint8_t*>(0x0203'FFFF)
 
-#define MEM_IWRAM_BEGIN reinterpret_cast<uint8_t*>(0x0300'0000)
+#define MEM_IWRAM (*reinterpret_cast<ox::Array<uint8_t, 0x0300'7FFF - 0x0300'0000>*>(0x0300'0000))
-#define MEM_IWRAM_END   reinterpret_cast<uint8_t*>(0x0300'7FFF)
 
-#define REG_BLNDCTL *reinterpret_cast<uint16_t*>(0x0400'0050)
+#define REG_BLNDCTL (*reinterpret_cast<uint16_t*>(0x0400'0050))
 
-#define MEM_BG_PALETTE reinterpret_cast<uint16_t*>(0x0500'0000)
+using Palette = ox::Array<uint16_t, 128>;
-#define MEM_SPRITE_PALETTE reinterpret_cast<uint16_t*>(0x0500'0200)
+#define MEM_BG_PALETTE (*reinterpret_cast<::Palette*>(0x0500'0000))
+#define MEM_SPRITE_PALETTE (*reinterpret_cast<::Palette*>(0x0500'0200))
 
 using BgMapTile = ox::Array<uint16_t, 8192>;
-#define MEM_BG_TILES reinterpret_cast<BgMapTile*>(0x0600'0000)
+#define MEM_BG_TILES (*reinterpret_cast<ox::Array<BgMapTile, 4>*>(0x0600'0000))
-#define MEM_BG_MAP reinterpret_cast<BgMapTile*>(0x0600'e000)
+#define MEM_BG_MAP (*reinterpret_cast<ox::Array<BgMapTile, 4>*>(0x0600'e000))
 
-#define MEM_SPRITE_TILES reinterpret_cast<uint16_t*>(0x0601'0000)
+#define MEM_SPRITE_TILES (*reinterpret_cast<ox::Array<uint16_t, 32 * ox::units::KB>*>(0x0601'0000))
-#define MEM_OAM reinterpret_cast<uint64_t*>(0x0700'0000)
+#define MEM_OAM (*reinterpret_cast<ox::Array<uint64_t, 64>*>(0x0700'0000))
 
-#define MEM_ROM reinterpret_cast<char*>(0x0800'0000)
+#define MEM_ROM (*reinterpret_cast<ox::Array<char, 32 * ox::units::MB>*>(0x0700'0000))
 
-#define MEM_SRAM reinterpret_cast<char*>(0x0e00'0000)
+#define MEM_SRAM (*reinterpret_cast<ox::Array<char, 64 * ox::units::KB>*>(0x0e00'0000))
-#define MEM_SRAM_SIZE 65535

deps/teagba/include/teagba/gfx.hpp

@@ -37,8 +37,12 @@ struct OX_ALIGN8 GbaSpriteAttrUpdate {
 
 GbaSpriteAttrUpdate &spriteAttr(size_t i) noexcept;
 
-void addSpriteUpdate(const GbaSpriteAttrUpdate &upd) noexcept;
+void addSpriteUpdate(GbaSpriteAttrUpdate const &upd) noexcept;
 
 void applySpriteUpdates() noexcept;
 
+void setBgOffset(uint16_t bg, int16_t x, int16_t y) noexcept;
+
+void scrollBgOffset(uint16_t bg, int16_t x, int16_t y) noexcept;
+
 }

deps/teagba/src/cstartup.cpp

@@ -2,6 +2,8 @@
  * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
+#ifdef __GNUC__
+
 #include <ox/std/heapmgr.hpp>
 
 #include <teagba/bios.hpp>
@@ -24,7 +26,7 @@ extern void (*__preinit_array_end[]) (void);
 extern void (*__init_array_start[]) (void);
 extern void (*__init_array_end[]) (void);
 
-int main(int argc, const char **argv);
+int main(int argc, char const **argv);
 
 extern "C" {
 
@@ -48,7 +50,7 @@ void __libc_init_array() {
 }
 
 int c_start() {
-	const char *args[2] = {"", "rom.oxfs"};
+	char const *args[2] = {"", "rom.oxfs"};
 	ox::heapmgr::initHeap(HEAP_BEGIN, HEAP_END);
 	mgba::initConsole();
 #pragma GCC diagnostic push
@@ -58,3 +60,5 @@ int c_start() {
 }
 
 }
+
+#endif

deps/teagba/src/gfx.cpp

@@ -12,11 +12,11 @@ namespace teagba {
 
 static ox::Array<GbaSpriteAttrUpdate, 128> g_spriteBuffer;
 
-GbaSpriteAttrUpdate &spriteAttr(size_t i) noexcept {
+GbaSpriteAttrUpdate &spriteAttr(size_t const i) noexcept {
 	return g_spriteBuffer[i];
 }
 
-void addSpriteUpdate(const GbaSpriteAttrUpdate &upd) noexcept {
+void addSpriteUpdate(GbaSpriteAttrUpdate const &upd) noexcept {
 	const auto ie = REG_IE; // disable vblank interrupt handler
 	REG_IE = REG_IE & static_cast<uint16_t>(~teagba::Int_vblank); // disable vblank interrupt handler
 	g_spriteBuffer[upd.idx] = upd;
@@ -29,4 +29,16 @@ void applySpriteUpdates() noexcept {
 	}
 }
 
+void setBgOffset(uint16_t const bg, int16_t const x, int16_t const y) noexcept {
+	auto &o = regBgOfs(bg);
+	o.x = x;
+	o.y = y;
+}
+
+void scrollBgOffset(uint16_t const bg, int16_t const x, int16_t const y) noexcept {
+	auto &o = regBgOfs(bg);
+	o.x = o.x + x;
+	o.y = o.y + y;
+}
+
 }

release-notes.md

@@ -1,13 +1,75 @@
-# d2025.02
+# d2025.07.0
+
+* Add sub-command for exporting TileSheets as PNG files.
+* Add 'Reload Project' menu item under File.
+* Fix opening a project to mark an unopenable file as closed in the config file on startup.
+
+# d2025.06.0
+
+* Add ability to remember recent projects in config
+* Add navigation support (back and forward)
+* Fix file deletion to close file even if not active
+* Fix file copy to work when creating a copy with the name of a previously
+  deleted file
+* Fix crash that could occur after switching projects
+* Make file picker popup accept on double click of a file
+* TileSheetEditor: Fix copy/cut/paste enablement when there is no selection
+* TileSheetEditor: Fix manual redo of draw actions, fix drawing to pixel 0, 0
+  as first action
+* TileSheetEditor: Fix draw command to work on same pixel after switching
+  subsheets
+* PaletteEditor: Add RGB key shortcuts for focusing color channels
+* PaletteEditor: Add color preview to color editor
+
+# d2025.05.1
+
+* TileSheetEditor: Fix overrun errors when switching subsheets, clear selection
+  on switch (261e324acd)
+* Fix new build error that occurs in MSVC (26d5048e6720c4c2d52508a6ee44c67dd9fe3ee5)
+
+# d2025.05.0
+
+* Add app icon for both window and file
+* Change application font to Roboto Medium
+* Closing application will now confirm with user if any files have unsaved
+  changes.
+* UUID duplicates will now be reported when opening a project.
+* Deleting a directory now closes files in that directory.
+* Delete key now initiates deletion of selected directory.
+* Remove ability to re-order tabs. There were bugs associated with that.
+* Mac: Menu bar shortcuts now say Cmd instead of Ctrl.
+* TileSheetEditor: Fix selection clearing to work when clicking outside image.
+* TileSheetEditor: Fix Delete Tile functionality, which was completely broken
+* TileSheetEditor: Fix Insert Tile functionality, which was completely broken
+* PaletteEditor: Fix color number key range. Previously, pressing A caused the
+  editor to jump to the last color.
+* PaletteEditor: Page rename will now take effect upon pressing enter if the
+  text input has focus
+
+# d2025.02.1
+
+* Fix closing tab with unsaved changes (a44c5acc4b)
+
+# d2025.02.0
 
 * Rename core namespace to gfx.
 * Add PaletteV5 to accommodate namespace change.
 * Add TileSheetV5. TileSheetV5 retains the bpp field for the sake of
   CompactTileSheet, but always store it pixel as 8 bpp for itself.
-* Replace file picker combo boxes with support for dragging files from the
+* Add ability to move subsheets in the subsheet tree.
-  project explorer.
+* Add Flip X and Flip Y functionality to TileSheet Editor.
+* Add rotate functionality to TileSheet Editor.
+* Add draw line tool to TileSheet editor
+* Replace file picker combo boxes with a browse button and file picker, and
+  support for dragging files from the project explorer.
+* Add ability to jump to a color in a Palette by double clicking on the
+  color from the TileSheet editor
 * Add ability to create directories.
 * Add ability to add files to specific directories.
 * Add ability to delete files from the project explorer.
 * Ctrl-<num key> keyboard shortcuts for jumping between tabs.
 * Fix Palette Editor to ignore keyboard input when popups are open.
+* Palette Editor move color mechanism now uses drag and drop.
+* Add ability to reorder Palette pages.
+* Add warning for closing a tab with unsaved changes.
+* Add ability to close a tab with Ctrl/Cmd-W

sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.CompactPalette;1

@@ -0,0 +1,23 @@
+O1;net.drinkingtea.ox.TypeDescriptor;1;{
+	"fieldList" : 
+	[
+		{
+			"fieldName" : "pages",
+			"subscriptLevels" : 2,
+			"subscriptStack" : 
+			[
+				{
+					"subscriptType" : 4
+				},
+				{
+					"subscriptType" : 4
+				}
+			],
+			"typeId" : "B.uint16;0"
+		}
+	],
+	"preloadable" : true,
+	"primitiveType" : 5,
+	"typeName" : "net.drinkingtea.nostalgia.gfx.CompactPalette",
+	"typeVersion" : 1
+}

sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.CompactTileSheet;1

@@ -0,0 +1,28 @@
+O1;net.drinkingtea.ox.TypeDescriptor;1;{
+	"fieldList" : 
+	[
+		{
+			"fieldName" : "bpp",
+			"typeId" : "B.int8;0"
+		},
+		{
+			"fieldName" : "defaultPalette",
+			"typeId" : "net.drinkingtea.ox.FileAddress;1"
+		},
+		{
+			"fieldName" : "pixels",
+			"subscriptLevels" : 1,
+			"subscriptStack" : 
+			[
+				{
+					"subscriptType" : 4
+				}
+			],
+			"typeId" : "B.uint8;0"
+		}
+	],
+	"preloadable" : true,
+	"primitiveType" : 5,
+	"typeName" : "net.drinkingtea.nostalgia.gfx.CompactTileSheet",
+	"typeVersion" : 1
+}

sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.Palette.PalettePage;2

@@ -0,0 +1,23 @@
+O1;net.drinkingtea.ox.TypeDescriptor;1;{
+	"fieldList" : 
+	[
+		{
+			"fieldName" : "name",
+			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
+		},
+		{
+			"fieldName" : "colors",
+			"subscriptLevels" : 1,
+			"subscriptStack" : 
+			[
+				{
+					"subscriptType" : 4
+				}
+			],
+			"typeId" : "net.drinkingtea.nostalgia.gfx.PaletteColor;2"
+		}
+	],
+	"primitiveType" : 5,
+	"typeName" : "net.drinkingtea.nostalgia.gfx.Palette.PalettePage",
+	"typeVersion" : 2
+}

sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.Palette;5

@@ -0,0 +1,31 @@
+O1;net.drinkingtea.ox.TypeDescriptor;1;{
+	"fieldList" : 
+	[
+		{
+			"fieldName" : "colorNames",
+			"subscriptLevels" : 1,
+			"subscriptStack" : 
+			[
+				{
+					"subscriptType" : 4
+				}
+			],
+			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
+		},
+		{
+			"fieldName" : "pages",
+			"subscriptLevels" : 1,
+			"subscriptStack" : 
+			[
+				{
+					"subscriptType" : 4
+				}
+			],
+			"typeId" : "net.drinkingtea.nostalgia.gfx.Palette.PalettePage;2"
+		}
+	],
+	"preloadable" : true,
+	"primitiveType" : 5,
+	"typeName" : "net.drinkingtea.nostalgia.gfx.Palette",
+	"typeVersion" : 5
+}

sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.PaletteColor;2

@@ -0,0 +1,24 @@
+O1;net.drinkingtea.ox.TypeDescriptor;1;{
+	"fieldList" : 
+	[
+		{
+			"fieldName" : "r",
+			"typeId" : "B.uint8;0"
+		},
+		{
+			"fieldName" : "g",
+			"typeId" : "B.uint8;0"
+		},
+		{
+			"fieldName" : "b",
+			"typeId" : "B.uint8;0"
+		},
+		{
+			"fieldName" : "a",
+			"typeId" : "B.uint8;0"
+		}
+	],
+	"primitiveType" : 5,
+	"typeName" : "net.drinkingtea.nostalgia.gfx.PaletteColor",
+	"typeVersion" : 2
+}

sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet;5

@@ -0,0 +1,46 @@
+O1;net.drinkingtea.ox.TypeDescriptor;1;{
+	"fieldList" : 
+	[
+		{
+			"fieldName" : "id",
+			"typeId" : "B.int32;0"
+		},
+		{
+			"fieldName" : "name",
+			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
+		},
+		{
+			"fieldName" : "rows",
+			"typeId" : "B.int32;0"
+		},
+		{
+			"fieldName" : "columns",
+			"typeId" : "B.int32;0"
+		},
+		{
+			"fieldName" : "subsheets",
+			"subscriptLevels" : 1,
+			"subscriptStack" : 
+			[
+				{
+					"subscriptType" : 4
+				}
+			],
+			"typeId" : "net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet;5"
+		},
+		{
+			"fieldName" : "pixels",
+			"subscriptLevels" : 1,
+			"subscriptStack" : 
+			[
+				{
+					"subscriptType" : 4
+				}
+			],
+			"typeId" : "B.uint8;0"
+		}
+	],
+	"primitiveType" : 5,
+	"typeName" : "net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet",
+	"typeVersion" : 5
+}

sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.TileSheet;5

@@ -0,0 +1,24 @@
+O1;net.drinkingtea.ox.TypeDescriptor;1;{
+	"fieldList" : 
+	[
+		{
+			"fieldName" : "bpp",
+			"typeId" : "B.int8;0"
+		},
+		{
+			"fieldName" : "idIt",
+			"typeId" : "B.int32;0"
+		},
+		{
+			"fieldName" : "defaultPalette",
+			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
+		},
+		{
+			"fieldName" : "subsheet",
+			"typeId" : "net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet;5"
+		}
+	],
+	"primitiveType" : 5,
+	"typeName" : "net.drinkingtea.nostalgia.gfx.TileSheet",
+	"typeVersion" : 5
+}

sample_project/Palettes/Dirt.npal

@@ -1 +1,28 @@
-K1;0f75977f-1c52-45f8-9793-52ea2dc200a0;M2;net.drinkingtea.nostalgia.core.Palette;1;
<03><><07><>
+K1;0f75977f-1c52-45f8-9793-52ea2dc200a0;O1;net.drinkingtea.nostalgia.gfx.Palette;5;{
+	"colorNames" : 
+	[
+		"Color 1",
+		"Color 2"
+	],
+	"pages" : 
+	[
+		{
+			"colors" : 
+			[
+				{
+					"a" : 1,
+					"b" : 31,
+					"g" : 31,
+					"r" : 31
+				},
+				{
+					"a" : 1,
+					"b" : 22,
+					"g" : 22,
+					"r" : 22
+				}
+			],
+			"name" : "Page 1"
+		}
+	]
+}

sample_project/Palettes/Logo.npal

@@ -1 +1,36 @@
-K1;c79f21e2-f74f-4ad9-90ed-32b0ef7da6ed;M2;net.drinkingtea.nostalgia.core.Palette;1;

P<>{<03><>C<>
+K1;c79f21e2-f74f-4ad9-90ed-32b0ef7da6ed;O1;net.drinkingtea.nostalgia.gfx.Palette;5;{
+	"colorNames" : 
+	[
+		"Color 1",
+		"Color 2",
+		"Color 3",
+		"Color 4"
+	],
+	"pages" : 
+	[
+		{
+			"colors" : 
+			[
+				{
+					"b" : 5
+				},
+				{
+					"b" : 22,
+					"g" : 22,
+					"r" : 22
+				},
+				{
+					"b" : 27,
+					"g" : 27,
+					"r" : 27
+				},
+				{
+					"b" : 20,
+					"g" : 8,
+					"r" : 8
+				}
+			],
+			"name" : "Page 1"
+		}
+	]
+}

sample_project/Palettes/SC9K_Logo.npal

@@ -0,0 +1,28 @@
+K1;3d1a77ec-265f-4905-2061-4f1003ee2189;O1;net.drinkingtea.nostalgia.gfx.Palette;5;{
+	"colorNames" : 
+	[
+		"Color 1",
+		"Color 2",
+		"Color 3"
+	],
+	"pages" : 
+	[
+		{
+			"colors" : 
+			[
+				{
+					"b" : 10,
+					"g" : 5,
+					"r" : 5
+				},
+				{},
+				{
+					"b" : 31,
+					"g" : 31,
+					"r" : 31
+				}
+			],
+			"name" : "Page 1"
+		}
+	]
+}

sample_project/TileSheets/Chester.nts

@@ -0,0 +1,352 @@
+K1;5667c759-7ba1-470a-8860-72f0720dc58c;O1;net.drinkingtea.nostalgia.gfx.TileSheet;5;{
+	"bpp" : 4,
+	"defaultPalette" : "uuid://14fc3dd8-42ff-4bf9-81f1-a010cc5ac251",
+	"idIt" : 7,
+	"subsheet" : 
+	{
+		"columns" : -1,
+		"name" : "Root",
+		"rows" : -1,
+		"subsheets" : 
+		[
+			{
+				"columns" : 1,
+				"id" : 5,
+				"name" : "Blank",
+				"pixels" : 
+				[
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0
+				],
+				"rows" : 1
+			},
+			{
+				"columns" : 2,
+				"id" : 6,
+				"name" : "Dirt",
+				"pixels" : 
+				[
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					2,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					2,
+					1,
+					1,
+					1,
+					2,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					2,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					2,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					2,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					2,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					2,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					2,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					2,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1
+				],
+				"rows" : 2
+			}
+		]
+	}
+}

sample_project/TileSheets/Logo.nts

@@ -0,0 +1,591 @@
+K1;896a7d25-9dc2-46a0-b4da-c6923b6da01b;O1;net.drinkingtea.nostalgia.gfx.TileSheet;5;{
+	"bpp" : 4,
+	"defaultPalette" : "uuid://c79f21e2-f74f-4ad9-90ed-32b0ef7da6ed",
+	"idIt" : 2,
+	"subsheet" : 
+	{
+		"columns" : 3,
+		"id" : 1,
+		"name" : "Root",
+		"pixels" : 
+		[
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			1,
+			0,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			1,
+			1,
+			1,
+			0,
+			0,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			0,
+			0,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			0,
+			0,
+			1,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			1,
+			1,
+			0,
+			0,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			0,
+			0,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			0,
+			0,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			1,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0
+		],
+		"rows" : 3
+	}
+}

sample_project/TileSheets/NS_Logo16.nts

@@ -0,0 +1,269 @@
+K1;e7ae945e-d6c5-4444-5738-be95b4e5937a;O1;net.drinkingtea.nostalgia.gfx.TileSheet;5;{
+	"bpp" : 4,
+	"defaultPalette" : "uuid://c79f21e2-f74f-4ad9-90ed-32b0ef7da6ed",
+	"subsheet" : 
+	{
+		"columns" : 2,
+		"name" : "Root",
+		"pixels" : 
+		[
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			3,
+			3,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			1,
+			0,
+			0,
+			2,
+			3,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			3,
+			2,
+			0,
+			0,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			3,
+			3,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			1,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0,
+			0
+		],
+		"rows" : 2
+	}
+}