From 538fcdb43ca29c2d731af458c9e8e90df70ad427 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 8 Mar 2019 21:26:21 -0600 Subject: [PATCH] [ox/ser] Rename McStr to SerStr --- deps/ox/src/ox/mc/read.cpp | 2 +- deps/ox/src/ox/mc/read.hpp | 4 ++-- deps/ox/src/ox/mc/test/tests.cpp | 2 +- deps/ox/src/ox/mc/write.cpp | 2 +- deps/ox/src/ox/mc/write.hpp | 4 ++-- deps/ox/src/ox/ser/descwrite.cpp | 2 +- deps/ox/src/ox/ser/descwrite.hpp | 4 ++-- deps/ox/src/ox/ser/types.hpp | 9 +++------ 8 files changed, 13 insertions(+), 16 deletions(-) diff --git a/deps/ox/src/ox/mc/read.cpp b/deps/ox/src/ox/mc/read.cpp index 0773932e..330e588d 100644 --- a/deps/ox/src/ox/mc/read.cpp +++ b/deps/ox/src/ox/mc/read.cpp @@ -65,7 +65,7 @@ Error MetalClawReader::op(const char*, bool *val) { return 0; } -Error MetalClawReader::op(const char*, McStr val) { +Error MetalClawReader::op(const char*, SerStr val) { if (m_fieldPresence.get(m_field)) { // read the length StringLength size = 0; diff --git a/deps/ox/src/ox/mc/read.hpp b/deps/ox/src/ox/mc/read.hpp index e814fd6f..39414271 100644 --- a/deps/ox/src/ox/mc/read.hpp +++ b/deps/ox/src/ox/mc/read.hpp @@ -61,7 +61,7 @@ class MetalClawReader { template Error op(const char*, ox::BString *val); - Error op(const char*, McStr val); + Error op(const char*, SerStr val); /** * Reads an array length from the current location in the buffer. @@ -116,7 +116,7 @@ Error MetalClawReader::op(const char*, T *val) { template Error MetalClawReader::op(const char *name, ox::BString *val) { - return op(name, McStr(val->data(), val->cap())); + return op(name, SerStr(val->data(), val->cap())); } template diff --git a/deps/ox/src/ox/mc/test/tests.cpp b/deps/ox/src/ox/mc/test/tests.cpp index 631c24dc..b974879c 100644 --- a/deps/ox/src/ox/mc/test/tests.cpp +++ b/deps/ox/src/ox/mc/test/tests.cpp @@ -230,7 +230,7 @@ std::map tests = { case ox::PrimitiveType::String: { ox::Vector v(rdr->stringLength()); //std::cout << rdr->stringLength() << '\n'; - oxAssert(rdr->op(fieldName, ox::McStr(v.data(), v.size())), "Walking ioOp failed."); + oxAssert(rdr->op(fieldName, ox::SerStr(v.data(), v.size())), "Walking ioOp failed."); std::cout << fieldName << ":\t" << "string: " << v.data() << '\n'; break; } diff --git a/deps/ox/src/ox/mc/write.cpp b/deps/ox/src/ox/mc/write.cpp index 6a3cbcdd..c3b846d0 100644 --- a/deps/ox/src/ox/mc/write.cpp +++ b/deps/ox/src/ox/mc/write.cpp @@ -60,7 +60,7 @@ Error MetalClawWriter::op(const char*, bool *val) { return m_fieldPresence.set(m_field++, *val); } -Error MetalClawWriter::op(const char*, McStr val) { +Error MetalClawWriter::op(const char*, SerStr val) { int err = 0; bool fieldSet = false; if (val.cap()) { diff --git a/deps/ox/src/ox/mc/write.hpp b/deps/ox/src/ox/mc/write.hpp index 8c201cf6..7beb5d7b 100644 --- a/deps/ox/src/ox/mc/write.hpp +++ b/deps/ox/src/ox/mc/write.hpp @@ -57,7 +57,7 @@ class MetalClawWriter { template Error op(const char*, ox::BString *val); - Error op(const char*, McStr val); + Error op(const char*, SerStr val); template int op(const char*, T *val); @@ -77,7 +77,7 @@ class MetalClawWriter { template Error MetalClawWriter::op(const char *name, ox::BString *val) { - return op(name, McStr(val->data(), val->cap())); + return op(name, SerStr(val->data(), val->cap())); } template diff --git a/deps/ox/src/ox/ser/descwrite.cpp b/deps/ox/src/ox/ser/descwrite.cpp index 56a90e9f..d1681fd9 100644 --- a/deps/ox/src/ox/ser/descwrite.cpp +++ b/deps/ox/src/ox/ser/descwrite.cpp @@ -108,7 +108,7 @@ DescriptorType *TypeDescWriter::type(const char*, bool *alreadyExisted) { return getType(TypeName, PT, 0, alreadyExisted); } -DescriptorType *TypeDescWriter::type(McStr, bool *alreadyExisted) { +DescriptorType *TypeDescWriter::type(SerStr, bool *alreadyExisted) { constexpr auto TypeName = "B:string"; constexpr auto PT = PrimitiveType::String; return getType(TypeName, PT, 0, alreadyExisted); diff --git a/deps/ox/src/ox/ser/descwrite.hpp b/deps/ox/src/ox/ser/descwrite.hpp index b2b988b7..e91a5f81 100644 --- a/deps/ox/src/ox/ser/descwrite.hpp +++ b/deps/ox/src/ox/ser/descwrite.hpp @@ -97,7 +97,7 @@ class TypeDescWriter { DescriptorType *type(const char *val, bool *alreadyExisted); - DescriptorType *type(McStr val, bool *alreadyExisted); + DescriptorType *type(SerStr val, bool *alreadyExisted); template DescriptorType *type(BString *val, bool *alreadyExisted); @@ -144,7 +144,7 @@ ox::Error TypeDescWriter::op(const char *name, T *val) { template DescriptorType *TypeDescWriter::type(BString *val, bool *alreadyExisted) { - return type(McStr(val), alreadyExisted); + return type(SerStr(val), alreadyExisted); } template diff --git a/deps/ox/src/ox/ser/types.hpp b/deps/ox/src/ox/ser/types.hpp index 31b66cd6..8d131a06 100644 --- a/deps/ox/src/ox/ser/types.hpp +++ b/deps/ox/src/ox/ser/types.hpp @@ -14,10 +14,7 @@ namespace ox { -using StringLength = uint32_t; -using ArrayLength = uint32_t; - -class McStr { +class SerStr { protected: int m_cap = 0; @@ -25,12 +22,12 @@ class McStr { public: template - constexpr McStr(BString *str) noexcept { + constexpr SerStr(BString *str) noexcept { m_str = str->data(); m_cap = str->cap(); } - constexpr McStr(char *str, int cap) noexcept { + constexpr SerStr(char *str, int cap) noexcept { m_str = str; m_cap = cap; }