[nostalgia/core/studio] Increase max tilesheet export size, fix input handling when popups open

.liccor.yml

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

deps/glutils/.liccor.yml

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

deps/glutils/include/glutils/glutils.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
 #pragma once
@@ -150,39 +150,8 @@ class FrameBufferBind {
 
 void bind(const FrameBuffer &fb) noexcept;
 
-struct ShaderVarSet {
-	GLsizei len{};
-	ox::String name;
-};
 
-struct ProgramSource {
-	ox::Vector<glutils::ShaderVarSet> const shaderParams;
-	GLsizei const rowLen = [this] {
-		GLsizei len{};
-		for (auto const&v : shaderParams) {
-			len += v.len;
-		}
-		return len;
-	}();
-	GLsizei const vboLen = rowLen * 4;
-	ox::String const vertShader{};
-	ox::String const fragShader{};
-	ox::String const geomShader{};
-};
-
-ox::Result<GLProgram> buildShaderProgram(ProgramSource const&src) noexcept;
-
-ox::Result<GLProgram> buildShaderProgram(
-		ox::CStringView const&vert,
-		ox::CStringView const&frag,
-		ox::CStringView const&geo = "") noexcept;
-
-void setupShaderParams(
-		GLProgram const&shader,
-		ox::Vector<ShaderVarSet> const&vars,
-		GLsizei vertexRowLen) noexcept;
-
-void setupShaderParams(GLProgram const&shader, ox::Vector<ShaderVarSet> const&vars) noexcept;
+ox::Result<GLProgram> buildShaderProgram(ox::CStringView const&vert, ox::CStringView const&frag, ox::CStringView const&geo = "") noexcept;
 
 glutils::GLVertexArray generateVertexArrayObject() noexcept;
 
@@ -191,8 +160,6 @@ glutils::GLBuffer generateBuffer() noexcept;
 [[nodiscard]]
 FrameBuffer generateFrameBuffer(int width, int height) noexcept;
 
-void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept;
-
 /**
  * Resizes a FrameBuffer, and creates if it does not already exist.
  */

deps/glutils/src/glutils.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
 #include <ox/std/assert.hpp>
@@ -88,40 +88,6 @@ static ox::Result<GLShader> buildShader(
 	return shader;
 }
 
-ox::Result<GLProgram> buildShaderProgram(ProgramSource const&src) noexcept {
-	oxRequireM(program, buildShaderProgram(
-			src.vertShader,
-			src.fragShader,
-			src.geomShader));
-	setupShaderParams(program, src.shaderParams, src.rowLen);
-	return std::move(program);
-}
-
-void setupShaderParams(
-		GLProgram const&shader,
-		ox::Vector<ShaderVarSet> const&vars,
-		GLsizei vertexRowLen) noexcept {
-	// setup vars
-	for (auto lenWritten = 0LU; auto const&v : vars) {
-		auto const attr = static_cast<GLuint>(glGetAttribLocation(shader, v.name.c_str()));
-		glEnableVertexAttribArray(attr);
-		glVertexAttribPointer(
-				attr, v.len, GL_FLOAT, GL_FALSE,
-				vertexRowLen * static_cast<GLsizei>(sizeof(float)),
-				std::bit_cast<void*>(uintptr_t{lenWritten * sizeof(float)}));
-		lenWritten += static_cast<size_t>(v.len);
-	}
-}
-
-void setupShaderParams(GLProgram const&shader, ox::Vector<ShaderVarSet> const&vars) noexcept {
-	// get row len
-	GLsizei vertexRowLen{};
-	for (auto const&v : vars) {
-		vertexRowLen += v.len;
-	}
-	setupShaderParams(shader, vars, vertexRowLen);
-}
-
 ox::Result<GLProgram> buildShaderProgram(
 		ox::CStringView const&vert,
 		ox::CStringView const&frag,
@@ -181,7 +147,11 @@ FrameBuffer generateFrameBuffer(int width, int height) noexcept {
 	return fb;
 }
 
-void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
+void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
+	if (!fb) {
+		fb = generateFrameBuffer(width, height);
+		return;
+	}
 	width = ox::max(1, width);
 	height = ox::max(1, height);
 	fb.width = width;
@@ -201,14 +171,6 @@ void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	glBindRenderbuffer(GL_RENDERBUFFER, 0);
 }
 
-void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
-	if (!fb) {
-		fb = generateFrameBuffer(width, height);
-		return;
-	}
-	resizeFrameBuffer(fb, width, height);
-}
-
 void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const&sz) noexcept {
 	resizeInitFrameBuffer(fb, sz.width, sz.height);
 }

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

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #include <ox/std/string.hpp>
@@ -27,7 +27,7 @@ ClArgs::ClArgs(int argc, const char **args) noexcept {
 						m_bools[arg] = false;
 					}
 					m_strings[arg] = val;
