[studio] Fix build

Also, fix dir context menu to work when dir is closed, and fix it not to
override last file in the directory.

.gitignore

@@ -6,7 +6,7 @@
 .mypy_cache
 .stfolder
 .stignore
-scripts/__pycache__
+util/scripts/__pycache__
 pyenv
 CMakeLists.txt.user
 ROM.oxfs

.liccor.yml

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

Makefile

@@ -1,26 +1,31 @@
 BC_VAR_PROJECT_NAME=nostalgia
 BC_VAR_PROJECT_NAME_CAP=Nostalgia
+BC_VAR_DEVENV_ROOT=util
 BUILDCORE_PATH=deps/buildcore
 include ${BUILDCORE_PATH}/base.mk
 
 ifeq ($(BC_VAR_OS),darwin)
-	NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio.app/Contents/MacOS/${BC_VAR_PROJECT_NAME_CAP}Studio
+	PROJECT_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio.app/Contents/MacOS/${BC_VAR_PROJECT_NAME_CAP}Studio
 	MGBA=/Applications/mGBA.app/Contents/MacOS/mGBA
 else
-	NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio
+	PROJECT_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio
 	MGBA=mgba-qt
 endif
+PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}
 
 .PHONY: pkg-gba
 pkg-gba: build
-	${BC_CMD_ENVRUN} ${BC_PY3} ./scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
+	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
 
+.PHONY: build-player
+build-player:
+	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} ${BC_VAR_PROJECT_NAME_CAP}
 .PHONY: run
-run: build
-	./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
+run: build-player
+	${PROJECT_PLAYER} sample_project
 .PHONY: run-studio
 run-studio: build
-	${NOSTALGIA_STUDIO}
+	${PROJECT_STUDIO}
 .PHONY: gba-run
 gba-run: pkg-gba
 	${MGBA} ${BC_VAR_PROJECT_NAME}.gba
@@ -29,7 +34,7 @@ debug: build
 	${BC_CMD_HOST_DEBUGGER} ./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
 .PHONY: debug-studio
 debug-studio: build
-	${BC_CMD_HOST_DEBUGGER} ${NOSTALGIA_STUDIO}
+	${BC_CMD_HOST_DEBUGGER} ${PROJECT_STUDIO}
 
 .PHONY: configure-gba
 configure-gba:

deps/gbabuildcore/base.cmake

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

deps/glad/CMakeLists.txt

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

deps/imgui/CMakeLists.txt

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

deps/ox/.liccor.yml

@@ -2,7 +2,7 @@
 source:
 - src
 copyright_notice: |-
-  Copyright 2015 - 2024 gary@drinkingtea.net
+  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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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
@@ -215,7 +215,7 @@ Error Signal<Args...>::emitCheckError(Args... args) const noexcept {
 		}
 		return ox::Error(0);
 	} catch (const ox::Exception &ex) {
-		return ox::Error(ex.file, ex.line, ex.errCode, ex.msg);
+		return ox::Error(ex.errCode, ex.msg, ex.src);
 	}
 }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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
@@ -63,18 +63,6 @@ Error FileSystem::read(const FileAddress &addr, std::size_t readStart, std::size
 	}
 }
 
