From 3e95bc08427c2ce8cf9db93871a06abe7406545d Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Tue, 27 Jan 2026 23:09:53 -0600 Subject: [PATCH] [ox/model] Update style for ModelHandlerAdaptor --- deps/ox/src/ox/model/modelhandleradaptor.hpp | 52 ++++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/deps/ox/src/ox/model/modelhandleradaptor.hpp b/deps/ox/src/ox/model/modelhandleradaptor.hpp index 89f3fdf0..3311f983 100644 --- a/deps/ox/src/ox/model/modelhandleradaptor.hpp +++ b/deps/ox/src/ox/model/modelhandleradaptor.hpp @@ -25,28 +25,28 @@ class ModelHandlerInterface { template constexpr ox::Error setTypeInfo( - const char* name = T::TypeName, + CString name = T::TypeName, int version = T::TypeVersion, - const Vector& typeParams = {}) noexcept { + Vector const &typeParams = {}) noexcept { return m_handler.template setTypeInfo(name, version, typeParams, ModelFieldCount_v); } template constexpr ox::Error setTypeInfo( - const char *name, + CString name, int version, - const Vector& typeParams, - std::size_t fields) noexcept { + Vector const &typeParams, + size_t fields) noexcept { return m_handler.template setTypeInfo(name, version, typeParams, fields); } - template - constexpr Error fieldCString(const char *name, char val[len]) noexcept { + template + constexpr Error fieldCString(CString name, char val[len]) noexcept { return m_handler.fieldCString(name, &val[0], len); } - template - constexpr Error fieldCString(const char *name, const char val[len]) noexcept requires(opType_v != OpType::Read) { + template + 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); } else { @@ -54,11 +54,11 @@ class ModelHandlerInterface { } } - constexpr Error fieldCString(const char *name, char **val) noexcept { + 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); @@ -67,7 +67,7 @@ class ModelHandlerInterface { } } - 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); @@ -76,11 +76,11 @@ class ModelHandlerInterface { } } - constexpr Error fieldCString(const char *name, char **val, std::size_t buffLen) noexcept { + 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); @@ -89,11 +89,11 @@ class ModelHandlerInterface { } } - constexpr Error fieldCString(const char *name, char *val, std::size_t buffLen) noexcept { + 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 auto *v) noexcept { + constexpr Error fieldModelValue(char const *name, CommonPtrWith auto *v) noexcept { switch (v->type()) { case ModelValue::Type::Undefined: break; @@ -126,7 +126,7 @@ class ModelHandlerInterface { u.setActiveField(whichFieldPresent(m_handler, name, u)); return m_handler.field(name, UnionView(&u, u.unionIdx())); } else { - return m_handler.field(name, UnionView(&u, u.unionIdx())); + return m_handler.field(name, UnionView(&u, u.unionIdx())); } } case ModelValue::Type::Vector: @@ -141,12 +141,12 @@ class ModelHandlerInterface { // array handler, with callback to allow handling individual elements template - constexpr Error field(const char *name, Callback cb) noexcept { + constexpr Error field(CString name, Callback cb) noexcept { return m_handler.template field(name, cb); } template - 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) { return fieldModelValue(name, v); } else { @@ -155,7 +155,7 @@ class ModelHandlerInterface { } template - constexpr Error field(const char *name, T *v) noexcept { + constexpr Error field(CString name, T *v) noexcept { if constexpr(ox::is_same_v) { return fieldModelValue(name, v); } else { @@ -164,11 +164,11 @@ class ModelHandlerInterface { } template - constexpr Error field(const char *name, UnionView val) noexcept { + constexpr Error field(CString name, UnionView val) noexcept { return m_handler.field(name, val); } - constexpr Error field(const char *name, auto *val, std::size_t len) noexcept { + constexpr Error field(CString name, auto *val, size_t len) noexcept { return m_handler.field(name, val, len); } @@ -178,7 +178,7 @@ class ModelHandlerInterface { * @param pass indicates that the parsing should iterate past the array length */ [[nodiscard]] - constexpr auto arrayLength(const char *name, bool pass = true) noexcept { + constexpr auto arrayLength(CString name, bool pass = true) noexcept { return m_handler.arrayLength(name, pass); } @@ -186,7 +186,7 @@ class ModelHandlerInterface { * Reads an string length from the current location in the buffer. */ [[nodiscard]] - constexpr auto stringLength(const char *name) noexcept { + constexpr auto stringLength(CString name) noexcept { return m_handler.stringLength(name); } @@ -202,13 +202,13 @@ class ModelHandlerInterface { private: template - static constexpr int whichFieldPresent(H &h, const char *name, ModelUnion const &u) noexcept + static constexpr int whichFieldPresent(H &h, CString name, ModelUnion const &u) noexcept requires(H::opType() == OpType::Read) { return h.whichFieldPresent(name, u); } template - static constexpr int whichFieldPresent(H&, const char*, ModelUnion const&) noexcept + static constexpr int whichFieldPresent(H&, CString, ModelUnion const&) noexcept requires(H::opType() != OpType::Read) { return 0; }