drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[ox/model] Update style for ModelHandlerAdaptor

Browse Source
This commit is contained in:
Gary Talent
2026-01-27 23:09:53 -06:00
parent 58e19fad48
commit 3e95bc0842
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
deps/ox/src/ox/model/modelhandleradaptor.hpp vendored
View File

@@ -25,28 +25,28 @@ class ModelHandlerInterface {
template<typename T = std::nullptr_t> template<typename T = std::nullptr_t>
constexpr ox::Error setTypeInfo( constexpr ox::Error setTypeInfo(
const char* name = T::TypeName, CString name = T::TypeName,
int version = T::TypeVersion, int version = T::TypeVersion,
const Vector<String>& typeParams = {}) noexcept { Vector<String> const &typeParams = {}) noexcept {
return m_handler.template setTypeInfo<T>(name, version, typeParams, ModelFieldCount_v<T>); return m_handler.template setTypeInfo<T>(name, version, typeParams, ModelFieldCount_v<T>);
} }
template<typename T = std::nullptr_t> template<typename T = std::nullptr_t>
constexpr ox::Error setTypeInfo( constexpr ox::Error setTypeInfo(
const char *name, CString name,
int version, int version,
const Vector<String>& typeParams, Vector<String> const &typeParams,
std::size_t fields) noexcept { size_t fields) noexcept {
return m_handler.template setTypeInfo<T>(name, version, typeParams, fields); return m_handler.template setTypeInfo<T>(name, version, typeParams, fields);
} }
template<std::size_t len> template<size_t len>
constexpr Error fieldCString(const char *name, char val[len]) noexcept { constexpr Error fieldCString(CString name, char val[len]) noexcept {
return m_handler.fieldCString(name, &val[0], len); return m_handler.fieldCString(name, &val[0], len);
} }
template<std::size_t len> template<size_t len>
constexpr Error fieldCString(const char *name, const char val[len]) noexcept requires(opType_v != OpType::Read) { constexpr Error fieldCString(CString name, char const val[len]) noexcept requires(opType_v != OpType::Read) {
if constexpr(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 { } 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); 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 // this check looks pointless, but it's to address a Clang bug
if constexpr(opType_v != OpType::Read) { if constexpr(opType_v != OpType::Read) {
return m_handler.fieldCString(name, val); 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 // this check looks pointless, but it's to address a Clang bug
if constexpr(opType_v != OpType::Read) { if constexpr(opType_v != OpType::Read) {
return m_handler.fieldCString(name, val); 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); 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 // this check looks pointless, but it's to address a Clang bug
if constexpr(opType_v != OpType::Read) { if constexpr(opType_v != OpType::Read) {
return m_handler.fieldCString(name, val, buffLen); 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); 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()) { switch (v->type()) {
case ModelValue::Type::Undefined: case ModelValue::Type::Undefined:
break; break;
@@ -126,7 +126,7 @@ class ModelHandlerInterface {
u.setActiveField(whichFieldPresent(m_handler, name, u)); u.setActiveField(whichFieldPresent(m_handler, name, u));
return m_handler.field(name, UnionView<ModelUnion, true>(&u, u.unionIdx())); return m_handler.field(name, UnionView<ModelUnion, true>(&u, u.unionIdx()));
} else { } 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: case ModelValue::Type::Vector:
@@ -141,12 +141,12 @@ class ModelHandlerInterface {
// array handler, with callback to allow handling individual elements // array handler, with callback to allow handling individual elements
template<typename T, typename Callback> template<typename T, typename Callback>
constexpr Error field(const char *name, Callback cb) noexcept { constexpr Error field(CString name, Callback cb) noexcept {
return m_handler.template field<T, Callback>(name, cb); return m_handler.template field<T, Callback>(name, cb);
} }
template<typename T> 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>) { if constexpr(ox::is_same_v<T, ModelValue>) {
return fieldModelValue(name, v); return fieldModelValue(name, v);
} else { } else {
@@ -155,7 +155,7 @@ class ModelHandlerInterface {
} }
template<typename T> 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>) { if constexpr(ox::is_same_v<T, ModelValue>) {
return fieldModelValue(name, v); return fieldModelValue(name, v);
} else { } else {
@@ -164,11 +164,11 @@ class ModelHandlerInterface {
} }
template<typename U, bool force = false> template<typename U, bool force = false>
constexpr Error field(const char *name, UnionView<U, force> val) noexcept { constexpr Error field(CString name, UnionView<U, force> val) noexcept {
return m_handler.field(name, val); 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); 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 * @param pass indicates that the parsing should iterate past the array length
*/ */
[[nodiscard]] [[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); return m_handler.arrayLength(name, pass);
} }
@@ -186,7 +186,7 @@ class ModelHandlerInterface {
* Reads an string length from the current location in the buffer. * Reads an string length from the current location in the buffer.
*/ */
[[nodiscard]] [[nodiscard]]
constexpr auto stringLength(const char *name) noexcept { constexpr auto stringLength(CString name) noexcept {
return m_handler.stringLength(name); return m_handler.stringLength(name);
} }
@@ -202,13 +202,13 @@ class ModelHandlerInterface {
private: private:
template<typename H> template<typename H>
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) { requires(H::opType() == OpType::Read) {
return h.whichFieldPresent(name, u); return h.whichFieldPresent(name, u);
} }
template<typename H> template<typename H>
static constexpr int whichFieldPresent(H&, const char*, ModelUnion const&) noexcept static constexpr int whichFieldPresent(H&, CString, ModelUnion const&) noexcept
requires(H::opType() != OpType::Read) { requires(H::opType() != OpType::Read) {
return 0; return 0;
} }