From e29a50d0dc37c347e9e1fec02555351d74e6df4f Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 7 Feb 2026 14:13:18 -0600 Subject: [PATCH] [ox] Rename UniquePtr to UPtr --- deps/ox/src/ox/claw/read.cpp | 6 ++-- deps/ox/src/ox/event/signal.hpp | 4 +-- deps/ox/src/ox/fs/tool.cpp | 2 +- deps/ox/src/ox/model/descwrite.hpp | 2 +- deps/ox/src/ox/model/modelvalue.hpp | 12 +++---- deps/ox/src/ox/model/types.hpp | 2 +- deps/ox/src/ox/model/typestore.hpp | 10 +++--- deps/ox/src/ox/oc/read.hpp | 2 +- deps/ox/src/ox/preloader/preloader.hpp | 6 ++-- deps/ox/src/ox/std/memory.hpp | 43 ++++++++++++-------------- 10 files changed, 43 insertions(+), 46 deletions(-) diff --git a/deps/ox/src/ox/claw/read.cpp b/deps/ox/src/ox/claw/read.cpp index c5284bed..8e12ebfc 100644 --- a/deps/ox/src/ox/claw/read.cpp +++ b/deps/ox/src/ox/claw/read.cpp @@ -12,7 +12,7 @@ namespace ox { -ox::Result readClawTypeId(ox::BufferView buff) noexcept { +Result readClawTypeId(BufferView const buff) noexcept { auto buffRaw = buff.data(); auto buffLen = buff.size(); size_t outSz{}; @@ -43,7 +43,7 @@ ox::Result readClawTypeId(ox::BufferView buff) noexcept { return {{buff.data() + fmtSz, outSz - fmtSz - 1}}; } -Result readClawHeader(ox::BufferView buff) noexcept { +Result 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 readClawHeader(ox::BufferView buff) noexcept { return hdr; } -Result stripClawHeader(ox::BufferView buff) noexcept { +Result stripClawHeader(BufferView const buff) noexcept { OX_REQUIRE(header, readClawHeader(buff)); return {{header.data, header.dataSize}}; } diff --git a/deps/ox/src/ox/event/signal.hpp b/deps/ox/src/ox/event/signal.hpp index eb09f00b..ad476faf 100644 --- a/deps/ox/src/ox/event/signal.hpp +++ b/deps/ox/src/ox/event/signal.hpp @@ -122,7 +122,7 @@ class Signal { } }; - mutable Vector> m_slots; + mutable Vector> m_slots; public: ~Signal() noexcept; @@ -303,7 +303,7 @@ class Signal { } }; - mutable Vector> m_slots; + mutable Vector> m_slots; public: ~Signal() noexcept; diff --git a/deps/ox/src/ox/fs/tool.cpp b/deps/ox/src/ox/fs/tool.cpp index af667354..634562fc 100644 --- a/deps/ox/src/ox/fs/tool.cpp +++ b/deps/ox/src/ox/fs/tool.cpp @@ -34,7 +34,7 @@ static ox::Result loadFsBuff(const char *path) noexcept { } } -static ox::Result> loadFs(const char *path) noexcept { +static ox::Result> loadFs(const char *path) noexcept { OX_REQUIRE(buff, loadFsBuff(path)); return {ox::make_unique(buff.data, buff.size)}; } diff --git a/deps/ox/src/ox/model/descwrite.hpp b/deps/ox/src/ox/model/descwrite.hpp index 1bd5c093..b31c398b 100644 --- a/deps/ox/src/ox/model/descwrite.hpp +++ b/deps/ox/src/ox/model/descwrite.hpp @@ -51,7 +51,7 @@ constexpr auto buildSubscriptStack(const T**, SubscriptStack *s) noexcept { } template -constexpr auto buildSubscriptStack(const UniquePtr*, SubscriptStack *s) noexcept { +constexpr auto buildSubscriptStack(const UPtr*, SubscriptStack *s) noexcept { s->push_back({.subscriptType = Subscript::SubscriptType::Ptr}); } diff --git a/deps/ox/src/ox/model/modelvalue.hpp b/deps/ox/src/ox/model/modelvalue.hpp index be54059a..5b22936f 100644 --- a/deps/ox/src/ox/model/modelvalue.hpp +++ b/deps/ox/src/ox/model/modelvalue.hpp @@ -519,7 +519,7 @@ class ModelObject { protected: OX_MODEL_FRIEND(ModelObject); friend ModelValue; - Vector> m_fieldsOrder; + Vector> m_fieldsOrder; HashMap m_fields; const DescriptorType *m_type = nullptr; @@ -692,7 +692,7 @@ class ModelUnion { }; friend constexpr Error model(auto *h, CommonPtrWith auto *obj) noexcept; friend ModelValue; - Vector> m_fieldsOrder; + Vector> m_fieldsOrder; HashMap m_fields; const DescriptorType *m_type = nullptr; int m_unionIdx = -1; @@ -718,14 +718,14 @@ class ModelUnion { m_unionIdx = other.m_unionIdx; } - static constexpr Result> make(const DescriptorType *type) noexcept { - UniquePtr out(new ModelUnion); + static constexpr Result> make(const DescriptorType *type) noexcept { + UPtr out(new ModelUnion); OX_RETURN_ERROR(out->setType(type)); return out; } - static constexpr Result> make(const ModelUnion &other) noexcept { - return UniquePtr(new ModelUnion(other)); + static constexpr Result> make(const ModelUnion &other) noexcept { + return UPtr(new ModelUnion(other)); } constexpr ox::Result at(StringView const&k) noexcept { diff --git a/deps/ox/src/ox/model/types.hpp b/deps/ox/src/ox/model/types.hpp index 2256930a..07f131f0 100644 --- a/deps/ox/src/ox/model/types.hpp +++ b/deps/ox/src/ox/model/types.hpp @@ -161,7 +161,7 @@ template constexpr bool isSmartPtr_v = false; template -constexpr bool isSmartPtr_v<::ox::UniquePtr> = true; +constexpr bool isSmartPtr_v<::ox::UPtr> = true; #if __has_include() template diff --git a/deps/ox/src/ox/model/typestore.hpp b/deps/ox/src/ox/model/typestore.hpp index 3646c3b0..3c0baf7b 100644 --- a/deps/ox/src/ox/model/typestore.hpp +++ b/deps/ox/src/ox/model/typestore.hpp @@ -21,7 +21,7 @@ namespace ox { class TypeStore { private: - HashMap> m_cache; + HashMap> m_cache; public: constexpr TypeStore() noexcept = default; @@ -86,12 +86,12 @@ class TypeStore { return getLoad(typeName, typeVersion); } - constexpr void set(const auto &typeId, UniquePtr dt) noexcept { + constexpr void set(const auto &typeId, UPtr dt) noexcept { m_cache[typeId] = std::move(dt); } constexpr void set(const auto &typeId, DescriptorType *dt) noexcept { - m_cache[typeId] = UniquePtr(dt); + m_cache[typeId] = UPtr(dt); } [[nodiscard]] @@ -105,11 +105,11 @@ class TypeStore { } protected: - virtual Result> loadDescriptor(ox::StringView) noexcept { + virtual Result> loadDescriptor(ox::StringView) noexcept { return ox::Error(1); } - Result> loadDescriptor(ox::StringViewCR name, int version, + Result> loadDescriptor(ox::StringViewCR name, int version, const ox::TypeParamPack &typeParams) noexcept { const auto typeId = buildTypeId(name, version, typeParams); return loadDescriptor(typeId); diff --git a/deps/ox/src/ox/oc/read.hpp b/deps/ox/src/ox/oc/read.hpp index 973bcdab..30e91f3b 100644 --- a/deps/ox/src/ox/oc/read.hpp +++ b/deps/ox/src/ox/oc/read.hpp @@ -282,7 +282,7 @@ Error readOC(BufferView const buff, auto &val) noexcept { try { Json::Value doc; Json::CharReaderBuilder parserBuilder; - auto parser = UniquePtr(parserBuilder.newCharReader()); + auto parser = UPtr(parserBuilder.newCharReader()); OX_ALLOW_UNSAFE_BUFFERS_BEGIN if (!parser->parse(buff.data(), buff.data() + buff.size(), &doc, nullptr)) { OX_ALLOW_UNSAFE_BUFFERS_END diff --git a/deps/ox/src/ox/preloader/preloader.hpp b/deps/ox/src/ox/preloader/preloader.hpp index 29e80930..9fd30a6c 100644 --- a/deps/ox/src/ox/preloader/preloader.hpp +++ b/deps/ox/src/ox/preloader/preloader.hpp @@ -74,7 +74,7 @@ class Preloader: public ModelHandlerBase, OpType::Reflect> { const Preloader &operator=(const Preloader &src) = delete; const Preloader &operator=(Preloader &&src) = delete; - constexpr static ox::Result> make(ox::ios_base::seekdir anchor = ox::ios_base::cur, + constexpr static ox::Result> make(ox::ios_base::seekdir anchor = ox::ios_base::cur, std::size_t sz = 0) noexcept; template @@ -141,9 +141,9 @@ class Preloader: public ModelHandlerBase, OpType::Reflect> { }; template -constexpr ox::Result>> +constexpr ox::Result>> Preloader::make(ox::ios_base::seekdir anchor, std::size_t sz) noexcept { - auto p = ox::UniquePtr(new Preloader); + auto p = ox::UPtr(new Preloader); if (const auto err = p->m_writer.seekp(0, anchor)) { return {std::move(p), err}; } diff --git a/deps/ox/src/ox/std/memory.hpp b/deps/ox/src/ox/std/memory.hpp index f145d9a9..308d8ca4 100644 --- a/deps/ox/src/ox/std/memory.hpp +++ b/deps/ox/src/ox/std/memory.hpp @@ -179,26 +179,26 @@ constexpr bool operator!=(std::nullptr_t, const SharedPtr &p2) noexcept { template -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 - constexpr UniquePtr(UniquePtr &&other) noexcept { + constexpr UPtr(UPtr &&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 - constexpr UniquePtr &operator=(UniquePtr const&other) = delete; + constexpr UPtr &operator=(UPtr const&other) = delete; - constexpr UniquePtr &operator=(UniquePtr &&other) noexcept { + constexpr UPtr &operator=(UPtr &&other) noexcept { reset(std::move(other)); return *this; } template - constexpr UniquePtr &operator=(UniquePtr &&other) noexcept { + constexpr UPtr &operator=(UPtr &&other) noexcept { reset(std::move(other)); return *this; } @@ -249,37 +249,34 @@ class UniquePtr { }; -template -using UPtr = UniquePtr; - template -constexpr bool operator==(const UniquePtr &p1, const UniquePtr &p2) noexcept { +constexpr bool operator==(const UPtr &p1, const UPtr &p2) noexcept { return p1.get() == p2.get(); } template -constexpr bool operator==(const UniquePtr &p1, std::nullptr_t) noexcept { +constexpr bool operator==(const UPtr &p1, std::nullptr_t) noexcept { return p1.get() == nullptr; } template -constexpr bool operator==(std::nullptr_t, const UniquePtr &p2) noexcept { +constexpr bool operator==(std::nullptr_t, const UPtr &p2) noexcept { return p2.get() == nullptr; } template -constexpr bool operator!=(const UniquePtr &p1, const UniquePtr &p2) noexcept { +constexpr bool operator!=(const UPtr &p1, const UPtr &p2) noexcept { return p1.get() != p2.get(); } template -constexpr bool operator!=(const UniquePtr &p1, std::nullptr_t) noexcept { +constexpr bool operator!=(const UPtr &p1, std::nullptr_t) noexcept { return !p1.get(); } template -constexpr bool operator!=(std::nullptr_t, const UniquePtr &p2) noexcept { +constexpr bool operator!=(std::nullptr_t, const UPtr &p2) noexcept { return !p2.get(); } @@ -287,14 +284,14 @@ constexpr bool operator!=(std::nullptr_t, const UniquePtr &p2) noexcept { template [[nodiscard]] constexpr auto make_unique(Args&&... args) { - return UniquePtr(new T(ox::forward(args)...)); + return UPtr(new T(ox::forward(args)...)); } template [[nodiscard]] -constexpr Result> make_unique_catch(Args&&... args) noexcept { +constexpr Result> make_unique_catch(Args&&... args) noexcept { try { - return UniquePtr(new T(ox::forward(args)...)); + return UPtr(new T(ox::forward(args)...)); } catch (ox::Exception const&ex) { return ex.toError(); }