-Error FileSystem::remove(const FileAddress &addr, bool recursive) noexcept {
-	switch (addr.type()) {
-		case FileAddressType::Inode:
-			return remove(addr.getInode().value, recursive);
-		case FileAddressType::ConstPath:
-		case FileAddressType::Path:
-			return remove(StringView(addr.getPath().value), recursive);
-		default:
-			return ox::Error(1);
-	}
-}
-
 Error FileSystem::write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType) noexcept {
 	switch (addr.type()) {
 		case FileAddressType::Inode:

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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
@@ -57,9 +57,9 @@ class FileSystem {
 
 		virtual Result<Vector<String>> ls(StringViewCR dir) const noexcept = 0;
 
-		virtual Error remove(StringViewCR path, bool recursive) noexcept = 0;
-
-		Error remove(const FileAddress &addr, bool recursive = false) noexcept;
+		Error remove(StringViewCR path, bool recursive = false) noexcept {
+			return removePath(path, recursive);
+		}
 
 		virtual Error resize(uint64_t size, void *buffer) noexcept = 0;
 
@@ -142,6 +142,8 @@ class FileSystem {
 
 		virtual Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept = 0;
 
+		virtual Error removePath(StringViewCR path, bool recursive) noexcept = 0;
+
 		virtual Error writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept = 0;
 
 		virtual Error writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept = 0;
@@ -209,6 +211,8 @@ class FileSystemTemplate: public MemFS {
 
 		Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
 
+		Error removePath(StringViewCR path, bool recursive) noexcept override;
+
 		Result<const char*> directAccessInode(uint64_t) const noexcept override;
 
 		Result<Vector<String>> ls(StringViewCR dir) const noexcept override;
@@ -216,8 +220,6 @@ class FileSystemTemplate: public MemFS {
 		template<typename F>
 		Error ls(StringViewCR path, F cb) const;
 
-		Error remove(StringViewCR path, bool recursive) noexcept override;
-
 		/**
 		 * Resizes FileSystem to minimum possible size.
 		 */
@@ -356,6 +358,25 @@ Error FileSystemTemplate<FileStore, Directory>::readFileInodeRange(uint64_t inod
 	return m_fs.read(inode, readStart, readSize, reinterpret_cast<uint8_t*>(buffer), size);
 }
 
+template<typename FileStore, typename Directory>
+Error FileSystemTemplate<FileStore, Directory>::removePath(StringViewCR path, bool recursive) noexcept {
+	OX_REQUIRE(fd, fileSystemData());
+	Directory rootDir(m_fs, fd.rootDirInode);
+	OX_REQUIRE(inode, rootDir.find(path));
+	OX_REQUIRE(st, statInode(inode));
+	if (st.fileType == FileType::NormalFile || recursive) {
+		if (auto err = rootDir.remove(path)) {
+			// removal failed, try putting the index back
+			oxLogError(rootDir.write(path, inode));
+			return err;
+		}
+	} else {
+		oxTrace("FileSystemTemplate.remove.fail", "Tried to remove directory without recursive setting.");
+		return ox::Error(1);
+	}
+	return ox::Error(0);
+}
+
 template<typename FileStore, typename Directory>
 Result<const char*> FileSystemTemplate<FileStore, Directory>::directAccessInode(uint64_t inode) const noexcept {
 	auto data = m_fs.read(inode);
@@ -384,25 +405,6 @@ Error FileSystemTemplate<FileStore, Directory>::ls(StringViewCR path, F cb) cons
 	return dir.ls(cb);
 }
 
-template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::remove(StringViewCR path, bool recursive) noexcept {
-	OX_REQUIRE(fd, fileSystemData());
-	Directory rootDir(m_fs, fd.rootDirInode);
-	OX_REQUIRE(inode, rootDir.find(path));
-	OX_REQUIRE(st, statInode(inode));
-	if (st.fileType == FileType::NormalFile || recursive) {
-		if (auto err = rootDir.remove(path)) {
-			// removal failed, try putting the index back
-			oxLogError(rootDir.write(path, inode));
-			return err;
-		}
-	} else {
-		oxTrace("FileSystemTemplate.remove.fail", "Tried to remove directory without recursive setting.");
-		return ox::Error(1);
-	}
-	return ox::Error(0);
-}
-
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::resize() noexcept {
 	return m_fs.resize();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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
@@ -75,14 +75,6 @@ Result<Vector<String>> PassThroughFS::ls(StringViewCR dir) const noexcept {
 	return out;
 }
 
-Error PassThroughFS::remove(StringViewCR path, bool recursive) noexcept {
-	if (recursive) {
-		return ox::Error(std::filesystem::remove_all(m_path / stripSlash(path)) != 0);
-	} else {
-		return ox::Error(std::filesystem::remove(m_path / stripSlash(path)) != 0);
-	}
-}
-
 Error PassThroughFS::resize(uint64_t, void*) noexcept {
 	// unsupported
 	return ox::Error(1, "resize is not supported by PassThroughFS");
@@ -167,6 +159,14 @@ Error PassThroughFS::readFileInodeRange(uint64_t, std::size_t, std::size_t, void
 	return ox::Error(1, "read(uint64_t, std::size_t, std::size_t, void*, std::size_t*) is not supported by PassThroughFS");
 }
 
+Error PassThroughFS::removePath(StringViewCR path, bool const recursive) noexcept {
+	if (recursive) {
+		return ox::Error{std::filesystem::remove_all(m_path / stripSlash(path)) == 0};
+	} else {
+		return ox::Error{!std::filesystem::remove(m_path / stripSlash(path))};
+	}
+}
+
 Error PassThroughFS::writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType) noexcept {
 	const auto p = (m_path / stripSlash(path));
 	try {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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
@@ -45,8 +45,6 @@ class PassThroughFS: public FileSystem {
 		template<typename F>
 		Error ls(StringViewCR dir, F cb) const noexcept;
 
-		Error remove(StringViewCR path, bool recursive) noexcept override;
-
 		Error resize(uint64_t size, void *buffer) noexcept override;
 
 		Result<FileStat> statInode(uint64_t inode) const noexcept override;
@@ -75,6 +73,8 @@ class PassThroughFS: public FileSystem {
 
 		Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
 
+		Error removePath(StringViewCR path, bool recursive) noexcept override;
+
 		Error writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept override;
 
 		Error writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept override;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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
@@ -140,16 +140,16 @@ constexpr Str getModelTypeName() noexcept {
 	return out;
 }
 
-template<typename T>
+template<typename T, typename Str = const char*>
 [[nodiscard]]
 consteval auto requireModelTypeName() noexcept {
-	constexpr auto name = getModelTypeName<T>();
+	constexpr auto name = getModelTypeName<T, Str>();
 	static_assert(ox::StringView{name}.len(), "Type lacks required TypeName");
 	return name;
 }
 
 template<typename T, typename Str = const char*>
-constexpr auto ModelTypeName_v = getModelTypeName<T, Str>();
+constexpr auto ModelTypeName_v = requireModelTypeName<T, Str>();
 
 template<typename T, typename Str = const char*>
 constexpr auto ModelTypeVersion_v = requireModelTypeVersion<T>();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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
@@ -144,7 +144,11 @@ Error OrganicClawReader::field(const char *key, T *val) noexcept {
 				if (jv.empty()) {
 					*val = 0;
 				} else if (rightType) {
-					*val = static_cast<T>(jv.asUInt());
+					if constexpr(ox::is_signed_v<T>) {
+						*val = static_cast<T>(jv.asInt64());
+					} else {
+						*val = static_cast<T>(jv.asUInt64());
+					}
 				} else {
 					err = ox::Error(1, "Type mismatch");
 				}
@@ -172,7 +176,8 @@ Error OrganicClawReader::field(const char *key, T *val) noexcept {
 				err = ox::Error(1, "Type mismatch");
 			}
 		}
-	} catch (Json::LogicError const&) {
+	} catch (Json::LogicError const&e) {
+		oxDebugf("JSON error: {}", e.what());
 		err = ox::Error(1, "error reading JSON data");
 	}
 	++m_fieldIt;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -109,6 +109,7 @@ install(
 		error.hpp
 		fmt.hpp
 		hardware.hpp
+		hash.hpp
 		hashmap.hpp
 		heapmgr.hpp
 		ignore.hpp

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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
@@ -15,18 +15,22 @@
 
 namespace ox {
 
-class AnyPtr {
+namespace detail {
+
+template<bool unique>
+class AnyPtrT {
 	private:
 		struct WrapBase {
 			virtual constexpr ~WrapBase() = default;
 			virtual constexpr WrapBase *copyTo(ox::Span<char> s) noexcept = 0;
 			virtual constexpr operator bool() const noexcept = 0;
+			virtual void free() noexcept = 0;
 		};
 
 		template<typename T>
-		struct Wrap: public WrapBase {
+		struct Wrap final: WrapBase {
 			T *data{};
-			constexpr Wrap(T *pData) noexcept: data(pData) {
+			explicit constexpr Wrap(T *pData) noexcept: data(pData) {
 			}
 			constexpr WrapBase *copyTo(ox::Span<char> s) noexcept override {
 				oxAssert(s.size() >= sizeof(Wrap), "too small buffer");
@@ -39,39 +43,60 @@ class AnyPtr {
 			constexpr operator bool() const noexcept override {
 				return data != nullptr;
 			}
+			constexpr void free() noexcept override {
+				safeDelete(data);
+				data = {};
+			}
 		};
 
 		WrapBase *m_wrapPtr{};
 		ox::Array<char, sizeof(Wrap<void*>)> m_wrapData;
 
 	public:
-		constexpr AnyPtr() noexcept = default;
+		constexpr AnyPtrT() noexcept = default;
 
 		template<typename T>
-		constexpr AnyPtr(T *ptr) noexcept {
+		constexpr AnyPtrT(T *ptr) noexcept {
 			if (std::is_constant_evaluated()) {
-				m_wrapPtr = new Wrap(ptr);
+				m_wrapPtr = new Wrap<T>(ptr);
 			} else {
-				m_wrapPtr = new(m_wrapData.data()) Wrap(ptr);
+				m_wrapPtr = new(m_wrapData.data()) Wrap<T>(ptr);
 			}
 		}
 
-		constexpr AnyPtr(AnyPtr const&other) noexcept {
+		constexpr AnyPtrT(AnyPtrT const&other) noexcept requires(!unique) {
 			if (other) {
 				m_wrapPtr = other.m_wrapPtr->copyTo(m_wrapData);
 			}
 		}
 
-		constexpr ~AnyPtr() noexcept {
+		constexpr AnyPtrT(AnyPtrT &&other) noexcept {
+			if (other) {
+				m_wrapPtr = other.m_wrapPtr->copyTo(m_wrapData);
+				if (std::is_constant_evaluated()) {
+					ox::safeDelete(m_wrapPtr);
+				}
+				other.m_wrapPtr = {};
+			}
+		}
+
+		constexpr ~AnyPtrT() noexcept {
+			if constexpr(unique) {
+				free();
+			}
 			if (std::is_constant_evaluated()) {
 				ox::safeDelete(m_wrapPtr);
 			}
 		}
 
 		template<typename T>
-		constexpr AnyPtr &operator=(T *ptr) noexcept {
-			if (std::is_constant_evaluated()) {
+		constexpr AnyPtrT &operator=(T *ptr) noexcept {
+			if constexpr(unique) {
+				free();
+			} else if (std::is_constant_evaluated()) {
 				ox::safeDelete(m_wrapPtr);
+			}
+			if (std::is_constant_evaluated()) {
 				m_wrapPtr = new Wrap(ptr);
 			} else {
 				m_wrapPtr = new(m_wrapData.data()) Wrap(ptr);
@@ -79,10 +104,12 @@ class AnyPtr {
 			return *this;
 		}
 
-		constexpr AnyPtr &operator=(AnyPtr const&ptr) noexcept {
+		constexpr AnyPtrT &operator=(AnyPtrT const&ptr) noexcept requires(!unique) {
 			if (this != &ptr) {
-				if (ptr) {
+				if (std::is_constant_evaluated()) {
 					ox::safeDelete(m_wrapPtr);
+				}
+				if (ptr) {
 					m_wrapPtr = ptr.m_wrapPtr->copyTo(m_wrapData);
 				} else {
 					m_wrapPtr = nullptr;
@@ -91,10 +118,40 @@ class AnyPtr {
 			return *this;
 		}
 
+		constexpr AnyPtrT &operator=(AnyPtrT &&ptr) noexcept {
+			if (this != &ptr) {
+				if constexpr(unique) {
+					free();
+				} else if (std::is_constant_evaluated()) {
+					ox::safeDelete(m_wrapPtr);
+				}
+				if (ptr) {
+					m_wrapPtr = ptr.m_wrapPtr->copyTo(m_wrapData);
+					if (std::is_constant_evaluated()) {
+						ox::safeDelete(ptr.m_wrapPtr);
+						ptr.m_wrapPtr = nullptr;
+					}
+				} else {
+					m_wrapPtr = nullptr;
+				}
+			}
+			return *this;
+		}
+
 		constexpr operator bool() const noexcept {
 			return m_wrapPtr && *m_wrapPtr;
 		}
 
+		constexpr void free() noexcept {
+			if (m_wrapPtr) {
+				m_wrapPtr->free();
+			}
+			if (std::is_constant_evaluated()) {
+				ox::safeDelete(m_wrapPtr);
+			}
+			m_wrapPtr = nullptr;
+		}
+
 		template<typename T>
 		[[nodiscard]]
 		constexpr T *get() const noexcept {
@@ -104,6 +161,12 @@ class AnyPtr {
 			return dynamic_cast<Wrap<T>*>(m_wrapPtr)->data;
 #endif
 		}
+
 };
 
+}
+
+using AnyPtr = detail::AnyPtrT<false>;
+using UAnyPtr = detail::AnyPtrT<true>;
+
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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
@@ -7,6 +7,7 @@
  */
 
 #include "fmt.hpp"
+#include "realstd.hpp"
 #include "stacktrace.hpp"
 #include "trace.hpp"
 
@@ -14,14 +15,14 @@
 
 namespace ox {
 
-void panic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err) noexcept {
+void panic(StringViewCR file, int const line, StringViewCR panicMsg, Error const&err) noexcept {
 	oxErrf("\033[31;1;1mPANIC:\033[0m [{}:{}]: {}\n", file, line, panicMsg);
 	if (err.msg) {
 		oxErrf("\tError Message:\t{}\n", err.msg);
 	}
 	oxErrf("\tError Code:\t{}\n", static_cast<ErrorCode>(err));
-	if (err.file != nullptr) {
-		oxErrf("\tError Location:\t{}:{}\n", err.file, err.line);
+	if (err.src.file_name() != nullptr) {
+		oxErrf("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
 	}
 #ifdef OX_USE_STDLIB
 	printStackTrace(2);
@@ -32,16 +33,19 @@ void panic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err)
 #endif
 }
 
-void panic(const char *file, int line, const char *panicMsg, const Error &err) noexcept {
+void panic(const char *file, int const line, char const*panicMsg, Error const&err) noexcept {
 	panic(StringView{file}, line, StringView{panicMsg}, err);
 }
 
-void assertFailFuncRuntime(StringViewCR file, int line, StringViewCR assertTxt, StringViewCR msg) noexcept {
+void assertFailFuncRuntime(
+	StringViewCR file,
+	int const line,
+	StringViewCR assertTxt,
+	StringViewCR msg) noexcept {
 #ifdef OX_USE_STDLIB
-	auto output = sfmt("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, msg);
-	output += genStackTrace(2);
-	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]", msg, assertTxt, file, line);
-	std::abort();
+	auto const st = genStackTrace(2);
+	oxTracef("assert", "Failed assert: {} ({}) [{}:{}]:\n{}", msg, assertTxt, file, 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);
@@ -49,20 +53,25 @@ void assertFailFuncRuntime(StringViewCR file, int line, StringViewCR assertTxt,
 #endif
 }
 
-void assertFailFuncRuntime(StringViewCR file, int line, [[maybe_unused]] const Error &err, StringViewCR, StringViewCR assertMsg) noexcept {
+void assertFailFuncRuntime(
+	StringViewCR file,
+	int const line,
+	[[maybe_unused]] Error const&err,
+	StringViewCR,
+	StringViewCR assertMsg) noexcept {
 #if defined(OX_USE_STDLIB)
 	auto msg = sfmt("\n\033[31;1;1mASSERT FAILURE:\033[0m [{}:{}]: {}\n", file, line, assertMsg);
 	if (err.msg) {
 		msg += sfmt("\tError Message:\t{}\n", err.msg);
 	}
 	msg += sfmt("\tError Code:\t{}\n", static_cast<ErrorCode>(err));
-	if (err.file != nullptr) {
-		msg += sfmt("\tError Location:\t{}:{}\n", err.file, err.line);
+	if (err.src.file_name() != nullptr) {
+		msg += sfmt("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
 	}
 	msg += genStackTrace(2);
 	oxErr(msg);
 	oxTracef("assert", "Failed assert: {} [{}:{}]", assertMsg, file, line);
-	std::abort();
+	abort();
 #else
 	constexprPanic(file, line, assertMsg);
 #endif

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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
@@ -22,9 +22,15 @@
 
 namespace ox {
 
-void panic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err = ox::Error(0)) noexcept;
+[[noreturn]]
+void panic(StringViewCR file, int line, StringViewCR panicMsg, Error const&err = {}) noexcept;
 
-constexpr void constexprPanic(StringViewCR file, int line, StringViewCR panicMsg, const Error &err = ox::Error(0)) noexcept {
+[[noreturn]]
+constexpr void constexprPanic(
+	StringViewCR file,
+	int const line,
+	StringViewCR panicMsg,
+	Error const&err = {}) noexcept {
 	if (!std::is_constant_evaluated()) {
 		panic(file, line, panicMsg, err);
 	} else {
@@ -32,10 +38,24 @@ constexpr void constexprPanic(StringViewCR file, int line, StringViewCR panicMsg
 	}
 }
 
-void assertFailFuncRuntime(StringViewCR file, int line, StringViewCR assertTxt, StringViewCR msg) noexcept;
-void assertFailFuncRuntime(StringViewCR file, int line, const Error &err, StringViewCR, StringViewCR assertMsg) noexcept;
+void assertFailFuncRuntime(
+	StringViewCR file,
+	int line,
+	StringViewCR assertTxt,
+	StringViewCR msg) noexcept;
+void assertFailFuncRuntime(
+	StringViewCR file,
+	int line,
+	Error const&err,
+	StringViewCR,
+	StringViewCR assertMsg) noexcept;
 
-constexpr void assertFunc(StringViewCR file, int line, bool pass, [[maybe_unused]]StringViewCR assertTxt, [[maybe_unused]]StringViewCR msg) noexcept {
+constexpr void assertFunc(
+	StringViewCR file,
+	int const line,
+	bool const pass,
+	[[maybe_unused]]StringViewCR assertTxt,
+	[[maybe_unused]]StringViewCR msg) noexcept {
 	if (!pass) {
 		if (!std::is_constant_evaluated()) {
 			assertFailFuncRuntime(file, line, assertTxt, msg);
@@ -45,7 +65,12 @@ constexpr void assertFunc(StringViewCR file, int line, bool pass, [[maybe_unused
 	}
 }
 
-constexpr void assertFunc(StringViewCR file, int line, const Error &err, StringViewCR, StringViewCR assertMsg) noexcept {
+constexpr void assertFunc(
+	StringViewCR file,
+	int const line,
+	Error const&err,
+	StringViewCR,
+	StringViewCR assertMsg) noexcept {
 	if (err) {
 		if (!std::is_constant_evaluated()) {
 			assertFailFuncRuntime(file, line, err, {}, assertMsg);
@@ -55,7 +80,11 @@ constexpr void assertFunc(StringViewCR file, int line, const Error &err, StringV
 	}
 }
 
-constexpr void expect(StringViewCR file, int line, const auto &actual, const auto &expected) noexcept {
+constexpr void expect(
+	StringViewCR file,
+	int const line,
+	auto const&actual,
+	auto const&expected) noexcept {
 	if (actual != expected) {
 		 if (!std::is_constant_evaluated()) {
 #if defined(OX_USE_STDLIB)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2024 gary@drinkingtea.net
+ * 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