drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 13:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[coding] Rename non-empty string serialization.

Browse Source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako
2025-07-02 22:05:34 -03:00
committed by Konstantin Pastbin
parent 7b4862b442
commit 1d29e7816a
8 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libs/coding/string_utf8_multilang.hpp
View File

@@ -1,46 +1,35 @@
#pragma once
#include "coding/reader.hpp"
#include "coding/read_write_utils.hpp"
#include "coding/varint.hpp"
#include "coding/writer.hpp"
#include "base/assert.hpp"
#include "base/buffer_vector.hpp"
#include "base/control_flow.hpp"
#include <map>
#include <string>
#include <string_view>
#include <vector>
namespace utils
namespace rw
{
template <class TSink, bool EnableExceptions = false>
void WriteString(TSink & sink, std::string const & s)
template <class TSink>
void WriteNonEmpty(TSink & sink, std::string const & s)
{
if (EnableExceptions && s.empty())
MYTHROW(Writer::WriteException, ("String is empty"));
else
CHECK(!s.empty(), ());
CHECK(!s.empty(), ());
size_t const sz = s.size();
WriteVarUint(sink, static_cast<uint32_t>(sz - 1));
sink.Write(s.c_str(), sz);
}
template <class TSource, bool EnableExceptions = false>
void ReadString(TSource & src, std::string & s)
template <class TSource>
void ReadNonEmpty(TSource & src, std::string & s)
{
uint32_t const sz = ReadVarUint<uint32_t>(src) + 1;
s.resize(sz);
src.Read(&s[0], sz);
if (EnableExceptions && s.empty())
MYTHROW(Reader::ReadException, ("String is empty"));
else
CHECK(!s.empty(), ());
}
} // namespace utils
} // namespace rw
// A class to store strings in multiple languages.
// May be used e.g. to store several translations of a feature's name.
@@ -201,15 +190,14 @@ public:
/// @name Used for serdes.
/// @{
template <class TSink>
void Write(TSink & sink) const
void WriteNonEmpty(TSink & sink) const
{
utils::WriteString(sink, m_s);
rw::WriteNonEmpty(sink, m_s);
}
template <class TSource>
void Read(TSource & src)
void ReadNonEmpty(TSource & src)
{
utils::ReadString(src, m_s);
rw::ReadNonEmpty(src, m_s);
}
std::string const & GetBuffer() const { return m_s; }