[keel] Cleanup

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

@@ -12,7 +12,7 @@
 
 namespace ox {
 
-ox::Result<ox::StringView> readClawTypeId(ox::BufferView buff) noexcept {
+Result<StringView> readClawTypeId(BufferView const buff) noexcept {
 	auto buffRaw = buff.data();
 	auto buffLen = buff.size();
 	size_t outSz{};
@@ -43,7 +43,7 @@ ox::Result<ox::StringView> readClawTypeId(ox::BufferView buff) noexcept {
 	return {{buff.data() + fmtSz, outSz - fmtSz - 1}};
 }
 
-Result<ClawHeader> readClawHeader(ox::BufferView buff) noexcept {
+Result<ClawHeader> readClawHeader(BufferView const buff) noexcept {
 	auto buffRaw = buff.data();
 	auto buffLen = buff.size();
 	const auto s1End = ox::strchr(buffRaw, ';', buffLen);
@@ -87,7 +87,7 @@ Result<ClawHeader> readClawHeader(ox::BufferView buff) noexcept {
 	return hdr;
 }
 
-Result<BufferView> stripClawHeader(ox::BufferView buff) noexcept {
+Result<BufferView> stripClawHeader(BufferView const buff) noexcept {
 	OX_REQUIRE(header, readClawHeader(buff));
 	return {{header.data, header.dataSize}};
 }
@@ -106,15 +106,14 @@ Result<ModelObject> readClaw(TypeStore &ts, BufferView buff) noexcept {
 		{
 			ox::BufferReader br({header.data, header.dataSize});
 			MetalClawReader reader(br);
-			ModelHandlerInterface handler(&reader);
-			OX_RETURN_ERROR(model(&handler, &obj));
+			OX_RETURN_ERROR(model(reader.interface(), &obj));
 			return obj;
 		}
 		case ClawFormat::Organic:
 		{
 #ifdef OX_USE_STDLIB
 			OrganicClawReader reader({header.data, header.dataSize});
-			ModelHandlerInterface handler(&reader);
+			ModelHandlerInterface handler(reader);
 			OX_RETURN_ERROR(model(&handler, &obj));
 			return obj;
 #else

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

@@ -52,8 +52,7 @@ Error readClaw(ox::BufferView buff, T &val) {
 		{
 			ox::BufferReader br({header.data, header.dataSize});
 			MetalClawReader reader(br);
-			ModelHandlerInterface handler(&reader);
-			return model(&handler, &val);
+			return model(reader.interface(), &val);
 		}
 		case ClawFormat::Organic:
 		{

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

@@ -135,7 +135,7 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 				constexpr auto hdr = ox::StringLiteral("M2;com.drinkingtea.ox.claw.test.Header2;3;awefawf");
 				constexpr auto expected = ox::StringLiteral("com.drinkingtea.ox.claw.test.Header2;3");
 				OX_REQUIRE(actual, ox::readClawTypeId({hdr.data(), hdr.size() + 1}));
-				oxExpect(actual, expected);
+				ox::expect(actual, expected);
 				return ox::Error{};
 			}
 		},

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

@@ -122,7 +122,7 @@ class Signal {
 			}
 		};
 
-		mutable Vector<UniquePtr<BaseSlot>> m_slots;
+		mutable Vector<UPtr<BaseSlot>> m_slots;
 
 	public:
 		~Signal() noexcept;
@@ -303,7 +303,7 @@ class Signal<Error(Args...)> {
 			}
 		};
 
-		mutable Vector<UniquePtr<BaseSlot>> m_slots;
+		mutable Vector<UPtr<BaseSlot>> m_slots;
 
 	public:
 		~Signal() noexcept;

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

@@ -74,9 +74,9 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				ox::PathIterator it(path);
 				ox::StringView buff;
 				oxAssert(it.next(buff), "PathIterator::next returned error");
-				oxExpect(buff, "usr");
+				ox::expect(buff, "usr");
 				oxAssert(it.next(buff), "PathIterator::next returned error");
-				oxExpect(buff, "share");
+				ox::expect(buff, "share");
 				return ox::Error(0);
 			}
 		},
@@ -175,8 +175,8 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				auto list = new (ox_alloca(buffLen)) ox::ptrarith::NodeBuffer<uint32_t, ox::FileStoreItem<uint32_t>>(buffLen);
 				oxAssert(ox::FileStore32::format(list, buffLen), "FileStore::format failed.");
 				ox::FileStore32 fileStore(list, buffLen);
-				oxAssert(fileStore.write(4, const_cast<char*>(str1), str1Len, 1), "FileStore::write 1 failed.");
-				oxAssert(fileStore.write(5, const_cast<char*>(str2), str2Len, 1), "FileStore::write 2 failed.");
+				oxAssert(fileStore.write(4, str1, str1Len, 1), "FileStore::write 1 failed.");
+				oxAssert(fileStore.write(5, str2, str2Len, 1), "FileStore::write 2 failed.");
 
 				char str1Read[str1Len];
 				size_t str1ReadSize = 0;

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

@@ -34,7 +34,7 @@ static ox::Result<Buff> loadFsBuff(const char *path) noexcept {
 	}
 }
 
-static ox::Result<ox::UniquePtr<ox::FileSystem>> loadFs(const char *path) noexcept {
+static ox::Result<ox::UPtr<ox::FileSystem>> loadFs(const char *path) noexcept {
 	OX_REQUIRE(buff, loadFsBuff(path));
 	return {ox::make_unique<ox::FileSystem32>(buff.data, buff.size)};
 }

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

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

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

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

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

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

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

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

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

@@ -32,58 +32,58 @@ class MetalClawReaderTemplate: public ModelHandlerBase<MetalClawReaderTemplate<R
 
 	private:
 		FieldBitmapReader<Reader> m_fieldPresence;
-		std::size_t m_fields = 0;
-		std::size_t m_field = 0;
-		ox::Optional<int> m_unionIdx;
+		size_t m_fields{};
+		size_t m_field{};
+		Optional<int> const m_unionIdx{};
 		Reader &m_reader;
 
 	public:
 		explicit constexpr MetalClawReaderTemplate(
 				Reader &reader,
-				ox::Optional<int> const&unionIdx = {}) noexcept;
+				Optional<int> const &unionIdx = {}) noexcept;
 
 		constexpr ~MetalClawReaderTemplate() noexcept;
 
-		constexpr Error field(const char*, int8_t *val) noexcept;
-		constexpr Error field(const char*, int16_t *val) noexcept;
-		constexpr Error field(const char*, int32_t *val) noexcept;
-		constexpr Error field(const char*, int64_t *val) noexcept;
+		constexpr Error field(CString, int8_t *val) noexcept;
+		constexpr Error field(CString, int16_t *val) noexcept;
+		constexpr Error field(CString, int32_t *val) noexcept;
+		constexpr Error field(CString, int64_t *val) noexcept;
 
-		constexpr Error field(const char*, uint8_t *val) noexcept;
-		constexpr Error field(const char*, uint16_t *val) noexcept;
-		constexpr Error field(const char*, uint32_t *val) noexcept;
-		constexpr Error field(const char*, uint64_t *val) noexcept;
+		constexpr Error field(CString, uint8_t *val) noexcept;
+		constexpr Error field(CString, uint16_t *val) noexcept;
+		constexpr Error field(CString, uint32_t *val) noexcept;
+		constexpr Error field(CString, uint64_t *val) noexcept;
 
-		constexpr Error field(const char*, bool *val) noexcept;
+		constexpr Error field(CString, bool *val) noexcept;
 
 		// array handler
-		constexpr Error field(const char*, auto *val, std::size_t len) noexcept;
+		constexpr Error field(CString, auto *val, size_t valLen) noexcept;
 
 		// map handler
 		template<typename T>
-		constexpr Error field(const char*, HashMap<String, T> *val) noexcept;
+		constexpr Error field(CString, HashMap<String, T> *val) noexcept;
 
 		// array handler, with callback to allow handling individual elements
 		template<typename T, typename CB>
-		constexpr Error field(const char*, CB cb) noexcept;
+		constexpr Error field(CString, CB cb) noexcept;
 
 		template<typename T>
-		constexpr Error field(const char*, T *val) noexcept;
+		constexpr Error field(CString, T *val) noexcept;
 
 		template<typename U, bool force>
-		constexpr Error field(const char*, UnionView<U, force> val) noexcept;
+		constexpr Error field(CString, UnionView<U, force> val) noexcept;
 
-		template<std::size_t SmallStringSize>
-		constexpr Error field(const char*, BasicString<SmallStringSize> *val) noexcept;
+		template<size_t SmallStringSize>
+		constexpr Error field(CString, BasicString<SmallStringSize> *val) noexcept;
 
-		template<std::size_t L>
-		constexpr Error field(const char*, IString<L> *val) noexcept;
+		template<size_t L>
+		constexpr Error field(CString, IString<L> *val) noexcept;
 
-		constexpr Error fieldCString(const char*, char *val, std::size_t buffLen) noexcept;
+		constexpr Error fieldCString(CString, char *val, size_t buffLen) noexcept;
 
-		constexpr Error fieldCString(const char*, char **val) noexcept;
+		constexpr Error fieldCString(CString, char **val) noexcept;
 
-		constexpr Error fieldCString(const char*, char **val, std::size_t buffLen) noexcept;
+		constexpr Error fieldCString(CString, char **val, size_t buffLen) noexcept;
 
 		/**
 		 * Reads an array length from the current location in the buffer.
@@ -101,13 +101,13 @@ class MetalClawReaderTemplate: public ModelHandlerBase<MetalClawReaderTemplate<R
 				const char *name = T::TypeName,
 				int version = T::TypeVersion,
 				const Vector<String>& = {},
-				std::size_t fields = ModelFieldCount_v<T>) noexcept;
+				size_t fields = ModelFieldCount_v<T>) noexcept;
 
 		/**
 		 * Returns a MetalClawReader to parse a child object.
 		 */
 		[[nodiscard]]
-		constexpr MetalClawReaderTemplate<Reader> child(const char *name, ox::Optional<int> unionIdx = {}) noexcept;
+		constexpr MetalClawReaderTemplate<Reader> child(const char *name, Optional<int> unionIdx = {}) noexcept;
 
 		/**
 		 * Indicates whether or not the next field to be read is present.
@@ -122,20 +122,20 @@ class MetalClawReaderTemplate: public ModelHandlerBase<MetalClawReaderTemplate<R
 		constexpr bool fieldPresent(int fieldNo) const noexcept;
 
 		[[nodiscard]]
-		constexpr int whichFieldPresent(const char *name, const ModelUnion&) const noexcept;
+		constexpr int whichFieldPresent(const char *name, ModelUnion const&) const noexcept;
 
 		constexpr void nextField() noexcept;
 
 	private:
 		template<typename I>
-		constexpr Error readInteger(I *val) noexcept;
+		constexpr Error readInteger(I &val) noexcept;
 
 };
 
 template<Reader_c Reader>
 constexpr MetalClawReaderTemplate<Reader>::MetalClawReaderTemplate(
 		Reader &reader,
-		ox::Optional<int> const&unionIdx) noexcept:
+		Optional<int> const &unionIdx) noexcept:
 		m_fieldPresence(reader),
 		m_unionIdx(unionIdx),
 		m_reader(reader) {
@@ -149,50 +149,50 @@ constexpr MetalClawReaderTemplate<Reader>::~MetalClawReaderTemplate() noexcept {
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int8_t *val) noexcept {
-	return readInteger(val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(CString, int8_t *val) noexcept {
+	return readInteger(*val);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int16_t *val) noexcept {
-	return readInteger(val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(CString, int16_t *val) noexcept {
+	return readInteger(*val);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int32_t *val) noexcept {
-	return readInteger(val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(CString, int32_t *val) noexcept {
+	return readInteger(*val);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, int64_t *val) noexcept {
-	return readInteger(val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(CString, int64_t *val) noexcept {
+	return readInteger(*val);
 }
 
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint8_t *val) noexcept {
-	return readInteger(val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(CString, uint8_t *val) noexcept {
+	return readInteger(*val);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint16_t *val) noexcept {
-	return readInteger(val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(CString, uint16_t *val) noexcept {
+	return readInteger(*val);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint32_t *val) noexcept {
-	return readInteger(val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(CString, uint32_t *val) noexcept {
+	return readInteger(*val);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, uint64_t *val) noexcept {
-	return readInteger(val);
+constexpr Error MetalClawReaderTemplate<Reader>::field(CString, uint64_t *val) noexcept {
+	return readInteger(*val);
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, bool *val) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
-		auto const result = m_fieldPresence.get(static_cast<std::size_t>(m_field));
+constexpr Error MetalClawReaderTemplate<Reader>::field(CString, bool *val) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
+		auto const result = m_fieldPresence.get(static_cast<size_t>(m_field));
 		*val = result.value;
 		OX_RETURN_ERROR(result);
 	}
@@ -202,18 +202,19 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, bool *val) n
 
 // array handler
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, auto *val, std::size_t valLen) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::field(
+	const char *name, auto *val, size_t const valLen) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
 			// read the length
-			std::size_t bytesRead = 0;
-			OX_REQUIRE(len, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
+			size_t bytesRead = 0;
+			OX_REQUIRE(len, mc::decodeInteger<ArrayLength>(m_reader, bytesRead));
 			// read the list
 			if (valLen >= len) {
 				auto reader = child({});
 				auto &handler = *reader.interface();
-				OX_RETURN_ERROR(handler.setTypeInfo("List", 0, {}, static_cast<std::size_t>(len)));
-				for (std::size_t i = 0; i < len; ++i) {
+				OX_RETURN_ERROR(handler.setTypeInfo("List", 0, {}, static_cast<size_t>(len)));
+				for (size_t i = 0; i < len; ++i) {
 OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 					OX_RETURN_ERROR(handler.field({}, &val[i]));
 OX_ALLOW_UNSAFE_BUFFERS_END
@@ -230,18 +231,18 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 
 template<Reader_c Reader>
 template<typename T>
-constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, HashMap<String, T> *val) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::field(CString, HashMap<String, T> *val) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
 			// read the length
 			OX_REQUIRE(g, m_reader.tellg());
-			std::size_t bytesRead = 0;
-			OX_REQUIRE(len, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
+			size_t bytesRead = 0;
+			OX_REQUIRE(len, mc::decodeInteger<ArrayLength>(m_reader, bytesRead));
 			OX_RETURN_ERROR(m_reader.seekg(g));
 			// read the list
 			auto reader = child("");
 			auto &handler = *reader.interface();
-			OX_RETURN_ERROR(handler.setTypeInfo("List", 0, {}, static_cast<std::size_t>(len)));
+			OX_RETURN_ERROR(handler.setTypeInfo("List", 0, {}, static_cast<size_t>(len)));
 			// this loop body needs to be in a lambda because of the potential alloca call
 			constexpr auto loopBody = [](auto &handler, auto &val) {
 				OX_REQUIRE(keyLen, handler.stringLength(nullptr));
@@ -250,7 +251,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, HashMap<Stri
 				OX_RETURN_ERROR(handler.fieldCString("", &wkeyPtr, keyLen + 1));
 				return handler.field("", &val[wkeyPtr]);
 			};
-			for (std::size_t i = 0; i < len; ++i) {
+			for (size_t i = 0; i < len; ++i) {
 				OX_RETURN_ERROR(loopBody(handler, *val));
 			}
 		}
@@ -263,9 +264,9 @@ template<Reader_c Reader>
 template<typename T>
 constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, T *val) noexcept {
 	if constexpr(isVector_v<T>) {
-		if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
+		if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
 			// set size of val if the field is present, don't worry about it if not
-			if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+			if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
 				OX_REQUIRE(len, arrayLength(name, false));
 				OX_RETURN_ERROR(ox::resizeVector(*val, len));
 				return field(name, val->data(), val->size());
@@ -275,9 +276,9 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, T *val)
 		++m_field;
 		return {};
 	} else if constexpr(isArray_v<T>) {
-		if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
+		if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
 			// set size of val if the field is present, don't worry about it if not
-			if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+			if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
 				OX_REQUIRE(len, arrayLength(name, false));
 				if (len > val->size()) {
 					return ox::Error(1, "Input array is too long");
@@ -288,8 +289,8 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, T *val)
 		++m_field;
 		return {};
 	} else {
-		if ((!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) && val) {
-			if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+		if ((!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) && val) {
+			if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
 				auto reader = child("");
 				OX_RETURN_ERROR(model(reader.interface(), val));
 			}
@@ -301,9 +302,9 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char *name, T *val)
 
 template<Reader_c Reader>
 template<typename U, bool force>
-constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, UnionView<U, force> val) noexcept {
-	if ((!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) && val.get()) {
-		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::field(CString, UnionView<U, force> val) noexcept {
+	if ((!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) && val.get()) {
+		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
 			auto reader = child("", ox::Optional<int>(ox::in_place, val.idx()));
 			OX_RETURN_ERROR(model(reader.interface(), val.get()));
 		}
@@ -313,13 +314,13 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, UnionView<U,
 }
 
 template<Reader_c Reader>
-template<std::size_t SmallStringSize>
-constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, BasicString<SmallStringSize> *val) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+template<size_t SmallStringSize>
+constexpr Error MetalClawReaderTemplate<Reader>::field(CString, BasicString<SmallStringSize> *val) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
 			// read the length
-			std::size_t bytesRead = 0;
-			OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
+			size_t bytesRead = 0;
+			OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, bytesRead));
 			const auto cap = size;
 			*val = BasicString<SmallStringSize>(cap);
 			auto data = val->data();
@@ -334,13 +335,13 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, BasicString<
 }
 
 template<Reader_c Reader>
-template<std::size_t L>
-constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, IString<L> *val) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+template<size_t L>
+constexpr Error MetalClawReaderTemplate<Reader>::field(CString, IString<L> *val) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
 			// read the length
-			std::size_t bytesRead = 0;
-			OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
+			size_t bytesRead = 0;
+			OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, bytesRead));
 			*val = IString<L>();
 			OX_RETURN_ERROR(val->resize(size));
 			auto const data = val->data();
@@ -355,11 +356,12 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, IString<L> *
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char *val, std::size_t buffLen) noexcept {
-	if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(
+	CString, char *val, size_t const buffLen) noexcept {
+	if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
 		// read the length
-		std::size_t bytesRead = 0;
-		OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
+		size_t bytesRead = 0;
+		OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, bytesRead));
 		if (size > buffLen) {
 			return ox::Error(McOutputBuffEnded);
 		}
@@ -374,11 +376,11 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char **val) noexcept {
-	if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(CString, char **val) noexcept {
+	if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
 		// read the length
-		std::size_t bytesRead = 0;
-		OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
+		size_t bytesRead = 0;
+		OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, bytesRead));
 		// re-allocate in case too small
 		safeDelete(*val);
 		*val = new char[size + 1];
@@ -392,12 +394,12 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char
 }
 
 template<Reader_c Reader>
-constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char **val, std::size_t buffLen) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(CString, char **val, size_t buffLen) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
 			// read the length
-			std::size_t bytesRead = 0;
-			OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, &bytesRead));
+			size_t bytesRead = 0;
+			OX_REQUIRE(size, mc::decodeInteger<StringLength>(m_reader, bytesRead));
 			// re-allocate if too small
 			if (buffLen < size + 1) {
 				safeDelete(*val);
@@ -420,13 +422,13 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char
 }
 
 template<Reader_c Reader>
-constexpr Result<ArrayLength> MetalClawReaderTemplate<Reader>::arrayLength(const char*, bool pass) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+constexpr Result<ArrayLength> MetalClawReaderTemplate<Reader>::arrayLength(CString, bool const pass) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
 			// read the length
-			std::size_t bytesRead = 0;
+			size_t bytesRead = 0;
 			OX_REQUIRE(g, m_reader.tellg());
-			OX_REQUIRE(out, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
+			OX_REQUIRE(out, mc::decodeInteger<ArrayLength>(m_reader, bytesRead));
 			if (!pass) {
 				OX_RETURN_ERROR(m_reader.seekg(g));
 			}
@@ -437,12 +439,12 @@ constexpr Result<ArrayLength> MetalClawReaderTemplate<Reader>::arrayLength(const
 }
 
 template<Reader_c Reader>
-constexpr Result<StringLength> MetalClawReaderTemplate<Reader>::stringLength(const char*) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+constexpr Result<StringLength> MetalClawReaderTemplate<Reader>::stringLength(CString) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
 			// read the length
-			std::size_t bytesRead = 0;
-			auto len = mc::decodeInteger<StringLength>(m_reader, &bytesRead);
+			size_t bytesRead = 0;
+			auto len = mc::decodeInteger<StringLength>(m_reader, bytesRead);
 			OX_RETURN_ERROR(m_reader.seekg(-static_cast<int64_t>(bytesRead), ox::ios_base::cur));
 			return len;
 		}
@@ -452,15 +454,15 @@ constexpr Result<StringLength> MetalClawReaderTemplate<Reader>::stringLength(con
 
 template<Reader_c Reader>
 template<typename I>
-constexpr Error MetalClawReaderTemplate<Reader>::readInteger(I *val) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
-			std::size_t bytesRead = 0;
-			auto const result = mc::decodeInteger<I>(m_reader, &bytesRead);
+constexpr Error MetalClawReaderTemplate<Reader>::readInteger(I &val) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
+			size_t bytesRead = 0;
+			auto const result = mc::decodeInteger<I>(m_reader, bytesRead);
 			OX_RETURN_ERROR(result);
-			*val = result.value;
+			val = result.value;
 		} else {
-			*val = 0;
+			val = 0;
 		}
 	}
 	++m_field;
@@ -469,17 +471,17 @@ constexpr Error MetalClawReaderTemplate<Reader>::readInteger(I *val) noexcept {
 
 template<Reader_c Reader>
 template<typename T, typename CB>
-constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, CB cb) noexcept {
-	if (!m_unionIdx.has_value() || static_cast<std::size_t>(*m_unionIdx) == m_field) {
-		if (m_fieldPresence.get(static_cast<std::size_t>(m_field))) {
+constexpr Error MetalClawReaderTemplate<Reader>::field(CString, CB cb) noexcept {
+	if (!m_unionIdx.has_value() || static_cast<size_t>(*m_unionIdx) == m_field) {
+		if (m_fieldPresence.get(static_cast<size_t>(m_field))) {
 			// read the length
-			std::size_t bytesRead = 0;
-			OX_REQUIRE(len, mc::decodeInteger<ArrayLength>(m_reader, &bytesRead));
+			size_t bytesRead = 0;
+			OX_REQUIRE(len, mc::decodeInteger<ArrayLength>(m_reader, bytesRead));
 			// read the list
 			auto reader = child("");
 			auto &handler = *reader.interface();
-			OX_RETURN_ERROR(handler.setTypeInfo("List", 0, {}, static_cast<std::size_t>(len)));
-			for (std::size_t i = 0; i < len; ++i) {
+			OX_RETURN_ERROR(handler.setTypeInfo("List", 0, {}, static_cast<size_t>(len)));
+			for (size_t i = 0; i < len; ++i) {
 				T val;
 				OX_RETURN_ERROR(handler.field("", &val));
 				OX_RETURN_ERROR(cb(i, &val));
@@ -493,7 +495,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, CB cb) noexc
 template<Reader_c Reader>
 template<typename T>
 constexpr ox::Error MetalClawReaderTemplate<Reader>::setTypeInfo(
-		const char*, int, const Vector<String>&, std::size_t fields) noexcept {
+		CString, int, const Vector<String>&, size_t const fields) noexcept {
 	m_fields = fields;
 	// Warning: narrow-conv
 	return m_reader.seekg(
@@ -503,24 +505,24 @@ constexpr ox::Error MetalClawReaderTemplate<Reader>::setTypeInfo(
 
 template<Reader_c Reader>
 constexpr MetalClawReaderTemplate<Reader> MetalClawReaderTemplate<Reader>::child(
-		const char*,
-		ox::Optional<int> unionIdx) noexcept {
+		CString,
+		Optional<int> const unionIdx) noexcept {
 	return MetalClawReaderTemplate<Reader>(m_reader, unionIdx);
 }
 
 template<Reader_c Reader>
-constexpr bool MetalClawReaderTemplate<Reader>::fieldPresent(const char*) const noexcept {
-	return m_fieldPresence.get(static_cast<std::size_t>(m_field)).value;
+constexpr bool MetalClawReaderTemplate<Reader>::fieldPresent(CString) const noexcept {
+	return m_fieldPresence.get(static_cast<size_t>(m_field)).value;
 }
 
 template<Reader_c Reader>
-constexpr bool MetalClawReaderTemplate<Reader>::fieldPresent(int fieldNo) const noexcept {
-	return m_fieldPresence.get(static_cast<std::size_t>(fieldNo)).value;
+constexpr bool MetalClawReaderTemplate<Reader>::fieldPresent(int const fieldNo) const noexcept {
+	return m_fieldPresence.get(static_cast<size_t>(fieldNo)).value;
 }
 
 template<Reader_c Reader>
 [[nodiscard]]
-constexpr int MetalClawReaderTemplate<Reader>::whichFieldPresent(const char*, const ModelUnion &u) const noexcept {
+constexpr int MetalClawReaderTemplate<Reader>::whichFieldPresent(CString, ModelUnion const &u) const noexcept {
 	FieldBitmapReader<Reader> p(m_reader);
 	for (auto i = 0u; i < u.fieldCount(); ++i) {
 		if (p.get(i)) {
@@ -538,11 +540,10 @@ constexpr void MetalClawReaderTemplate<Reader>::nextField() noexcept {
 using MetalClawReader = MetalClawReaderTemplate<ox::BufferReader>;
 
 template<typename T>
-Error readMC(ox::BufferView buff, T &val) noexcept {
+Error readMC(ox::BufferView const buff, T &val) noexcept {
 	BufferReader br(buff);
 	MetalClawReader reader(br);
-	ModelHandlerInterface<MetalClawReader, ox::OpType::Read> handler(&reader);
-	return model(&handler, &val);
+	return model(reader.interface(), &val);
 }
 
 template<typename T>

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

@@ -157,7 +157,7 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				oxAssert(testIn.Int8                == testOut.Int8,                "Int8 value mismatch");
 				oxAssert(testIn.Union.Int           == testOut.Union.Int,           "Union.Int value mismatch");
 				oxAssert(testIn.String              == testOut.String,              "String value mismatch");
-				oxExpect(testIn.IString,               testOut.IString);
+				ox::expect(testIn.IString,               testOut.IString);
 				oxAssert(testIn.List[0]             == testOut.List[0],             "List[0] value mismatch");
 				oxAssert(testIn.List[1]             == testOut.List[1],             "List[1] value mismatch");
 				oxAssert(testIn.List[2]             == testOut.List[2],             "List[2] value mismatch");

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

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

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

@@ -51,7 +51,7 @@ constexpr auto buildSubscriptStack(const T**, SubscriptStack *s) noexcept {
 }
 
 template<typename T>
-constexpr auto buildSubscriptStack(const UniquePtr<T>*, SubscriptStack *s) noexcept {
+constexpr auto buildSubscriptStack(const UPtr<T>*, SubscriptStack *s) noexcept {
 	s->push_back({.subscriptType = Subscript::SubscriptType::Ptr});
 }
 
@@ -187,7 +187,7 @@ constexpr ox::Error TypeDescWriter::setTypeInfo(
 	PrimitiveType pt;
 	if constexpr(is_union_v<T>) {
 		pt = PrimitiveType::Union;
-	} else if constexpr(isBasicString_v<T> || isBString_v<T>) {
+	} else if constexpr(isBasicString_v<T> || isIString_v<T>) {
 		pt = PrimitiveType::String;
 	} else {
 		pt = PrimitiveType::Struct;
@@ -380,7 +380,7 @@ constexpr const DescriptorType *TypeDescWriter::getType(StringViewCR tn, int typ
 template<typename T>
 constexpr Result<DescriptorType*> buildTypeDef(TypeStore &typeStore) noexcept {
 	TypeDescWriter writer(&typeStore);
-	ModelHandlerInterface<TypeDescWriter, ox::OpType::Reflect> handler(&writer);
+	ModelHandlerInterface<TypeDescWriter, ox::OpType::Reflect> handler(writer);
 	if (std::is_constant_evaluated()) {
 		std::allocator<T> a;
 		T *t = a.allocate(1);
@@ -396,7 +396,7 @@ constexpr Result<DescriptorType*> buildTypeDef(TypeStore &typeStore) noexcept {
 template<typename T>
 constexpr Result<DescriptorType*> buildTypeDef(TypeStore &typeStore, T &val) noexcept {
 	TypeDescWriter writer(&typeStore);
-	ModelHandlerInterface<TypeDescWriter, ox::OpType::Reflect> handler(&writer);
+	ModelHandlerInterface<TypeDescWriter, ox::OpType::Reflect> handler(writer);
 	OX_RETURN_ERROR(model(&handler, &val));
 	return writer.definition();
 }

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

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

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

@@ -6,19 +6,21 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
+#include <ox/std/hashmap.hpp>
+
 #include "modelvalue.hpp"
 
 namespace ox {
 
-static_assert([]() -> ox::Error {
-	ox::ModelValue v;
+static_assert([]() -> Error {
+	ModelValue v;
 	OX_RETURN_ERROR(v.setType<int32_t>());
 	if (v.type() != ModelValue::Type::SignedInteger32) {
-		return ox::Error(1, "type is wrong");
+		return Error(1, "type is wrong");
 	}
 	//oxReturnError(v.set<int32_t>(5));
 	return {};
-}() == ox::Error{});
+}() == Error{});
 
 // a dummy function to prevent linker errors in a library that has no other symbols
 void modelDummyFunc() noexcept {}

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

@@ -100,7 +100,7 @@ class ModelValue {
 				return Type::Union;
 			} else if constexpr(is_same_v<U, ModelObject>) {
 				return Type::Object;
-			} else if constexpr(isBasicString_v<U> || isBString_v<U>) {
+			} else if constexpr(isBasicString_v<U> || isIString_v<U>) {
 				return Type::String;
 			} else if constexpr(is_same_v<U, ModelValueVector>) {
 				return Type::Vector;
@@ -168,7 +168,7 @@ class ModelValue {
 		constexpr const auto &get() const noexcept {
 			constexpr auto type = getType<T>();
 			if (m_type != type) [[unlikely]] {
-				oxPanic(ox::Error(1), "invalid cast");
+				ox::panic("invalid cast");
 			}
 			return getValue<type>(*this);
 		}
@@ -178,7 +178,7 @@ class ModelValue {
 		constexpr auto &get() noexcept {
 			constexpr auto type = getType<T>();
 			if (m_type != type) [[unlikely]] {
-				oxPanic(ox::Error(1), "invalid cast");
+				ox::panic("invalid cast");
 			}
 			return getValue<type>(*this);
 		}
@@ -187,7 +187,7 @@ class ModelValue {
 		constexpr Type type() const noexcept;
 
 		constexpr Error setType(
-				DescriptorType const*type,
+				DescriptorType const *type,
 				SubscriptStack const& = {},
 				int subscriptLevels = 0) noexcept;
 
@@ -200,8 +200,6 @@ class ModelValue {
 		template<typename T>
 		constexpr Error set(T &&v) noexcept;
 
-		constexpr ModelValue &operator=(ModelValue &val) noexcept;
-
 		constexpr ModelValue &operator=(const ModelValue &val) noexcept;
 
 		constexpr ModelValue &operator=(ModelValue &&val) noexcept;
@@ -275,7 +273,7 @@ class ModelValueArray {
 		}
 
 		constexpr Error setType(
-				DescriptorType const*type,
+				DescriptorType const *type,
 				SubscriptStack subscriptStack,
 				int subscriptLevels) noexcept {
 			oxAssert(subscriptLevels <= static_cast<int>(subscriptStack.size()), "subscript level mismatch");
@@ -418,7 +416,7 @@ class ModelValueVector {
 		}
 
 		constexpr Error setType(
-				DescriptorType const*type,
+				DescriptorType const *type,
 				SubscriptStack subscriptStack,
 				int subscriptLevels) noexcept {
 			oxAssert(subscriptLevels <= static_cast<int>(subscriptStack.size()), "subscript level mismatch");
@@ -521,7 +519,7 @@ class ModelObject {
 	protected:
 		OX_MODEL_FRIEND(ModelObject);
 		friend ModelValue;
-		Vector<UniquePtr<Field>> m_fieldsOrder;
+		Vector<UPtr<Field>> m_fieldsOrder;
 		HashMap<String, ModelValue*> m_fields;
 		const DescriptorType *m_type = nullptr;
 
@@ -694,7 +692,7 @@ class ModelUnion {
 		};
 		friend constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept;
 		friend ModelValue;
-		Vector<UniquePtr<Field>> m_fieldsOrder;
+		Vector<UPtr<Field>> m_fieldsOrder;
 		HashMap<String, Field*> m_fields;
 		const DescriptorType *m_type = nullptr;
 		int m_unionIdx = -1;
@@ -720,14 +718,14 @@ class ModelUnion {
 			m_unionIdx = other.m_unionIdx;
 		}
 
-		static constexpr Result<UniquePtr<ModelUnion>> make(const DescriptorType *type) noexcept {
-			UniquePtr<ModelUnion> out(new ModelUnion);
+		static constexpr Result<UPtr<ModelUnion>> make(const DescriptorType *type) noexcept {
+			UPtr<ModelUnion> out(new ModelUnion);
 			OX_RETURN_ERROR(out->setType(type));
 			return out;
 		}
 
-		static constexpr Result<UniquePtr<ModelUnion>> make(const ModelUnion &other) noexcept {
-			return UniquePtr<ModelUnion>(new ModelUnion(other));
+		static constexpr Result<UPtr<ModelUnion>> make(const ModelUnion &other) noexcept {
+			return UPtr<ModelUnion>(new ModelUnion(other));
 		}
 
 		constexpr ox::Result<ModelValue*> at(StringView const&k) noexcept {
@@ -821,7 +819,7 @@ class ModelUnion {
 
 template<typename PlatSpec>
 [[nodiscard]]
-constexpr std::size_t sizeOf(ModelValueArray const*v) noexcept {
+constexpr std::size_t sizeOf(ModelValueArray const *v) noexcept {
 	return sizeOf<PlatSpec>(&(*v)[0]) * v->size();
 }
 
@@ -1176,7 +1174,7 @@ template<typename T>
 constexpr Error ModelValue::set(const T &v) noexcept {
 	constexpr auto type = getType<T>();
 	if (m_type != type) [[unlikely]] {
-		return ox::Error(1, "type mismatch");
+		return Error(1, "type mismatch");
 	}
 	auto &value = getValue<type>(*this);
 	if constexpr(type == Type::Vector || type == Type::Object ||
@@ -1202,10 +1200,6 @@ constexpr Error ModelValue::set(T &&v) noexcept {
 	return {};
 }
 
-constexpr ModelValue &ModelValue::operator=(ModelValue &other) noexcept {
-	return this->operator=(const_cast<const ModelValue&>(other));
-}
-
 constexpr ModelValue &ModelValue::operator=(const ModelValue &other) noexcept {
 	if (this == &other) [[unlikely]] {
 		return *this;

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

@@ -31,18 +31,18 @@
 namespace ox {
 
 namespace types {
-constexpr StringView BasicString = "net.drinkingtea.ox.BasicString";
-constexpr StringView IString     = "net.drinkingtea.ox.IString";
-constexpr StringView String      = "B.string";
-constexpr StringView Bool        = "B.bool";
-constexpr StringView Uint8       = "B.uint8";
-constexpr StringView Uint16      = "B.uint16";
-constexpr StringView Uint32      = "B.uint32";
-constexpr StringView Uint64      = "B.uint64";
-constexpr StringView Int8        = "B.int8";
-constexpr StringView Int16       = "B.int16";
-constexpr StringView Int32       = "B.int32";
-constexpr StringView Int64       = "B.int64";
+constexpr StringLiteral BasicString = "net.drinkingtea.ox.BasicString";
+constexpr StringLiteral IString     = "net.drinkingtea.ox.IString";
+constexpr StringLiteral String      = "B.string";
+constexpr StringLiteral Bool        = "B.bool";
+constexpr StringLiteral Uint8       = "B.uint8";
+constexpr StringLiteral Uint16      = "B.uint16";
+constexpr StringLiteral Uint32      = "B.uint32";
+constexpr StringLiteral Uint64      = "B.uint64";
+constexpr StringLiteral Int8        = "B.int8";
+constexpr StringLiteral Int16       = "B.int16";
+constexpr StringLiteral Int32       = "B.int32";
+constexpr StringLiteral Int64       = "B.int64";
 }
 
 template<typename T>
@@ -63,17 +63,17 @@ static_assert(isBasicString_v<ox::BasicString<8ul>>);
 static_assert(isBasicString_v<ox::String>);
 
 template<typename T>
-consteval bool isBString(const T*) noexcept {
+consteval bool isIString(const T*) noexcept {
 	return false;
 }
 
 template<std::size_t SmallVecSize>
-consteval bool isBString(const BasicString<SmallVecSize>*) noexcept {
+consteval bool isIString(const BasicString<SmallVecSize>*) noexcept {
 	return true;
 }
 
 template<typename T>
-constexpr bool isBString_v = isBasicString(static_cast<const T*>(nullptr));
+constexpr bool isIString_v = isIString(static_cast<const T*>(nullptr));
 
 static_assert(isBasicString_v<ox::BasicString<0ul>>);
 static_assert(isBasicString_v<ox::BasicString<8ul>>);
@@ -161,7 +161,7 @@ template<typename T>
 constexpr bool isSmartPtr_v = false;
 
 template<typename T>
-constexpr bool isSmartPtr_v<::ox::UniquePtr<T>> = true;
+constexpr bool isSmartPtr_v<::ox::UPtr<T>> = true;
 
 #if __has_include(<array>)
 template<typename T>

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

@@ -21,7 +21,7 @@ namespace ox {
 
 class TypeStore {
 	private:
-		HashMap<String, UniquePtr<DescriptorType>> m_cache;
+		HashMap<String, UPtr<DescriptorType>> m_cache;
 
 	public:
 		constexpr TypeStore() noexcept = default;
@@ -86,12 +86,12 @@ class TypeStore {
 			return getLoad(typeName, typeVersion);
 		}
 
-		constexpr void set(const auto &typeId, UniquePtr<DescriptorType> dt) noexcept {
+		constexpr void set(const auto &typeId, UPtr<DescriptorType> dt) noexcept {
 			m_cache[typeId] = std::move(dt);
 		}
 
 		constexpr void set(const auto &typeId, DescriptorType *dt) noexcept {
-			m_cache[typeId] = UniquePtr<DescriptorType>(dt);
+			m_cache[typeId] = UPtr<DescriptorType>(dt);
 		}
 
 		[[nodiscard]]
@@ -105,11 +105,11 @@ class TypeStore {
 		}
 
 	protected:
-		virtual Result<UniquePtr<DescriptorType>> loadDescriptor(ox::StringView) noexcept {
+		virtual Result<UPtr<DescriptorType>> loadDescriptor(ox::StringView) noexcept {
 			return ox::Error(1);
 		}
 
-		Result<UniquePtr<DescriptorType>> loadDescriptor(ox::StringViewCR name, int version,
+		Result<UPtr<DescriptorType>> loadDescriptor(ox::StringViewCR name, int version,
 		                                                 const ox::TypeParamPack &typeParams) noexcept {
 			const auto typeId = buildTypeId(name, version, typeParams);
 			return loadDescriptor(typeId);

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

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

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

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

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

@@ -10,15 +10,15 @@
 
 namespace ox {
 
-OrganicClawWriter::OrganicClawWriter(int unionIdx) noexcept: m_unionIdx(unionIdx) {
+OrganicClawWriter::OrganicClawWriter(int const unionIdx) noexcept: m_unionIdx(unionIdx) {
 }
 
-OrganicClawWriter::OrganicClawWriter(Json::Value json, int unionIdx) noexcept:
+OrganicClawWriter::OrganicClawWriter(Json::Value json, int const unionIdx) noexcept:
 	m_json(std::move(json)),
 	m_unionIdx(unionIdx) {
 }
 
-Error OrganicClawWriter::fieldCString(const char *key, const char *const*val, int len) noexcept {
+Error OrganicClawWriter::fieldCString(const char *key, const char *const *val, int const len) noexcept {
 	if (targetValid() && len) {
 		value(key) = *val;
 	}
@@ -26,11 +26,11 @@ Error OrganicClawWriter::fieldCString(const char *key, const char *const*val, in
 	return {};
 }
 
-Error OrganicClawWriter::fieldCString(const char *key, const char *const*val) noexcept {
+Error OrganicClawWriter::fieldCString(const char *key, const char *const *val) noexcept {
 	return fieldCString(key, const_cast<const char**>(val), static_cast<int>(ox::strlen(val)));
 }
 
-Error OrganicClawWriter::field(const char *key, const UUID *uuid) noexcept {
+Error OrganicClawWriter::field(const char *key, UUID const *uuid) noexcept {
 	const auto uuidStr = uuid->toString();
 	if (targetValid() && uuidStr.size()) {
 		value(key) = uuidStr.c_str();

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

@@ -28,20 +28,20 @@ namespace ox {
 
 class OrganicClawWriter {
 
-	friend Result<ox::Buffer> writeOC(const auto &val) noexcept;
-	friend Result<ox::String> writeOCString(const auto &val) noexcept;
+	friend Result<Buffer> writeOC(const auto &val) noexcept;
+	friend Result<String> writeOCString(const auto &val) noexcept;
 
 	protected:
 		Json::Value m_json{Json::Value(Json::objectValue)};
 		Json::ArrayIndex m_fieldIt = 0;
-		int m_unionIdx = -1;
+		int const m_unionIdx = -1;
 
 	public:
 		explicit OrganicClawWriter(int unionIdx = -1) noexcept;
 
 		explicit OrganicClawWriter(Json::Value json, int unionIdx = -1) noexcept;
 
-		Error field(const char *key, const int8_t *val) noexcept {
+		Error field(CString const key, int8_t const *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
@@ -49,7 +49,7 @@ class OrganicClawWriter {
 			return {};
 		}
 
-		Error field(const char *key, const int16_t *val) noexcept {
+		Error field(CString const key, int16_t const *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
@@ -57,7 +57,7 @@ class OrganicClawWriter {
 			return {};
 		}
 
-		Error field(const char *key, const int32_t *val) noexcept {
+		Error field(CString const key, int32_t const *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
@@ -65,7 +65,7 @@ class OrganicClawWriter {
 			return {};
 		}
 
-		Error field(const char *key, const int64_t *val) noexcept {
+		Error field(CString const key, int64_t const *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
@@ -74,7 +74,7 @@ class OrganicClawWriter {
 		}
 
 
-		Error field(const char *key, const uint8_t *val) noexcept {
+		Error field(CString const key, uint8_t const *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
@@ -82,7 +82,7 @@ class OrganicClawWriter {
 			return {};
 		}
 
-		Error field(const char *key, const uint16_t *val) noexcept {
+		Error field(CString const key, uint16_t const *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
@@ -90,7 +90,7 @@ class OrganicClawWriter {
 			return {};
 		}
 
-		Error field(const char *key, const uint32_t *val) noexcept {
+		Error field(CString const key, uint32_t const *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
@@ -98,7 +98,7 @@ class OrganicClawWriter {
 			return {};
 		}
 
-		Error field(const char *key, const uint64_t *val) noexcept {
+		Error field(CString const key, uint64_t const *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
@@ -106,7 +106,7 @@ class OrganicClawWriter {
 			return {};
 		}
 
-		Error field(char const*key, bool const*val) noexcept {
+		Error field(char const*key, bool const *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
 				value(key) = *val;
 			}
@@ -118,12 +118,12 @@ class OrganicClawWriter {
 		Error field(char const*, UnionView<U, force> val) noexcept;
 
 		template<typename T>
-		Error field(char const*key, HashMap<String, T> const*val) noexcept {
+		Error field(char const*key, HashMap<String, T> const *val) noexcept {
 			if (targetValid()) {
 				const auto &keys = val->keys();
 				OrganicClawWriter w;
-				ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{&w};
-				for (std::size_t i = 0; i < keys.size(); ++i) {
+				ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{w};
+				for (size_t i = 0; i < keys.size(); ++i) {
 					const auto k = keys[i].c_str();
 					if (k) [[likely]] {
 						OX_REQUIRE_M(value, val->at(k));
@@ -136,8 +136,8 @@ class OrganicClawWriter {
 			return {};
 		}
 
-		template<std::size_t L>
-		Error field(char const*key, IString<L> const*val) noexcept {
+		template<size_t L>
+		Error field(char const*key, IString<L> const *val) noexcept {
 			if (targetValid() && val->size()) {
 				value(key) = val->c_str();
 			}
@@ -145,8 +145,8 @@ class OrganicClawWriter {
 			return {};
 		}
 
-		template<std::size_t L>
-		Error field(char const*key, BasicString<L> const*val) noexcept {
+		template<size_t L>
+		Error field(char const*key, BasicString<L> const *val) noexcept {
 			if (targetValid() && val->size()) {
 				value(key) = val->c_str();
 			}
@@ -154,31 +154,31 @@ class OrganicClawWriter {
 			return {};
 		}
 
-		Error fieldCString(const char*, const char *const*val, int len) noexcept;
+		Error fieldCString(CString, CString const *val, int len) noexcept;
 
-		Error fieldCString(const char *name, const char *const*val) noexcept;
+		Error fieldCString(CString name, CString const*val) noexcept;
 
-		Error field(const char *key, const UUID *uuid) noexcept;
+		Error field(CString key, UUID const *uuid) noexcept;
 
 		template<typename T>
-		Error field(const char*, const T *val, std::size_t len) noexcept;
+		Error field(CString, T const *val, size_t len) noexcept;
 
 		template<typename T>
-		Error field(const char*, const T *val) noexcept;
+		Error field(CString, T const *val) noexcept;
 
 		template<typename T>
-		constexpr ox::Error setTypeInfo(
+		constexpr Error setTypeInfo(
 				const char* = T::TypeName,
 				int = T::TypeVersion) noexcept {
 			return {};
 		}
 
 		template<typename T>
-		constexpr ox::Error setTypeInfo(
+		constexpr Error setTypeInfo(
 				const char*,
 				int,
-				const Vector<String>&,
-				std::size_t) noexcept {
+				Vector<String> const&,
+				size_t) noexcept {
 			return {};
 		}
 
@@ -194,16 +194,16 @@ class OrganicClawWriter {
 		}
 
 		[[nodiscard]]
-		Json::Value &value(const char *key) noexcept;
+		Json::Value &value(CString key) noexcept;
 
 };
 
 template<typename T>
-Error OrganicClawWriter::field(const char *key, const T *val, std::size_t len) noexcept {
+Error OrganicClawWriter::field(CString key, T const *val, size_t const len) noexcept {
 	if (targetValid() && len) {
 		OrganicClawWriter w((Json::Value(Json::arrayValue)));
-		ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{&w};
-		for (std::size_t i = 0; i < len; ++i) {
+		ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{w};
+		for (size_t i = 0; i < len; ++i) {
 OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			OX_RETURN_ERROR(handler.field({}, &val[i]));
 OX_ALLOW_UNSAFE_BUFFERS_END
@@ -215,22 +215,22 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 }
 
 template<typename T>
-Error OrganicClawWriter::field(const char *key, const T *val) noexcept {
+Error OrganicClawWriter::field(CString key, T const *val) noexcept {
 	if constexpr(is_integer_v<T>) {
 		if (targetValid() && (*val || m_json.isArray())) {
 			// the int type needs to be normalized because jsoncpp doesn't
 			// factor in every permutation unsigned long, etc.
-			if constexpr(ox::is_signed_v<T>) {
-				value(key) = static_cast<ox::Int<8 * sizeof(*val)>>(*val);
+			if constexpr(is_signed_v<T>) {
+				value(key) = static_cast<Int<8 * sizeof(*val)>>(*val);
 			} else {
-				value(key) = static_cast<ox::Uint<8 * sizeof(*val)>>(*val);
+				value(key) = static_cast<Uint<8 * sizeof(*val)>>(*val);
 			}
 		}
 	} else if constexpr(isVector_v<T> || isArray_v<T>) {
 		return field(key, val->data(), val->size());
 	} else if (val && targetValid()) {
 		OrganicClawWriter w;
-		ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{&w};
+		ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{w};
 		OX_RETURN_ERROR(model(&handler, val));
 		if (!w.m_json.empty() || m_json.isArray()) {
 			value(key) = w.m_json;
@@ -241,10 +241,10 @@ Error OrganicClawWriter::field(const char *key, const T *val) noexcept {
 }
 
 template<typename U, bool force>
-Error OrganicClawWriter::field(const char *key, UnionView<U, force> val) noexcept {
+Error OrganicClawWriter::field(CString key, UnionView<U, force> val) noexcept {
 	if (targetValid()) {
 		OrganicClawWriter w(val.idx());
-		ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{&w};
+		ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{w};
 		OX_RETURN_ERROR(model(&handler, val.get()));
 		if (!w.m_json.isNull()) {
 			value(key) = w.m_json;
@@ -254,12 +254,12 @@ Error OrganicClawWriter::field(const char *key, UnionView<U, force> val) noexcep
 	return {};
 }
 
-Result<ox::Buffer> writeOC(const auto &val) noexcept {
+Result<Buffer> writeOC(auto const &val) noexcept {
 	OrganicClawWriter writer;
-	ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler(&writer);
+	ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler(writer);
 	OX_RETURN_ERROR(model(&handler, &val));
 	Json::StreamWriterBuilder const jsonBuilder;
-	const auto str = Json::writeString(jsonBuilder, writer.m_json);
+	auto const str = Json::writeString(jsonBuilder, writer.m_json);
 	Result<Buffer> buff;
 	buff.value.resize(str.size() + 1);
 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
@@ -268,13 +268,13 @@ Result<ox::Buffer> writeOC(const auto &val) noexcept {
 	return buff;
 }
 
-Result<ox::String> writeOCString(const auto &val) noexcept {
+Result<String> writeOCString(auto const &val) noexcept {
 	OrganicClawWriter writer;
-	ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler(&writer);
+	ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler(writer);
 	OX_RETURN_ERROR(model(&handler, &val));
 	Json::StreamWriterBuilder const jsonBuilder;
-	const auto str = Json::writeString(jsonBuilder, writer.m_json);
-	Result<ox::String> buff;
+	auto const str = Json::writeString(jsonBuilder, writer.m_json);
+	Result<String> buff;
 	buff.value.resize(str.size());
 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(buff.value.data(), str.data(), str.size() + 1);

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

@@ -74,7 +74,7 @@ class Preloader: public ModelHandlerBase<Preloader<PlatSpec>, OpType::Reflect> {
 		const Preloader &operator=(const Preloader &src) = delete;
 		const Preloader &operator=(Preloader &&src) = delete;
 
-		constexpr static ox::Result<ox::UniquePtr<Preloader>> make(ox::ios_base::seekdir anchor = ox::ios_base::cur,
+		constexpr static ox::Result<ox::UPtr<Preloader>> make(ox::ios_base::seekdir anchor = ox::ios_base::cur,
 		                                                           std::size_t sz = 0) noexcept;
 
 		template<typename T>
@@ -141,9 +141,9 @@ class Preloader: public ModelHandlerBase<Preloader<PlatSpec>, OpType::Reflect> {
 };
 
 template<typename PlatSpec>
-constexpr ox::Result<ox::UniquePtr<Preloader<PlatSpec>>>
+constexpr ox::Result<ox::UPtr<Preloader<PlatSpec>>>
 Preloader<PlatSpec>::make(ox::ios_base::seekdir anchor, std::size_t sz) noexcept {
-	auto p = ox::UniquePtr<Preloader>(new Preloader);
+	auto p = ox::UPtr<Preloader>(new Preloader);
 	if (const auto err = p->m_writer.seekp(0, anchor)) {
 		return {std::move(p), err};
 	}

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

@@ -33,6 +33,7 @@ add_library(
 		concepts.cpp
 		fmt.cpp
 		heapmgr.cpp
+		istreamreader.cpp
 		math.cpp
 		memops.cpp
 		random.cpp

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

@@ -22,7 +22,7 @@ class AnyPtrT {
 	private:
 		struct WrapBase {
 			virtual constexpr ~WrapBase() = default;
-			virtual constexpr WrapBase *copyTo(ox::Span<char> s) noexcept = 0;
+			virtual constexpr WrapBase *copyTo(Span<char> s) const noexcept = 0;
 			virtual constexpr operator bool() const noexcept = 0;
 			virtual void free() noexcept = 0;
 		};
@@ -32,7 +32,7 @@ class AnyPtrT {
 			T *data{};
 			explicit constexpr Wrap(T *pData) noexcept: data(pData) {
 			}
-			constexpr WrapBase *copyTo(ox::Span<char> s) noexcept override {
+			constexpr WrapBase *copyTo(Span<char> s) const noexcept override {
 				oxAssert(s.size() >= sizeof(Wrap), "too small buffer");
 				if (std::is_constant_evaluated()) {
 					return new Wrap(data);
@@ -49,8 +49,10 @@ class AnyPtrT {
 			}
 		};
 
-		WrapBase *m_wrapPtr{};
-		ox::Array<char, sizeof(Wrap<void*>)> m_wrapData;
+		union {
+			WrapBase *m_wrapPtr{};
+			AllocAlias<Wrap<void*>> m_wrapData;
+		} m_data;
 
 	public:
 		constexpr AnyPtrT() noexcept = default;
@@ -58,25 +60,25 @@ class AnyPtrT {
 		template<typename T>
 		constexpr AnyPtrT(T *ptr) noexcept {
 			if (std::is_constant_evaluated()) {
-				m_wrapPtr = new Wrap<T>(ptr);
+				setWrapPtr(new Wrap<T>(ptr));
 			} else {
-				m_wrapPtr = new(m_wrapData.data()) Wrap<T>(ptr);
+				new(m_data.m_wrapData.data()) Wrap<T>(ptr);
 			}
 		}
 
-		constexpr AnyPtrT(AnyPtrT const&other) noexcept requires(!unique) {
+		constexpr AnyPtrT(AnyPtrT const &other) noexcept requires(!unique) {
 			if (other) {
-				m_wrapPtr = other.m_wrapPtr->copyTo(m_wrapData);
+				setWrapPtr(other.getWrapPtr()->copyTo(m_data.m_wrapData.buff));
 			}
 		}
 
 		constexpr AnyPtrT(AnyPtrT &&other) noexcept {
 			if (other) {
-				m_wrapPtr = other.m_wrapPtr->copyTo(m_wrapData);
+				setWrapPtr(other.getWrapPtr()->copyTo(m_data.m_wrapData.buff));
 				if (std::is_constant_evaluated()) {
-					ox::safeDelete(m_wrapPtr);
+					ox::safeDelete(m_data.m_wrapPtr);
 				}
-				other.m_wrapPtr = {};
+				m_data.m_wrapData = {};
 			}
 		}
 
@@ -85,7 +87,7 @@ class AnyPtrT {
 				free();
 			}
 			if (std::is_constant_evaluated()) {
-				ox::safeDelete(m_wrapPtr);
+				ox::safeDelete(m_data.m_wrapPtr);
 			}
 		}
 
@@ -94,25 +96,31 @@ class AnyPtrT {
 			if constexpr(unique) {
 				free();
 			} else if (std::is_constant_evaluated()) {
-				ox::safeDelete(m_wrapPtr);
+				ox::safeDelete(m_data.m_wrapPtr);
 			}
 			if (std::is_constant_evaluated()) {
-				m_wrapPtr = new Wrap(ptr);
+				setWrapPtr(new Wrap(ptr));
 			} else {
-				m_wrapPtr = new(m_wrapData.data()) Wrap(ptr);
+				new(m_data.m_wrapData.data()) Wrap(ptr);
 			}
 			return *this;
 		}
 
-		constexpr AnyPtrT &operator=(AnyPtrT const&ptr) noexcept requires(!unique) {
+		constexpr AnyPtrT &operator=(AnyPtrT const &ptr) noexcept requires(!unique) {
 			if (this != &ptr) {
 				if (std::is_constant_evaluated()) {
-					ox::safeDelete(m_wrapPtr);
+					ox::safeDelete(m_data.m_wrapPtr);
 				}
-				if (ptr) {
-					m_wrapPtr = ptr.m_wrapPtr->copyTo(m_wrapData);
+				if (std::is_constant_evaluated()) {
+					if (ptr) {
+						ptr.getWrapPtr()->copyTo(m_data.m_wrapData.buff);
+					}
 				} else {
-					m_wrapPtr = nullptr;
+					if (ptr) {
+						setWrapPtr(ptr.getWrapPtr()->copyTo(m_data.m_wrapData.buff));
+					} else {
+						setWrapPtr(nullptr);
+					}
 				}
 			}
 			return *this;
@@ -123,43 +131,65 @@ class AnyPtrT {
 				if constexpr(unique) {
 					free();
 				} else if (std::is_constant_evaluated()) {
-					ox::safeDelete(m_wrapPtr);
+					ox::safeDelete(m_data.m_wrapPtr);
 				}
 				if (ptr) {
-					m_wrapPtr = ptr.m_wrapPtr->copyTo(m_wrapData);
+					setWrapPtr(ptr.getWrapPtr()->copyTo(m_data.m_wrapData.buff));
 					if (std::is_constant_evaluated()) {
-						ox::safeDelete(ptr.m_wrapPtr);
-						ptr.m_wrapPtr = nullptr;
+						ox::safeDelete(ptr.m_data.m_wrapPtr);
+						setWrapPtr(nullptr);
 					}
 				} else {
-					m_wrapPtr = nullptr;
+					m_data = {};
 				}
 			}
 			return *this;
 		}
 
 		constexpr operator bool() const noexcept {
-			return m_wrapPtr && *m_wrapPtr;
+			return getWrapPtr() && *getWrapPtr();
 		}
 
 		constexpr void free() noexcept {
-			if (m_wrapPtr) {
-				m_wrapPtr->free();
+			if (auto p = getWrapPtr()) {
+				p->free();
 			}
 			if (std::is_constant_evaluated()) {
-				ox::safeDelete(m_wrapPtr);
+				ox::safeDelete(m_data.m_wrapPtr);
 			}
-			m_wrapPtr = nullptr;
+			m_data.m_wrapData = {};
 		}
 
 		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
+			if constexpr(defines::HasRTTI) {
+				return dynamic_cast<Wrap<T> const*>(getWrapPtr())->data;
+			}
+			return static_cast<Wrap<T> const*>(getWrapPtr())->data;
+		}
+
+	private:
+		constexpr void setWrapPtr(WrapBase *ptr) noexcept {
+			if (std::is_constant_evaluated()) {
+				m_data.m_wrapPtr = ptr;
+			}
+		}
+
+		constexpr WrapBase *getWrapPtr() noexcept {
+			if (std::is_constant_evaluated()) {
+				return m_data.m_wrapPtr;
+			} else {
+				return std::launder(reinterpret_cast<WrapBase*>(m_data.m_wrapData.data()));
+			}
+		}
+
+		constexpr WrapBase const *getWrapPtr() const noexcept {
+			if (std::is_constant_evaluated()) {
+				return m_data.m_wrapPtr;
+			} else {
+				return std::launder(reinterpret_cast<WrapBase const*>(m_data.m_wrapData.data()));
+			}
 		}
 
 };

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

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

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

@@ -15,8 +15,8 @@
 
 namespace ox {
 
-void panic(StringViewCR file, int const line, StringViewCR panicMsg, Error const&err) noexcept {
-	oxErrf("\033[31;1;1mPANIC:\033[0m [{}:{}]: {}\n", file, line, panicMsg);
+void panic(Error const &err, StringViewCR panicMsg, std::source_location const &src) noexcept {
+	oxErrf("\033[31;1;1mPANIC:\033[0m [{}:{}]: {}\n", src.file_name(), src.line(), panicMsg);
 	if (err.msg) {
 		oxErrf("\tError Message:\t{}\n", err.msg);
 	}
@@ -26,7 +26,7 @@ void panic(StringViewCR file, int const line, StringViewCR panicMsg, Error const
 	}
 #ifdef OX_USE_STDLIB
 	printStackTrace(2);
-	oxTrace("panic").del("") << "Panic: " << panicMsg << " (" << file << ":" << line << ")";
+	oxTrace("panic").del("") << "Panic: " << panicMsg << " (" << src.file_name() << ":" << src.line() << ")";
 	std::abort();
 #else
 	while (1);
@@ -36,34 +36,51 @@ void panic(StringViewCR file, int const line, StringViewCR panicMsg, Error const
 #if __GNUC__ && !_WIN32
 __attribute__((weak))
 #endif
-void panic(const char *file, int const line, char const*panicMsg, Error const&err) noexcept {
-	panic(StringView{file}, line, StringView{panicMsg}, err);
+void panic(Error const &err, char const*panicMsg, std::source_location const &src) noexcept {
+	panic(err, StringView{panicMsg}, src);
 }
 
 void assertFailFuncRuntime(
-	StringViewCR file,
-	int const line,
 	StringViewCR assertTxt,
-	StringViewCR msg) noexcept {
+	StringViewCR msg,
+	std::source_location const &src) noexcept {
 #ifdef OX_USE_STDLIB
 	auto const st = genStackTrace(2);
-	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]:\n{}", msg, assertTxt, file, line, st);
+	oxTracef(
+		"assert", "Failed assert: {} ({}) [{}:{}]:\n{}",
+		msg,
+		assertTxt,
+		src.file_name(),
+		src.line(),
+		st);
 	abort();
 #else
-	oxErrf("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, msg);
-	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]", msg, assertTxt, file, line);
-	constexprPanic(file, line, msg);
+	oxErrf(
+		"\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n",
+		src.file_name(),
+		src.line(),
+		msg);
+	oxTracef(
+		"assert", "Failed assert: {} ({}) [{}:{}]",
+		msg,
+		assertTxt,
+		src.file_name(),
+		src.line());
+	constexprPanic(msg, {}, src);
 #endif
 }
 
 void assertFailFuncRuntime(
-	StringViewCR file,
-	int const line,
-	[[maybe_unused]] Error const&err,
+	[[maybe_unused]] Error const &err,
 	StringViewCR,
-	StringViewCR assertMsg) noexcept {
+	StringViewCR assertMsg,
+	std::source_location const &src) noexcept {
 #if defined(OX_USE_STDLIB)
-	auto msg = sfmt("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, assertMsg);
+	auto msg = sfmt(
+		"\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n",
+		src.file_name(),
+		src.line(),
+		assertMsg);
 	if (err.msg) {
 		msg += sfmt("\tError Message:\t{}\n", err.msg);
 	}
@@ -73,10 +90,10 @@ void assertFailFuncRuntime(
 	}
 	msg += genStackTrace(2);
 	oxErr(msg);
-	oxTracef("assert", "Failed assert: {} [{}:{}]", assertMsg, file, line);
+	oxTracef("assert", "Failed assert: {} [{}:{}]", assertMsg, src.file_name(), src.line());
 	abort();
 #else
-	constexprPanic(file, line, assertMsg);
+	constexprPanic(assertMsg, {}, src);
 #endif
 }
 

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

@@ -8,10 +8,6 @@
 
 #pragma once
 
-#if defined(OX_USE_STDLIB)
-#include <iostream>
-#endif
-
 #include "def.hpp"
 #include "defines.hpp"
 #include "error.hpp"
@@ -23,42 +19,49 @@
 namespace ox {
 
 [[noreturn]]
-void panic(StringViewCR file, int line, StringViewCR panicMsg, Error const&err = {}) noexcept;
+void panic(
+	Error const&err,
+	StringViewCR panicMsg,
+	std::source_location const &src = std::source_location::current()) noexcept;
+
+[[noreturn]]
+inline void panic(
+	StringViewCR panicMsg,
+	std::source_location const &src = std::source_location::current()) noexcept {
+	panic(Error{1}, panicMsg, src);
+}
 
 [[noreturn]]
 constexpr void constexprPanic(
-	StringViewCR file,
-	int const line,
 	StringViewCR panicMsg,
-	Error const&err = {}) noexcept {
+	Error const &err = {},
+	std::source_location const &src = std::source_location::current()) noexcept {
 	if (!std::is_constant_evaluated()) {
-		panic(file, line, panicMsg, err);
+		panic(err, panicMsg, src);
 	} else {
 		while (true);
 	}
 }
 
 void assertFailFuncRuntime(
-	StringViewCR file,
-	int line,
 	StringViewCR assertTxt,
-	StringViewCR msg) noexcept;
+	StringViewCR msg,
+	std::source_location const &src = std::source_location::current()) noexcept;
+
 void assertFailFuncRuntime(
-	StringViewCR file,
-	int line,
-	Error const&err,
+	Error const &err,
 	StringViewCR,
-	StringViewCR assertMsg) noexcept;
+	StringViewCR assertMsg,
+	std::source_location const &src = std::source_location::current()) noexcept;
 
 constexpr void assertFunc(
-	StringViewCR file,
-	int const line,
 	bool const pass,
 	[[maybe_unused]]StringViewCR assertTxt,
-	[[maybe_unused]]StringViewCR msg) noexcept {
+	[[maybe_unused]]StringViewCR msg,
+	std::source_location const &src = std::source_location::current()) noexcept {
 	if (!pass) {
 		if (!std::is_constant_evaluated()) {
-			assertFailFuncRuntime(file, line, assertTxt, msg);
+			assertFailFuncRuntime(assertTxt, msg, src);
 		} else {
 			while (true);
 		}
@@ -66,14 +69,13 @@ constexpr void assertFunc(
 }
 
 constexpr void assertFunc(
-	StringViewCR file,
-	int const line,
-	Error const&err,
+	Error const &err,
 	StringViewCR,
-	StringViewCR assertMsg) noexcept {
+	StringViewCR assertMsg,
+	std::source_location const &src = std::source_location::current()) noexcept {
 	if (err) {
 		if (!std::is_constant_evaluated()) {
-			assertFailFuncRuntime(file, line, err, {}, assertMsg);
+			assertFailFuncRuntime(err, {}, assertMsg, src);
 		} else {
 			while (true);
 		}
@@ -81,20 +83,31 @@ constexpr void assertFunc(
 }
 
 constexpr void expect(
-	StringViewCR file,
-	int const line,
-	auto const&actual,
-	auto const&expected) noexcept {
+	auto const &actual,
+	auto const &expected,
+	std::source_location const &src = std::source_location::current()) noexcept {
 	if (actual != expected) {
 		 if (!std::is_constant_evaluated()) {
 #if defined(OX_USE_STDLIB)
-			oxErrf("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, "Value incorrect");
-			oxErrf("expected: {}\nactual:   {}\n", detail::toStringView<true>(expected), detail::toStringView<true>(actual));
+			oxErrf(
+				"\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n",
+				src.file_name(),
+				src.line(),
+				"Value incorrect");
+			oxErrf(
+				"expected: {}\nactual:   {}\n",
+				detail::toStringView<true>(expected),
+				detail::toStringView<true>(actual));
 			printStackTrace(2);
-			oxTracef("assert.expect", "Failed assert: {} == {} [{}:{}]", detail::toStringView<true>(actual), detail::toStringView<true>(expected), file, line);
+			oxTracef(
+				"assert.expect", "Failed assert: {} == {} [{}:{}]",
+				detail::toStringView<true>(actual),
+				detail::toStringView<true>(expected),
+				src.file_name(),
+				src.line());
 			std::abort();
 #else
-			constexprPanic(file, line, "Comparison failed");
+			constexprPanic("Comparison failed", {}, src);
 #endif
 		} else {
 			while (true);

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

@@ -48,9 +48,8 @@
 
 // Asserts
 
-#define oxPanic(errCode, msg) ox::panic(__FILE__, __LINE__, msg, errCode)
 #ifndef NDEBUG
-#define oxAssert(pass, msg) ox::assertFunc(__FILE__, __LINE__, pass, #pass, msg)
+#define oxAssert(pass, msg) ox::assertFunc(pass, #pass, msg)
 #else
 namespace ox {
 struct [[nodiscard]] Error;
@@ -59,8 +58,6 @@ constexpr void oxAssert(bool, const char*) noexcept {}
 constexpr void oxAssert(const ox::Error&, const char*) noexcept {}
 #endif
 
-#define oxExpect(actual, expected) ox::expect(__FILE__, __LINE__, actual, expected)
-
 // Alloca
 
 #if defined(_MSC_VER)

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

@@ -53,6 +53,12 @@ constexpr auto NDebug = true;
 constexpr auto NDebug = false;
 #endif
 
+#if defined(OX_BARE_METAL)
+constexpr auto HasRTTI = false;
+#else
+constexpr auto HasRTTI = true;
+#endif
+
 #if defined(__BIG_ENDIAN__)
 constexpr auto BigEndian = true;
 constexpr auto LittleEndian = false;

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

@@ -17,7 +17,7 @@ class exception {
 		virtual ~exception() = default;
 
 		[[nodiscard]]
-		virtual char const*what() const noexcept {
+		virtual char const *what() const noexcept {
 			return "";
 		}
 };
@@ -37,22 +37,22 @@ using ErrorCode = uint16_t;
 
 struct [[nodiscard]] Error {
 	std::source_location src;
-	ox::CString msg = nullptr;
+	CString msg = nullptr;
 	ErrorCode errCode = 0;
 
 	constexpr Error() noexcept = default;
 
 	explicit constexpr Error(
 		ErrorCode const errCode,
-		std::source_location const&src = std::source_location::current()) noexcept:
+		std::source_location const &src = std::source_location::current()) noexcept:
 		src{src},
 		errCode{errCode}
 	{}
 
 	explicit constexpr Error(
 		ErrorCode const errCode,
-		ox::CString msg,
-		std::source_location const&src = std::source_location::current()) noexcept:
+		CString const msg,
+		std::source_location const &src = std::source_location::current()) noexcept:
 		src{src},
 		msg{msg},
 		errCode{errCode}
@@ -62,39 +62,53 @@ struct [[nodiscard]] Error {
 		return errCode;
 	}
 
+	constexpr void throwException() const;
+
+	constexpr Error reoriginate(
+		ErrorCode const pErrCode,
+		CString const pMsg = nullptr,
+		std::source_location const &pSrc = std::source_location::current()) const noexcept {
+		return Error{pErrCode, pMsg, pSrc};
+	}
+
+	constexpr Error reoriginate(
+		std::source_location const &pSrc = std::source_location::current()) const noexcept {
+		return Error{errCode, msg, pSrc};
+	}
+
 };
 
 [[nodiscard]]
-constexpr auto errCode(Error const&err) noexcept {
+constexpr auto errCode(Error const &err) noexcept {
 	return err.errCode;
 }
 
 template<typename T = char const*>
 [[nodiscard]]
-constexpr auto toStr(Error const&err) noexcept {
+constexpr auto toStr(Error const &err) noexcept {
 	return err.msg ? T{err.msg} : "";
 }
 
 struct Exception: public std::exception {
 	std::source_location src;
-	ox::CString msg = nullptr;
+	CString msg = nullptr;
 	ErrorCode errCode = 0;
 
 	explicit Exception(
 		ErrorCode const errCode,
-		std::source_location const&src = std::source_location::current()) noexcept:
+		std::source_location const &src = std::source_location::current()) noexcept:
 		src{src},
 		errCode{errCode} {}
 
 	explicit Exception(
 		ErrorCode const errCode,
-		ox::CString msg,
-		std::source_location const&src = std::source_location::current()) noexcept:
+		CString msg,
+		std::source_location const &src = std::source_location::current()) noexcept:
 		src{src},
 		msg{msg},
 		errCode{errCode} {}
 
-	explicit Exception(Error const&err) noexcept:
+	explicit Exception(Error const &err) noexcept:
 		src{err.src},
 		msg{err.msg ? err.msg : ""},
 		errCode{err.errCode} {}
@@ -104,18 +118,29 @@ struct Exception: public std::exception {
 	}
 
 	[[nodiscard]]
-	char const*what() const noexcept override {
+	char const *what() const noexcept override {
 		return msg;
 	}
 };
 
+
+constexpr void Error::throwException() const {
+	if (errCode) [[unlikely]] {
+		throw Exception{*this};
+	}
+}
+
+
 [[noreturn]]
-void panic(char const*file, int line, char const*panicMsg, Error const&err) noexcept;
+void panic(
+	Error const &err,
+	CString panicMsg,
+	std::source_location const &src = std::source_location::current()) noexcept;
 
 template<typename T>
 struct [[nodiscard]] Result {
 
-	using type = typename remove_reference<T>::type;
+	using type = remove_reference_t<T>;
 
 	T value;
 	Error error;
@@ -124,25 +149,25 @@ struct [[nodiscard]] Result {
 	}
 
 	template<typename U>
-	constexpr Result(Result<U> const&other) noexcept: value(other.value), error(other.error) {
+	constexpr Result(Result<U> const &other) noexcept: value(other.value), error(other.error) {
 	}
 
 	template<typename U>
 	constexpr Result(Result<U> &&other) noexcept: value(std::move(other.value)), error(std::move(other.error)) {
 	}
 
-	constexpr Result(Error const&error) noexcept: value(), error(error) {
+	constexpr Result(Error const &error) noexcept: value(), error(error) {
 	}
 
-	constexpr Result(type const&value, Error const&error = {}) noexcept: value(value), error(error) {
+	constexpr Result(type const &value, Error const &error = {}) noexcept: value(value), error(error) {
 	}
 
-	constexpr Result(type &&value, Error const&error = {}) noexcept: value(std::move(value)), error(error) {
+	constexpr Result(type &&value, Error const &error = {}) noexcept: value(std::move(value)), error(error) {
 	}
 
 	constexpr ~Result() noexcept = default;
 
-	explicit constexpr operator type const&() const noexcept {
+	explicit constexpr operator type const &() const noexcept {
 		return value;
 	}
 
@@ -156,7 +181,7 @@ struct [[nodiscard]] Result {
 	}
 
 	template<typename U>
-	constexpr Error copyTo(U &val) const& noexcept {
+	constexpr Error copyTo(U &val) const & noexcept {
 		if (!error) [[likely]] {
 			val = value;
 		}
@@ -182,7 +207,7 @@ struct [[nodiscard]] Result {
 	[[nodiscard]]
 	constexpr T &unwrap() & noexcept {
 		if (error) {
-			oxPanic(error, "Failed unwrap");
+			ox::panic(error, "Failed unwrap");
 		}
 		return value;
 	}
@@ -190,15 +215,15 @@ struct [[nodiscard]] Result {
 	[[nodiscard]]
 	constexpr T &&unwrap() && noexcept {
 		if (error) {
-			oxPanic(error, "Failed unwrap");
+			ox::panic(error, "Failed unwrap");
 		}
 		return std::move(value);
 	}
 
 	[[nodiscard]]
-	constexpr T const&unwrap() const & noexcept {
+	constexpr T const &unwrap() const & noexcept {
 		if (error) [[unlikely]] {
-			oxPanic(error, "Failed unwrap");
+			ox::panic(error, "Failed unwrap");
 		}
 		return value;
 	}
@@ -206,7 +231,7 @@ struct [[nodiscard]] Result {
 	[[nodiscard]]
 	constexpr T &unwrapThrow() & {
 		if (error) {
-			throw ox::Exception(error);
+			throw Exception(error);
 		}
 		return value;
 	}
@@ -214,13 +239,13 @@ struct [[nodiscard]] Result {
 	[[nodiscard]]
 	constexpr T &&unwrapThrow() && {
 		if (error) {
-			throw ox::Exception(error);
+			throw Exception(error);
 		}
 		return std::move(value);
 	}
 
 	[[nodiscard]]
-	constexpr T const&unwrapThrow() const & {
+	constexpr T const &unwrapThrow() const & {
 		if (error) {
 			throw ox::Exception(error);
 		}
@@ -244,7 +269,7 @@ struct [[nodiscard]] Result {
 	}
 
 	template<typename U = T>
-	constexpr ox::Result<U> to(auto const&f) & noexcept {
+	constexpr ox::Result<U> to(auto const &f) & noexcept {
 		if (error) [[unlikely]] {
 			return error;
 		}
@@ -252,7 +277,7 @@ struct [[nodiscard]] Result {
 	}
 
 	template<typename U = T>
-	constexpr ox::Result<U> to(auto const&f) && noexcept {
+	constexpr ox::Result<U> to(auto const &f) && noexcept {
 		if (error) [[unlikely]] {
 			return error;
 		}
@@ -264,7 +289,7 @@ struct [[nodiscard]] Result {
 	 * @param alt
 	 * @return value of Result or alt
 	 */
-	constexpr T or_value(T &&alt) const& noexcept {
+	constexpr T or_value(T &&alt) const & noexcept {
 		if (error) {
 			return std::move(alt);
 		}
@@ -288,7 +313,7 @@ struct [[nodiscard]] Result {
 	 * @param alt
 	 * @return value of Result or alt
 	 */
-	constexpr T or_value(T const&alt) const& noexcept {
+	constexpr T or_value(T const &alt) const & noexcept {
 		if (error) {
 			return alt;
 		}
@@ -300,7 +325,7 @@ struct [[nodiscard]] Result {
 	 * @param alt
 	 * @return value of Result or alt
 	 */
-	constexpr T or_value(T const&alt) && noexcept {
+	constexpr T or_value(T const &alt) && noexcept {
 		if (error) {
 			return alt;
 		}
@@ -318,34 +343,36 @@ struct [[nodiscard]] Result {
 
 namespace detail {
 
-constexpr Error toError(Error const&e) noexcept {
+constexpr Error toError(Error const &e) noexcept {
 	return e;
 }
 
 template<typename T>
-constexpr Error toError(Result<T> const&r) noexcept {
+constexpr Error toError(Result<T> const &r) noexcept {
 	return r.error;
 }
 
 }
 
-constexpr void primitiveAssert(char const*file, int line, bool pass, char const*msg) noexcept {
+constexpr void primitiveAssert(
+	bool const pass,
+	char const *msg,
+	std::source_location const &src = std::source_location::current()) noexcept {
 	if constexpr(ox::defines::Debug) {
 		if (!pass) [[unlikely]] {
-			panic(file, line, msg, ox::Error(1));
+			panic(ox::Error{1}, msg, src);
 		}
 	}
 }
 
 constexpr void boundsCheck(
-	char const*file,
-	int const line,
 	size_t const i,
 	size_t const sz,
-	char const*msg) noexcept {
+	char const *msg,
+	std::source_location const &src = std::source_location::current()) noexcept {
 	if constexpr(defines::CheckBounds) {
 		if (i >= sz) [[unlikely]] {
-			panic(file, line, msg, ox::Error{1});
+			panic(ox::Error{1}, msg, src);
 		}
 	}
 }

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

@@ -106,9 +106,12 @@ constexpr bool HashMap<K, T>::operator==(HashMap const &other) const {
 	if (m_keys != other.m_keys) {
 		return false;
 	}
-	for (int i = 0; i < m_keys.size(); ++i) {
-		auto &k = m_keys[i];
-		if (at(k) != other.at(k)) {
+	for (auto &k : m_keys) {
+		auto const a = at(k).value;
+		auto const b = other.at(k).value;
+		if (
+			a != b && // handle one being null and other not
+			(a && b && *a != *b)) {
 			return false;
 		}
 	}
@@ -196,7 +199,7 @@ constexpr std::size_t HashMap<K, T>::size() const noexcept {
 }
 
 template<typename K, typename T>
-constexpr Vector<K> const&HashMap<K, T>::keys() const noexcept {
+constexpr Vector<K> const &HashMap<K, T>::keys() const noexcept {
 	return m_keys;
 }
 
@@ -205,8 +208,8 @@ constexpr Vector<T> HashMap<K, T>::values() const noexcept {
 	Vector<T> out;
 	out.reserve(m_keys.size());
 	for (auto const &p : m_pairs) {
-		if (out) {
-			out.emplace_back(p->value);
+		if (p) {
+			out.emplace_back(*p->value);
 		}
 	}
 	return out;

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

@@ -77,7 +77,7 @@ static HeapSegment *findSegmentFor(std::size_t sz) noexcept {
 			return s;
 		}
 	}
-	oxPanic(ox::Error(1), "malloc: could not find segment");
+	ox::panic("malloc: could not find segment");
 	return nullptr;
 }
 
@@ -102,7 +102,7 @@ void free(void *ptr) noexcept {
 	} else if (p.segment) {
 		p.segment->inUse = false;
 	} else {
-		oxPanic(ox::Error(1), "Bad heap free");
+		ox::panic("Bad heap free");
 	}
 }
 

deps/ox/src/ox/std/istreamreader.cpp

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015 - 2025 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+
+#ifdef OX_USE_STDLIB
+#include <istream>
+
+#include "array.hpp"
+#include "reader.hpp"
+#include "istreamreader.hpp"
+
+namespace ox {
+
+[[nodiscard]]
+constexpr std::ios_base::seekdir sdMap(ox::ios_base::seekdir in) noexcept {
+	switch (in) {
+		case ox::ios_base::beg:
+			return std::ios_base::beg;
+		case ox::ios_base::end:
+			return std::ios_base::end;
+		case ox::ios_base::cur:
+			return std::ios_base::cur;
+	}
+	return std::ios_base::beg;
+}
+
+Result<char> StreamReader::peek() const noexcept {
+	try {
+		if (m_strm.eof()) {
+			return Error{1, "EOF"};
+		}
+		char c{};
+		m_strm.get(c);
+		if (m_strm.unget()) [[unlikely]] {
+			return ox::Error{1, "Unable to unget character"};
+		}
+		return static_cast<char>(c);
+	} catch (std::exception const&) {
+		return ox::Error(1, "peek failed");
+	}
+}
+
+Result<size_t> StreamReader::read(char *v, size_t cnt) noexcept {
+	return static_cast<size_t>(m_strm.read(v, static_cast<std::streamsize>(cnt)).gcount());
+}
+
+Error StreamReader::seekg(size_t p) noexcept {
+	try {
+		m_strm.seekg(static_cast<long long int>(p), std::ios_base::cur);
+	} catch (std::exception const&) {
+		return ox::Error(1, "seekg failed");
+	}
+	return {};
+}
+
+Error StreamReader::seekg(int64_t p, ios_base::seekdir sd) noexcept {
+	try {
+		m_strm.seekg(p, sdMap(sd));
+	} catch (std::exception const&) {
+		return ox::Error(1, "seekg failed");
+	}
+	return {};
+}
+
+Result<size_t> StreamReader::tellg() noexcept {
+	const auto sz = m_strm.tellg();
+	return {static_cast<size_t>(sz), ox::Error(sz == -1)};
+}
+
+}
+
+#endif

deps/ox/src/ox/std/istreamreader.hpp

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 - 2025 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#ifdef OX_USE_STDLIB
+#include <istream>
+#endif
+
+#include "reader.hpp"
+
+namespace ox {
+
+#ifdef OX_USE_STDLIB
+class StreamReader: public Reader_v {
+	private:
+		std::istream &m_strm;
+	public:
+		constexpr explicit StreamReader(std::istream &stream) noexcept: m_strm(stream) {}
+		Result<char> peek() const noexcept override;
+		Result<size_t> read(char *v, size_t cnt) noexcept override;
+		Error seekg(size_t p) noexcept override;
+		Error seekg(int64_t p, ios_base::seekdir sd) noexcept override;
+		Result<size_t> tellg() noexcept override;
+};
+#endif
+
+}

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

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

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

@@ -179,26 +179,26 @@ constexpr bool operator!=(std::nullptr_t, const SharedPtr<T> &p2) noexcept {
 
 
 template<typename T, typename Deleter = DefaultDelete>
-class UniquePtr {
+class UPtr {
 
 	private:
 		T *m_t = nullptr;
 
 	public:
 		using value_type = T;
-		explicit constexpr UniquePtr(T *t = nullptr) noexcept: m_t(t) {
+		explicit constexpr UPtr(T *t = nullptr) noexcept: m_t(t) {
 		}
 
-		constexpr UniquePtr(UniquePtr&) = delete;
+		constexpr UPtr(UPtr&) = delete;
 
-		constexpr UniquePtr(const UniquePtr&) = delete;
+		constexpr UPtr(const UPtr&) = delete;
 
 		template<typename U, typename UDeleter>
-		constexpr UniquePtr(UniquePtr<U, UDeleter> &&other) noexcept {
+		constexpr UPtr(UPtr<U, UDeleter> &&other) noexcept {
 			m_t = other.release();
 		}
 
-		constexpr ~UniquePtr() {
+		constexpr ~UPtr() {
 			Deleter()(m_t);
 		}
 
@@ -213,24 +213,24 @@ class UniquePtr {
 			return m_t;
 		}
 
-		constexpr void reset(UniquePtr &&other = UniquePtr()) {
+		constexpr void reset(UPtr &&other = UPtr()) {
 			auto t = m_t;
 			m_t = other.release();
 			Deleter()(t);
 		}
 
-		constexpr UniquePtr &operator=(UniquePtr const&other) = delete;
+		constexpr UPtr &operator=(UPtr const&other) = delete;
 
 		template<typename U, typename UDeleter>
-		constexpr UniquePtr &operator=(UniquePtr<U, UDeleter> const&other) = delete;
+		constexpr UPtr &operator=(UPtr<U, UDeleter> const&other) = delete;
 
-		constexpr UniquePtr &operator=(UniquePtr<T> &&other) noexcept {
+		constexpr UPtr &operator=(UPtr<T> &&other) noexcept {
 			reset(std::move(other));
 			return *this;
 		}
 
 		template<typename U, typename UDeleter>
-		constexpr UniquePtr &operator=(UniquePtr<U, UDeleter> &&other) noexcept {
+		constexpr UPtr &operator=(UPtr<U, UDeleter> &&other) noexcept {
 			reset(std::move(other));
 			return *this;
 		}
@@ -249,37 +249,34 @@ class UniquePtr {
 
 };
 
-template<typename T, typename Deleter = DefaultDelete>
-using UPtr = UniquePtr<T, Deleter>;
-
 template<typename T>
-constexpr bool operator==(const UniquePtr<T> &p1, const UniquePtr<T> &p2) noexcept {
+constexpr bool operator==(const UPtr<T> &p1, const UPtr<T> &p2) noexcept {
 	return p1.get() == p2.get();
 }
 
 template<typename T>
-constexpr bool operator==(const UniquePtr<T> &p1, std::nullptr_t) noexcept {
+constexpr bool operator==(const UPtr<T> &p1, std::nullptr_t) noexcept {
 	return p1.get() == nullptr;
 }
 
 template<typename T>
-constexpr bool operator==(std::nullptr_t, const UniquePtr<T> &p2) noexcept {
+constexpr bool operator==(std::nullptr_t, const UPtr<T> &p2) noexcept {
 	return p2.get() == nullptr;
 }
 
 
 template<typename T>
-constexpr bool operator!=(const UniquePtr<T> &p1, const UniquePtr<T> &p2) noexcept {
+constexpr bool operator!=(const UPtr<T> &p1, const UPtr<T> &p2) noexcept {
 	return p1.get() != p2.get();
 }
 
 template<typename T>
-constexpr bool operator!=(const UniquePtr<T> &p1, std::nullptr_t) noexcept {
+constexpr bool operator!=(const UPtr<T> &p1, std::nullptr_t) noexcept {
 	return !p1.get();
 }
 
 template<typename T>
-constexpr bool operator!=(std::nullptr_t, const UniquePtr<T> &p2) noexcept {
+constexpr bool operator!=(std::nullptr_t, const UPtr<T> &p2) noexcept {
 	return !p2.get();
 }
 
@@ -287,14 +284,14 @@ constexpr bool operator!=(std::nullptr_t, const UniquePtr<T> &p2) noexcept {
 template<typename T, typename U = T, typename ...Args>
 [[nodiscard]]
 constexpr auto make_unique(Args&&... args) {
-	return UniquePtr<U>(new T(ox::forward<Args>(args)...));
+	return UPtr<U>(new T(ox::forward<Args>(args)...));
 }
 
 template<typename T, typename U = T, typename ...Args>
 [[nodiscard]]
-constexpr Result<UniquePtr<U>> make_unique_catch(Args&&... args) noexcept {
+constexpr Result<UPtr<U>> make_unique_catch(Args&&... args) noexcept {
 	try {
-		return UniquePtr<U>(new T(ox::forward<Args>(args)...));
+		return UPtr<U>(new T(ox::forward<Args>(args)...));
 	} catch (ox::Exception const&ex) {
 		return ex.toError();
 	}

deps/ox/src/ox/std/new.hpp

@@ -79,11 +79,11 @@ constexpr U *make(Args &&...args) noexcept {
 #ifdef __cpp_exceptions
 	try {
 		return new T(ox::forward<Args>(args)...);
-	} catch (std::exception const&ex) {
-		oxPanic(ox::Error(1, ex.what()), ex.what());
+	} catch (std::exception const &ex) {
+		ox::panic(ox::Error(1, ex.what()), ex.what());
 		return nullptr;
 	} catch (...) {
-		oxPanic(ox::Error(2, "Allocation or constructor failed"),  "Allocation or constructor failed");
+		ox::panic(ox::Error(2, "Allocation or constructor failed"),  "Allocation or constructor failed");
 		return nullptr;
 	}
 #else

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

@@ -5,72 +5,3 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-
-
-#ifdef OX_USE_STDLIB
-#include <istream>
-
-#include "array.hpp"
-#include "reader.hpp"
-
-namespace ox {
-
-[[nodiscard]]
-constexpr std::ios_base::seekdir sdMap(ox::ios_base::seekdir in) noexcept {
-	switch (in) {
-		case ox::ios_base::beg:
-			return std::ios_base::beg;
-		case ox::ios_base::end:
-			return std::ios_base::end;
-		case ox::ios_base::cur:
-			return std::ios_base::cur;
-	}
-	return std::ios_base::beg;
-}
-
-ox::Result<char> StreamReader::peek() const noexcept {
-	try {
-		if (m_strm.eof()) {
-			return Error{1, "EOF"};
-		}
-		char c{};
-		m_strm.get(c);
-		if (m_strm.unget()) [[unlikely]] {
-			return ox::Error{1, "Unable to unget character"};
-		}
-		return static_cast<char>(c);
-	} catch (std::exception const&) {
-		return ox::Error(1, "peek failed");
-	}
-}
-
-ox::Result<std::size_t> StreamReader::read(char *v, std::size_t cnt) noexcept {
-	return static_cast<size_t>(m_strm.read(v, static_cast<std::streamsize>(cnt)).gcount());
-}
-
-ox::Error StreamReader::seekg(std::size_t p) noexcept {
-	try {
-		m_strm.seekg(static_cast<long long int>(p), std::ios_base::cur);
-	} catch (std::exception const&) {
-		return ox::Error(1, "seekg failed");
-	}
-	return {};
-}
-
-ox::Error StreamReader::seekg(int64_t p, ios_base::seekdir sd) noexcept {
-	try {
-		m_strm.seekg(p, sdMap(sd));
-	} catch (std::exception const&) {
-		return ox::Error(1, "seekg failed");
-	}
-	return {};
-}
-
-ox::Result<std::size_t> StreamReader::tellg() noexcept {
-	const auto sz = m_strm.tellg();
-	return {static_cast<std::size_t>(sz), ox::Error(sz == -1)};
-}
-
-}
-
-#endif

deps/ox/src/ox/std/reader.hpp

@@ -8,10 +8,6 @@
 
 #pragma once
 
-#ifdef OX_USE_STDLIB
-#include <istream>
-#endif
-
 #include "concepts.hpp"
 #include "error.hpp"
 #include "types.hpp"
@@ -63,18 +59,4 @@ class ReaderT: public Reader_v {
 		}
 };
 
-#ifdef OX_USE_STDLIB
-class StreamReader: public Reader_v {
-	private:
-		std::istream &m_strm;
-	public:
-		constexpr explicit StreamReader(std::istream &stream) noexcept: m_strm(stream) {}
-		ox::Result<char> peek() const noexcept override;
-		ox::Result<std::size_t> read(char *v, std::size_t cnt) noexcept override;
-		ox::Error seekg(std::size_t p) noexcept override;
-		ox::Error seekg(int64_t p, ios_base::seekdir sd) noexcept override;
-		ox::Result<std::size_t> tellg() noexcept override;
-};
-#endif
-
 }

deps/ox/src/ox/std/serialize.hpp

@@ -18,7 +18,7 @@ namespace ox {
 
 template<typename PlatSpec>
 struct VectorMemMap {
-	const std::size_t smallVecSize = 0; // not a map value
+	size_t const smallVecSize = 0; // not a map value
 	typename PlatSpec::size_t size = 0;
 	typename PlatSpec::size_t cap = 0;
 	typename PlatSpec::PtrType items = 0;
@@ -26,11 +26,11 @@ struct VectorMemMap {
 
 template<typename PlatSpec>
 [[nodiscard]]
-constexpr auto sizeOf(const VectorMemMap<PlatSpec> *t) noexcept {
-	constexpr auto padding = [](std::size_t size, std::size_t al) {
+constexpr auto sizeOf(VectorMemMap<PlatSpec> const *t) noexcept {
+	constexpr auto padding = [](size_t const size, size_t const al) {
 		return size % al;
 	};
-	std::size_t size = 0;
+	size_t size = 0;
 	if (t->smallVecSize) {
 		size += t->smallVecSize;
 		size += padding(size, PlatSpec::alignOf(t->size));
@@ -43,17 +43,17 @@ constexpr auto sizeOf(const VectorMemMap<PlatSpec> *t) noexcept {
 	return size;
 }
 
-template<typename PlatSpec, std::size_t SmallVecSize = 0>
+template<typename PlatSpec, size_t SmallVecSize = 0>
 [[nodiscard]]
-constexpr auto alignOf(const VectorMemMap<PlatSpec>&) noexcept {
-	const typename PlatSpec::size_t i = 0;
+constexpr auto alignOf(VectorMemMap<PlatSpec> const&) noexcept {
+	typename PlatSpec::size_t const i = 0;
 	return PlatSpec::alignOf(i);
 }
 
 template<typename PlatSpec, typename T>
-constexpr ox::Error pad(Writer_c auto &w, const T *v) noexcept {
-	const auto a = PlatSpec::alignOf(*v);
-	const auto excess = w.tellp() % a;
+constexpr Error pad(Writer_c auto &w, T const *v) noexcept {
+	auto const a = PlatSpec::alignOf(*v);
+	auto const excess = w.tellp() % a;
 	if (excess) {
 		return w.write(nullptr, a - excess);
 	} else {
@@ -62,7 +62,7 @@ constexpr ox::Error pad(Writer_c auto &w, const T *v) noexcept {
 }
 
 template<typename PlatSpec>
-constexpr ox::Error serialize(Writer_c auto &w, const VectorMemMap<PlatSpec> &vm) noexcept {
+constexpr Error serialize(Writer_c auto &w, VectorMemMap<PlatSpec> const &vm) noexcept {
 	OX_RETURN_ERROR(w.write(nullptr, vm.smallVecSize));
 	OX_RETURN_ERROR(serialize(w, PlatSpec::correctEndianness(vm.size)));
 	OX_RETURN_ERROR(serialize(w, PlatSpec::correctEndianness(vm.cap)));
@@ -70,21 +70,20 @@ constexpr ox::Error serialize(Writer_c auto &w, const VectorMemMap<PlatSpec> &vm
 	return {};
 }
 
-template<typename T>
-constexpr ox::Error serialize(Writer_c auto &w, T val) noexcept requires(is_integer_v<T>) {
-	ox::Array<char, sizeof(T)> tmp;
-	for (auto i = 0u; i < sizeof(T); ++i) {
+constexpr Error serialize(Writer_c auto &w, Integral_c auto val) noexcept {
+	Array<char, sizeof(val)> tmp;
+	for (auto i = 0u; i < sizeof(val); ++i) {
 		tmp[i] = static_cast<char>((val >> i * 8) & 255);
 	}
 	return w.write(tmp.data(), tmp.size());
-};
+}
 
 template<typename T>
-constexpr ox::Result<ox::Array<char, sizeof(T)>> serialize(const T &in) noexcept {
-	ox::Array<char, sizeof(T)> out = {};
+constexpr Result<Array<char, sizeof(T)>> serialize(T const &in) noexcept {
+	Array<char, sizeof(T)> out = {};
 	CharBuffWriter w(out);
 	OX_RETURN_ERROR(serialize(w, in));
 	return out;
-};
+}
 
 }

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

@@ -47,7 +47,7 @@ class Span {
 		}
 
 		template<std::size_t sz>
-		constexpr Span(std::array<ox::remove_const_t<T>, sz> const&a) noexcept:
+		constexpr Span(std::array<ox::remove_const_t<T>, sz> const &a) noexcept:
 			m_items(a.data()),
 			m_size(a.size()) {
 		}
@@ -60,7 +60,7 @@ class Span {
 		}
 
 		template<std::size_t sz>
-		constexpr Span(ox::Array<ox::remove_const_t<T>, sz> const&a) noexcept:
+		constexpr Span(ox::Array<ox::remove_const_t<T>, sz> const &a) noexcept:
 			m_items(a.data()),
 			m_size(a.size()) {
 		}
@@ -72,7 +72,7 @@ class Span {
 		}
 
 		template<std::size_t sz, typename Allocator>
-		constexpr Span(ox::Vector<ox::remove_const_t<T>, sz, Allocator> const&v) noexcept:
+		constexpr Span(ox::Vector<ox::remove_const_t<T>, sz, Allocator> const &v) noexcept:
 			m_items(v.data()),
 			m_size(v.size()) {
 		}
@@ -147,17 +147,17 @@ class Span {
 		}
 
 		constexpr T &operator[](std::size_t i) const noexcept {
-			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
+			boundsCheck(i, size(), "Span access overflow");
 			return m_items[i];
 		}
 
 		constexpr Span operator+(size_t i) const noexcept {
-			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
+			boundsCheck(i, size(), "Span access overflow");
 			return {m_items + i, m_size - i};
 		}
 
 		constexpr Span operator+=(size_t i) noexcept {
-			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
+			boundsCheck(i, size(), "Span access overflow");
 			m_items += i;
 			m_size -= i;
 			return *this;

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

@@ -7,9 +7,9 @@
  */
 
 #include "def.hpp"
+#include "span.hpp"
 #include "strops.hpp"
 
-OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 
 static_assert(ox::strcmp("asdf", "hijk") < 0, "asdf < hijk");
 static_assert(ox::strcmp("hijk", "asdf") > 0, "hijk > asdf");
@@ -19,30 +19,29 @@ static_assert(ox::strcmp("resize", "resize") == 0, "resize == resize");
 static_assert(ox::strcmp("", "") == 0, "\"\" == \"\"");
 
 static_assert([] {
-	auto testStr = "asdf";
-OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
-	return ox::strchr(testStr, 0, 4) == &testStr[4];
-OX_CLANG_NOWARN_END
+	auto constexpr testStr = ox::Span{"asdf"};
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+	return ox::strchr(testStr.data(), 0, 4) == &testStr[4];
+OX_ALLOW_UNSAFE_BUFFERS_END
 }(), "ox::strchr 0");
 
 static_assert([] {
-	int retval = 0;
-	auto testStr = "aaaa";
+	auto constexpr testStr = "aaaa";
 	// test the const and non-const versions of ox::lastIndexOf
-	retval |= !(ox::lastIndexOf(const_cast<char*>(testStr), 'a', ox::strlen(testStr)) == 3);
-	retval |= !(ox::lastIndexOf(testStr, 'a', ox::strlen(testStr)) == 3);
-	return retval == 0;
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+	return ox::lastIndexOf(testStr, 'a', ox::strlen(testStr)) == 3;
+OX_ALLOW_UNSAFE_BUFFERS_END
 }(), "ox::lastIndexOf aaaa a");
 
 #ifndef OX_USE_STDLIB
 
 extern "C"
-std::size_t strlen(const char *str) {
-	std::size_t len = 0;
-	for (; str[len]; len++);
+size_t strlen(const char *str) {
+	size_t len{};
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+	while (str[len]) { ++len; }
+OX_ALLOW_UNSAFE_BUFFERS_END
 	return len;
 }
 
 #endif
-
-OX_ALLOW_UNSAFE_BUFFERS_END

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

@@ -30,7 +30,7 @@ static uint64_t steadyNowMs() {
 }
 
 template<typename Map = ox::SmallMap<ox::String, ox::UUID>>
-uint64_t timeMapStrToUuid(int elemCnt, int lookups, uint64_t seed = 4321) noexcept {
+uint64_t timeMapStrToUuid(int const elemCnt, int const lookups, uint64_t seed = 4321) noexcept {
 	ox::UUID::seedGenerator({1234, seed});
 	Map map;
 	// setup test map
@@ -43,15 +43,16 @@ uint64_t timeMapStrToUuid(int elemCnt, int lookups, uint64_t seed = 4321) noexce
 	// start
 	auto const startTime = steadyNowMs();
 	for (int i = 0; i < lookups; ++i) {
-		auto const&k = keys[rand.gen() % keys.size()];
+		auto const &k = keys[rand.gen() % keys.size()];
 		map[k];
-		oxExpect(map[k], ox::UUID::fromString(k).unwrap());
+		ox::expect(map[k], ox::UUID::fromString(k).unwrap());
 	}
 	return steadyNowMs() - startTime;
 }
 
 template<typename Map = ox::SmallMap<ox::UUID, ox::String>>
-uint64_t timeMapUuidToStr(int elemCnt, int lookups, uint64_t seed = 4321) noexcept {
+[[nodiscard]]
+uint64_t timeMapUuidToStr(int const elemCnt, int const lookups, uint64_t seed = 4321) noexcept {
 	ox::UUID::seedGenerator({1234, seed});
 	Map map;
 	// setup test map
@@ -64,13 +65,13 @@ uint64_t timeMapUuidToStr(int elemCnt, int lookups, uint64_t seed = 4321) noexce
 	// start
 	auto const startTime = steadyNowMs();
 	for (int i = 0; i < lookups; ++i) {
-		auto const&k = keys[rand.gen() % keys.size()];
-		oxExpect(map[k], k.toString());
+		auto const &k = keys[rand.gen() % keys.size()];
+		ox::expect(map[k], k.toString());
 	}
 	return steadyNowMs() - startTime;
 }
 
-static ox::Error compareMaps(int lookupCnt = 1'000'000) {
+static ox::Error compareMaps(int const lookupCnt = 1'000'000) {
 	auto const seed = steadyNowMs();
 	uint64_t hashTime{};
 	uint64_t smallTime{};
@@ -126,7 +127,7 @@ OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 OX_CLANG_NOWARN_END
 			ox::heapmgr::free(a1);
 			ox::heapmgr::free(a2);
-			return ox::Error(0);
+			return ox::Error{};
 		}
 	},
 	{
@@ -135,13 +136,13 @@ OX_CLANG_NOWARN_END
 			ox::Array<char, 10> buff;
 			ox::CharBuffWriter bw(buff);
 			oxAssert(ox::writeItoa(5, bw), "ox::writeItoa returned Error");
-			oxExpect(ox::StringView(buff.data()), ox::StringView("5"));
+			ox::expect(ox::StringView(buff.data()), ox::StringView("5"));
 			OX_RETURN_ERROR(bw.seekp(0));
 			oxAssert(ox::writeItoa(50, bw), "ox::writeItoa returned Error");
-			oxExpect(ox::StringView(buff.data()), ox::StringView("50"));
+			ox::expect(ox::StringView(buff.data()), ox::StringView("50"));
 			OX_RETURN_ERROR(bw.seekp(0));
 			oxAssert(ox::writeItoa(500, bw), "ox::writeItoa returned Error");
-			oxExpect(ox::StringView(buff.data()), ox::StringView("500"));
+			ox::expect(ox::StringView(buff.data()), ox::StringView("500"));
 			return ox::Error{};
 		}
 	},
@@ -184,7 +185,7 @@ OX_CLANG_NOWARN_END
 			oxAssert(s == "asdf", "String assign broken");
 			oxAssert(s != "aoeu", "String assign broken");
 			oxAssert(s.size() == 4, "String assign broken");
-			return ox::Error(0);
+			return ox::Error{};
 		}
 	},
 	{
@@ -214,11 +215,11 @@ OX_CLANG_NOWARN_END
 			oxAssert(ox::StringView("Write") != ox::String(""), "String / StringView comparison broken");
 			oxAssert(ox::String("Write") != ox::StringView(""), "String / StringView comparison broken");
 			oxAssert(ox::String("Write") == ox::StringView("Write"), "String / StringView comparison broken");
-			oxExpect(ox::String("asdf").substr(1, 3), "sd");
+			ox::expect(ox::String("asdf").substr(1, 3), "sd");
 			oxAssert(
 					ox::String(ox::StringView("Write")) == ox::StringView("Write"),
 					"String / StringView comparison broken");
-			return ox::Error(0);
+			return ox::Error{};
 		}
 	},
 	{
@@ -227,16 +228,16 @@ OX_CLANG_NOWARN_END
 			ox::Vector<int> v;
 			oxAssert(v.size() == 0, "Initial Vector size not 0");
 			oxAssert(v.empty(), "Vector::empty() is broken");
-			auto insertTest = [&v](int val, std::size_t size) {
+			auto insertTest = [&v](int const val, std::size_t const size) {
 				v.push_back(val);
 				OX_RETURN_ERROR(ox::Error(v.size() != size, "Vector size incorrect"));
 				OX_RETURN_ERROR(ox::Error(v[v.size() - 1] != val, "Vector value wrong"));
-				return ox::Error(0);
+				return ox::Error{};
 			};
 			oxAssert(insertTest(42, 1), "Vector insertion failed");
 			oxAssert(insertTest(100, 2), "Vector insertion failed");
 			oxAssert(insertTest(102, 3), "Vector insertion failed");
-			return ox::Error(0);
+			return ox::Error{};
 		}
 	},
 	{
@@ -249,9 +250,9 @@ OX_CLANG_NOWARN_END
 				v.emplace_back("aoeu");
 				auto const origData = v.data();
 				v.shrink_to_fit();
-				oxExpect(v[0], "asdf");
-				oxExpect(v[1], "aoeu");
-				oxExpect(v.capacity(), 2u);
+				ox::expect(v[0], "asdf");
+				ox::expect(v[1], "aoeu");
+				ox::expect(v.capacity(), 2u);
 				oxAssert(origData != v.data(), "shrink_to_fit did not create a new allocation");
 			}
 			{
@@ -261,9 +262,9 @@ OX_CLANG_NOWARN_END
 				v.emplace_back("aoeu");
 				auto const origData = v.data();
 				v.shrink_to_fit();
-				oxExpect(v[0], "asdf");
-				oxExpect(v[1], "aoeu");
-				oxExpect(v.capacity(), 2u);
+				ox::expect(v[0], "asdf");
+				ox::expect(v[1], "aoeu");
+				ox::expect(v.capacity(), 2u);
 				oxAssert(origData == v.data(), "shrink_to_fit inappropriately created a new allocation");
 			}
 			return ox::Error{};
@@ -273,13 +274,13 @@ OX_CLANG_NOWARN_END
 		"findIdx",
 		[] {
 			ox::Vector<ox::IString<8>> const v {"zero", "one", "two", "three", "four"};
-			oxExpect(ox::findIdx(v.begin(), v.end(), "zero").or_value(5), 0u);
-			oxExpect(ox::findIdx(v.begin(), v.end(), "one").or_value(5), 1u);
-			oxExpect(ox::findIdx(v.begin(), v.end(), "two").or_value(5), 2u);
-			oxExpect(ox::findIdx(v.begin(), v.end(), "three").or_value(5), 3u);
-			oxExpect(ox::findIdx(v.begin(), v.end(), "four").or_value(5), 4u);
-			oxExpect(ox::findIdx(v.begin(), v.end(), "five").or_value(5), 5u);
-			oxExpect(ox::findIdx(v.begin(), v.end(), "six").or_value(6), 6u);
+			ox::expect(ox::findIdx(v.begin(), v.end(), "zero").or_value(5), 0u);
+			ox::expect(ox::findIdx(v.begin(), v.end(), "one").or_value(5), 1u);
+			ox::expect(ox::findIdx(v.begin(), v.end(), "two").or_value(5), 2u);
+			ox::expect(ox::findIdx(v.begin(), v.end(), "three").or_value(5), 3u);
+			ox::expect(ox::findIdx(v.begin(), v.end(), "four").or_value(5), 4u);
+			ox::expect(ox::findIdx(v.begin(), v.end(), "five").or_value(5), 5u);
+			ox::expect(ox::findIdx(v.begin(), v.end(), "six").or_value(6), 6u);
 			return ox::Error{};
 		}
 	},
@@ -288,19 +289,19 @@ OX_CLANG_NOWARN_END
 		[] {
 			ox::SmallMap<ox::String, ox::String> map;
 			map["asdf"] = "aoeu";
-			oxExpect(map["asdf"], "aoeu");
-			oxExpect(map.size(), 1u);
-			oxExpect(map["aoeu"], "");
-			oxExpect(map.size(), 2u);
+			ox::expect(map["asdf"], "aoeu");
+			ox::expect(map.size(), 1u);
+			ox::expect(map["aoeu"], "");
+			ox::expect(map.size(), 2u);
 			ox::SmallMap<ox::String, ox::String> cmap;
 			cmap["asdf"] = "aoeu";
-			auto constexpr constTest = [](ox::SmallMap<ox::String, ox::String> const&map) {
+			auto constexpr constTest = [](ox::SmallMap<ox::String, ox::String> const &map) {
 				OX_REQUIRE(asdf, map.at("asdf"));
-				oxExpect(*asdf, "aoeu");
-				oxExpect(map.size(), 1u);
+				ox::expect(*asdf, "aoeu");
+				ox::expect(map.size(), 1u);
 				auto const aoeu = map.at("aoeu");
-				oxExpect(aoeu.ok(), false);
-				oxExpect(map.size(), 1u);
+				ox::expect(aoeu.ok(), false);
+				ox::expect(map.size(), 1u);
 				return ox::Error{};
 			};
 			return constTest(cmap);
@@ -319,7 +320,7 @@ OX_CLANG_NOWARN_END
 			ii[5] = 100;
 			oxAssert(ii[4] == 42, "4 != 42");
 			oxAssert(ii[5] == 100, "5 != 100");
-			return ox::Error(0);
+			return ox::Error{};
 		}
 	},
 	{
@@ -334,17 +335,17 @@ OX_CLANG_NOWARN_END
 			oxAssert(!si.contains("asdf"), "wrongly contains asdf");
 			oxAssert(si.contains("aoeu"), "does not contains aoeu");
 			oxAssert(!si.at("asdf").ok(), "asdf != 0");
-			oxExpect(si["asdf"], 0);
+			ox::expect(si["asdf"], 0);
 			oxAssert(si["aoeu"] == 100, "aoeu != 100");
 			auto si2 = si;
-			oxExpect(si2["asdf"], 0);
+			ox::expect(si2["asdf"], 0);
 			oxAssert(si2["aoeu"] == 100, "aoeu != 100");
 			ox::HashMap<int, int> ii;
 			ii[4] = 42;
 			ii[5] = 100;
 			oxAssert(ii[4] == 42, "4 != 42");
 			oxAssert(ii[5] == 100, "5 != 100");
-			return ox::Error(0);
+			return ox::Error{};
 		}
 	},
 	{
@@ -377,15 +378,15 @@ OX_CLANG_NOWARN_END
 				   static_cast<int>(actual[1]),
 				   static_cast<int>(actual[2]),
 				   static_cast<int>(actual[3]));
-			oxExpect(ox::serialize<int32_t>(4).unwrap(), BA({4, 0, 0, 0}));
-			oxExpect(ox::serialize<int32_t>(256).unwrap(), BA({0, 1, 0, 0}));
-			oxExpect(ox::serialize<int32_t>(257).unwrap(), BA({1, 1, 0, 0}));
-			oxExpect(ox::serialize<uint32_t>(4).unwrap(), BA({4, 0, 0, 0}));
-			oxExpect(ox::serialize<uint32_t>(256).unwrap(), BA({0, 1, 0, 0}));
-			oxExpect(ox::serialize<uint32_t>(257).unwrap(), BA({1, 1, 0, 0}));
+			ox::expect(ox::serialize<int32_t>(4).unwrap(), BA({4, 0, 0, 0}));
+			ox::expect(ox::serialize<int32_t>(256).unwrap(), BA({0, 1, 0, 0}));
+			ox::expect(ox::serialize<int32_t>(257).unwrap(), BA({1, 1, 0, 0}));
+			ox::expect(ox::serialize<uint32_t>(4).unwrap(), BA({4, 0, 0, 0}));
+			ox::expect(ox::serialize<uint32_t>(256).unwrap(), BA({0, 1, 0, 0}));
+			ox::expect(ox::serialize<uint32_t>(257).unwrap(), BA({1, 1, 0, 0}));
 			constexpr auto neg1 = static_cast<char>(-1); // ARM64 Linux assumes -1 literals are ints...
-			oxExpect(ox::serialize<uint32_t>(0xffff'ffff).unwrap(), BA({neg1, neg1, neg1, neg1}));
-			return ox::Error(0);
+			ox::expect(ox::serialize<uint32_t>(0xffff'ffff).unwrap(), BA({neg1, neg1, neg1, neg1}));
+			return ox::Error{};
 		}
 	},
 	{
@@ -394,58 +395,58 @@ OX_CLANG_NOWARN_END
 			ox::Buffer b;
 			ox::BufferWriter w(&b);
 			oxAssert(w.write("asdf", 4), "write failed");
-			oxExpect(b.size(), 4u);
+			ox::expect(b.size(), 4u);
 			oxAssert(w.write("aoeu", 4), "write failed");
-			oxExpect(b.size(), 8u);
-			oxExpect(ox::StringView(b.data(), b.size()), "asdfaoeu");
+			ox::expect(b.size(), 8u);
+			ox::expect(ox::StringView(b.data(), b.size()), "asdfaoeu");
 			ox::StringView constexpr qwerty = "qwerty";
 			oxAssert(w.write(qwerty.data(), qwerty.bytes()), "write failed");
-			oxExpect(b.size(), 14u);
-			oxExpect(ox::StringView(b.data(), b.size()), "asdfaoeuqwerty");
-			return ox::Error(0);
+			ox::expect(b.size(), 14u);
+			ox::expect(ox::StringView(b.data(), b.size()), "asdfaoeuqwerty");
+			return ox::Error{};
 		}
 	},
 	{
 		"FromHex",
 		[] {
-			oxExpect(ox::detail::fromHex("01").unwrap(), 0x01);
-			oxExpect(ox::detail::fromHex("02").unwrap(), 0x02);
-			oxExpect(ox::detail::fromHex("03").unwrap(), 0x03);
-			oxExpect(ox::detail::fromHex("04").unwrap(), 0x04);
-			oxExpect(ox::detail::fromHex("05").unwrap(), 0x05);
-			oxExpect(ox::detail::fromHex("06").unwrap(), 0x06);
-			oxExpect(ox::detail::fromHex("07").unwrap(), 0x07);
-			oxExpect(ox::detail::fromHex("08").unwrap(), 0x08);
-			oxExpect(ox::detail::fromHex("0d").unwrap(), 0x0d);
-			oxExpect(ox::detail::fromHex("0e").unwrap(), 0x0e);
-			oxExpect(ox::detail::fromHex("0f").unwrap(), 0x0f);
-			oxExpect(ox::detail::fromHex("0F").unwrap(), 0x0f);
-			oxExpect(ox::detail::fromHex("fF").unwrap(), 0xff);
-			oxExpect(ox::detail::fromHex("ff").unwrap(), 0xff);
-			oxExpect(ox::detail::fromHex("a0").unwrap(), 0xa0);
-			oxExpect(ox::detail::fromHex("93").unwrap(), 0x93);
-			oxExpect(ox::detail::fromHex("40").unwrap(), 0x40);
-			return ox::Error(0);
+			ox::expect(ox::detail::fromHex("01").unwrap(), 0x01);
+			ox::expect(ox::detail::fromHex("02").unwrap(), 0x02);
+			ox::expect(ox::detail::fromHex("03").unwrap(), 0x03);
+			ox::expect(ox::detail::fromHex("04").unwrap(), 0x04);
+			ox::expect(ox::detail::fromHex("05").unwrap(), 0x05);
+			ox::expect(ox::detail::fromHex("06").unwrap(), 0x06);
+			ox::expect(ox::detail::fromHex("07").unwrap(), 0x07);
+			ox::expect(ox::detail::fromHex("08").unwrap(), 0x08);
+			ox::expect(ox::detail::fromHex("0d").unwrap(), 0x0d);
+			ox::expect(ox::detail::fromHex("0e").unwrap(), 0x0e);
+			ox::expect(ox::detail::fromHex("0f").unwrap(), 0x0f);
+			ox::expect(ox::detail::fromHex("0F").unwrap(), 0x0f);
+			ox::expect(ox::detail::fromHex("fF").unwrap(), 0xff);
+			ox::expect(ox::detail::fromHex("ff").unwrap(), 0xff);
+			ox::expect(ox::detail::fromHex("a0").unwrap(), 0xa0);
+			ox::expect(ox::detail::fromHex("93").unwrap(), 0x93);
+			ox::expect(ox::detail::fromHex("40").unwrap(), 0x40);
+			return ox::Error{};
 		}
 	},
 	{
 		"ToHex",
 		[] {
-			oxExpect(ox::detail::toHex(0x01), "01");
-			oxExpect(ox::detail::toHex(0x02), "02");
-			oxExpect(ox::detail::toHex(0x03), "03");
-			oxExpect(ox::detail::toHex(0x04), "04");
-			oxExpect(ox::detail::toHex(0x05), "05");
-			oxExpect(ox::detail::toHex(0x06), "06");
-			oxExpect(ox::detail::toHex(0x07), "07");
-			oxExpect(ox::detail::toHex(0x08), "08");
-			oxExpect(ox::detail::toHex(0x0d), "0d");
-			oxExpect(ox::detail::toHex(0x0e), "0e");
-			oxExpect(ox::detail::toHex(0x0f), "0f");
-			oxExpect(ox::detail::toHex(0x93), "93");
-			oxExpect(ox::detail::toHex(0x40), "40");
-			oxExpect(ox::detail::toHex(0xf0), "f0");
-			return ox::Error(0);
+			ox::expect(ox::detail::toHex(0x01), "01");
+			ox::expect(ox::detail::toHex(0x02), "02");
+			ox::expect(ox::detail::toHex(0x03), "03");
+			ox::expect(ox::detail::toHex(0x04), "04");
+			ox::expect(ox::detail::toHex(0x05), "05");
+			ox::expect(ox::detail::toHex(0x06), "06");
+			ox::expect(ox::detail::toHex(0x07), "07");
+			ox::expect(ox::detail::toHex(0x08), "08");
+			ox::expect(ox::detail::toHex(0x0d), "0d");
+			ox::expect(ox::detail::toHex(0x0e), "0e");
+			ox::expect(ox::detail::toHex(0x0f), "0f");
+			ox::expect(ox::detail::toHex(0x93), "93");
+			ox::expect(ox::detail::toHex(0x40), "40");
+			ox::expect(ox::detail::toHex(0xf0), "f0");
+			return ox::Error{};
 		}
 	},
 	{
@@ -453,20 +454,20 @@ OX_CLANG_NOWARN_END
 		[] {
 			constexpr ox::StringView uuidStr = "8d814442-f46e-4cc3-8edc-ca3c01cc86db";
 			OX_REQUIRE(uuid, ox::UUID::fromString(uuidStr));
-			oxExpect(uuid.toString(), uuidStr);
-			oxExpect(ox::UUID{}.isNull(), true);
-			oxExpect(ox::UUID::fromString(uuidStr).value.isNull(), false);
-			return ox::Error(0);
+			ox::expect(uuid.toString(), uuidStr);
+			ox::expect(ox::UUID{}.isNull(), true);
+			ox::expect(ox::UUID::fromString(uuidStr).value.isNull(), false);
+			return ox::Error{};
 		}
 	},
 	{
 		"UUID::generate",
 		[] {
 			ox::UUID::seedGenerator({1234, 4321});
-			oxExpect(ox::UUID::generate().unwrap().toString(), "5c3f4b5e-ccbf-4727-7f03-3053dedc8827");
-			oxExpect(ox::UUID::generate().unwrap().toString(), "90d0274a-2774-4afa-88e5-0c1d60ba3abf");
-			oxExpect(ox::UUID::generate().unwrap().toString(), "7df77910-841c-48ba-ea2e-44521ac47c2e");
-			return ox::Error(0);
+			ox::expect(ox::UUID::generate().unwrap().toString(), "5c3f4b5e-ccbf-4727-7f03-3053dedc8827");
+			ox::expect(ox::UUID::generate().unwrap().toString(), "90d0274a-2774-4afa-88e5-0c1d60ba3abf");
+			ox::expect(ox::UUID::generate().unwrap().toString(), "7df77910-841c-48ba-ea2e-44521ac47c2e");
+			return ox::Error{};
 		}
 	},
 	{
@@ -474,100 +475,100 @@ OX_CLANG_NOWARN_END
 		[] {
 			ox::StringView sv = "ab.cd";
 			auto list = ox::split(sv, ".");
-			oxExpect(list.size(), 2u);
-			oxExpect(list[0], "ab");
-			oxExpect(list[1], "cd");
+			ox::expect(list.size(), 2u);
+			ox::expect(list[0], "ab");
+			ox::expect(list[1], "cd");
 			sv = "ab.cd.fg";
 			list = ox::split(sv, ".");
-			oxExpect(list.size(), 3u);
-			oxExpect(list[0], "ab");
-			oxExpect(list[1], "cd");
-			oxExpect(list[2], "fg");
+			ox::expect(list.size(), 3u);
+			ox::expect(list[0], "ab");
+			ox::expect(list[1], "cd");
+			ox::expect(list[2], "fg");
 			sv = "ab.cd.";
 			list = ox::split(sv, ".");
-			oxExpect(list.size(), 2u);
-			oxExpect(list[0], "ab");
-			oxExpect(list[1], "cd");
+			ox::expect(list.size(), 2u);
+			ox::expect(list[0], "ab");
+			ox::expect(list[1], "cd");
 			sv = ".ab.cd.";
 			list = ox::split(sv, ".");
-			oxExpect(list.size(), 2u);
-			oxExpect(list[0], "ab");
-			oxExpect(list[1], "cd");
+			ox::expect(list.size(), 2u);
+			ox::expect(list[0], "ab");
+			ox::expect(list[1], "cd");
 			sv = ".";
 			list = ox::split(sv, ".");
-			oxExpect(list.size(), 0u);
+			ox::expect(list.size(), 0u);
 			sv = ".";
 			list = ox::split(sv, ".");
-			oxExpect(list.size(), 0u);
+			ox::expect(list.size(), 0u);
 			sv = "";
 			list = ox::split(sv, ".");
-			oxExpect(list.size(), 0u);
+			ox::expect(list.size(), 0u);
 			// split by single char
 			sv = "ab.cd";
 			list = ox::split(sv, '.');
-			oxExpect(list.size(), 2u);
-			oxExpect(list[0], "ab");
-			oxExpect(list[1], "cd");
+			ox::expect(list.size(), 2u);
+			ox::expect(list[0], "ab");
+			ox::expect(list[1], "cd");
 			sv = "ab.cd.fg";
 			list = ox::split(sv, '.');
-			oxExpect(list.size(), 3u);
-			oxExpect(list[0], "ab");
-			oxExpect(list[1], "cd");
-			oxExpect(list[2], "fg");
+			ox::expect(list.size(), 3u);
+			ox::expect(list[0], "ab");
+			ox::expect(list[1], "cd");
+			ox::expect(list[2], "fg");
 			sv = "ab.cd.";
 			list = ox::split(sv, '.');
-			oxExpect(list.size(), 2u);
-			oxExpect(list[0], "ab");
-			oxExpect(list[1], "cd");
+			ox::expect(list.size(), 2u);
+			ox::expect(list[0], "ab");
+			ox::expect(list[1], "cd");
 			sv = ".ab.cd.";
 			list = ox::split(sv, '.');
-			oxExpect(list.size(), 2u);
-			oxExpect(list[0], "ab");
-			oxExpect(list[1], "cd");
+			ox::expect(list.size(), 2u);
+			ox::expect(list[0], "ab");
+			ox::expect(list[1], "cd");
 			sv = ".";
 			list = ox::split(sv, '.');
-			oxExpect(list.size(), 0u);
+			ox::expect(list.size(), 0u);
 			sv = ".";
 			list = ox::split(sv, '.');
-			oxExpect(list.size(), 0u);
+			ox::expect(list.size(), 0u);
 			sv = "";
 			list = ox::split(sv, '.');
-			oxExpect(list.size(), 0u);
-			return ox::Error(0);
+			ox::expect(list.size(), 0u);
+			return ox::Error{};
 		}
 	},
 	{
 		"intToStr",
 		[] {
-			oxExpect(ox::intToStr<uint8_t>(255u), "255");
-			oxExpect(ox::intToStr<int8_t>(127), "127");
-			oxExpect(ox::intToStr<int8_t>(-128), "-128");
-			oxExpect(ox::intToStr<uint16_t>(65535u), "65535");
-			oxExpect(ox::intToStr<int16_t>(32767), "32767");
-			oxExpect(ox::intToStr<int16_t>(-32768), "-32768");
-			oxExpect(ox::intToStr<uint32_t>(4294967295u), "4294967295");
-			oxExpect(ox::intToStr<int32_t>(2147483647), "2147483647");
-			oxExpect(ox::intToStr<int32_t>(-2147483648), "-2147483648");
-			oxExpect(ox::intToStr<uint64_t>(18446744073709551615u), "18446744073709551615");
-			oxExpect(ox::intToStr<int64_t>(9223372036854775807), "9223372036854775807");
-			oxExpect(ox::intToStr<int64_t>(-9223372036854775807), "-9223372036854775807");
-			oxExpect(ox::intToStr<uint64_t>(0), "0");
-			oxExpect(ox::intToStr<uint64_t>(5), "5");
-			oxExpect(ox::intToStr(0), "0");
-			oxExpect(ox::intToStr(5), "5");
-			oxExpect(ox::intToStr(5000), "5000");
-			oxExpect(ox::intToStr(50000), "50000");
-			oxExpect(ox::intToStr(500000), "500000");
-			oxExpect(ox::intToStr(-5), "-5");
-			oxExpect(ox::intToStr(-5000), "-5000");
-			oxExpect(ox::intToStr(-50000), "-50000");
-			oxExpect(ox::intToStr(-500000), "-500000");
+			ox::expect(ox::intToStr<uint8_t>(255u), "255");
+			ox::expect(ox::intToStr<int8_t>(127), "127");
+			ox::expect(ox::intToStr<int8_t>(-128), "-128");
+			ox::expect(ox::intToStr<uint16_t>(65535u), "65535");
+			ox::expect(ox::intToStr<int16_t>(32767), "32767");
+			ox::expect(ox::intToStr<int16_t>(-32768), "-32768");
+			ox::expect(ox::intToStr<uint32_t>(4294967295u), "4294967295");
+			ox::expect(ox::intToStr<int32_t>(2147483647), "2147483647");
+			ox::expect(ox::intToStr<int32_t>(-2147483648), "-2147483648");
+			ox::expect(ox::intToStr<uint64_t>(18446744073709551615u), "18446744073709551615");
+			ox::expect(ox::intToStr<int64_t>(9223372036854775807), "9223372036854775807");
+			ox::expect(ox::intToStr<int64_t>(-9223372036854775807), "-9223372036854775807");
+			ox::expect(ox::intToStr<uint64_t>(0), "0");
+			ox::expect(ox::intToStr<uint64_t>(5), "5");
+			ox::expect(ox::intToStr(0), "0");
+			ox::expect(ox::intToStr(5), "5");
+			ox::expect(ox::intToStr(5000), "5000");
+			ox::expect(ox::intToStr(50000), "50000");
+			ox::expect(ox::intToStr(500000), "500000");
+			ox::expect(ox::intToStr(-5), "-5");
+			ox::expect(ox::intToStr(-5000), "-5000");
+			ox::expect(ox::intToStr(-50000), "-50000");
+			ox::expect(ox::intToStr(-500000), "-500000");
 			return ox::Error{};
 		}
 	},
 };
 
-int main(int argc, const char **argv) {
+int main(int const argc, const char **argv) {
 	if (argc < 2) {
 		oxError("Must specify test to run");
 		return -1;

deps/ox/src/ox/std/typetraits.hpp

@@ -34,6 +34,41 @@ inline constexpr bool is_trivially_copyable_v = __is_trivially_copyable(T);
 
 namespace ox {
 
+template<typename T>
+struct remove_cv {
+	using type = T;
+};
+
+template<typename T>
+struct remove_cv<const T> {
+	using type = T;
+};
+
+template<typename T>
+struct remove_cv<volatile T> {
+	using type = T;
+};
+
+template<typename T>
+struct remove_cv<const volatile T> {
+	using type = T;
+};
+
+
+template<typename T>
+struct remove_const {
+	using type = T;
+};
+
+template<typename T>
+struct remove_const<const T> {
+	using type = T;
+};
+
+template<typename T>
+using remove_const_t = typename remove_const<T>::type;
+
+
 template<class T, T v>
 struct integral_constant {
 
@@ -109,6 +144,12 @@ template<> struct is_integer<int16_t> : true_type {};
 template<> struct is_integer<uint16_t>: true_type {};
 template<> struct is_integer<int32_t> : true_type {};
 template<> struct is_integer<uint32_t>: true_type {};
+template<> struct is_integer<int8_t const>  : true_type {};
+template<> struct is_integer<uint8_t const> : true_type {};
+template<> struct is_integer<int16_t const> : true_type {};
+template<> struct is_integer<uint16_t const>: true_type {};
+template<> struct is_integer<int32_t const> : true_type {};
+template<> struct is_integer<uint32_t const>: true_type {};
 
 // some of these need to be done with the actual language syntax because no one
 // can agree on what an (u)int64_t is...
@@ -116,9 +157,13 @@ template<> struct is_integer<long>: true_type {};
 template<> struct is_integer<long long>: true_type {};
 template<> struct is_integer<unsigned long>: true_type {};
 template<> struct is_integer<unsigned long long>: true_type {};
+template<> struct is_integer<long const>: true_type {};
+template<> struct is_integer<long long const>: true_type {};
+template<> struct is_integer<unsigned long const>: true_type {};
+template<> struct is_integer<unsigned long long const>: true_type {};
 
 template<typename T>
-constexpr bool is_integer_v = is_integral<T>::value;
+constexpr bool is_integer_v = is_integer<T>::value;
 
 template<typename T>
 concept Integer_c = is_integer<T>::value;
@@ -223,6 +268,9 @@ struct remove_pointer<T* const volatile> {
 	using type = T;
 };
 
+template<typename T>
+using remove_pointer_t = typename remove_pointer<T>::type;
+
 
 template<typename T>
 struct remove_reference {
@@ -261,39 +309,23 @@ template<class T>
 constexpr bool is_move_constructible_v = detail::is_move_constructible<T>(0);
 
 
+namespace detail {
 template<typename T>
-struct remove_cv {
-	using type = T;
-};
+T const &declvalCopy();
+
+template<typename T, typename = decltype(T(declvalCopy<T>()))>
+constexpr bool is_copy_constructible(int) {
+	return true;
+}
 
 template<typename T>
-struct remove_cv<const T> {
-	using type = T;
-};
+constexpr bool is_copy_constructible(bool) {
+	return false;
+}
+}
 
-template<typename T>
-struct remove_cv<volatile T> {
-	using type = T;
-};
-
-template<typename T>
-struct remove_cv<const volatile T> {
-	using type = T;
-};
-
-
-template<typename T>
-struct remove_const {
-	using type = T;
-};
-
-template<typename T>
-struct remove_const<const T> {
-	using type = T;
-};
-
-template<typename T>
-using remove_const_t = typename remove_const<T>::type;
+template<class T>
+constexpr bool is_copy_constructible_v = detail::is_copy_constructible<T>(0);
 
 
 // is String?

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

@@ -26,7 +26,7 @@ namespace ox {
 
 namespace detail {
 
-template<typename T, typename Allocator, std::size_t Size = 1>
+template<typename T, typename Allocator, size_t Size = 1>
 struct VectorAllocator {
 	static_assert(sizeof(AllocAlias<T>) == sizeof(T));
 	static_assert(alignof(AllocAlias<T>) == alignof(T));
@@ -37,7 +37,7 @@ struct VectorAllocator {
 		constexpr VectorAllocator(VectorAllocator const&) noexcept = default;
 		constexpr VectorAllocator(VectorAllocator&&) noexcept = default;
 
-		constexpr void allocate(T **items, std::size_t const cap) noexcept {
+		constexpr void allocate(T **items, size_t const cap) noexcept {
 			// small vector optimization cannot be done it constexpr, but it doesn't really matter in constexpr
 			if (std::is_constant_evaluated() || cap > Size) {
 				*items = Allocator{}.allocate(cap);
@@ -49,8 +49,8 @@ struct VectorAllocator {
 		constexpr void moveConstructItemsFrom(
 				T **items,
 				VectorAllocator *src,
-				std::size_t const count,
-				std::size_t const cap) noexcept {
+				size_t const count,
+				size_t const cap) noexcept {
 			// this totally idiotic redundant check (&& count <= Size) is required to address a bug in devkitARM,
 			// try removing it later
 			if (!std::is_constant_evaluated()) {
@@ -68,7 +68,7 @@ struct VectorAllocator {
 			}
 		}
 
-		constexpr void deallocate(T *const items, std::size_t const cap) noexcept {
+		constexpr void deallocate(T *const items, size_t const cap) noexcept {
 			// small vector optimization cannot be done it constexpr, but it doesn't really matter in constexpr
 			if (std::is_constant_evaluated()) {
 				if (items) {
@@ -90,7 +90,7 @@ struct VectorAllocator<T, Allocator, 0> {
 		constexpr VectorAllocator(VectorAllocator const&) noexcept = default;
 		constexpr VectorAllocator(VectorAllocator&&) noexcept = default;
 
-		constexpr void allocate(T **items, std::size_t const cap) noexcept {
+		constexpr void allocate(T **items, size_t const cap) noexcept {
 			*items = Allocator{}.allocate(cap);
 		}
 
@@ -98,15 +98,15 @@ struct VectorAllocator<T, Allocator, 0> {
 		constexpr void moveConstructItemsFrom(
 				T**,
 				VectorAllocator*,
-				std::size_t const,
-				std::size_t const) noexcept {
+				size_t const,
+				size_t const) noexcept {
 		}
 
 		[[maybe_unused]]
-		constexpr void moveItemsFrom(T**, VectorAllocator*, std::size_t const, std::size_t const) noexcept {
+		constexpr void moveItemsFrom(T**, VectorAllocator*, size_t const, size_t const) noexcept {
 		}
 
-		constexpr void deallocate(T *const items, std::size_t const cap) noexcept {
+		constexpr void deallocate(T *const items, size_t const cap) noexcept {
 			if (items) {
 				Allocator{}.deallocate(items, cap);
 			}
@@ -116,12 +116,12 @@ struct VectorAllocator<T, Allocator, 0> {
 
 }
 
-template<typename T, std::size_t SmallVectorSize = 0, typename Allocator = std::allocator<T>>
+template<typename T, size_t SmallVectorSize = 0, typename Allocator = std::allocator<T>>
 class Vector: detail::VectorAllocator<T, Allocator, SmallVectorSize> {
 
 	public:
 		using value_type = T;
-		using size_type = std::size_t;
+		using size_type = size_t;
 
 		template<typename RefType = T&, typename PtrType = T*, bool reverse = false>
 		using iterator = SpanIterator<T, RefType, PtrType, reverse>;
@@ -129,18 +129,18 @@ class Vector: detail::VectorAllocator<T, Allocator, SmallVectorSize> {
 	private:
 		static constexpr auto initialCap = SmallVectorSize > 0 ? SmallVectorSize : 50;
 		static constexpr auto useNoexcept = ox::is_integral_v<T> || ox::is_pointer_v<T>;
-		std::size_t m_size = 0;
-		std::size_t m_cap = 0;
+		size_t m_size = 0;
+		size_t m_cap = 0;
 		T *m_items = nullptr;
 
 	public:
 		constexpr Vector() noexcept = default;
 
-		explicit constexpr Vector(std::size_t size) noexcept;
+		explicit constexpr Vector(size_t size) noexcept;
 
 		constexpr Vector(std::initializer_list<T> list) noexcept;
 
-		constexpr Vector(const Vector &other) noexcept(useNoexcept);
+		constexpr Vector(Vector const &other) noexcept(useNoexcept);
 
 		constexpr Vector(Vector &&other) noexcept;
 
@@ -155,23 +155,23 @@ class Vector: detail::VectorAllocator<T, Allocator, SmallVectorSize> {
 		}
 
 		[[nodiscard]]
-		constexpr iterator<const T&, const T*> begin() const noexcept {
-			return iterator<const T&, const T*>(m_items, 0, m_size);
+		constexpr iterator<T const&, T const*> begin() const noexcept {
+			return iterator<T const&, T const*>(m_items, 0, m_size);
 		}
 
 		[[nodiscard]]
-		constexpr iterator<const T&, const T*> end() const noexcept {
-			return iterator<const T&, const T*>(m_items, m_size, m_size);
+		constexpr iterator<T const&, T const*> end() const noexcept {
+			return iterator<T const&, T const*>(m_items, m_size, m_size);
 		}
 
 		[[nodiscard]]
-		constexpr iterator<const T&, const T*> cbegin() const noexcept {
-			return iterator<const T&, const T*>(m_items, 0, m_size);
+		constexpr iterator<T const&, T const*> cbegin() const noexcept {
+			return iterator<T const&, T const*>(m_items, 0, m_size);
 		}
 
 		[[nodiscard]]
-		constexpr iterator<const T&, const T*> cend() const noexcept {
-			return iterator<const T&, const T*>(m_items, m_size, m_size);
+		constexpr iterator<T const&, T const*> cend() const noexcept {
+			return iterator<T const&, T const*>(m_items, m_size, m_size);
 		}
 
 		[[nodiscard]]
@@ -185,36 +185,36 @@ class Vector: detail::VectorAllocator<T, Allocator, SmallVectorSize> {
 		}
 
 		[[nodiscard]]
-		constexpr iterator<const T&, const T*, true> crbegin() const noexcept {
-			return iterator<const T&, const T*, true>(m_items, m_size - 1, m_size);
+		constexpr iterator<T const&, T const*, true> crbegin() const noexcept {
+			return iterator<T const&, T const*, true>(m_items, m_size - 1, m_size);
 		}
 
 		[[nodiscard]]
-		constexpr iterator<const T&, const T*, true> crend() const noexcept {
-			return iterator<const T&, const T*, true>(m_items, MaxValue<size_type>, m_size);
+		constexpr iterator<T const&, T const*, true> crend() const noexcept {
+			return iterator<T const&, T const*, true>(m_items, MaxValue<size_type>, m_size);
 		}
 
 		[[nodiscard]]
-		constexpr iterator<const T&, const T*, true> rbegin() const noexcept {
-			return iterator<const T&, const T*, true>(m_items, m_size - 1, m_size);
+		constexpr iterator<T const&, T const*, true> rbegin() const noexcept {
+			return iterator<T const&, T const*, true>(m_items, m_size - 1, m_size);
 		}
 
 		[[nodiscard]]
-		constexpr iterator<const T&, const T*, true> rend() const noexcept {
-			return iterator<const T&, const T*, true>(m_items, MaxValue<size_type>, m_size);
+		constexpr iterator<T const&, T const*, true> rend() const noexcept {
+			return iterator<T const&, T const*, true>(m_items, MaxValue<size_type>, m_size);
 		}
 
-		constexpr bool operator==(const Vector &other) const noexcept(useNoexcept);
+		constexpr bool operator==(Vector const &other) const noexcept(useNoexcept);
 
-		constexpr Vector &operator=(const Vector &other) noexcept(useNoexcept);
+		constexpr Vector &operator=(Vector const &other) noexcept(useNoexcept);
 
 		constexpr Vector &operator=(Vector &&other) noexcept;
 
 		[[nodiscard]]
-		constexpr T &operator[](std::size_t i) noexcept;
+		constexpr T &operator[](size_t i) noexcept;
 
 		[[nodiscard]]
-		constexpr const T &operator[](std::size_t i) const noexcept;
+		constexpr T const &operator[](size_t i) const noexcept;
 
 		[[nodiscard]]
 		constexpr Result<T*> at(size_t i) noexcept;
@@ -226,28 +226,28 @@ class Vector: detail::VectorAllocator<T, Allocator, SmallVectorSize> {
 		constexpr Result<T*> front() noexcept;
 
 		[[nodiscard]]
-		constexpr Result<const T*> front() const noexcept;
+		constexpr Result<T const*> front() const noexcept;
 
 		[[nodiscard]]
 		constexpr Result<T*> back() noexcept;
 
 		[[nodiscard]]
-		constexpr Result<const T*> back() const noexcept;
+		constexpr Result<T const*> back() const noexcept;
 
 		[[nodiscard]]
-		constexpr std::size_t capacity() const noexcept;
+		constexpr size_t capacity() const noexcept;
 
 		[[nodiscard]]
-		constexpr std::size_t size() const noexcept;
+		constexpr size_t size() const noexcept;
 
 		[[nodiscard]]
 		constexpr bool empty() const noexcept;
 
 		constexpr void clear() noexcept(useNoexcept);
 
-		constexpr void resize(std::size_t size) noexcept(useNoexcept);
+		constexpr void resize(size_t size) noexcept(useNoexcept);
 
-		constexpr void reserveResize(std::size_t size) noexcept(useNoexcept);
+		constexpr void reserveResize(size_t size) noexcept(useNoexcept);
 
 		[[nodiscard]]
 		constexpr T *data() noexcept {
@@ -255,7 +255,7 @@ class Vector: detail::VectorAllocator<T, Allocator, SmallVectorSize> {
 		}
 
 		[[nodiscard]]
-		constexpr const T *data() const noexcept {
+		constexpr T const *data() const noexcept {
 			return m_items;
 		}
 
@@ -263,12 +263,12 @@ class Vector: detail::VectorAllocator<T, Allocator, SmallVectorSize> {
 		constexpr bool contains(MaybeView_t<T> const&) const noexcept;
 
 		constexpr iterator<T&, T*, false> insert(
-				std::size_t pos, std::size_t cnt, T const&val) noexcept(useNoexcept);
+			size_t pos, size_t cnt, T const &val) noexcept(useNoexcept);
 
-		constexpr iterator<T&, T*, false> insert(std::size_t pos, T val) noexcept(useNoexcept);
+		constexpr iterator<T&, T*, false> insert(size_t pos, T val) noexcept(useNoexcept);
 
 		template<typename... Args>
-		constexpr iterator<T&, T*, false> emplace(std::size_t pos, Args&&... args) noexcept(useNoexcept);
+		constexpr iterator<T&, T*, false> emplace(size_t pos, Args&&... args) noexcept(useNoexcept);
 
 		template<typename... Args>
 		constexpr T &emplace_back(Args&&... args) noexcept(useNoexcept);
@@ -284,14 +284,14 @@ class Vector: detail::VectorAllocator<T, Allocator, SmallVectorSize> {
 		 * @param pos iterator at the point to remove
 		 * @return Error if index is out of bounds
 		 */
-		constexpr Result<iterator<T&, T*, false>> erase(const iterator<> &pos) noexcept(useNoexcept);
+		constexpr Result<iterator<T&, T*, false>> erase(iterator<> const &pos) noexcept(useNoexcept);
 
 		/**
 		 * Removes an item from the Vector.
 		 * @param pos position of item to remove
 		 * @return Error if index is out of bounds
 		 */
-		constexpr Result<iterator<T&, T*, false>> erase(std::size_t pos) noexcept(useNoexcept);
+		constexpr Result<iterator<T&, T*, false>> erase(size_t pos) noexcept(useNoexcept);
 
 		/**
 		 * Moves the last item in the Vector to position pos and decrements the
@@ -299,59 +299,62 @@ class Vector: detail::VectorAllocator<T, Allocator, SmallVectorSize> {
 		 * @param pos position of item to remove
 		 * @return Error if index is out of bounds
 		 */
-		constexpr Error unordered_erase(std::size_t pos) noexcept(useNoexcept);
+		constexpr Error unordered_erase(size_t pos) noexcept(useNoexcept);
 
 		constexpr Error remove(MaybeView_t<T> const &val);
 
-		constexpr void reserve(std::size_t cap) noexcept(useNoexcept);
+		constexpr void reserve(size_t cap) noexcept(useNoexcept);
 
 		constexpr void shrink_to_fit() noexcept(useNoexcept);
 
 	private:
 		constexpr void reserveInsert(
-				std::size_t cap, std::size_t pos, std::size_t offset = 1) noexcept(useNoexcept);
+				size_t cap, size_t pos, size_t offset = 1) noexcept(useNoexcept);
 
 };
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator, typename RefType, bool reverse>
+template<typename T, size_t SmallVectorSize, typename Allocator, typename RefType, bool reverse>
 using VectorIt = typename Vector<T, SmallVectorSize, Allocator>::template iterator<RefType, reverse>;
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator, typename RefType, bool reverse>
+template<typename T, size_t SmallVectorSize, typename Allocator, typename RefType, bool reverse>
 constexpr VectorIt<T, SmallVectorSize, Allocator, RefType, reverse> operator+(
-		std::size_t n,
-		const VectorIt<T, SmallVectorSize, Allocator, RefType, reverse> &a) {
+		size_t n,
+		VectorIt<T, SmallVectorSize, Allocator, RefType, reverse> const &a) {
 	return a + n;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr Vector<T, SmallVectorSize, Allocator>::Vector(std::size_t size) noexcept {
+template<typename T, size_t SmallVectorSize, typename Allocator>
+constexpr Vector<T, SmallVectorSize, Allocator>::Vector(size_t const size) noexcept {
 	m_size = size;
 	m_cap = m_size;
 	this->allocate(&m_items, m_cap);
-	for (std::size_t i = 0; i < size; ++i) {
+	for (size_t i = 0; i < size; ++i) {
 		std::construct_at(&m_items[i]);
 	}
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr Vector<T, SmallVectorSize, Allocator>::Vector(std::initializer_list<T> list) noexcept {
-	reserve(list.size());
-	for (auto &item : list) {
-		emplace_back(std::move(item));
+	m_size = list.size();
+	m_cap = m_size;
+	this->allocate(&m_items, m_cap);
+	for (size_t i{}; auto &item : list) {
+		std::construct_at(&m_items[i], std::move(item));
+		++i;
 	}
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr Vector<T, SmallVectorSize, Allocator>::Vector(const Vector &other) noexcept(useNoexcept) {
+template<typename T, size_t SmallVectorSize, typename Allocator>
+constexpr Vector<T, SmallVectorSize, Allocator>::Vector(Vector const &other) noexcept(useNoexcept) {
 	m_size = other.m_size;
 	m_cap = other.m_cap;
 	this->allocate(&m_items, other.m_cap);
-	for (std::size_t i = 0; i < m_size; ++i) {
+	for (size_t i = 0; i < m_size; ++i) {
 		std::construct_at(&m_items[i], other.m_items[i]);
 	}
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr Vector<T, SmallVectorSize, Allocator>::Vector(Vector &&other) noexcept {
 	m_size = other.m_size;
 	m_cap = other.m_cap;
@@ -362,20 +365,20 @@ constexpr Vector<T, SmallVectorSize, Allocator>::Vector(Vector &&other) noexcept
 	other.m_items = nullptr;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr Vector<T, SmallVectorSize, Allocator>::~Vector() {
 	clear();
 	this->deallocate(m_items, m_cap);
 	m_items = nullptr;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr bool Vector<T, SmallVectorSize, Allocator>::operator==(
-		const Vector &other) const noexcept(useNoexcept) {
+		Vector const &other) const noexcept(useNoexcept) {
 	if (m_size != other.m_size) {
 		return false;
 	}
-	for (std::size_t i = 0; i < m_size; i++) {
+	for (size_t i = 0; i < m_size; i++) {
 		if (!(m_items[i] == other.m_items[i])) {
 			return false;
 		}
@@ -383,9 +386,9 @@ constexpr bool Vector<T, SmallVectorSize, Allocator>::operator==(
 	return true;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr Vector<T, SmallVectorSize, Allocator> &Vector<T, SmallVectorSize, Allocator>::operator=(
-		const Vector &other) noexcept(useNoexcept) {
+		Vector const &other) noexcept(useNoexcept) {
 	if (this != &other) {
 		clear();
 		this->deallocate(m_items, m_cap);
@@ -393,14 +396,14 @@ constexpr Vector<T, SmallVectorSize, Allocator> &Vector<T, SmallVectorSize, Allo
 		m_size = other.m_size;
 		m_cap = other.m_cap;
 		this->allocate(&m_items, other.m_cap);
-		for (std::size_t i = 0; i < m_size; i++) {
+		for (size_t i = 0; i < m_size; i++) {
 			std::construct_at(&m_items[i], other.m_items[i]);
 		}
 	}
 	return *this;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr Vector<T, SmallVectorSize, Allocator> &Vector<T, SmallVectorSize, Allocator>::operator=(
 		Vector &&other) noexcept {
 	if (this != &other) {
@@ -417,35 +420,35 @@ constexpr Vector<T, SmallVectorSize, Allocator> &Vector<T, SmallVectorSize, Allo
 	return *this;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr T &Vector<T, SmallVectorSize, Allocator>::operator[](std::size_t i) noexcept {
-	boundsCheck(__FILE__, __LINE__, i, size(), "Vector access overflow");
+template<typename T, size_t SmallVectorSize, typename Allocator>
+constexpr T &Vector<T, SmallVectorSize, Allocator>::operator[](size_t const i) noexcept {
+	boundsCheck(i, size(), "Vector access overflow");
 	return m_items[i];
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr const T &Vector<T, SmallVectorSize, Allocator>::operator[](std::size_t i) const noexcept {
-	boundsCheck(__FILE__, __LINE__, i, size(), "Vector access overflow");
+template<typename T, size_t SmallVectorSize, typename Allocator>
+constexpr T const &Vector<T, SmallVectorSize, Allocator>::operator[](size_t const i) const noexcept {
+	boundsCheck(i, size(), "Vector access overflow");
 	return m_items[i];
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr Result<T*> Vector<T, SmallVectorSize, Allocator>::at(size_t i) noexcept {
+template<typename T, size_t SmallVectorSize, typename Allocator>
+constexpr Result<T*> Vector<T, SmallVectorSize, Allocator>::at(size_t const i) noexcept {
 	if (i < size()) [[likely]] {
 		return &operator[](i);
 	}
 	return ox::Error(1, "Vector: Invalid index");
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr Result<T const*> Vector<T, SmallVectorSize, Allocator>::at(size_t i) const noexcept {
+template<typename T, size_t SmallVectorSize, typename Allocator>
+constexpr Result<T const*> Vector<T, SmallVectorSize, Allocator>::at(size_t const i) const noexcept {
 	if (i < size()) [[likely]] {
 		return &operator[](i);
 	}
 	return ox::Error(1, "Vector: Invalid index");
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr Result<T*> Vector<T, SmallVectorSize, Allocator>::front() noexcept {
 	if (!m_size) {
 		return {nullptr, ox::Error(1)};
@@ -453,15 +456,15 @@ constexpr Result<T*> Vector<T, SmallVectorSize, Allocator>::front() noexcept {
 	return &m_items[0];
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr Result<const T*> Vector<T, SmallVectorSize, Allocator>::front() const noexcept {
+template<typename T, size_t SmallVectorSize, typename Allocator>
+constexpr Result<T const*> Vector<T, SmallVectorSize, Allocator>::front() const noexcept {
 	if (!m_size) {
 		return {nullptr, ox::Error(1)};
 	}
 	return &m_items[0];
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr Result<T*> Vector<T, SmallVectorSize, Allocator>::back() noexcept {
 	if (!m_size) {
 		return {nullptr, ox::Error(1)};
@@ -469,65 +472,65 @@ constexpr Result<T*> Vector<T, SmallVectorSize, Allocator>::back() noexcept {
 	return &m_items[m_size - 1];
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr Result<const T*> Vector<T, SmallVectorSize, Allocator>::back() const noexcept {
+template<typename T, size_t SmallVectorSize, typename Allocator>
+constexpr Result<T const*> Vector<T, SmallVectorSize, Allocator>::back() const noexcept {
 	if (!m_size) {
 		return {nullptr, ox::Error(1)};
 	}
 	return &m_items[m_size - 1];
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr std::size_t Vector<T, SmallVectorSize, Allocator>::capacity() const noexcept {
+template<typename T, size_t SmallVectorSize, typename Allocator>
+constexpr size_t Vector<T, SmallVectorSize, Allocator>::capacity() const noexcept {
 	return m_cap;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr std::size_t Vector<T, SmallVectorSize, Allocator>::size() const noexcept {
+template<typename T, size_t SmallVectorSize, typename Allocator>
+constexpr size_t Vector<T, SmallVectorSize, Allocator>::size() const noexcept {
 	return m_size;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr bool Vector<T, SmallVectorSize, Allocator>::empty() const noexcept {
 	return !m_size;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr void Vector<T, SmallVectorSize, Allocator>::clear() noexcept(useNoexcept) {
 	if constexpr(is_class<T>()) {
-		for (std::size_t i = 0; i < m_size; ++i) {
+		for (size_t i = 0; i < m_size; ++i) {
 			m_items[i].~T();
 		}
 	}
 	m_size = 0;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr void Vector<T, SmallVectorSize, Allocator>::resize(std::size_t size) noexcept(useNoexcept) {
+template<typename T, size_t SmallVectorSize, typename Allocator>
+constexpr void Vector<T, SmallVectorSize, Allocator>::resize(size_t const size) noexcept(useNoexcept) {
 	if (m_cap < size) {
 		reserve(size * 2);
 	}
 	if (m_size < size) {
-		for (std::size_t i = m_size; i < size; i++) {
+		for (size_t i = m_size; i < size; i++) {
 			std::construct_at(&m_items[i]);
 		}
 	} else {
-		for (std::size_t i = size; i < m_size; i++) {
+		for (size_t i = size; i < m_size; i++) {
 			m_items[i].~T();
 		}
 	}
 	m_size = size;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr void Vector<T, SmallVectorSize, Allocator>::reserveResize(std::size_t const size) noexcept(useNoexcept) {
+template<typename T, size_t SmallVectorSize, typename Allocator>
+constexpr void Vector<T, SmallVectorSize, Allocator>::reserveResize(size_t const size) noexcept(useNoexcept) {
 	reserve(size);
 	resize(size);
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr bool Vector<T, SmallVectorSize, Allocator>::contains(MaybeView_t<T> const&v) const noexcept {
-	for (std::size_t i = 0; i < m_size; ++i) {
+template<typename T, size_t SmallVectorSize, typename Allocator>
+constexpr bool Vector<T, SmallVectorSize, Allocator>::contains(MaybeView_t<T> const &v) const noexcept {
+	for (size_t i = 0; i < m_size; ++i) {
 		if (m_items[i] == v) {
 			return true;
 		}
@@ -535,10 +538,10 @@ constexpr bool Vector<T, SmallVectorSize, Allocator>::contains(MaybeView_t<T> co
 	return false;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr typename Vector<T, SmallVectorSize, Allocator>::template iterator<T&, T*, false>
 Vector<T, SmallVectorSize, Allocator>::insert(
-		std::size_t pos, std::size_t cnt, T const&val) noexcept(useNoexcept) {
+	size_t const pos, size_t const cnt, T const &val) noexcept(useNoexcept) {
 	if (m_size + cnt > m_cap) {
 		reserveInsert(m_cap ? m_size + cnt : initialCap, pos, cnt);
 	}
@@ -558,9 +561,9 @@ Vector<T, SmallVectorSize, Allocator>::insert(
 	return begin() + pos;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr typename Vector<T, SmallVectorSize, Allocator>::template iterator<T&, T*, false>
-Vector<T, SmallVectorSize, Allocator>::insert(std::size_t pos, T val) noexcept(useNoexcept) {
+Vector<T, SmallVectorSize, Allocator>::insert(size_t pos, T val) noexcept(useNoexcept) {
 	if (m_size == m_cap) {
 		reserveInsert(m_cap ? m_cap * 2 : initialCap, pos);
 	}
@@ -576,10 +579,10 @@ Vector<T, SmallVectorSize, Allocator>::insert(std::size_t pos, T val) noexcept(u
 	return begin() + pos;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 template<typename... Args>
 constexpr typename Vector<T, SmallVectorSize, Allocator>::template iterator<T&, T*, false>
-Vector<T, SmallVectorSize, Allocator>::emplace(std::size_t pos, Args&&... args) noexcept(useNoexcept) {
+Vector<T, SmallVectorSize, Allocator>::emplace(size_t pos, Args&&... args) noexcept(useNoexcept) {
 	if (m_size == m_cap) {
 		reserveInsert(m_cap ? m_cap * 2 : initialCap, pos);
 		if (pos < m_size) {
@@ -599,7 +602,7 @@ Vector<T, SmallVectorSize, Allocator>::emplace(std::size_t pos, Args&&... args)
 	return begin() + pos;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 template<typename... Args>
 constexpr T &Vector<T, SmallVectorSize, Allocator>::emplace_back(Args&&... args) noexcept(useNoexcept) {
 	if (m_size == m_cap) {
@@ -610,7 +613,7 @@ constexpr T &Vector<T, SmallVectorSize, Allocator>::emplace_back(Args&&... args)
 	return *out;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr void Vector<T, SmallVectorSize, Allocator>::push_back(T const &item) noexcept(useNoexcept) {
 	if (m_size == m_cap) {
 		reserve(m_cap ? m_cap * 2 : initialCap);
@@ -619,7 +622,7 @@ constexpr void Vector<T, SmallVectorSize, Allocator>::push_back(T const &item) n
 	++m_size;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr void Vector<T, SmallVectorSize, Allocator>::push_back(T &&item) noexcept(useNoexcept) {
 	if (m_size == m_cap) {
 		reserve(m_cap ? m_cap * 2 : initialCap);
@@ -628,21 +631,21 @@ constexpr void Vector<T, SmallVectorSize, Allocator>::push_back(T &&item) noexce
 	++m_size;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr void Vector<T, SmallVectorSize, Allocator>::pop_back() noexcept(useNoexcept) {
 	--m_size;
 	m_items[m_size].~T();
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr Result<typename Vector<T, SmallVectorSize, Allocator>::template iterator<T&, T*, false>>
-Vector<T, SmallVectorSize, Allocator>::erase(const iterator<> &pos) noexcept(useNoexcept) {
+Vector<T, SmallVectorSize, Allocator>::erase(iterator<> const &pos) noexcept(useNoexcept) {
 	return erase(pos.offset());
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr Result<typename Vector<T, SmallVectorSize, Allocator>::template iterator<T&, T*, false>>
-Vector<T, SmallVectorSize, Allocator>::erase(std::size_t pos) noexcept(useNoexcept) {
+Vector<T, SmallVectorSize, Allocator>::erase(size_t pos) noexcept(useNoexcept) {
 	if (pos >= m_size) {
 		return ox::Error(1, "Vector::erase failed: pos is greater than Vector size");
 	}
@@ -654,8 +657,8 @@ Vector<T, SmallVectorSize, Allocator>::erase(std::size_t pos) noexcept(useNoexce
 	return begin() + pos;
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr Error Vector<T, SmallVectorSize, Allocator>::unordered_erase(std::size_t pos)
+template<typename T, size_t SmallVectorSize, typename Allocator>
+constexpr Error Vector<T, SmallVectorSize, Allocator>::unordered_erase(size_t pos)
 	noexcept(useNoexcept) {
 	if (pos >= m_size) {
 		return ox::Error(1);
@@ -666,7 +669,7 @@ constexpr Error Vector<T, SmallVectorSize, Allocator>::unordered_erase(std::size
 	return {};
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr ox::Error Vector<T, SmallVectorSize, Allocator>::remove(MaybeView_t<T> const &val) {
 	for (size_t i{}; auto const &v : *this) {
 		if (v == val) {
@@ -677,18 +680,18 @@ constexpr ox::Error Vector<T, SmallVectorSize, Allocator>::remove(MaybeView_t<T>
 	return ox::Error{1, "element not found"};
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr void Vector<T, SmallVectorSize, Allocator>::reserve(std::size_t cap) noexcept(useNoexcept) {
+template<typename T, size_t SmallVectorSize, typename Allocator>
+constexpr void Vector<T, SmallVectorSize, Allocator>::reserve(size_t cap) noexcept(useNoexcept) {
 	if (cap <= m_cap) {
 		return;
 	}
-	const auto oldItems = m_items;
-	const auto oldCap = m_cap;
+	auto const oldItems = m_items;
+	auto const oldCap = m_cap;
 	m_cap = cap;
 	this->allocate(&m_items, cap);
 	if (oldItems) { // move over old items
-		const auto itRange = ox::min(cap, m_size);
-		for (std::size_t i = 0; i < itRange; ++i) {
+		auto const itRange = ox::min(cap, m_size);
+		for (size_t i = 0; i < itRange; ++i) {
 			std::construct_at(&m_items[i], std::move(oldItems[i]));
 			oldItems[i].~T();
 		}
@@ -696,17 +699,17 @@ constexpr void Vector<T, SmallVectorSize, Allocator>::reserve(std::size_t cap) n
 	}
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr void Vector<T, SmallVectorSize, Allocator>::shrink_to_fit() noexcept(useNoexcept)  {
 	if (m_size == m_cap) {
 		return;
 	}
-	const auto oldItems = m_items;
-	const auto oldCap = m_cap;
+	auto const oldItems = m_items;
+	auto const oldCap = m_cap;
 	m_cap = m_size;
 	this->allocate(&m_items, m_size);
 	if (oldItems) { // move over old items
-		for (std::size_t i = 0; i < m_size; ++i) {
+		for (size_t i = 0; i < m_size; ++i) {
 			std::construct_at(&m_items[i], std::move(oldItems[i]));
 			oldItems[i].~T();
 		}
@@ -714,26 +717,26 @@ constexpr void Vector<T, SmallVectorSize, Allocator>::shrink_to_fit() noexcept(u
 	}
 }
 
-template<typename T, std::size_t SmallVectorSize, typename Allocator>
+template<typename T, size_t SmallVectorSize, typename Allocator>
 constexpr void Vector<T, SmallVectorSize, Allocator>::reserveInsert(
-		std::size_t cap,
-		std::size_t pos,
-		std::size_t offset) noexcept(useNoexcept) {
+		size_t cap,
+		size_t pos,
+		size_t offset) noexcept(useNoexcept) {
 	if (cap <= m_cap) {
 		return;
 	}
-	const auto oldItems = m_items;
-	const auto oldCap = m_cap;
+	auto const oldItems = m_items;
+	auto const oldCap = m_cap;
 	m_cap = cap;
 	this->allocate(&m_items, cap);
 	if (oldItems) { // move over old items
 		auto itRange = ox::min(m_size, pos);
-		for (std::size_t i = 0; i < itRange; ++i) {
+		for (size_t i = 0; i < itRange; ++i) {
 			std::construct_at(&m_items[i], std::move(oldItems[i]));
 			oldItems[i].~T();
 		}
 		itRange = m_size;
-		for (std::size_t i = pos; i < itRange; ++i) {
+		for (size_t i = pos; i < itRange; ++i) {
 			std::construct_at(&m_items[i + offset], std::move(oldItems[i]));
 			oldItems[i].~T();
 		}
@@ -744,8 +747,8 @@ constexpr void Vector<T, SmallVectorSize, Allocator>::reserveInsert(
 
 template<typename PlatSpec, typename T>
 [[nodiscard]]
-constexpr auto alignOf(const Vector<T>&) noexcept {
-	const typename PlatSpec::size_t i = 0;
+constexpr auto alignOf(Vector<T> const&) noexcept {
+	typename PlatSpec::size_t const i = 0;
 	return PlatSpec::alignOf(i);
 }
 

release-notes.md

@@ -1,3 +1,7 @@
+# NEXT
+
+* Add Get Info file dialog option in project explorer
+
 # d2025.07.0
 
 * Add sub-command for exporting TileSheets as PNG files.

src/nostalgia/modules/gfx/src/gfx-gba.cpp

@@ -321,23 +321,23 @@ void showSprite(Context&, unsigned const idx) noexcept {
 	});
 }
 
-void setSprite(Context&, uint_t const idx, Sprite const &s) noexcept {
+void setSprite(Context&, uint_t const idx, Sprite const &sprite) noexcept {
 	//oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
-	uint16_t const eightBpp = s.bpp == 8;
+	uint16_t const eightBpp = sprite.bpp == 8;
 	teagba::addSpriteUpdate({
 		.attr0 = static_cast<uint16_t>(
-			  (static_cast<uint16_t>(s.y & ox::onMask<uint8_t>(0b111'1111)))
+			  (static_cast<uint16_t>(sprite.y & ox::onMask<uint8_t>(0b111'1111)))
 			| (static_cast<uint16_t>(1) << 10) // enable alpha
 			| (static_cast<uint16_t>(eightBpp) << 13)
-			| (static_cast<uint16_t>(s.spriteShape) << 14)),
+			| (static_cast<uint16_t>(sprite.spriteShape) << 14)),
 		.attr1 = static_cast<uint16_t>(
-			  (static_cast<uint16_t>(s.x) & ox::onMask<uint8_t>(8))
-			| (static_cast<uint16_t>(s.flipX) << 12)
-			| (static_cast<uint16_t>(s.spriteSize) << 14)),
+			  (static_cast<uint16_t>(sprite.x) & ox::onMask<uint8_t>(8))
+			| (static_cast<uint16_t>(sprite.flipX) << 12)
+			| (static_cast<uint16_t>(sprite.spriteSize) << 14)),
 		.attr2 = static_cast<uint16_t>(
 			// double tileIdx if 8 bpp
-			  (static_cast<uint16_t>((s.tileIdx * (1 + eightBpp)) & ox::onMask<uint16_t>(8)))
-			| (static_cast<uint16_t>(s.priority & 0b11) << 10)),
+			  (static_cast<uint16_t>((sprite.tileIdx * (1 + eightBpp)) & ox::onMask<uint16_t>(8)))
+			| (static_cast<uint16_t>(sprite.priority & 0b11) << 10)),
 		.idx = static_cast<uint16_t>(idx),
 	});
 }
@@ -350,7 +350,7 @@ uint_t spriteCount(Context const &) noexcept {
 
 namespace ox {
 
-void panic(char const *file, int line, char const *panicMsg, ox::Error const &err) noexcept {
+void panic(char const*panicMsg, Error const&err, std::source_location const &src) noexcept {
 	using namespace nostalgia::gfx;
 	// reset heap to make sure we have enough memory to allocate context data
 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
@@ -374,7 +374,7 @@ void panic(char const *file, int line, char const *panicMsg, ox::Error const &er
 	}
 	consoleWrite(*ctx, 32 + 1, 15, "PLEASE RESTART THE SYSTEM");
 	// print to terminal if in mGBA
-	oxErrf("\033[31;1;1mPANIC:\033[0m [{}:{}]: {}\n", file, line, panicMsg);
+	oxErrf("\033[31;1;1mPANIC:\033[0m [{}:{}]: {}\n", src.file_name(), src.line(), panicMsg);
 	if (err.msg) {
 		oxErrf("\tError Message:\t{}\n", err.msg);
 	}

src/nostalgia/modules/gfx/src/keel/keelmodule.cpp

@@ -13,79 +13,66 @@
 
 namespace nostalgia::gfx {
 
-static class: public keel::Module {
-	public:
-		[[nodiscard]]
-		ox::String id() const noexcept override {
-			return ox::String{"net.drinkingtea.nostalgia.gfx"};
-		}
+static struct: keel::Module {
 
-		[[nodiscard]]
-		ox::Vector<keel::TypeDescGenerator> types() const noexcept final {
-			return {
-				keel::generateTypeDesc<TileSheetV1>,
-				keel::generateTypeDesc<TileSheetV2>,
-				keel::generateTypeDesc<TileSheetV3>,
-				keel::generateTypeDesc<TileSheetV4>,
-				keel::generateTypeDesc<TileSheetV5>,
-				keel::generateTypeDesc<CompactTileSheetV1>,
-				keel::generateTypeDesc<PaletteV1>,
-				keel::generateTypeDesc<PaletteV2>,
-				keel::generateTypeDesc<PaletteV3>,
-				keel::generateTypeDesc<PaletteV4>,
-				keel::generateTypeDesc<PaletteV5>,
-				keel::generateTypeDesc<CompactPaletteV1>,
-			};
-		}
+	[[nodiscard]]
+	ox::String id() const noexcept override {
+		return ox::String{"net.drinkingtea.nostalgia.gfx"};
+	}
 
-		[[nodiscard]]
-		ox::Vector<keel::Converter> converters() const noexcept final {
-			return {
-				keel::Converter::make<convertNostalgiaPaletteToPaletteV1>(),
-				keel::Converter::make<convertPaletteV1ToPaletteV2>(),
-				keel::Converter::make<convertPaletteV2ToPaletteV3>(),
-				keel::Converter::make<convertPaletteV3ToPaletteV4>(),
-				keel::Converter::make<convertPaletteV4ToPaletteV5>(),
-				keel::Converter::make<convertPaletteToCompactPalette>(),
-				keel::Converter::make<convertTileSheetV1ToTileSheetV2>(),
-				keel::Converter::make<convertTileSheetV2ToTileSheetV3>(),
-				keel::Converter::make<convertTileSheetV3ToTileSheetV4>(),
-				keel::Converter::make<convertTileSheetV4ToTileSheetV5>(),
-				keel::Converter::make<convertTileSheetToCompactTileSheet>(),
-			};
-		}
+	[[nodiscard]]
+	ox::Vector<keel::TypeDescGenerator> types() const noexcept final {
+		return {
+			keel::generateTypeDesc<TileSheetV1>,
+			keel::generateTypeDesc<TileSheetV2>,
+			keel::generateTypeDesc<TileSheetV3>,
+			keel::generateTypeDesc<TileSheetV4>,
+			keel::generateTypeDesc<TileSheetV5>,
+			keel::generateTypeDesc<CompactTileSheetV1>,
+			keel::generateTypeDesc<PaletteV1>,
+			keel::generateTypeDesc<PaletteV2>,
+			keel::generateTypeDesc<PaletteV3>,
+			keel::generateTypeDesc<PaletteV4>,
+			keel::generateTypeDesc<PaletteV5>,
+			keel::generateTypeDesc<CompactPaletteV1>,
+		};
+	}
 
-		[[nodiscard]]
-		ox::Vector<keel::PackTransform> packTransforms() const noexcept final {
-			return {
-				// convert tilesheets to CompactTileSheets
-				[](keel::Context &ctx, ox::Buffer &buff, ox::StringViewCR typeId) -> ox::Result<bool> {
-					if (typeId == ox::ModelTypeId_v<TileSheetV1> ||
-					    typeId == ox::ModelTypeId_v<TileSheetV2> ||
-					    typeId == ox::ModelTypeId_v<TileSheetV3> ||
-					    typeId == ox::ModelTypeId_v<TileSheetV4> ||
-					    typeId == ox::ModelTypeId_v<TileSheetV5>) {
-						OX_RETURN_ERROR(keel::convertBuffToBuff<CompactTileSheet>(
-								ctx, buff, ox::ClawFormat::Metal).moveTo(buff));
-						return true;
-					}
-					return false;
-				},
-				[](keel::Context &ctx, ox::Buffer &buff, ox::StringViewCR typeId) -> ox::Result<bool> {
-					if (typeId == ox::ModelTypeId_v<NostalgiaPalette> ||
-					    typeId == ox::ModelTypeId_v<PaletteV1> ||
-					    typeId == ox::ModelTypeId_v<PaletteV2> ||
-					    typeId == ox::ModelTypeId_v<PaletteV3> ||
-					    typeId == ox::ModelTypeId_v<PaletteV4> ||
-					    typeId == ox::ModelTypeId_v<PaletteV5>) {
-						OX_RETURN_ERROR(keel::convertBuffToBuff<CompactPalette>(
-								ctx, buff, ox::ClawFormat::Metal).moveTo(buff));
-						return true;
-					}
-					return false;
-				},
-			};
-		}
+	[[nodiscard]]
+	ox::Vector<keel::Converter> converters() const noexcept final {
+		return {
+			keel::Converter::make<convertNostalgiaPaletteToPaletteV1>(),
+			keel::Converter::make<convertPaletteV1ToPaletteV2>(),
+			keel::Converter::make<convertPaletteV2ToPaletteV3>(),
+			keel::Converter::make<convertPaletteV3ToPaletteV4>(),
+			keel::Converter::make<convertPaletteV4ToPaletteV5>(),
+			keel::Converter::make<convertPaletteToCompactPalette>(),
+			keel::Converter::make<convertTileSheetV1ToTileSheetV2>(),
+			keel::Converter::make<convertTileSheetV2ToTileSheetV3>(),
+			keel::Converter::make<convertTileSheetV3ToTileSheetV4>(),
+			keel::Converter::make<convertTileSheetV4ToTileSheetV5>(),
+			keel::Converter::make<convertTileSheetToCompactTileSheet>(),
+		};
+	}
+
+	[[nodiscard]]
+	ox::Vector<keel::PackTransform> packTransforms() const noexcept final {
+		return {
+			// convert tilesheets to CompactTileSheets
+			keel::transformRule<TileSheetV1, CompactTileSheet>,
+			keel::transformRule<TileSheetV2, CompactTileSheet>,
+			keel::transformRule<TileSheetV3, CompactTileSheet>,
+			keel::transformRule<TileSheetV4, CompactTileSheet>,
+			keel::transformRule<TileSheetV5, CompactTileSheet>,
+			// convert palettes to CompactPalettes
+			keel::transformRule<NostalgiaPalette, CompactPalette>,
+			keel::transformRule<PaletteV1, CompactPalette>,
+			keel::transformRule<PaletteV2, CompactPalette>,
+			keel::transformRule<PaletteV3, CompactPalette>,
+			keel::transformRule<PaletteV4, CompactPalette>,
+			keel::transformRule<PaletteV5, CompactPalette>,
+		};
+	}
 
 } const mod;
 

src/nostalgia/modules/gfx/src/keel/typeconv.cpp

@@ -109,8 +109,8 @@ static void convertSubsheet(
 	dst.rows    = src.rows;
 	dst.pixels  = std::move(src.pixels);
 	++idIt;
-	dst.subsheets.resize(src.subsheets.size());
-	for (auto i = 0u; i < src.subsheets.size(); ++i) {
+	dst.subsheets.reserveResize(src.subsheets.size());
+	for (size_t i{}; i < src.subsheets.size(); ++i) {
 		convertSubsheet(src.subsheets[i], dst.subsheets[i], idIt);
 	}
 }
@@ -136,8 +136,8 @@ static void convertSubsheet(
 	dst.rows    = src.rows;
 	dst.pixels  = std::move(src.pixels);
 	++idIt;
-	dst.subsheets.resize(src.subsheets.size());
-	for (auto i = 0u; i < src.subsheets.size(); ++i) {
+	dst.subsheets.reserveResize(src.subsheets.size());
+	for (size_t i{}; i < src.subsheets.size(); ++i) {
 		convertSubsheet(src.subsheets[i], dst.subsheets[i], idIt);
 	}
 }
@@ -173,8 +173,8 @@ static void convertSubsheet(
 	} else {
 		dst.pixels = std::move(src.pixels);
 	}
-	dst.subsheets.resize(src.subsheets.size());
-	for (auto i = 0u; i < src.subsheets.size(); ++i) {
+	dst.subsheets.reserveResize(src.subsheets.size());
+	for (size_t i{}; i < src.subsheets.size(); ++i) {
 		convertSubsheet(bpp, src.subsheets[i], dst.subsheets[i]);
 	}
 }

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/cutpastecommand.cpp

@@ -6,13 +6,14 @@
 
 namespace nostalgia::gfx {
 
-TileSheetClipboard::Pixel::Pixel(uint16_t pColorIdx, ox::Point pPt) noexcept {
-	colorIdx = pColorIdx;
-	pt = pPt;
-}
+TileSheetClipboard::Pixel::Pixel(
+	uint8_t const pColorIdx,
+	ox::Point const pPt) noexcept:
+	colorIdx(pColorIdx),
+	pt(pPt) {}
 
 
-void TileSheetClipboard::addPixel(ox::Point const&pt, uint16_t colorIdx) noexcept {
+void TileSheetClipboard::addPixel(ox::Point const &pt, uint8_t colorIdx) noexcept {
 	m_pixels.emplace_back(colorIdx, pt);
 }
 
@@ -22,43 +23,37 @@ const ox::Vector<TileSheetClipboard::Pixel> &TileSheetClipboard::pixels() const
 
 
 CutPasteCommand::CutPasteCommand(
-		CommandId commandId,
+		CommandId const commandId,
 		TileSheet &img,
 		TileSheet::SubSheetIdx subSheetIdx,
-		ox::Point const&dstStart,
+		ox::Point const &dstStart,
 		ox::Point dstEnd,
-		TileSheetClipboard const&cb):
+		TileSheetClipboard const &cb):
 		m_commandId(commandId),
 		m_img(img),
 		m_subSheetIdx(std::move(subSheetIdx)) {
-	auto const&ss = getSubSheet(m_img, m_subSheetIdx);
+	auto const &ss = getSubSheet(m_img, m_subSheetIdx);
 	if (dstStart.x >= ss.columns * TileWidth || dstStart.y >= ss.rows * TileHeight) {
 		throw ox::Exception{1, "paste starts beyond the bounds of target"};
 	}
 	dstEnd.x = std::min(ss.columns * TileWidth - 1, dstEnd.x);
 	dstEnd.y = std::min(ss.rows * TileHeight - 1, dstEnd.y);
-	for (auto const&p : cb.pixels()) {
+	for (auto const &p : cb.pixels()) {
 		auto const dstPt = p.pt + dstStart;
 		if (dstPt.x <= dstEnd.x && dstPt.y <= dstEnd.y) {
 			auto const idx = gfx::idx(ss, dstPt);
-			m_changes.emplace_back(static_cast<uint32_t>(idx), p.colorIdx, getPixel(ss, idx));
+			m_changes.emplace_back(static_cast<uint32_t>(idx), p.colorIdx);
 		}
 	}
 }
 
 ox::Error CutPasteCommand::redo() noexcept {
-	auto &subsheet = getSubSheet(m_img, m_subSheetIdx);
-	for (auto const &c : m_changes) {
-		subsheet.pixels[c.idx] = static_cast<uint8_t>(c.newPalIdx);
-	}
+	swap();
 	return {};
 }
 
 ox::Error CutPasteCommand::undo() noexcept {
-	auto &subsheet = getSubSheet(m_img, m_subSheetIdx);
-	for (auto const &c : m_changes) {
-		subsheet.pixels[c.idx] = static_cast<uint8_t>(c.oldPalIdx);
-	}
+	swap();
 	return {};
 }
 
@@ -66,8 +61,15 @@ int CutPasteCommand::commandId() const noexcept {
 	return static_cast<int>(m_commandId);
 }
 
-TileSheet::SubSheetIdx const&CutPasteCommand::subsheetIdx() const noexcept {
+TileSheet::SubSheetIdx const &CutPasteCommand::subsheetIdx() const noexcept {
 	return m_subSheetIdx;
 }
 
+void CutPasteCommand::swap() noexcept {
+	auto &subsheet = getSubSheet(m_img, m_subSheetIdx);
+	for (auto &c : m_changes) {
+		std::swap(subsheet.pixels[c.idx], c.palIdx);
+	}
+}
+
 }

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/cutpastecommand.hpp

@@ -22,15 +22,15 @@ class TileSheetClipboard: public turbine::ClipboardObject<TileSheetClipboard> {
 		struct Pixel {
 			static constexpr auto TypeName = "net.drinkingtea.nostalgia.gfx.studio.TileSheetClipboard.Pixel";
 			static constexpr auto TypeVersion = 1;
-			uint16_t colorIdx = 0;
+			uint8_t colorIdx = 0;
 			ox::Point pt;
-			Pixel(uint16_t pColorIdx, ox::Point pPt) noexcept;
+			Pixel(uint8_t pColorIdx, ox::Point pPt) noexcept;
 		};
 	protected:
 		ox::Vector<Pixel> m_pixels;
 
 	public:
-		void addPixel(ox::Point const &pt, uint16_t colorIdx) noexcept;
+		void addPixel(ox::Point const &pt, uint8_t colorIdx) noexcept;
 
 		[[nodiscard]]
 		ox::Vector<Pixel> const &pixels() const noexcept;
@@ -49,12 +49,10 @@ class CutPasteCommand: public TileSheetCommand {
 	private:
 		struct Change {
 			uint32_t idx = 0;
-			uint16_t newPalIdx = 0;
-			uint16_t oldPalIdx = 0;
-			constexpr Change(uint32_t pIdx, uint16_t pNewPalIdx, uint16_t pOldPalIdx) noexcept {
+			uint8_t palIdx = 0;
+			constexpr Change(uint32_t const pIdx, uint8_t const pPalIdx) noexcept {
 				idx = pIdx;
-				newPalIdx = pNewPalIdx;
-				oldPalIdx = pOldPalIdx;
+				palIdx = pPalIdx;
 			}
 		};
 		CommandId m_commandId;
@@ -81,6 +79,9 @@ class CutPasteCommand: public TileSheetCommand {
 		[[nodiscard]]
 		TileSheet::SubSheetIdx const &subsheetIdx() const noexcept override;
 
+	private:
+		void swap() noexcept;
+
 };
 
 }

src/nostalgia/modules/gfx/test/CMakeLists.txt

@@ -8,4 +8,4 @@ target_link_libraries(
 		NostalgiaGfx
 )
 
-add_test("[NostalgiaGfx] readWriteTileSheet" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/NostalgiaGfxTest readWriteTileSheet)
+add_test("[nostalgia/gfx] readWriteTileSheet" ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/NostalgiaGfxTest readWriteTileSheet)

src/nostalgia/modules/gfx/test/tests.cpp

@@ -18,7 +18,7 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 			gfx::TileSheet const in;
 			OX_REQUIRE(buff, ox::writeMC(in));
 			OX_REQUIRE(out, ox::readMC<gfx::TileSheet>(buff));
-			oxAssert(in.subsheet.name == out.subsheet.name, "subsheet.name serialization broken");
+			ox::expect(in.subsheet.name, out.subsheet.name);
 			return {};
 		}
 	},

src/olympic/keel/include/keel/media.hpp

@@ -189,8 +189,4 @@ ox::Error setRomFs(Context &ctx, ox::UPtr<ox::FileSystem> &&fs) noexcept;
 
 ox::Result<ox::UPtr<ox::FileSystem>> loadRomFs(ox::StringViewCR path) noexcept;
 
-ox::Result<char*> loadRom(ox::StringViewCR path = "") noexcept;
-
-void unloadRom(char*) noexcept;
-
 }

src/olympic/keel/include/keel/module.hpp

@@ -37,9 +37,9 @@ class Module {
 		virtual ox::Vector<PackTransform> packTransforms() const noexcept;
 };
 
-void registerModule(Module const*mod) noexcept;
+void registerModule(Module const *mod) noexcept;
 
 [[nodiscard]]
-ox::Vector<keel::Module const*> const &modules() noexcept;
+ox::Vector<Module const*> const &modules() noexcept;
 
 }

src/olympic/keel/include/keel/typeconv.hpp

@@ -19,7 +19,7 @@ class Wrap {
 	public:
 		virtual ~Wrap() = default;
 		[[nodiscard]]
-		virtual ox::CStringView typeName() const noexcept = 0;
+		virtual ox::StringLiteral typeName() const noexcept = 0;
 		[[nodiscard]]
 		virtual int typeVersion() const noexcept = 0;
 		[[nodiscard]]
@@ -48,7 +48,7 @@ class WrapRef final: public WrapT<T> {
 		constexpr explicit WrapRef(T &obj): m_obj{obj} {}
 
 		[[nodiscard]]
-		ox::CStringView typeName() const noexcept override {
+		ox::StringLiteral typeName() const noexcept override {
 			return ox::ModelTypeName_v<T>;
 		}
 
@@ -77,7 +77,7 @@ class WrapInline final: public WrapT<T> {
 		}
 
 		[[nodiscard]]
-		ox::CStringView typeName() const noexcept override {
+		ox::StringLiteral typeName() const noexcept override {
 			return ox::ModelTypeName_v<T>;
 		}
 
@@ -108,7 +108,7 @@ class BaseConverter {
 		constexpr virtual ~BaseConverter() noexcept = default;
 
 		[[nodiscard]]
-		constexpr virtual ox::StringView srcTypeName() const noexcept = 0;
+		constexpr virtual ox::StringLiteral srcTypeName() const noexcept = 0;
 
 		[[nodiscard]]
 		constexpr virtual int srcTypeVersion() const noexcept = 0;
@@ -154,7 +154,7 @@ class ConverterFunc final: public BaseConverter {
 		using DstType = typename decltype(extractParams(Func))::Dst;
 
 		[[nodiscard]]
-		constexpr ox::StringView srcTypeName() const noexcept override {
+		constexpr ox::StringLiteral srcTypeName() const noexcept override {
 			return ox::ModelTypeName_v<SrcType>;
 		}
 
@@ -253,19 +253,22 @@ template<typename DstType>
 ox::Result<DstType> convertObjToObj(
 		Context &ctx,
 		auto &src) noexcept {
-	OX_REQUIRE_M(out, convert(ctx, WrapRef{src}, ox::ModelTypeName_v<DstType>, ox::ModelTypeVersion_v<DstType>));
+	OX_REQUIRE_M(out,
+		convert(ctx, WrapRef{src}, ox::ModelTypeName_v<DstType>, ox::ModelTypeVersion_v<DstType>));
 	return std::move(wrapCast(*out));
 }
 
 template<typename DstType>
 ox::Result<DstType> convert(Context &ctx, ox::BufferView const &src) noexcept {
-	OX_REQUIRE(out, convert(ctx, src, ox::ModelTypeName_v<DstType>, ox::ModelTypeVersion_v<DstType>));
+	OX_REQUIRE(out,
+		convert(ctx, src, ox::ModelTypeName_v<DstType>, ox::ModelTypeVersion_v<DstType>));
 	return std::move(wrapCast<DstType>(*out));
 }
 
 template<typename DstType>
 ox::Error convert(Context &ctx, ox::BufferView const &buff, DstType &outObj) noexcept {
-	OX_REQUIRE(out, convert(ctx, buff, ox::ModelTypeName_v<DstType>, ox::ModelTypeVersion_v<DstType>));
+	OX_REQUIRE(out,
+		convert(ctx, buff, ox::ModelTypeName_v<DstType>, ox::ModelTypeVersion_v<DstType>));
 	outObj = std::move(wrapCast<DstType>(*out));
 	return {};
 }
@@ -280,7 +283,8 @@ ox::Error convertObjToObj(Context &ctx, auto &src, DstType &outObj) noexcept {
 template<typename DstType>
 ox::Result<ox::Buffer> convertBuffToBuff(
 		Context &ctx, ox::BufferView const &src, ox::ClawFormat const fmt) noexcept {
-	OX_REQUIRE(out, convert(ctx, src, ox::ModelTypeName_v<DstType>, ox::ModelTypeVersion_v<DstType>));
+	OX_REQUIRE(out,
+		convert(ctx, src, ox::ModelTypeName_v<DstType>, ox::ModelTypeVersion_v<DstType>));
 	return ox::writeClaw<DstType>(wrapCast<DstType>(*out), fmt);
 }
 

src/olympic/keel/test/tests.cpp

@@ -19,7 +19,7 @@ static std::map<ox::StringView, ox::Error(*)()> tests = {
 			ox::Array<char, hdr.size()> buff;
 			ox::CharBuffWriter bw(buff);
 			OX_RETURN_ERROR(keel::writeUuidHeader(bw, uuid));
-			oxExpect(ox::StringView(buff.data(), buff.size()), hdr);
+			ox::expect(ox::StringView(buff.data(), buff.size()), hdr);
 			return {};
 		}
 	},

src/olympic/studio/applib/src/CMakeLists.txt

@@ -6,6 +6,7 @@ add_library(
 		font.cpp
 		popups/about.cpp
 		popups/deleteconfirmation.cpp
+		popups/fileinfo.cpp
 		popups/makecopy.cpp
 		popups/newdir.cpp
 		popups/newmenu.cpp

src/olympic/studio/applib/src/popups/fileinfo.cpp

@@ -0,0 +1,126 @@
+/*
+ * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ */
+
+#include "fileinfo.hpp"
+
+namespace studio {
+
+FileInfo::FileInfo(Context &sctx) noexcept:
+	Popup("File Info"),
+	m_sctx(sctx) {}
+
+ox::Error FileInfo::open(ox::StringParam filePath) noexcept {
+	m_filePath = std::move(filePath);
+	auto &fs = m_sctx.project->romFs();
+	OX_REQUIRE(fileBuff, fs.read(m_filePath));
+	auto [hdr, err] = keel::readAssetHeader(fileBuff);
+	if (!err) {
+		m_fileInfo.emplace(Info{
+			.assetId = hdr.uuid.toString(),
+			.typeName = std::move(hdr.clawHdr.typeName),
+			.typeVersion = hdr.clawHdr.typeVersion,
+			.format = [&hdr] {
+				switch (hdr.clawHdr.fmt) {
+					case ox::ClawFormat::Metal:
+						return ox::StringLiteral{"Metal Claw"};
+					case ox::ClawFormat::Organic:
+						return ox::StringLiteral{"Organic Claw"};
+					default:
+						return ox::StringLiteral{"Other"};
+				}
+			}(),
+			.dataSize = hdr.clawHdr.dataSize,
+		});
+	}
+	Popup::open();
+	return {};
+}
+
+void FileInfo::draw(Context &sctx) noexcept {
+	if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
+		close();
+		return;
+	}
+	switch (m_stage) {
+		case Stage::Closed:
+			break;
+		case Stage::Opening:
+			ImGui::OpenPopup(m_title.c_str());
+			m_stage = Stage::Open;
+			[[fallthrough]];
+		case Stage::Open: {
+			constexpr auto modalFlags =
+					ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize;
+			ig::centerNextWindow(sctx.tctx);
+			auto open = true;
+			if (ImGui::BeginPopupModal(m_title.c_str(), &open, modalFlags)) {
+				drawTable();
+				switch (auto const r = ig::PopupControlsOk(m_open, "Close")) {
+					case ig::PopupResponse::None:
+						break;
+					case ig::PopupResponse::OK:
+						response.emit(r);
+						m_fileInfo.reset();
+						m_filePath = ox::String{};
+						close();
+						break;
+					case ig::PopupResponse::Cancel:
+						break;
+				}
+				ImGui::EndPopup();
+			}
+			if (!open) {
+				m_stage = Stage::Closed;
+			}
+			break;
+		}
+	}
+}
+
+void FileInfo::drawTable() const noexcept {
+	ig::IDStackItem const idStackItem{"FileInfo"};
+	ImGui::Text("%s", m_filePath.c_str());
+	if (m_fileInfo && ImGui::BeginTable(
+		"Table", 2,
+			ImGuiTableFlags_Borders |
+			ImGuiTableFlags_RowBg)) {
+		ImGui::TableSetupColumn("Field", ImGuiTableColumnFlags_WidthFixed, 70);
+		ImGui::TableSetupColumn("Value", ImGuiTableColumnFlags_NoHide);
+		// asset id
+		ImGui::TableNextRow();
+		ImGui::TableSetColumnIndex(0);
+		ImGui::Text("Asset ID:");
+		ImGui::TableSetColumnIndex(1);
+		ImGui::Text("%s", m_fileInfo->assetId.c_str());
+		// typeName
+		ImGui::TableNextRow();
+		ImGui::TableSetColumnIndex(0);
+		ImGui::Text("Type Name:");
+		ImGui::TableSetColumnIndex(1);
+		ImGui::Text("%s", m_fileInfo->typeName.c_str());
+		// typeVersion
+		ImGui::TableNextRow();
+		ImGui::TableSetColumnIndex(0);
+		ImGui::Text("Type Version:");
+		ImGui::TableSetColumnIndex(1);
+		ImGui::Text("%d", m_fileInfo->typeVersion);
+		// format
+		ImGui::TableNextRow();
+		ImGui::TableSetColumnIndex(0);
+		ImGui::Text("Format:");
+		ImGui::TableSetColumnIndex(1);
+		ImGui::Text("%s", m_fileInfo->format.c_str());
+		// size
+		ImGui::TableNextRow();
+		ImGui::TableSetColumnIndex(0);
+		ImGui::Text("Data Size:");
+		ImGui::TableSetColumnIndex(1);
+		ImGui::Text("%lluB", m_fileInfo->dataSize);
+		ImGui::EndTable();
+	} else {
+		ImGui::Text("No information available");
+	}
+}
+
+}

src/olympic/studio/applib/src/popups/fileinfo.hpp

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ */
+
+#pragma once
+
+#include <ox/std/string.hpp>
+
+#include <studio/context.hpp>
+#include <studio/imguiutil.hpp>
+
+namespace studio {
+
+class FileInfo: public ig::Popup {
+	private:
+		Context &m_sctx;
+		ox::String m_filePath;
+		struct Info {
+			ox::UUIDStr assetId;
+			ox::String typeName;
+			int typeVersion{};
+			ox::StringLiteral format;
+			// use manual sizing to work with %ull
+			unsigned long long dataSize{};
+		};
+		ox::Optional<Info> m_fileInfo;
+
+	public:
+		explicit FileInfo(Context &sctx) noexcept;
+
+		ox::Error open(ox::StringParam filePath) noexcept;
+
+		void draw(Context &sctx) noexcept override;
+
+	private:
+		void drawTable() const noexcept;
+
+};
+
+}

src/olympic/studio/applib/src/projectexplorer.cpp

@@ -36,6 +36,13 @@ void ProjectExplorer::dirMoved(ox::StringViewCR src, ox::StringViewCR dst) const
 
 void ProjectExplorer::fileContextMenu(ox::StringViewCR path) const noexcept {
 	if (ImGui::BeginPopupContextItem("FileMenu", ImGuiPopupFlags_MouseButtonRight)) {
+		if (ImGui::MenuItem("Open")) {
+			fileChosen.emit(path);
+		}
+		if (ImGui::MenuItem("Get Info")) {
+			getInfo.emit(path);
+		}
+		ImGui::Separator();
 		if (ImGui::MenuItem("Delete")) {
 			deleteItem.emit(path);
 		}

src/olympic/studio/applib/src/projectexplorer.hpp

@@ -21,6 +21,7 @@ class ProjectExplorer final: public FileExplorer {
 		ox::Signal<ox::Error(ox::StringViewCR)> deleteItem;
 		ox::Signal<ox::Error(ox::StringViewCR)> renameItem;
 		ox::Signal<ox::Error(ox::StringViewCR)> makeCopy;
+		ox::Signal<ox::Error(ox::StringViewCR)> getInfo;
 		ox::Signal<ox::Error(ox::StringViewCR src, ox::StringViewCR dst)> moveDir;
 		ox::Signal<ox::Error(ox::StringViewCR src, ox::StringViewCR dst)> moveItem;
 

src/olympic/studio/applib/src/studioui.cpp

@@ -146,6 +146,7 @@ StudioUI::StudioUI(turbine::Context &tctx, ox::StringParam projectDataDir) noexc
 	m_projectExplorer.addDir.connect(this, &StudioUI::addDir);
 	m_projectExplorer.addItem.connect(this, &StudioUI::addFile);
 	m_projectExplorer.deleteItem.connect(this, &StudioUI::deleteFile);
+	m_projectExplorer.getInfo.connect(this, &StudioUI::getFileInfo);
 	m_projectExplorer.renameItem.connect(this, &StudioUI::renameFile);
 	m_projectExplorer.makeCopy.connect(this, &StudioUI::makeCopyDlg);
 	m_projectExplorer.moveDir.connect(this, &StudioUI::queueDirMove);
@@ -569,6 +570,10 @@ ox::Error StudioUI::deleteFile(ox::StringViewCR path) noexcept {
 	return {};
 }
 
+ox::Error StudioUI::getFileInfo(ox::StringViewCR path) noexcept {
+	return m_fileInfo.open(path);
+}
+
 ox::Error StudioUI::renameFile(ox::StringViewCR path) noexcept {
 	return m_renameFile.openPath(path);
 }

src/olympic/studio/applib/src/studioui.hpp

@@ -21,6 +21,7 @@
 #include "popups/newmenu.hpp"
 #include "popups/newproject.hpp"
 #include "projectexplorer.hpp"
+#include "popups/fileinfo.hpp"
 #include "popups/renamefile.hpp"
 
 namespace studio {
@@ -48,6 +49,7 @@ class StudioUI final: public ox::SignalHandler {
 		NewMenu m_newMenu{keelCtx(m_tctx)};
 		AboutPopup m_aboutPopup{m_tctx};
 		DeleteConfirmation m_deleteConfirmation;
+		FileInfo m_fileInfo{m_sctx};
 		NewDir m_newDirDialog;
 		ig::QuestionPopup m_closeFileConfirm{"Close File?", "This file has unsaved changes. Close?"};
 		ig::QuestionPopup m_closeAppConfirm{
@@ -62,10 +64,11 @@ class StudioUI final: public ox::SignalHandler {
 			ig::QuestionPopup dlg{"Remove From Recents?", "Unable to load project. Remove from recent projects?"};
 			size_t idx{};
 		} m_removeRecentProject;
-		ox::Array<Widget*, 11> const m_widgets {
+		ox::Array<Widget*, 12> const m_widgets {
 			&m_closeFileConfirm,
 			&m_closeAppConfirm,
 			&m_copyFilePopup,
+			&m_fileInfo,
 			&m_newMenu,
 			&m_newProject,
 			&m_aboutPopup,
@@ -130,6 +133,8 @@ class StudioUI final: public ox::SignalHandler {
 
 		ox::Error deleteFile(ox::StringViewCR path) noexcept;
 
+		ox::Error getFileInfo(ox::StringViewCR path) noexcept;
+
 		ox::Error renameFile(ox::StringViewCR path) noexcept;
 
 		ox::Error handleMoveFile(ox::StringViewCR oldPath, ox::StringViewCR newPath, ox::UUID const &id) noexcept;