-					if (auto r = ox::atoi(val.c_str()); r.error == 0) {
+					if (auto r = ox_atoi(val.c_str()); r.error == 0) {
 						m_ints[arg] = r.value;
 					}
 					++i;

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -13,7 +13,7 @@
 namespace ox {
 
 Result<ClawHeader> readClawHeader(const char *buff, std::size_t buffLen) noexcept {
-	const auto s1End = ox::strchr(buff, ';', buffLen);
+	const auto s1End = ox_strchr(buff, ';', buffLen);
 	if (!s1End) {
 		return OxError(1, "Could not read Claw header");
 	}
@@ -22,7 +22,7 @@ Result<ClawHeader> readClawHeader(const char *buff, std::size_t buffLen) noexcep
 	buff += s1Size + 1;
 	buffLen -= s1Size + 1;
 
-	const auto s2End = ox::strchr(buff, ';', buffLen);
+	const auto s2End = ox_strchr(buff, ';', buffLen);
 	if (!s2End) {
 		return OxError(2, "Could not read Claw header");
 	}
@@ -31,7 +31,7 @@ Result<ClawHeader> readClawHeader(const char *buff, std::size_t buffLen) noexcep
 	buff += s2Size + 1;
 	buffLen -= s2Size + 1;
 
-	const auto s3End = ox::strchr(buff, ';', buffLen);
+	const auto s3End = ox_strchr(buff, ';', buffLen);
 	if (!s3End) {
 		return OxError(3, "Could not read Claw header");
 	}
@@ -49,7 +49,7 @@ Result<ClawHeader> readClawHeader(const char *buff, std::size_t buffLen) noexcep
 		return OxError(4, "Claw format does not match any supported format/version combo");
 	}
 	hdr.typeName = typeName;
-	if (auto r = ox::atoi(versionStr.c_str()); r.error == 0) {
+	if (auto r = ox_atoi(versionStr.c_str()); r.error == 0) {
 		hdr.typeVersion = r.value;
 	}
 	hdr.data = buff;
@@ -64,7 +64,7 @@ Result<ClawHeader> readClawHeader(const ox::Buffer &buff) noexcept {
 Result<Buffer> stripClawHeader(const char *buff, std::size_t buffLen) noexcept {
 	oxRequire(header, readClawHeader(buff, buffLen));
 	Buffer out(header.dataSize);
-	ox::listcpy(out.data(), header.data, out.size());
+	ox_memcpy(out.data(), header.data, out.size());
 	return out;
 }
 

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

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

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

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -88,7 +88,7 @@ ox::Error writeClawHeader(Writer_c auto &writer, const T *t, ClawFormat fmt) noe
 	oxReturnError(writer.put(';'));
 	const auto tn = detail::getTypeVersion(t);
 	if (tn > -1) {
-		oxReturnError(ox::writeItoa(tn, writer));
+		oxReturnError(ox::itoa(tn, writer));
 	}
 	oxReturnError(writer.put(';'));
 	return {};

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

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

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

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

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

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

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

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #undef NDEBUG

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

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

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

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -279,7 +279,7 @@ Error FileStoreTemplate<size_t>::write(uint64_t id64, const void *data, FsSize_t
 				oxAssert(destData.size() == dataSize, "Allocation size does not match data.");
 				// write data if any was provided
 				if (data != nullptr) {
-					ox::memcpy(destData, data, dest->size());
+					ox_memcpy(destData, data, dest->size());
 					oxTrace("ox.fs.FileStoreTemplate.write", "Data written");
 				}
 				auto fsData = fileStoreData();
@@ -336,7 +336,7 @@ Error FileStoreTemplate<size_t>::read(uint64_t id, void *out, FsSize_t outSize,
 		return OxError(1);
 	}
 
-	ox::memcpy(out, srcData, srcData.size());
+	ox_memcpy(out, srcData, srcData.size());
 	if (size) {
 		*size = src.size();
 	}
@@ -367,7 +367,7 @@ Error FileStoreTemplate<size_t>::read(uint64_t id, FsSize_t readStart, FsSize_t
 		return OxError(1);
 	}
 
-	ox::memcpy(out, srcData.get() + readStart, readSize);
+	ox_memcpy(out, srcData.get() + readStart, readSize);
 	if (size) {
 		*size = src.size();
 	}
@@ -400,7 +400,7 @@ Error FileStoreTemplate<size_t>::read(uint64_t id, FsSize_t readStart,
 		return OxError(1);
 	}
 
-	ox::memcpy(out, srcData.get() + readStart, readSize);
+	ox_memcpy(out, srcData.get() + readStart, readSize);
 	if (size) {
 		*size = src.size();
 	}

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

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

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

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -48,7 +48,7 @@ struct OX_PACKED DirectoryEntry {
 			auto d = data();
 			if (d.valid()) {
 				d->inode = inode;
-				ox::strncpy(d->name, name, ox::min(bufferSize, static_cast<InodeId_t>(MaxFileNameLength)));
+				ox_strncpy(d->name, name, ox::min(bufferSize, static_cast<InodeId_t>(MaxFileNameLength)));
 				return OxError(0);
 			}
 			return OxError(1);

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

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #include <ox/model/modelops.hpp>
@@ -46,9 +46,9 @@ FileAddress &FileAddress::operator=(const FileAddress &other) noexcept {
 		case FileAddressType::Path:
 		{
 			if (other.m_data.path) {
-				auto strSize = ox::strlen(other.m_data.path) + 1;
+				auto strSize = ox_strlen(other.m_data.path) + 1;
 				m_data.path = new char[strSize];
-				ox::memcpy(m_data.path, other.m_data.path, strSize);
+				ox_memcpy(m_data.path, other.m_data.path, strSize);
 			} else {
 				m_data.constPath = "";
 				m_type = FileAddressType::ConstPath;
@@ -88,32 +88,6 @@ FileAddress &FileAddress::operator=(FileAddress &&other) noexcept {
 	return *this;
 }
 
-bool FileAddress::operator==(FileAddress const&other) const noexcept {
-	if (m_type != other.m_type) {
-		auto const aIsPath =
-				m_type == FileAddressType::Path || m_type == FileAddressType::ConstPath;
-		auto const bIsPath =
-				other.m_type == FileAddressType::Path || other.m_type == FileAddressType::ConstPath;
-		if (!(aIsPath && bIsPath)) {
-			return false;
-		}
-	}
-	switch (m_type) {
-		case FileAddressType::ConstPath:
-		case FileAddressType::Path: {
-			auto const a = getPath();
-			auto const b = other.getPath();
-			return (other.m_type == FileAddressType::ConstPath || other.m_type == FileAddressType::Path)
-			    && (a.value == b.value);
-		}
-		case FileAddressType::Inode:
-			return m_data.inode == other.m_data.inode;
-		case FileAddressType::None:
-			return true;
-	}
-	return true;
-}
-
 bool FileAddress::operator==(CRStringView path) const noexcept {
 	auto [p, err] = getPath();
 	if (err) {

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

@@ -22,9 +22,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>
@@ -44,10 +41,13 @@ class FileAddress {
 
 	protected:
 		FileAddressType m_type = FileAddressType::None;
-		Data m_data{};
+		Data m_data;
 
 	public:
-		constexpr FileAddress() noexcept = default;
+		constexpr FileAddress() noexcept {
+			m_data.inode = 0;
+			m_type = FileAddressType::None;
+		}
 
 		FileAddress(const FileAddress &other) noexcept;
 
@@ -67,8 +67,6 @@ class FileAddress {
 
 		FileAddress &operator=(FileAddress &&other) noexcept;
 
-		bool operator==(const FileAddress &other) const noexcept;
-
 		bool operator==(CRStringView path) const noexcept;
 
 		[[nodiscard]]
@@ -91,12 +89,12 @@ class FileAddress {
 			}
 		}
 
-		constexpr Result<ox::CStringView> getPath() const noexcept {
+		constexpr Result<ox::StringView> getPath() const noexcept {
 			switch (m_type) {
 				case FileAddressType::Path:
-					return ox::CStringView(m_data.path);
+					return ox::StringView(m_data.path);
 				case FileAddressType::ConstPath:
-					return ox::CStringView(m_data.constPath);
+					return ox::StringView(m_data.constPath);
 				default:
 					return OxError(1);
 			}

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

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

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

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

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

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #include <ox/std/error.hpp>
@@ -186,7 +186,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);
+	const auto pathLen = ox_strlen(path);
 	for (auto i = 0u; i < pathLen && path[0] == '/'; i++) {
 		path = substr(path, 1);
 	}

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

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

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

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #include <ox/std/memops.hpp>
@@ -19,7 +19,7 @@ PathIterator::PathIterator(const char *path, std::size_t maxSize, std::size_t it
 	m_iterator = iterator;
 }
 
-PathIterator::PathIterator(const char *path): PathIterator(path, ox::strlen(path)) {
+PathIterator::PathIterator(const char *path): PathIterator(path, ox_strlen(path)) {
 }
 
 PathIterator::PathIterator(CRStringView path): PathIterator(path.data(), path.bytes()) {
@@ -29,10 +29,10 @@ PathIterator::PathIterator(CRStringView path): PathIterator(path.data(), path.by
  * @return 0 if no error
  */
 Error PathIterator::dirPath(char *out, std::size_t outSize) {
-	const auto idx = ox::lastIndexOf(m_path, '/', m_maxSize);
+	const auto idx = ox_lastIndexOf(m_path, '/', m_maxSize);
 	const auto size = static_cast<std::size_t>(idx + 1);
 	if (idx >= 0 && size < outSize) {
-		ox::memcpy(out, m_path, size);
+		ox_memcpy(out, m_path, size);
 		out[size] = 0;
 		return OxError(0);
 	} else {
@@ -44,12 +44,12 @@ Error PathIterator::dirPath(char *out, std::size_t outSize) {
  * @return 0 if no error
  */
 Error PathIterator::fileName(char *out, std::size_t outSize) {
-	auto idx = ox::lastIndexOf(m_path, '/', m_maxSize);
+	auto idx = ox_lastIndexOf(m_path, '/', m_maxSize);
 	if (idx >= 0) {
 		idx++; // pass up the preceding /
-		std::size_t fileNameSize = static_cast<size_t>(ox::strlen(&m_path[idx]));
+		std::size_t fileNameSize = static_cast<size_t>(ox_strlen(&m_path[idx]));
 		if (fileNameSize < outSize) {
-			ox::memcpy(out, &m_path[idx], fileNameSize);
+			ox_memcpy(out, &m_path[idx], fileNameSize);
 			out[fileNameSize] = 0;
 			return OxError(0);
 		} else {
@@ -67,8 +67,8 @@ Error PathIterator::get(char *pathOut, std::size_t pathOutSize) {
 		oxTracef("ox.fs.PathIterator.get", "m_iterator ({}) >= m_maxSize ({})", m_iterator, m_maxSize);
 		return OxError(1);
 	}
-	if (!ox::strlen(&m_path[m_iterator])) {
-		oxTrace("ox.fs.PathIterator.get", "!ox::strlen(&m_path[m_iterator])");
+	if (!ox_strlen(&m_path[m_iterator])) {
+		oxTrace("ox.fs.PathIterator.get", "!ox_strlen(&m_path[m_iterator])");
 		return OxError(1);
 	}
 	auto start = m_iterator;
@@ -76,10 +76,10 @@ Error PathIterator::get(char *pathOut, std::size_t pathOutSize) {
 		start++;
 	}
 	// end is at the next /
-	const char *substr = ox::strchr(&m_path[start], '/', m_maxSize - start);
+	const char *substr = ox_strchr(&m_path[start], '/', m_maxSize - start);
 	// correct end if it is invalid, which happens if there is no next /
 	if (!substr) {
-		substr = ox::strchr(&m_path[start], 0, m_maxSize - start);
+		substr = ox_strchr(&m_path[start], 0, m_maxSize - start);
 	}
 	const auto end = static_cast<size_t>(substr - m_path);
 	size = end - start;
@@ -87,7 +87,7 @@ Error PathIterator::get(char *pathOut, std::size_t pathOutSize) {
 	if (size >= pathOutSize || size == 0) {
 		return OxError(1);
 	}
-	ox::memcpy(pathOut, &m_path[start], size);
+	ox_memcpy(pathOut, &m_path[start], size);
 	// truncate trailing /
 	if (size && pathOut[size - 1] == '/') {
 		size--;
@@ -100,17 +100,17 @@ Error PathIterator::get(char *pathOut, std::size_t pathOutSize) {
 Error PathIterator::next(char *pathOut, std::size_t pathOutSize) {
 	std::size_t size = 0;
 	auto retval = OxError(1);
-	if (m_iterator < m_maxSize && ox::strlen(&m_path[m_iterator])) {
+	if (m_iterator < m_maxSize && ox_strlen(&m_path[m_iterator])) {
 		retval = OxError(0);
 		if (m_path[m_iterator] == '/') {
 			m_iterator++;
 		}
 		const auto start = m_iterator;
 		// end is at the next /
-		const char *substr = ox::strchr(&m_path[start], '/', m_maxSize - start);
+		const char *substr = ox_strchr(&m_path[start], '/', m_maxSize - start);
 		// correct end if it is invalid, which happens if there is no next /
 		if (!substr) {
-			substr = ox::strchr(&m_path[start], 0, m_maxSize - start);
+			substr = ox_strchr(&m_path[start], 0, m_maxSize - start);
 		}
 		const auto end = static_cast<size_t>(substr - m_path);
 		size = end - start;
@@ -118,7 +118,7 @@ Error PathIterator::next(char *pathOut, std::size_t pathOutSize) {
 		if (size >= pathOutSize) {
 			return OxError(1);
 		}
-		ox::memcpy(pathOut, &m_path[start], size);
+		ox_memcpy(pathOut, &m_path[start], size);
 	}
 	// truncate trailing /
 	if (size && pathOut[size - 1] == '/') {
@@ -147,17 +147,17 @@ Result<std::size_t> PathIterator::nextSize() const {
 	std::size_t size = 0;
 	auto retval = OxError(1);
 	auto it = m_iterator;
-	if (it < m_maxSize && ox::strlen(&m_path[it])) {
+	if (it < m_maxSize && ox_strlen(&m_path[it])) {
 		retval = OxError(0);
 		if (m_path[it] == '/') {
 			it++;
 		}
 		const auto start = it;
 		// end is at the next /
-		const char *substr = ox::strchr(&m_path[start], '/', m_maxSize - start);
+		const char *substr = ox_strchr(&m_path[start], '/', m_maxSize - start);
 		// correct end if it is invalid, which happens if there is no next /
 		if (!substr) {
-			substr = ox::strchr(&m_path[start], 0, m_maxSize - start);
+			substr = ox_strchr(&m_path[start], 0, m_maxSize - start);
 		}
 		const auto end = static_cast<std::size_t>(substr - m_path);
 		size = end - start;
@@ -168,16 +168,16 @@ Result<std::size_t> PathIterator::nextSize() const {
 
 bool PathIterator::hasNext() const {
 	std::size_t size = 0;
-	if (m_iterator < m_maxSize && ox::strlen(&m_path[m_iterator])) {
+	if (m_iterator < m_maxSize && ox_strlen(&m_path[m_iterator])) {
 		std::size_t start = m_iterator;
 		if (m_path[start] == '/') {
 			start++;
 		}
 		// end is at the next /
-		const char *substr = ox::strchr(&m_path[start], '/', m_maxSize - start);
+		const char *substr = ox_strchr(&m_path[start], '/', m_maxSize - start);
 		// correct end if it is invalid, which happens if there is no next /
 		if (!substr) {
-			substr = ox::strchr(&m_path[start], 0, m_maxSize - start);
+			substr = ox_strchr(&m_path[start], 0, m_maxSize - start);
 		}
 		const auto end = static_cast<std::size_t>(substr - m_path);
 		size = end - start;
@@ -192,16 +192,16 @@ bool PathIterator::valid() const {
 PathIterator PathIterator::next() const {
 	std::size_t size = 0;
 	auto iterator = m_iterator;
-	if (iterator < m_maxSize && ox::strlen(&m_path[iterator])) {
+	if (iterator < m_maxSize && ox_strlen(&m_path[iterator])) {
 		if (m_path[iterator] == '/') {
 			iterator++;
 		}
 		const auto start = iterator;
 		// end is at the next /
-		const char *substr = ox::strchr(&m_path[start], '/', m_maxSize - start);
+		const char *substr = ox_strchr(&m_path[start], '/', m_maxSize - start);
 		// correct end if it is invalid, which happens if there is no next /
 		if (!substr) {
-			substr = ox::strchr(&m_path[start], 0, m_maxSize - start);
+			substr = ox_strchr(&m_path[start], 0, m_maxSize - start);
 		}
 		const auto end = static_cast<std::size_t>(substr - m_path);
 		size = end - start;

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

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

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

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

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

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

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

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -173,15 +173,15 @@ class OX_PACKED NodeBuffer {
 template<typename size_t, typename Item>
 NodeBuffer<size_t, Item>::NodeBuffer(std::size_t size) noexcept {
 	m_header.size = static_cast<size_t>(size);
-	ox::memset(this + 1, 0, size - sizeof(*this));
+	ox_memset(this + 1, 0, size - sizeof(*this));
 	oxTracef("ox.NodeBuffer.constructor", "{}", m_header.firstItem.get());
 }
 
 template<typename size_t, typename Item>
 NodeBuffer<size_t, Item>::NodeBuffer(const NodeBuffer &other, std::size_t size) noexcept {
 	oxTracef("ox.ptrarith.NodeBuffer.copy", "other.m_header.firstItem: {}", other.m_header.firstItem.get());
-	ox::memset(this + 1, 0, size - sizeof(*this));
-	ox::memcpy(this, &other, size);
+	ox_memset(this + 1, 0, size - sizeof(*this));
+	ox_memcpy(this, &other, size);
 }
 
 template<typename size_t, typename Item>
@@ -291,7 +291,7 @@ Result<typename NodeBuffer<size_t, Item>::ItemPtr> NodeBuffer<size_t, Item>::mal
 			oxTrace("ox.ptrarith.NodeBuffer.malloc.fail", "Unknown");
 			return OxError(1, "NodeBuffer::malloc: unknown failure");
 		}
-		ox::memset(out, 0, fullSize);
+		ox_memset(out, 0, fullSize);
 		new (out) Item;
 		out->setSize(sz);
 
@@ -367,7 +367,7 @@ Error NodeBuffer<size_t, Item>::setSize(std::size_t size) noexcept {
 	} else {
 		m_header.size = static_cast<size_t>(size);
 		auto data = reinterpret_cast<uint8_t*>(this) + end;
-		ox::memset(data, 0, size - end);
+		ox_memset(data, 0, size - end);
 		return OxError(0);
 	}
 }
@@ -405,7 +405,7 @@ Error NodeBuffer<size_t, Item>::compact(F cb) noexcept {
 			return OxError(2);
 		}
 		// move node
-		ox::memcpy(dest, src, src->fullSize());
+		ox_memcpy(dest, src, src->fullSize());
 		oxReturnError(cb(src, dest));
 		// update surrounding nodes
 		auto prev = ptr(dest->prev);

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

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

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

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 // make sure asserts are enabled for the test file
@@ -61,9 +61,9 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				auto const path = ox::String("/usr/share/charset.gbag");
 				ox::PathIterator it(path.c_str(), path.len());
 				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
-				oxAssert(it.next(buff, path.len()) == 0 && ox::strcmp(buff, "usr") == 0, "PathIterator shows wrong next");
-				oxAssert(it.next(buff, path.len()) == 0 && ox::strcmp(buff, "share") == 0, "PathIterator shows wrong next");
-				oxAssert(it.next(buff, path.len()) == 0 && ox::strcmp(buff, "charset.gbag") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "usr") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "share") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "charset.gbag") == 0, "PathIterator shows wrong next");
 				return OxError(0);
 			}
 		},
@@ -73,8 +73,8 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				auto const path = ox::String("/usr/share/");
 				ox::PathIterator it(path.c_str(), path.len());
 				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
-				oxAssert(it.next(buff, path.len()) == 0 && ox::strcmp(buff, "usr") == 0, "PathIterator shows wrong next");
-				oxAssert(it.next(buff, path.len()) == 0 && ox::strcmp(buff, "share") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "usr") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "share") == 0, "PathIterator shows wrong next");
 				return OxError(0);
 			}
 		},
@@ -84,7 +84,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				auto const path = ox::String("/");
 				ox::PathIterator it(path.c_str(), path.len());
 				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
-				oxAssert(it.next(buff, path.len()) == 0 && ox::strcmp(buff, "\0") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "\0") == 0, "PathIterator shows wrong next");
 				return OxError(0);
 			}
 		},
@@ -94,9 +94,9 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				auto const path = ox::String("usr/share/charset.gbag");
 				ox::PathIterator it(path.c_str(), path.len());
 				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
-				oxAssert(it.next(buff, path.len()) == 0 && ox::strcmp(buff, "usr") == 0, "PathIterator shows wrong next");
-				oxAssert(it.next(buff, path.len()) == 0 && ox::strcmp(buff, "share") == 0, "PathIterator shows wrong next");
-				oxAssert(it.next(buff, path.len()) == 0 && ox::strcmp(buff, "charset.gbag") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "usr") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "share") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "charset.gbag") == 0, "PathIterator shows wrong next");
 				return OxError(0);
 			}
 		},
@@ -106,8 +106,8 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				auto const path = ox::String("usr/share/");
 				ox::PathIterator it(path.c_str(), path.len());
 				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
-				oxAssert(it.next(buff, path.len()) == 0 && ox::strcmp(buff, "usr") == 0, "PathIterator shows wrong next");
-				oxAssert(it.next(buff, path.len()) == 0 && ox::strcmp(buff, "share") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "usr") == 0, "PathIterator shows wrong next");
+				oxAssert(it.next(buff, path.len()) == 0 && ox_strcmp(buff, "share") == 0, "PathIterator shows wrong next");
 				return OxError(0);
 			}
 		},
@@ -117,7 +117,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				auto const path = ox::String("/usr/share/charset.gbag");
 				ox::PathIterator it(path.c_str(), path.len());
 				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
-				oxAssert(it.dirPath(buff, path.len()) == 0 && ox::strcmp(buff, "/usr/share/") == 0, "PathIterator shows incorrect dir path");
+				oxAssert(it.dirPath(buff, path.len()) == 0 && ox_strcmp(buff, "/usr/share/") == 0, "PathIterator shows incorrect dir path");
 				return OxError(0);
 			}
 		},
@@ -127,7 +127,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				auto const path = ox::String("/usr/share/charset.gbag");
 				ox::PathIterator it(path.c_str(), path.len());
 				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
-				oxAssert(it.fileName(buff, path.len()) == 0 && ox::strcmp(buff, "charset.gbag") == 0, "PathIterator shows incorrect file name");
+				oxAssert(it.fileName(buff, path.len()) == 0 && ox_strcmp(buff, "charset.gbag") == 0, "PathIterator shows incorrect file name");
 				return OxError(0);
 			}
 		},
@@ -135,7 +135,7 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::hasNext",
 			[](ox::StringView) {
 				const auto path = "/file1";
-				ox::PathIterator it(path, ox::strlen(path));
+				ox::PathIterator it(path, ox_strlen(path));
 				oxAssert(it.hasNext(), "PathIterator shows incorrect hasNext");
 				oxAssert(!it.next().hasNext(), "PathIterator shows incorrect hasNext");
 				return OxError(0);
@@ -171,9 +171,9 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			[](ox::StringView) {
 				constexpr auto buffLen = 5000;
 				constexpr auto str1 = "Hello, World!";
-				constexpr auto str1Len = ox::strlen(str1) + 1;
+				constexpr auto str1Len = ox_strlen(str1) + 1;
 				constexpr auto str2 = "Hello, Moon!";
-				constexpr auto str2Len = ox::strlen(str2) + 1;
+				constexpr auto str2Len = ox_strlen(str2) + 1;
 				auto list = new (ox_alloca(buffLen)) ox::ptrarith::NodeBuffer<uint32_t, ox::FileStoreItem<uint32_t>>(buffLen);
 				oxAssert(ox::FileStore32::format(list, buffLen), "FileStore::format failed.");
 				ox::FileStore32 fileStore(list, buffLen);

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

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

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

@@ -47,13 +47,13 @@ class CirculerBuffer {
 			}
 			// write seg 1
 			const auto seg1Sz = ox::min(sz, m_buff.size() - m_writePt);
-			ox::listcpy(&m_buff[m_writePt], &buff[0], seg1Sz);
+			ox_memcpy(&m_buff[m_writePt], &buff[0], seg1Sz);
 			m_writePt += sz;
 			if (seg1Sz != sz) {
 				m_writePt -= m_buff.size();
 				// write seg 2
 				const auto seg2Sz = sz - seg1Sz;
-				ox::listcpy(&m_buff[0], &buff[seg1Sz], seg2Sz);
+				ox_memcpy(&m_buff[0], &buff[seg1Sz], seg2Sz);
 				oxAssert(m_buff[0] == buff[seg1Sz], "break");
 			}
 			return {};
@@ -70,7 +70,7 @@ class CirculerBuffer {
 			return {};
 		}
 
-		constexpr ox::Error seekp(int, ios_base::seekdir) noexcept {
+		constexpr ox::Error seekp(int, ios_base::seekdir) {
 			return OxError(1, "Unimplemented");
 		}
 
@@ -84,13 +84,13 @@ class CirculerBuffer {
 			const auto bytesRead = ox::min(outSize, m_buff.size() - avail());
 			// read seg 1
 			const auto seg1Sz = ox::min(bytesRead, m_buff.size() - m_readPt);
-			ox::listcpy(&out[0], &m_buff[m_readPt], seg1Sz);
+			ox_memcpy(&out[0], &m_buff[m_readPt], seg1Sz);
 			m_readPt += bytesRead;
 			if (seg1Sz != bytesRead) {
 				m_readPt -= m_buff.size();
 				// read seg 2
 				const auto seg2Sz = bytesRead - seg1Sz;
-				ox::listcpy(&out[seg1Sz], &m_buff[0], seg2Sz);
+				ox_memcpy(&out[seg1Sz], &m_buff[0], seg2Sz);
 			}
 			return bytesRead;
 		}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

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

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

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -71,7 +71,7 @@ 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::memcpy(&val, &input, sizeof(input));
+	ox_memcpy(&val, &input, sizeof(input));
 	if (val) {
 		// bits needed to represent number factoring in space possibly
 		// needed for signed bit
@@ -94,7 +94,7 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 		}
 		if (bytes == 9) {
 			out.data[0] = bytesIndicator;
-			ox::memcpy(&out.data[1], &leVal, 8);
+			ox_memcpy(&out.data[1], &leVal, 8);
 			if (inputNegative) {
 				out.data[1] |= 0b1000'0000;
 			}
@@ -104,7 +104,7 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 			auto intermediate =
 				static_cast<uint64_t>(leVal.raw() | (negBit << (valBits - 1))) << bytes |
 				static_cast<uint64_t>(bytesIndicator);
-			ox::memcpy(out.data, &intermediate, sizeof(intermediate));
+			ox_memcpy(out.data, &intermediate, sizeof(intermediate));
 		}
 		out.length = bytes;
 	}
@@ -160,7 +160,7 @@ 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::memcpy(d.data(), &decoded, sizeof(decoded));
+			 ox_memcpy(d.data(), &decoded, sizeof(decoded));
 			 auto bit = negBit;
 			 for (; bit < ox::min<std::size_t>(Bits<I>, 32); ++bit) {
 				 d[0] |= 1 << bit;
@@ -175,7 +175,7 @@ constexpr Result<I> decodeInteger(Reader_c auto&rdr, std::size_t *bytesRead) noe
 				 d[0] = d[1];
 				 d[1] = d0Tmp;
 			 }
-			 ox::memcpy(&out, d.data(), sizeof(out));
+			 ox_memcpy(&out, d.data(), sizeof(out));
 			 return out;
 		 }
 	}

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

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

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

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #include "err.hpp"

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -320,27 +320,27 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				ox::ModelObject testOut;
 				oxReturnError(testOut.setType(type));
 				oxAssert(ox::readMC(dataBuff.data(), dataBuff.size(), &testOut), "Data read failed");
-				oxAssert(testOut.at("Int").unwrap()->get<int>() == testIn.Int, "testOut.Int failed");
-				oxAssert(testOut.at("Bool").unwrap()->get<bool>() == testIn.Bool, "testOut.Bool failed");
-				oxAssert(testOut.at("BString").unwrap()->get<ox::String>() == testIn.BString.c_str(), "testOut.String failed");
-				oxAssert(testOut.at("String").unwrap()->get<ox::String>() == testIn.String, "testOut.String failed");
-				auto &testOutStruct = testOut.at("Struct").unwrap()->get<ox::ModelObject>();
-				auto &testOutUnion = testOut.at("Union").unwrap()->get<ox::ModelUnion>();
-				auto &testOutList = testOut.at("List").unwrap()->get<ox::ModelValueVector>();
-				auto testOutStructCopy = testOut.at("Struct").unwrap()->get<ox::ModelObject>();
-				auto testOutUnionCopy = testOut.at("Union").unwrap()->get<ox::ModelUnion>();
-				auto testOutListCopy = testOut.at("List").unwrap()->get<ox::ModelValueVector>();
+				oxAssert(testOut["Int"].get<int>() == testIn.Int, "testOut.Int failed");
+				oxAssert(testOut["Bool"].get<bool>() == testIn.Bool, "testOut.Bool failed");
+				oxAssert(testOut["BString"].get<ox::String>() == testIn.BString.c_str(), "testOut.String failed");
+				oxAssert(testOut["String"].get<ox::String>() == testIn.String, "testOut.String failed");
+				auto &testOutStruct = testOut["Struct"].get<ox::ModelObject>();
+				auto &testOutUnion = testOut["Union"].get<ox::ModelUnion>();
+				auto &testOutList = testOut["List"].get<ox::ModelValueVector>();
+				auto testOutStructCopy = testOut["Struct"].get<ox::ModelObject>();
+				auto testOutUnionCopy = testOut["Union"].get<ox::ModelUnion>();
+				auto testOutListCopy = testOut["List"].get<ox::ModelValueVector>();
 				oxAssert(testOutStruct.typeName() == TestStructNest::TypeName, "ModelObject TypeName failed");
 				oxAssert(testOutStruct.typeVersion() == TestStructNest::TypeVersion, "ModelObject TypeVersion failed");
-				oxAssert(testOutStruct.at("Bool").unwrap()->get<bool>() == testIn.Struct.Bool, "testOut.Struct.Bool failed");
-				oxAssert(testOutStruct.at("BString").unwrap()->get<ox::String>() == testIn.Struct.BString.c_str(), "testOut.Struct.BString failed");
-				oxAssert(testOut.at("unionIdx").unwrap()->get<int>() == testIn.unionIdx, "testOut.unionIdx failed");
+				oxAssert(testOutStruct["Bool"].get<bool>() == testIn.Struct.Bool, "testOut.Struct.Bool failed");
+				oxAssert(testOutStruct["BString"].get<ox::String>() == testIn.Struct.BString.c_str(), "testOut.Struct.BString failed");
+				oxAssert(testOut["unionIdx"].get<int>() == testIn.unionIdx, "testOut.unionIdx failed");
 				oxAssert(testOutUnion.unionIdx() == testIn.unionIdx, "testOut.Union idx wrong");
-				oxAssert(testOutUnion.at("Int").unwrap()->get<uint32_t>() == testIn.Union.Int, "testOut.Union.Int failed");
+				oxAssert(testOutUnion["Int"].get<uint32_t>() == testIn.Union.Int, "testOut.Union.Int failed");
 				oxAssert(testOutList[0].get<uint32_t>() == testIn.List[0], "testOut.List[0] failed");
 				oxAssert(testOutList[1].get<uint32_t>() == testIn.List[1], "testOut.Struct.List[1] failed");
-				oxAssert(testOutStructCopy.at("Bool").unwrap()->get<bool>() == testIn.Struct.Bool, "testOut.Struct.Bool (copy) failed");
-				oxAssert(testOutStructCopy.at("BString").unwrap()->get<ox::String>() == testIn.Struct.BString.c_str(), "testOut.Struct.BString (copy) failed");
+				oxAssert(testOutStructCopy["Bool"].get<bool>() == testIn.Struct.Bool, "testOut.Struct.Bool (copy) failed");
+				oxAssert(testOutStructCopy["BString"].get<ox::String>() == testIn.Struct.BString.c_str(), "testOut.Struct.BString (copy) failed");
 				oxAssert(testOutListCopy[0].get<uint32_t>() == testIn.List[0], "testOut.Struct.List[0] (copy) failed");
 				oxAssert(testOutListCopy[1].get<uint32_t>() == testIn.List[1], "testOut.Struct.List[1] (copy) failed");
 				return OxError(0);

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -214,7 +214,7 @@ 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) {
-		const auto strLen = *val ? ox::strlen(*val) : 0;
+		const auto strLen = *val ? ox_strlen(*val) : 0;
 		// write the length
 		const auto strLenBuff = mc::encodeInteger(strLen);
 		oxReturnError(m_writer.write(reinterpret_cast<const char*>(strLenBuff.data), strLenBuff.length));

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

@@ -13,5 +13,5 @@
 #define oxModelBegin(modelName) constexpr ox::Error model(auto *io, [[maybe_unused]] ox::CommonPtrWith<modelName> auto *o) noexcept { oxReturnError(io->template setTypeInfo<modelName>());
 #define oxModelEnd() return OxError(0); }
 #define oxModelField(fieldName) oxReturnError(io->field(#fieldName, &o->fieldName));
-#define oxModelFieldRename(objFieldName, serFieldName) oxReturnError(io->field(#serFieldName, &o->objFieldName));
+#define oxModelFieldRename(serFieldName, objFieldName) oxReturnError(io->field(#serFieldName, &o->objFieldName));
 #define oxModelFriend(modelName) friend constexpr ox::Error model(auto*, ox::CommonPtrWith<modelName> auto*) noexcept

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

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

deps/ox/src/ox/model/desctypes.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #include "desctypes.hpp"

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

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

deps/ox/src/ox/model/modelhandleradaptor.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -131,8 +131,6 @@ class ModelHandlerInterface {
 				}
 				case ModelValue::Type::Vector:
 					return m_handler->field(name, &v->template get<ModelValueVector>());
-				case ModelValue::Type::InlineArray:
-					return m_handler->field(name, &v->template get<ModelValueArray>());
 			}
 			oxErrf("invalid type: {}: {}\n", name, static_cast<int>(v->type()));
 			oxPanic(OxError(1), "invalid type");

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -31,7 +31,6 @@ namespace ox {
 class ModelObject;
 class ModelUnion;
 class ModelValue;
-class ModelValueArray;
 class ModelValueVector;
 
 class ModelValue {
@@ -51,7 +50,6 @@ class ModelValue {
 			Object,
 			Union,
 			Vector,
-			InlineArray,
 		};
 
 	private:
@@ -70,7 +68,6 @@ class ModelValue {
 			ModelObject *obj;
 			ModelUnion *uni;
 			ModelValueVector *vec;
-			ModelValueArray *array;
 		} m_data;
 
 		template<typename T>
@@ -104,8 +101,6 @@ class ModelValue {
 				return Type::String;
 			} else if constexpr(is_same_v<U, ModelValueVector>) {
 				return Type::Vector;
-			} else if constexpr(is_same_v<U, ModelValueArray>) {
-				return Type::InlineArray;
 			} else {
 				return Type::Undefined;
 			}
@@ -139,8 +134,6 @@ class ModelValue {
 				return *t.m_data.obj;
 			} else if constexpr(type == Type::Vector) {
 				return *t.m_data.vec;
-			} else if constexpr(type == Type::InlineArray) {
-				return *t.m_data.array;
 			} else {
 				return t.m_data.i32;
 			}
@@ -154,12 +147,10 @@ class ModelValue {
 		constexpr ModelValue(ModelValue &&other) noexcept;
 
 		template<typename T>
-		explicit constexpr ModelValue(const T &val) noexcept
-			requires(!ox::is_same_v<ox::remove_reference_t<T>, ModelValue>);
+		explicit constexpr ModelValue(const T &val) noexcept;
 
 		template<typename T>
-		explicit constexpr ModelValue(T &&val) noexcept
-			requires(!ox::is_same_v<ox::remove_reference_t<T>, ModelValue>);
+		explicit constexpr ModelValue(T &&val) noexcept;
 
 		constexpr ~ModelValue() noexcept;
 
@@ -186,10 +177,7 @@ class ModelValue {
 		[[nodiscard]]
 		constexpr Type type() const noexcept;
 
-		constexpr Error setType(
-				DescriptorType const*type,
-				int subscriptLevels = 0,
-				SubscriptStack const& = {}) noexcept;
+		constexpr Error setType(const DescriptorType *type, int subscriptLevels = 0) noexcept;
 
 		template<typename T>
 		constexpr Error setType() noexcept;
@@ -211,166 +199,11 @@ class ModelValue {
 
 };
 
-class ModelValueArray {
-	private:
-		Vector<ModelValue> m_vec;
-		const DescriptorType *m_type = nullptr;
-		int m_typeSubscriptLevels = 0;
-		SubscriptStack m_subscriptStack;
-		String m_typeName;
-		int m_typeVersion = 0;
-
-	public:
-		constexpr explicit ModelValueArray() noexcept = default;
-
-		constexpr ModelValueArray(ModelValueArray const&other) noexcept {
-			for (auto &v : other.m_vec) {
-				m_vec.emplace_back(v);
-			}
-			m_typeName = other.m_typeName;
-			m_typeVersion = other.m_typeVersion;
-		}
-
-		constexpr ModelValueArray(ModelValueArray &&other) noexcept {
-			m_vec = std::move(other.m_vec);
-			m_typeName = std::move(other.m_typeName);
-			m_typeVersion = other.m_typeVersion;
-		}
-
-		constexpr ox::Error setSize(std::size_t sz) noexcept {
-			const auto oldSz = m_vec.size();
-			m_vec.resize(sz);
-			if (sz > oldSz) {
-				for (auto i = oldSz; i < sz; ++i) {
-					oxReturnError(m_vec[i].setType(m_type, m_typeSubscriptLevels));
-				}
-			}
-			return {};
-		}
-
-		[[nodiscard]]
-		constexpr auto data() const noexcept {
-			return m_vec.data();
-		}
-
-		[[nodiscard]]
-		constexpr auto data() noexcept {
-			return m_vec.data();
-		}
-
-		constexpr static ox::Result<ModelValueArray> make(size_t sz) noexcept {
-			ox::Result<ModelValueArray> out;
-			out.error = out.value.setSize(sz);
-			return out;
-		}
-
-		[[nodiscard]]
-		constexpr auto &get() noexcept {
-			return m_vec;
-		}
-
-		[[nodiscard]]
-		constexpr auto const&get() const noexcept {
-			return m_vec;
-		}
-
-		constexpr Error setType(
-				DescriptorType const*type,
-				int subscriptLevels,
-				SubscriptStack subscriptStack) noexcept {
-			m_type = type;
-			m_typeSubscriptLevels = subscriptLevels;
-			m_subscriptStack = std::move(subscriptStack);
-			return {};
-		}
-
-		[[nodiscard]]
-		constexpr String const&typeName() const noexcept {
-			return m_typeName;
-		}
-
-		[[nodiscard]]
-		constexpr int typeVersion() const noexcept {
-			return m_typeVersion;
-		}
-
-		[[nodiscard]]
-		constexpr std::size_t size() const noexcept {
-			return m_vec.size();
-		}
-
-		constexpr auto &operator[](std::size_t i) noexcept {
-			return m_vec[i];
-		}
-
-		constexpr auto &operator[](std::size_t i) const noexcept {
-			return m_vec[i];
-		}
-
-		[[nodiscard]]
-		auto begin() noexcept {
-			return m_vec.begin();
-		}
-
-		[[nodiscard]]
-		auto begin() const noexcept {
-			return m_vec.cbegin();
-		}
-
-		[[nodiscard]]
-		auto cbegin() const noexcept {
-			return m_vec.cbegin();
-		}
-
-		[[nodiscard]]
-		auto rbegin() noexcept {
-			return m_vec.rbegin();
-		}
-
-		[[nodiscard]]
-		auto crbegin() const noexcept {
-			return m_vec.crbegin();
-		}
-
-		[[nodiscard]]
-		auto end() noexcept {
-			return m_vec.end();
-		}
-
-		[[nodiscard]]
-		auto end() const noexcept {
-			return m_vec.cend();
-		}
-
-		[[nodiscard]]
-		auto cend() const noexcept {
-			return m_vec.cend();
-		}
-
-		[[nodiscard]]
-		auto rend() noexcept {
-			return m_vec.rend();
-		}
-
-		[[nodiscard]]
-		auto crend() const noexcept {
-			return m_vec.crend();
-		}
-
-};
-
-template<>
-[[nodiscard]]
-consteval bool isArray(ModelValueArray*) noexcept {
-	return true;
-}
-
 class ModelValueVector {
 	private:
 		Vector<ModelValue> m_vec;
 		const DescriptorType *m_type = nullptr;
 		int m_typeSubscriptLevels = 0;
-		SubscriptStack m_subscriptStack;
 		String m_typeName;
 		int m_typeVersion = 0;
 
@@ -400,7 +233,7 @@ class ModelValueVector {
 			m_vec.resize(sz);
 			if (sz > oldSz) {
 				for (auto i = oldSz; i < sz; ++i) {
-					oxReturnError(m_vec[i].setType(m_type, m_typeSubscriptLevels, m_subscriptStack));
+					oxReturnError(m_vec[i].setType(m_type, m_typeSubscriptLevels));
 				}
 			}
 			return {};
@@ -416,13 +249,9 @@ class ModelValueVector {
 			return m_vec;
 		}
 
-		constexpr Error setType(
-				DescriptorType const*type,
-				int subscriptLevels,
-				SubscriptStack subscriptStack) noexcept {
+		constexpr Error setType(const DescriptorType *type, int subscriptLevels) noexcept {
 			m_type = type;
 			m_typeSubscriptLevels = subscriptLevels;
-			m_subscriptStack = std::move(subscriptStack);
 			return {};
 		}
 
@@ -505,12 +334,7 @@ consteval bool isVector(const ModelValueVector*) noexcept {
 	return true;
 }
 
-constexpr Error model(auto *h, CommonPtrWith<ModelObject> auto *obj) noexcept;
-constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept;
-
-
 class ModelObject {
-	friend constexpr Error model(auto *h, CommonPtrWith<ModelObject> auto *obj) noexcept;
 	public:
 		struct Field {
 			String name;
@@ -642,9 +466,12 @@ class ModelObject {
 			return {};
 		}
 
-		constexpr ox::Result<ModelValue*> at(StringView const&k) noexcept {
-			oxRequire(v, m_fields.at(k));
-			return *v;
+		constexpr auto &operator[](StringView const&k) noexcept {
+			auto [v, err] = m_fields.at(k);
+			if (err) [[unlikely]] {
+				oxPanic(err, ox::sfmt("field {} does not exist in type {}", k, buildTypeId(*m_type)).c_str());
+			}
+			return **v;
 		}
 
 		constexpr auto &operator[](const std::size_t i) noexcept {
@@ -674,7 +501,7 @@ class ModelObject {
 			for (const auto &f : type->fieldList) {
 				auto field = make_unique<Field>();
 				field->name = f.fieldName;
-				oxReturnError(field->value.setType(f.type, f.subscriptLevels, f.subscriptStack));
+				oxReturnError(field->value.setType(f.type, f.subscriptLevels));
 				m_fields[field->name] = &field->value;
 				m_fieldsOrder.emplace_back(std::move(field));
 			}
@@ -690,7 +517,7 @@ class ModelUnion {
 			String name;
 			ModelValue value;
 		};
-		friend constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept;
+		oxModelFriend(ModelUnion);
 		friend ModelValue;
 		Vector<UniquePtr<Field>> m_fieldsOrder;
 		HashMap<String, Field*> m_fields;
@@ -728,9 +555,12 @@ class ModelUnion {
 			return UniquePtr<ModelUnion>(new ModelUnion(other));
 		}
 
-		constexpr ox::Result<ModelValue*> at(StringView const&k) noexcept {
-			oxRequire(v, m_fields.at(k));
-			return &(*v)->value;
+		constexpr auto &operator[](StringView const&k) noexcept {
+			const auto [v, err] = m_fields.at(k);
+			if (err) [[unlikely]] {
+				oxPanic(err, ox::sfmt("field {} does not exist in type {}", k, buildTypeId(*m_type)).c_str());
+			}
+			return (*v)->value;
 		}
 
 		constexpr auto &operator[](const std::size_t i) noexcept {
@@ -817,12 +647,6 @@ class ModelUnion {
 
 };
 
-template<typename PlatSpec>
-[[nodiscard]]
-constexpr std::size_t sizeOf(ModelValueArray const*v) noexcept {
-	return sizeOf<PlatSpec>(&(*v)[0]) * v->size();
-}
-
 template<typename PlatSpec>
 [[nodiscard]]
 constexpr std::size_t sizeOf(const ModelValueVector*) noexcept {
@@ -884,22 +708,10 @@ constexpr std::size_t sizeOf(const ModelValue *t) noexcept {
 		case ModelValue::Type::Vector:
 			size = sizeOf<PlatSpec>(&t->get<ox::ModelValueVector>());
 			break;
-		case ModelValue::Type::InlineArray:
-		{
-			auto &list = t->get<ox::ModelValueArray>();
-			size = sizeOf<PlatSpec>(&list[0]) * list.size();
-			break;
-		}
 	}
 	return size;
 }
 
-template<typename PlatSpec>
-[[nodiscard]]
-constexpr std::size_t alignOf(ModelValueArray const&v) noexcept {
-	return alignOf<PlatSpec>(v[0]);
-}
-
 template<typename PlatSpec>
 [[nodiscard]]
 constexpr std::size_t alignOf(const ModelValueVector&) noexcept {
@@ -910,63 +722,56 @@ constexpr std::size_t alignOf(const ModelValueVector&) noexcept {
 template<typename PlatSpec>
 [[nodiscard]]
 constexpr std::size_t alignOf(const ModelValue &t) noexcept {
-	std::size_t alignment = 0;
+	std::size_t size = 0;
 	switch (t.type()) {
 		case ModelValue::Type::Bool:
-			alignment = PlatSpec::alignOf(t.get<bool>());
+			size = PlatSpec::alignOf(t.get<bool>());
 			break;
 		case ModelValue::Type::Undefined:
-			alignment = 1;
+			size = 1;
 			break;
 		case ModelValue::Type::UnsignedInteger8:
-			alignment = PlatSpec::alignOf(t.get<uint8_t>());
+			size = PlatSpec::alignOf(t.get<uint8_t>());
 			break;
 		case ModelValue::Type::UnsignedInteger16:
-			alignment = PlatSpec::alignOf(t.get<uint16_t>());
+			size = PlatSpec::alignOf(t.get<uint16_t>());
 			break;
 		case ModelValue::Type::UnsignedInteger32:
-			alignment = PlatSpec::alignOf(t.get<uint32_t>());
+			size = PlatSpec::alignOf(t.get<uint32_t>());
 			break;
 		case ModelValue::Type::UnsignedInteger64:
-			alignment = PlatSpec::alignOf(t.get<uint64_t>());
+			size = PlatSpec::alignOf(t.get<uint64_t>());
 			break;
 		case ModelValue::Type::SignedInteger8:
-			alignment = PlatSpec::alignOf(t.get<int8_t>());
+			size = PlatSpec::alignOf(t.get<int8_t>());
 			break;
 		case ModelValue::Type::SignedInteger16:
-			alignment = PlatSpec::alignOf(t.get<int16_t>());
+			size = PlatSpec::alignOf(t.get<int16_t>());
 			break;
 		case ModelValue::Type::SignedInteger32:
-			alignment = PlatSpec::alignOf(t.get<int32_t>());
+			size = PlatSpec::alignOf(t.get<int32_t>());
 			break;
 		case ModelValue::Type::SignedInteger64:
-			alignment = PlatSpec::alignOf(t.get<int64_t>());
+			size = PlatSpec::alignOf(t.get<int64_t>());
 			break;
 		case ModelValue::Type::String:
-			alignment = alignOf<PlatSpec>(t.get<ox::String>());
+			size = PlatSpec::alignOf(t.get<ox::String>());
 			break;
 		case ModelValue::Type::Object:
-			alignment = alignOf<PlatSpec>(t.get<ox::ModelObject>());
+			size = alignOf<PlatSpec>(t.get<ox::ModelObject>());
 			break;
 		case ModelValue::Type::Union:
-			alignment = alignOf<PlatSpec>(t.get<ox::ModelUnion>());
+			size = alignOf<PlatSpec>(t.get<ox::ModelUnion>());
 			break;
 		case ModelValue::Type::Vector:
-			alignment = alignOf<PlatSpec>(t.get<ox::ModelValueVector>());
+			size = alignOf<PlatSpec>(t.get<ox::ModelValueVector>());
 			break;
-		case ModelValue::Type::InlineArray:
-		{
-			auto &list = t.get<ox::ModelValueArray>();
-			alignment = alignOf<PlatSpec>(list[0]);
-			break;
-		}
 	}
-	return alignment;
+	return size;
 }
 
 constexpr Error model(auto *h, CommonPtrWith<ModelObject> auto *obj) noexcept {
-	oxReturnError(h->template setTypeInfo<ModelObject>(
-			obj->typeName().c_str(), obj->typeVersion(), {}, obj->m_fieldsOrder.size()));
+	oxReturnError(h->template setTypeInfo<ModelObject>(obj->typeName().c_str(), obj->typeVersion(), {}, obj->m_fieldsOrder.size()));
 	for (auto &f : obj->m_fieldsOrder) {
 		oxReturnError(h->field(f->name.c_str(), &f->value));
 	}
@@ -974,8 +779,7 @@ constexpr Error model(auto *h, CommonPtrWith<ModelObject> auto *obj) noexcept {
 }
 
 constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept {
-	oxReturnError(h->template setTypeInfo<ModelUnion>(
-			obj->typeName().c_str(), obj->typeVersion(), {}, obj->m_fieldsOrder.size()));
+	oxReturnError(h->template setTypeInfo<ModelUnion>(obj->typeName().c_str(), obj->typeVersion(), {}, obj->m_fieldsOrder.size()));
 	for (auto &f : obj->m_fieldsOrder) {
 		oxReturnError(h->field(f->name.c_str(), &f->value));
 	}
@@ -995,7 +799,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));
+			ox_memcpy(&m_data, &other.m_data, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = new String(other.get<String>());
@@ -1009,9 +813,6 @@ constexpr ModelValue::ModelValue(const ModelValue &other) noexcept {
 		case Type::Vector:
 			m_data.vec = new ModelValueVector(*other.m_data.vec);
 			break;
-		case Type::InlineArray:
-			m_data.array = new ModelValueArray(*other.m_data.array);
-			break;
 	}
 }
 
@@ -1028,8 +829,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));
-			ox::memset(&other.m_data, 0, sizeof(m_data));
+			ox_memcpy(&m_data, &other.m_data, sizeof(m_data));
+			ox_memset(&other.m_data, 0, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = other.m_data.str;
@@ -1047,23 +848,17 @@ constexpr ModelValue::ModelValue(ModelValue &&other) noexcept {
 			m_data.vec = other.m_data.vec;
 			other.m_data.vec = new ModelValueVector;
 			break;
-		case Type::InlineArray:
-			m_data.array = other.m_data.array;
-			other.m_data.array = new ModelValueArray();
-			break;
 	}
 }
 
 template<typename T>
-constexpr ModelValue::ModelValue(const T &val) noexcept
-	requires(!ox::is_same_v<ox::remove_reference_t<T>, ModelValue>) {
-	oxIgnoreError(set(val));
+constexpr ModelValue::ModelValue(const T &val) noexcept {
+	set(val);
 }
 
 template<typename T>
-constexpr ModelValue::ModelValue(T &&val) noexcept
-	requires(!ox::is_same_v<ox::remove_reference_t<T>, ModelValue>) {
-	oxIgnoreError(set(ox::forward<T>(val)));
+constexpr ModelValue::ModelValue(T &&val) noexcept {
+	set(ox::forward(val));
 }
 
 constexpr ModelValue::~ModelValue() noexcept {
@@ -1074,24 +869,12 @@ constexpr ModelValue::Type ModelValue::type() const noexcept {
 	return m_type;
 }
 
-constexpr Error ModelValue::setType(
-		const DescriptorType *type,
-		int subscriptLevels,
-		SubscriptStack const&subscriptStack) noexcept {
+constexpr Error ModelValue::setType(const DescriptorType *type, int subscriptLevels) noexcept {
 	freeResources();
 	if (subscriptLevels) {
-		auto const&subscript = subscriptStack[subscriptStack.size() - static_cast<size_t>(subscriptLevels)];
-		if (subscript.subscriptType == Subscript::SubscriptType::InlineArray) {
-			m_type = Type::InlineArray;
-			m_data.array = new ModelValueArray;
-			oxReturnError(m_data.array->setType(type, subscriptLevels - 1, subscriptStack));
-			oxReturnError(m_data.array->setSize(static_cast<size_t>(subscript.length)));
-		} else {
-			m_type = Type::Vector;
-			m_data.vec = new ModelValueVector;
-			oxReturnError(m_data.vec->setType(type, subscriptLevels - 1, subscriptStack));
-		}
-		return {};
+		m_type = Type::Vector;
+		m_data.vec = new ModelValueVector;
+		return m_data.vec->setType(type, subscriptLevels - 1);
 	} else if (type->typeName == types::Bool) {
 		m_type = Type::Bool;
 	} else if (type->typeName == types::BasicString ||
@@ -1134,8 +917,7 @@ constexpr Error ModelValue::setType() noexcept {
 	constexpr auto type = getType<T>();
 	freeResources();
 	m_type = type;
-	// 2022.09.04: Clang retardedly requires initializing the union values directly,
-	//             rather than using getValue<type>()
+	// 2022.09.04: Clang retardedly requires initializing the union values directly, rather than using getValue<type>()
 	if constexpr(type == Type::Object) {
 		m_data.obj = new ModelObject;
 		oxReturnError(m_data.obj->setType(type));
@@ -1177,7 +959,7 @@ constexpr Error ModelValue::set(const T &v) noexcept {
 	}
 	auto &value = getValue<type>(*this);
 	if constexpr(type == Type::Vector || type == Type::Object ||
-	             type == Type::Union || type == Type::String || type == Type::InlineArray) {
+	             type == Type::Union || type == Type::String) {
 		safeDelete(&value);
 	}
 	value = v;
@@ -1192,10 +974,10 @@ constexpr Error ModelValue::set(T &&v) noexcept {
 	}
 	auto &value = getValue<type>(*this);
 	if constexpr(type == Type::Vector || type == Type::Object ||
-	             type == Type::Union || type == Type::String || type == Type::InlineArray) {
+	             type == Type::Union || type == Type::String) {
 		safeDelete(&value);
 	}
-	value = std::move(v);
+	value = ox::forward<T>(v);
 	return OxError(0);
 }
 
@@ -1220,7 +1002,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));
+			ox_memcpy(&m_data, &other.m_data, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = new String(other.get<String>());
@@ -1234,9 +1016,6 @@ constexpr ModelValue &ModelValue::operator=(const ModelValue &other) noexcept {
 		case Type::Vector:
 			m_data.vec = new ModelValueVector(*other.m_data.vec);
 			break;
-		case Type::InlineArray:
-			m_data.array = new ModelValueArray(*other.m_data.array);
-			break;
 	}
 	return *this;
 }
@@ -1258,8 +1037,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));
-			ox::memset(&other.m_data, 0, sizeof(m_data));
+			ox_memcpy(&m_data, &other.m_data, sizeof(m_data));
+			ox_memset(&other.m_data, 0, sizeof(m_data));
 			break;
 		case Type::String:
 			m_data.str = other.m_data.str;
@@ -1277,10 +1056,6 @@ constexpr ModelValue &ModelValue::operator=(ModelValue &&other) noexcept {
 			m_data.vec = other.m_data.vec;
 			other.m_data.vec = new ModelValueVector;
 			break;
-		case Type::InlineArray:
-			m_data.array = other.m_data.array;
-			other.m_data.array = new ModelValueArray;
-			break;
 	}
 	return *this;
 }
@@ -1310,9 +1085,6 @@ constexpr void ModelValue::freeResources() noexcept {
 		case Type::Vector:
 			safeDelete(m_data.vec);
 			break;
-		case Type::InlineArray:
-			safeDelete(m_data.array);
-			break;
 	}
 	m_type = Type::Undefined;
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -131,12 +131,7 @@ template<typename T, std::size_t sz>
 constexpr bool isBareArray_v<T[sz]> = true;
 
 template<typename T>
-consteval bool isArray(T*) noexcept {
-	return false;
-}
-
-template<typename T>
-constexpr bool isArray_v = isArray(static_cast<T*>(nullptr));
+constexpr bool isArray_v = false;
 
 template<typename T>
 constexpr bool isArray_v<T[]> = true;
@@ -147,16 +142,6 @@ constexpr bool isArray_v<T[sz]> = true;
 template<typename T, std::size_t sz>
 constexpr bool isArray_v<Array<T, sz>> = true;
 
-template<typename T, std::size_t sz>
-consteval bool isArray(T[sz]) noexcept {
-	return true;
-}
-
-template<typename T, std::size_t sz>
-consteval bool isArray(Array<T, sz>) noexcept {
-	return true;
-}
-
 template<typename T>
 constexpr bool isSmartPtr_v = false;
 

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

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

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

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

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(json, buffSize);
 	Json::CharReaderBuilder parserBuilder;
 	auto parser = std::unique_ptr<Json::CharReader>(parserBuilder.newCharReader());
 	if (!parser->parse(json, json + jsonLen, &m_json, nullptr)) {
@@ -198,7 +198,7 @@ Error OrganicClawReader::fieldCString(const char *key, char *val, std::size_t bu
 			if (strSize >= buffLen) {
 				err = OxError(2, "String size exceeds capacity of destination");
 			} else {
-				ox::memcpy(data, begin, static_cast<std::size_t>(strSize));
+				ox_memcpy(data, begin, static_cast<std::size_t>(strSize));
 				data[strSize] = 0;
 			}
 		} else {
@@ -224,7 +224,7 @@ Error OrganicClawReader::fieldCString(const char *key, char **val) noexcept {
 			const auto strSize = static_cast<std::size_t>(end - begin);
 			safeDelete(*val);
 			*val = new char[strSize + 1];
-			ox::memcpy(data, begin, static_cast<std::size_t>(strSize));
+			ox_memcpy(data, begin, static_cast<std::size_t>(strSize));
 			data[strSize] = 0;
 		} else {
 			err = OxError(1, "Type mismatch");
@@ -242,7 +242,7 @@ Error OrganicClawReader::fieldCString(const char *key, char **val, std::size_t b
 		if (jv.empty()) {
 			auto data = val;
 			if (data) {
-				data[0] = nullptr;
+				data[0] = 0;
 			}
 		} else if (jv.isString()) {
 			jv.getString(&begin, &end);
@@ -252,8 +252,8 @@ Error OrganicClawReader::fieldCString(const char *key, char **val, std::size_t b
 				safeDelete(*val);
 				*val = new char[strSize + 1];
 			}
-			ox::memcpy(data, begin, static_cast<std::size_t>(strSize));
-			data[strSize] = nullptr;
+			ox_memcpy(data, begin, static_cast<std::size_t>(strSize));
+			data[strSize] = 0;
 		} else {
 			err = OxError(1, "Type mismatch");
 		}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -274,7 +274,7 @@ Result<T> readOC(const char *json, std::size_t jsonLen) noexcept {
 
 template<typename T>
 Result<T> readOC(const char *json) noexcept {
-	return readOC<T>(json, ox::strlen(json));
+	return readOC<T>(json, ox_strlen(json));
 }
 
 template<typename T>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -27,7 +27,7 @@ Error OrganicClawWriter::fieldCString(const char *key, const char *const*val, in
 }
 
 Error OrganicClawWriter::fieldCString(const char *key, const char *const*val) noexcept {
-	return fieldCString(key, const_cast<const char**>(val), static_cast<int>(ox::strlen(val)));
+	return fieldCString(key, const_cast<const char**>(val), static_cast<int>(ox_strlen(val)));
 }
 
 Error OrganicClawWriter::field(const char *key, const UUID *uuid) noexcept {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -27,7 +27,7 @@ class OrganicClawWriter {
 	friend Result<Buffer> writeOC(const auto &val) noexcept;
 
 	protected:
-		Json::Value m_json{Json::Value(Json::objectValue)};
+		Json::Value m_json;
 		Json::ArrayIndex m_fieldIt = 0;
 		int m_unionIdx = -1;
 
@@ -215,7 +215,7 @@ Error OrganicClawWriter::field(const char *key, const T *val) noexcept {
 		OrganicClawWriter w;
 		ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{&w};
 		oxReturnError(model(&handler, val));
-		if (!w.m_json.empty() || m_json.isArray()) {
+		if (!w.m_json.isNull()) {
 			value(key) = w.m_json;
 		}
 	}

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

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

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

@@ -1,15 +1,10 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
 #pragma once
 
 #include <ox/std/serialize.hpp>
-#include <ox/std/string.hpp>
 #include <ox/std/typetraits.hpp>
 
 #include "alignmentcatcher.hpp"
@@ -52,7 +47,7 @@ constexpr std::size_t alignOf(const T &v) noexcept {
 		typename PlatSpec::PtrType p = 0;
 		return PlatSpec::alignOf(p);
 	} else {
-		AlignmentCatcher<PlatSpec> c;
+		AlignmentCatcher<NativePlatSpec> c;
 		oxAssert(model(c.interface(), &v), "Could not get alignment for type");
 		return c.biggestAlignment;
 	}

deps/ox/src/ox/preloader/preloader.cpp

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

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

@@ -1,9 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
 #pragma once
@@ -14,12 +10,10 @@
 #include <ox/std/error.hpp>
 #include <ox/std/memops.hpp>
 #include <ox/std/memory.hpp>
-#include <ox/std/string.hpp>
 #include <ox/std/types.hpp>
 #include <ox/std/typetraits.hpp>
 #include <ox/std/units.hpp>
 #include <ox/model/modelhandleradaptor.hpp>
-#include <ox/model/modelvalue.hpp>
 
 #include "platspecs.hpp"
 
@@ -64,7 +58,6 @@ class Preloader: public ModelHandlerBase<Preloader<PlatSpec>, OpType::Reflect> {
 						restore(pRestore), seekdir(pSeekdir) {}
 		};
 		ox::Vector<AllocStackItem, 8> m_allocStack;
-		ox::Vector<size_t> m_allocStart{};
 
 		constexpr Preloader() noexcept: m_writer(&m_buff) {}
 
@@ -108,9 +101,9 @@ class Preloader: public ModelHandlerBase<Preloader<PlatSpec>, OpType::Reflect> {
 		template<typename T>
 		constexpr ox::Error field(CRStringView, const T **val, std::size_t cnt) noexcept;
 
-		constexpr ox::Result<std::size_t> startAlloc(size_t sz, size_t align) noexcept;
+		constexpr ox::Result<std::size_t> startAlloc(std::size_t sz) noexcept;
 
-		constexpr ox::Result<std::size_t> startAlloc(size_t sz, size_t align, std::size_t restore) noexcept;
+		constexpr ox::Result<std::size_t> startAlloc(std::size_t sz, std::size_t restore) noexcept;
 
 		constexpr ox::Error endAlloc() noexcept;
 
@@ -132,8 +125,6 @@ class Preloader: public ModelHandlerBase<Preloader<PlatSpec>, OpType::Reflect> {
 
 		constexpr ox::Error fieldVector(CRStringView, const auto *val, ox::VectorMemMap<PlatSpec> vecVal) noexcept;
 
-		constexpr ox::Error fieldArray(CRStringView name, ox::ModelValueArray const*val) noexcept;
-
 		constexpr bool unionCheckAndIt() noexcept;
 };
 
@@ -174,19 +165,15 @@ constexpr ox::Error Preloader<PlatSpec>::field(CRStringView name, const T *val)
 	}
 	oxReturnError(pad(val));
 	if constexpr(ox::is_integral_v<T>) {
-		return ox::serialize(m_writer, PlatSpec::correctEndianness(*val));
+		//oxDebugf("Preloader::field(name, val): {}", name);
+		return ox::serialize(&m_writer, PlatSpec::correctEndianness(*val));
 	} else if constexpr(ox::is_pointer_v<T>) {
-		const PtrType a = startAlloc(sizeOf<PlatSpec>(val), alignOf<PlatSpec>(*val), m_writer.tellp()) + PlatSpec::RomStart;
+		const PtrType a = startAlloc(sizeOf<PlatSpec>(*val), m_writer.tellp()) + PlatSpec::RomStart;
 		oxReturnError(field(name, *val));
 		oxReturnError(endAlloc());
-		return ox::serialize(m_writer, PlatSpec::correctEndianness(a));
-	} else if constexpr(ox::isVector_v<T>) {
+		return ox::serialize(&m_writer, PlatSpec::correctEndianness(a));
+	} else if constexpr(ox::isVector_v<T> || ox::is_same_v<T, ox::ModelValueVector>) {
 		return fieldVector(name, val);
-	} else if constexpr(ox::is_same_v<T, ox::ModelValueVector>) {
-		val->types();
-		return fieldVector(name, val);
-	} else if constexpr(ox::is_same_v<T, ox::ModelValueArray>) {
-		return fieldArray(name, val);
 	} else {
 		m_unionIdx.emplace_back(-1);
 		const auto out = preload<PlatSpec, T>(this, val);
@@ -212,7 +199,7 @@ constexpr ox::Error Preloader<PlatSpec>::field(CRStringView, const ox::BasicStri
 	const auto restore = m_writer.tellp();
 	std::size_t a = 0;
 	if (sz && sz >= SmallStringSize) {
-		oxReturnError(ox::allocate(m_writer, sz).moveTo(a));
+		oxReturnError(ox::allocate(&m_writer, sz).moveTo(a));
 	} else {
 		a = restore;
 	}
@@ -220,7 +207,7 @@ constexpr ox::Error Preloader<PlatSpec>::field(CRStringView, const ox::BasicStri
 	oxReturnError(m_writer.seekp(a));
 	oxReturnError(m_writer.write(val->data(), sz));
 	oxReturnError(m_writer.seekp(restore));
-	oxReturnError(serialize(m_writer, vecVal));
+	oxReturnError(serialize(&m_writer, vecVal));
 	m_ptrs.emplace_back(restore + offsetof(VecMap, items), vecVal.items);
 	return {};
 }
@@ -231,7 +218,6 @@ constexpr ox::Error Preloader<PlatSpec>::field(CRStringView name, const ox::Arra
 	if (!unionCheckAndIt()) {
 		return {};
 	}
-	oxReturnError(pad(&(*val)[0]));
 	// serialize the Array elements
 	if constexpr(sz) {
 		m_unionIdx.emplace_back(-1);
@@ -249,40 +235,28 @@ constexpr ox::Error Preloader<PlatSpec>::field(CRStringView, const T **val, std:
 	if (!unionCheckAndIt()) {
 		return {};
 	}
-	if (cnt) {
-		oxReturnError(pad(*val));
-		// serialize the array
-		m_unionIdx.emplace_back(-1);
-		for (std::size_t i = 0; i < cnt; ++i) {
-			oxReturnError(this->interface()->field(nullptr, &val[i]));
-		}
-		m_unionIdx.pop_back();
+	// serialize the array
+	m_unionIdx.emplace_back(-1);
+	for (std::size_t i = 0; i < cnt; ++i) {
+		oxReturnError(this->interface()->field(nullptr, &val[i]));
 	}
+	m_unionIdx.pop_back();
 	return {};
 }
 
 template<typename PlatSpec>
-constexpr ox::Result<std::size_t> Preloader<PlatSpec>::startAlloc(size_t sz, size_t align) noexcept {
+constexpr ox::Result<std::size_t> Preloader<PlatSpec>::startAlloc(std::size_t sz) noexcept {
+	oxRequire(a, ox::allocate(&m_writer, sz));
 	m_allocStack.emplace_back(static_cast<typename PlatSpec::PtrType>(m_writer.tellp()));
-	oxReturnError(m_writer.seekp(0, ox::ios_base::end));
-	const auto padding = m_writer.tellp() % align;
-	oxRequireM(a, ox::allocate(m_writer, sz + padding));
-	a += padding;
 	oxReturnError(m_writer.seekp(a));
-	m_allocStart.push_back(a);
 	return a;
 }
 
 template<typename PlatSpec>
-constexpr ox::Result<std::size_t> Preloader<PlatSpec>::startAlloc(
-		std::size_t sz, size_t align, std::size_t restore) noexcept {
+constexpr ox::Result<std::size_t> Preloader<PlatSpec>::startAlloc(std::size_t sz, std::size_t restore) noexcept {
+	oxRequire(a, ox::allocate(&m_writer, sz));
 	m_allocStack.emplace_back(restore, ox::ios_base::beg);
-	oxReturnError(m_writer.seekp(0, ox::ios_base::end));
-	const auto padding = m_writer.tellp() % align;
-	oxRequireM(a, ox::allocate(m_writer, sz + padding));
-	a += padding;
 	oxReturnError(m_writer.seekp(a));
-	m_allocStart.push_back(a);
 	return a;
 }
 
@@ -294,7 +268,6 @@ constexpr ox::Error Preloader<PlatSpec>::endAlloc() noexcept {
 	const auto &si = *m_allocStack.back().unwrap();
 	oxReturnError(m_writer.seekp(static_cast<ox::ssize_t>(si.restore), si.seekdir));
 	m_allocStack.pop_back();
-	m_allocStart.pop_back();
 	return {};
 }
 
@@ -302,9 +275,8 @@ template<typename PlatSpec>
 constexpr ox::Error Preloader<PlatSpec>::offsetPtrs(std::size_t offset) noexcept {
 	for (const auto &p : m_ptrs) {
 		oxReturnError(m_writer.seekp(p.loc));
-		const auto val = PlatSpec::template correctEndianness<typename PlatSpec::PtrType>(
-				static_cast<typename PlatSpec::PtrType>(p.value + offset));
-		oxReturnError(ox::serialize(m_writer, val));
+		const auto val = PlatSpec::template correctEndianness<typename PlatSpec::PtrType>(static_cast<typename PlatSpec::PtrType>(p.value + offset));
+		oxReturnError(ox::serialize(&m_writer, val));
 	}
 	oxReturnError(m_writer.seekp(0, ox::ios_base::end));
 	return {};
@@ -323,12 +295,11 @@ constexpr ox::Error Preloader<PlatSpec>::pad(const T *v) noexcept {
 }
 
 template<typename PlatSpec>
-constexpr ox::Error Preloader<PlatSpec>::fieldVector(
-		CRStringView name, const ox::ModelValueVector *val) noexcept {
+constexpr ox::Error Preloader<PlatSpec>::fieldVector(CRStringView name, const ox::ModelValueVector *val) noexcept {
 	// serialize the Vector
 	ox::VectorMemMap<PlatSpec> vecVal{
-			.size = PlatSpec::correctEndianness(static_cast<typename PlatSpec::size_t>(val->size())),
-			.cap = PlatSpec::correctEndianness(static_cast<typename PlatSpec::size_t>(val->size())),
+		.size = PlatSpec::correctEndianness(static_cast<typename PlatSpec::size_t>(val->size())),
+		.cap = PlatSpec::correctEndianness(static_cast<typename PlatSpec::size_t>(val->size())),
 	};
 	return fieldVector(name, val, vecVal);
 }
@@ -356,11 +327,7 @@ constexpr ox::Error Preloader<PlatSpec>::fieldVector(
 	// serialize the Vector elements
 	if (val->size()) {
 		const auto sz = sizeOf<PlatSpec>(&(*val)[0]) * val->size();
-		const auto align = alignOf<PlatSpec>((*val)[0]);
-		oxReturnError(m_writer.seekp(0, ox::ios_base::end));
-		const auto padding = m_writer.tellp() % align;
-		oxRequireM(p, ox::allocate(m_writer, sz + padding));
-		p += padding;
+		oxRequire(p, ox::allocate(&m_writer, sz));
 		oxReturnError(m_writer.seekp(p));
 		m_unionIdx.emplace_back(-1);
 		for (std::size_t i = 0; i < val->size(); ++i) {
@@ -374,22 +341,11 @@ constexpr ox::Error Preloader<PlatSpec>::fieldVector(
 		vecVal.items = 0;
 	}
 	// serialize the Vector
-	oxReturnError(serialize(m_writer, vecVal));
+	oxReturnError(serialize(&m_writer, vecVal));
 	m_ptrs.emplace_back(m_writer.tellp() - PtrSize, vecVal.items);
 	return {};
 }
 
-template<typename PlatSpec>
-constexpr ox::Error Preloader<PlatSpec>::fieldArray(CRStringView, ox::ModelValueArray const*val) noexcept {
-	oxDebugf("array size: {}", val->size());
-	oxDebugf("array sizeOf: {}", sizeOf<PlatSpec>(val));
-	oxReturnError(pad(&(*val)[0]));
-	for (auto const&v : *val) {
-		oxReturnError(this->interface()->field({}, &v));
-	}
-	return {};
-}
-
 template<typename PlatSpec>
 constexpr bool Preloader<PlatSpec>::unionCheckAndIt() noexcept {
 	auto &u = *m_unionIdx.back().unwrap();

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

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

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

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

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

@@ -105,7 +105,6 @@ install(
 		heapmgr.hpp
 		iterator.hpp
 		math.hpp
-		maybeview.hpp
 		memops.hpp
 		memory.hpp
 		new.hpp

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

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

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

@@ -1,102 +0,0 @@
-
-#pragma once
-
-#include "assert.hpp"
-#include "array.hpp"
-#include "def.hpp"
-#include "span.hpp"
-
-namespace ox {
-
-class AnyPtr {
-	private:
-		struct WrapBase {
-			virtual constexpr ~WrapBase() = default;
-			virtual constexpr WrapBase *copyTo(ox::Span<char> s) noexcept = 0;
-			virtual constexpr operator bool() const noexcept = 0;
-		};
-
-		template<typename T>
-		struct Wrap: public WrapBase {
-			T *data{};
-			constexpr Wrap(T *pData) noexcept: data(pData) {
-			}
-			constexpr WrapBase *copyTo(ox::Span<char> s) noexcept override {
-				oxAssert(s.size() >= sizeof(Wrap), "too small buffer");
-				if (std::is_constant_evaluated()) {
-					return new Wrap(data);
-				} else {
-					return new(s.data()) Wrap(data);
-				}
-			}
-			constexpr operator bool() const noexcept override {
-				return data != nullptr;
-			}
-		};
-
-		WrapBase *m_wrapPtr{};
-		ox::Array<char, sizeof(Wrap<void*>)> m_wrapData;
-
-	public:
-		constexpr AnyPtr() noexcept = default;
-
-		template<typename T>
-		constexpr AnyPtr(T *ptr) noexcept {
-			if (std::is_constant_evaluated()) {
-				m_wrapPtr = new Wrap(ptr);
-			} else {
-				m_wrapPtr = new(m_wrapData.data()) Wrap(ptr);
-			}
-		}
-
-		constexpr AnyPtr(AnyPtr const&other) noexcept {
-			if (other) {
-				m_wrapPtr = other.m_wrapPtr->copyTo(m_wrapData);
-			}
-		}
-
-		constexpr ~AnyPtr() noexcept {
-			if (std::is_constant_evaluated()) {
-				ox::safeDelete(m_wrapPtr);
-			}
-		}
-
-		template<typename T>
-		constexpr AnyPtr &operator=(T *ptr) noexcept {
-			if (std::is_constant_evaluated()) {
-				ox::safeDelete(m_wrapPtr);
-				m_wrapPtr = new Wrap(ptr);
-			} else {
-				m_wrapPtr = new(m_wrapData.data()) Wrap(ptr);
-			}
-			return *this;
-		}
-
-		constexpr AnyPtr &operator=(AnyPtr const&ptr) noexcept {
-			if (this != &ptr) {
-				if (ptr) {
-					ox::safeDelete(m_wrapPtr);
-					m_wrapPtr = ptr.m_wrapPtr->copyTo(m_wrapData);
-				} else {
-					m_wrapPtr = nullptr;
-				}
-			}
-			return *this;
-		}
-
-		constexpr operator bool() const noexcept {
-			return m_wrapPtr && *m_wrapPtr;
-		}
-
-		template<typename T>
-		[[nodiscard]]
-		constexpr T *get() const noexcept {
-#ifdef OX_BARE_METAL
-			return static_cast<Wrap<T>*>(m_wrapPtr)->data;
-#else
-			return dynamic_cast<Wrap<T>*>(m_wrapPtr)->data;
-#endif
-		}
-};
-
-}

deps/ox/src/ox/std/array.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -13,6 +13,7 @@
 #include "initializerlist.hpp"
 #include "iterator.hpp"
 #include "math.hpp"
+#include "memory.hpp"
 #include "new.hpp"
 #include "types.hpp"
 #include "utility.hpp"

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

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #include "stacktrace.hpp"

deps/ox/src/ox/std/assert.hpp

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -131,7 +131,7 @@ class BaseStringView {
 
 		constexpr explicit BaseStringView(std::nullptr_t) noexcept {}
 
-		constexpr explicit BaseStringView(const char *str) noexcept: m_str(str), m_len(str ? ox::strlen(str) : 0) {}
+		constexpr explicit BaseStringView(const char *str) noexcept: m_str(str), m_len(str ? ox_strlen(str) : 0) {}
 
 		constexpr explicit BaseStringView(const char *str, std::size_t len) noexcept: m_str(str), m_len(len) {}
 

deps/ox/src/ox/std/bit.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #include "bit.hpp"

deps/ox/src/ox/std/bit.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -34,7 +34,7 @@ namespace ox {
 template<typename To, typename From>
 constexpr typename enable_if<sizeof(To) == sizeof(From), To>::type cbit_cast(From src) noexcept {
 	To dst = {};
-	ox::memcpy(&dst, &src, sizeof(src));
+	ox_memcpy(&dst, &src, sizeof(src));
 	return dst;
 }
 

deps/ox/src/ox/std/bounds.hpp

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

deps/ox/src/ox/std/bstring.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -109,7 +109,7 @@ constexpr BString<size>::BString(const char *str) noexcept: m_buff{{0}} {
 template<std::size_t size>
 constexpr BString<size> &BString<size>::operator=(Integer_c auto i) noexcept {
 	char str[65] = {};
-	ox::itoa(i, str);
+	ox_itoa(i, str);
 	return this->operator=(str);
 }
 
@@ -119,7 +119,7 @@ constexpr BString<size> &BString<size>::operator=(ox::CRStringView str) noexcept
 	if (cap() < strLen) {
 		strLen = cap();
 	}
-	ox::memcpy(m_buff, str.data(), strLen);
+	ox_memcpy(m_buff, str.data(), strLen);
 	// make sure last element is a null terminator
 	m_buff[strLen] = 0;
 	return *this;
@@ -127,11 +127,11 @@ constexpr BString<size> &BString<size>::operator=(ox::CRStringView str) noexcept
 
 template<std::size_t size>
 constexpr BString<size> &BString<size>::operator=(const char *str) noexcept {
-	std::size_t strLen = ox::strlen(str) + 1;
+	std::size_t strLen = ox_strlen(str) + 1;
 	if (cap() < strLen) {
 		strLen = cap();
 	}
-	ox::memcpy(m_buff, str, strLen);
+	ox_memcpy(m_buff, str, strLen);
 	// make sure last element is a null terminator
 	m_buff[cap()] = 0;
 	return *this;
@@ -144,7 +144,7 @@ constexpr BString<size> &BString<size>::operator=(char *str) noexcept {
 
 template<std::size_t size>
 constexpr BString<size> &BString<size>::operator+=(const char *str) noexcept {
-	std::size_t strLen = ox::strlen(str) + 1;
+	std::size_t strLen = ox_strlen(str) + 1;
 	oxIgnoreError(append(str, strLen));
 	return *this;
 }
@@ -157,7 +157,7 @@ constexpr BString<size> &BString<size>::operator+=(char *str) noexcept {
 template<std::size_t size>
 constexpr BString<size> &BString<size>::operator+=(Integer_c auto i) noexcept {
 	char str[65] = {};
-	ox::itoa(i, str);
+	ox_itoa(i, str);
 	return this->operator+=(str);
 }
 
@@ -171,7 +171,7 @@ constexpr BString<size> &BString<size>::operator+=(StringView s) noexcept {
 template<std::size_t size>
 constexpr BString<size> BString<size>::operator+(const char *str) const noexcept {
 	auto out = *this;
-	std::size_t strLen = ox::strlen(str) + 1;
+	std::size_t strLen = ox_strlen(str) + 1;
 	oxIgnoreError(out.append(str, strLen));
 	return out;
 }
@@ -184,7 +184,7 @@ constexpr BString<size> BString<size>::operator+(char *str) const noexcept {
 template<std::size_t size>
 constexpr BString<size> BString<size>::operator+(Integer_c auto i) const noexcept {
 	char str[65] = {};
-	ox::itoa(i, str);
+	ox_itoa(i, str);
 	return this->operator+(str);
 }
 
@@ -226,7 +226,7 @@ constexpr Error BString<buffLen>::append(const char *str, std::size_t strLen) no
 		strLen = cap() - currentLen;
 		err = OxError(1, "Insufficient space for full string");
 	}
-	ox::strncpy(m_buff + currentLen, str, strLen);
+	ox_strncpy(m_buff + currentLen, str, strLen);
 	// make sure last element is a null terminator
 	m_buff[currentLen + strLen] = 0;
 	return err;

deps/ox/src/ox/std/buffer.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #include "error.hpp"

deps/ox/src/ox/std/buffer.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -192,7 +192,7 @@ class BufferReader {
 			if (m_it + sz > m_size) [[unlikely]] {
 				return OxError(1, "Read failed: Buffer overrun");
 			}
-			ox::memcpy(v, &m_buff[m_it], sz);
+			ox_memcpy(v, &m_buff[m_it], sz);
 			m_it += sz;
 			return sz;
 		}

deps/ox/src/ox/std/buildinfo.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 namespace ox::buildinfo {

deps/ox/src/ox/std/buildinfo.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 namespace ox::buildinfo {

deps/ox/src/ox/std/byteswap.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #include "byteswap.hpp"

deps/ox/src/ox/std/byteswap.hpp

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,10 +11,8 @@
 #include "types.hpp"
 #include "typetraits.hpp"
 
-namespace ox {
-
 template<typename T1, typename T2>
-constexpr T1 strncpy(T1 dest, T2 src, std::size_t maxLen) noexcept {
+constexpr T1 ox_strncpy(T1 dest, T2 src, std::size_t maxLen) noexcept {
 	using T1Type = typename ox::remove_reference<decltype(dest[0])>::type;
 	std::size_t i = 0;
 	while (i < maxLen && src[i]) {
@@ -27,7 +25,7 @@ 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 auto ox_strnlen(const char *str1, std::size_t maxLen) noexcept {
 	std::size_t len = 0;
 	for (; len < maxLen && str1[len]; len++);
 	return len;
@@ -35,7 +33,7 @@ constexpr auto strnlen(const char *str1, std::size_t maxLen) noexcept {
 
 template<typename T>
 [[nodiscard]]
-constexpr auto strlen(T const&str1) noexcept {
+constexpr auto ox_strlen(T const&str1) noexcept {
 	std::size_t len = 0;
 	for (; str1[len]; len++);
 	return len;
@@ -43,7 +41,7 @@ constexpr auto strlen(T const&str1) noexcept {
 
 template<typename T1, typename T2>
 [[nodiscard]]
-constexpr int strcmp(const T1 &str1, const T2 &str2) noexcept {
+constexpr int ox_strcmp(const T1 &str1, const T2 &str2) noexcept {
 	auto retval = 0;
 	auto i = 0u;
 	while (str1[i] || str2[i]) {
@@ -61,7 +59,7 @@ constexpr int strcmp(const T1 &str1, const T2 &str2) noexcept {
 
 template<typename T1, typename T2>
 [[nodiscard]]
-constexpr int strncmp(T1 const&str1, T2 const&str2, const std::size_t maxLen) noexcept {
+constexpr int ox_strncmp(T1 const&str1, T2 const&str2, const std::size_t maxLen) noexcept {
 	auto retval = 0;
 	std::size_t i = 0;
 	while (i < maxLen && (str1[i] || str2[i])) {
@@ -78,7 +76,7 @@ constexpr int strncmp(T1 const&str1, T2 const&str2, const std::size_t maxLen) no
 }
 
 [[nodiscard]]
-constexpr const char *strchr(const char *str, int character, std::size_t maxLen = 0xFFFFFFFF) noexcept {
+constexpr const char *ox_strchr(const char *str, int character, std::size_t maxLen = 0xFFFFFFFF) noexcept {
 	for (std::size_t i = 0; i <= maxLen; i++) {
 		if (str[i] == character) {
 			return &str[i];
@@ -90,7 +88,7 @@ constexpr const char *strchr(const char *str, int character, std::size_t maxLen
 }
 
 [[nodiscard]]
-constexpr char *strchr(char *str, int character, std::size_t maxLen = 0xFFFFFFFF) noexcept {
+constexpr char *ox_strchr(char *str, int character, std::size_t maxLen = 0xFFFFFFFF) noexcept {
 	for (std::size_t i = 0; i < maxLen; i++) {
 		if (str[i] == character) {
 			return &str[i];
@@ -102,7 +100,7 @@ constexpr char *strchr(char *str, int character, std::size_t maxLen = 0xFFFFFFFF
 }
 
 [[nodiscard]]
-constexpr int lastIndexOf(const auto &str, int character, std::size_t maxLen = 0xFFFFFFFF) noexcept {
+constexpr int ox_lastIndexOf(const auto &str, int character, std::size_t maxLen = 0xFFFFFFFF) noexcept {
 	int retval = -1;
 	for (std::size_t i = 0; i < maxLen && str[i]; i++) {
 		if (str[i] == character) {
@@ -113,7 +111,7 @@ constexpr int lastIndexOf(const auto &str, int character, std::size_t maxLen = 0
 }
 
 template<typename Integer, typename T>
-constexpr T itoa(Integer v, T str) noexcept {
+constexpr T ox_itoa(Integer v, T str) noexcept {
 	if (v) {
 		ox::ResizedInt_t<Integer, 64> mod = 1000000000000000000;
 		ox::ResizedInt_t<Integer, 64> val = v;
@@ -145,5 +143,3 @@ constexpr T itoa(Integer v, T str) noexcept {
 	}
 	return str;
 }
-
-}

deps/ox/src/ox/std/def.hpp

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

deps/ox/src/ox/std/defer.hpp

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/std/fmt.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #include "fmt.hpp"

deps/ox/src/ox/std/fmt.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -81,7 +81,7 @@ class FmtArg {
 			if constexpr(is_bool_v<T>) {
 				return v ? "true" : "false";
 			} else if constexpr(is_integer_v<T>) {
-				return ox::itoa(v, dataStr);
+				return ox_itoa(v, dataStr);
 			} else {
 				return toStringView(v);
 			}
@@ -126,11 +126,11 @@ struct FmtSegment {
 	unsigned length = 0;
 
 	constexpr bool operator==(const FmtSegment &o) const noexcept {
-		return length == o.length && ox::strncmp(str, o.str, length) == 0;
+		return length == o.length && ox_strncmp(str, o.str, length) == 0;
 	}
 
 	constexpr bool operator!=(const FmtSegment &o) const noexcept {
-		return length != o.length || ox::strncmp(str, o.str, length) != 0;
+		return length != o.length || ox_strncmp(str, o.str, length) != 0;
 	}
 };
 

deps/ox/src/ox/std/hardware.hpp

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2022 gary@drinkingtea.net
+ * Copyright 2015 - 2023 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -45,16 +45,16 @@ class HashMap {
 
 		constexpr HashMap &operator=(HashMap &&other) noexcept;
 
-		constexpr T &operator[](MaybeView_t<K> const&key);
+		constexpr T &operator[](MaybeSV_t<K> const&key);
 
-		constexpr Result<T*> at(MaybeView_t<K> const&key) noexcept;
+		constexpr Result<T*> at(MaybeSV_t<K> const&key) noexcept;
 
-		constexpr Result<const T*> at(MaybeView_t<K> const&key) const noexcept;
+		constexpr Result<const T*> at(MaybeSV_t<K> const&key) const noexcept;
 
-		constexpr void erase(MaybeView_t<K> const&key);
+		constexpr void erase(MaybeSV_t<K> const&key);
 
 		[[nodiscard]]
-		constexpr bool contains(MaybeView_t<K> const&key) const noexcept;
+		constexpr bool contains(MaybeSV_t<K> const&key) const noexcept;
 
 		[[nodiscard]]
 		constexpr std::size_t size() const noexcept;
@@ -134,7 +134,7 @@ 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[](MaybeSV_t<K> const&k) {
 	auto &p = access(m_pairs, k);
 	if (p == nullptr) {
 		if (static_cast<double>(m_pairs.size()) * 0.7 <
@@ -149,7 +149,7 @@ constexpr T &HashMap<K, T>::operator[](MaybeView_t<K> const&k) {
 }
 
 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(MaybeSV_t<K> const&k) noexcept {
 	auto p = access(m_pairs, k);
 	if (!p) {
 		return {nullptr, OxError(1, "value not found for given key")};
@@ -158,7 +158,7 @@ constexpr Result<T*> HashMap<K, T>::at(MaybeView_t<K> const&k) noexcept {
 }
 
 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(MaybeSV_t<K> const&k) const noexcept {
 	auto p = access(m_pairs, k);
 	if (!p) {
 		return {nullptr, OxError(1, "value not found for given key")};
@@ -167,7 +167,7 @@ constexpr Result<const T*> HashMap<K, T>::at(MaybeView_t<K> const&k) const noexc
 }
 
 template<typename K, typename T>
-constexpr void HashMap<K, T>::erase(MaybeView_t<K> const&k) {
+constexpr void HashMap<K, T>::erase(MaybeSV_t<K> const&k) {
 	if (!contains(k)) {
 		return;
 	}
@@ -185,7 +185,7 @@ constexpr void HashMap<K, T>::erase(MaybeView_t<K> const&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(MaybeSV_t<K> const&k) const noexcept {
 	return access(m_pairs, k) != nullptr;
 }
 
@@ -212,7 +212,7 @@ template<typename K, typename T>
 constexpr void HashMap<K, T>::expand() {
 	Vector<Pair*> r;
 	for (std::size_t i = 0; i < m_keys.size(); ++i) {
-		auto const&k = m_keys[i];
+		K k{m_keys[i]};
 		access(r, k) = std::move(access(m_pairs, k));
 	}
 	m_pairs = std::move(r);

deps/ox/src/ox/std/heapmgr.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
 #include "assert.hpp"