amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-08-12 12:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ add reserve_indent helper

Browse Source 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-06-30 18:56:27 +02:00
parent 3249b180cc
commit 250787cb54
3 changed files with 54 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nlohmann/detail/output/serializer.hpp
+22 -15
View File
@@ -126,11 +126,7 @@ class serializer
// variable to hold indentation for recursive calls // variable to hold indentation for recursive calls
const auto new_indent = current_indent + indent_step; const auto new_indent = current_indent + indent_step;
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) reserve_indent(new_indent);
{
indent_string.resize((std::max)(indent_string.size() * 2, static_cast<std::size_t>(new_indent)), indent_char);
JSON_ASSERT(indent_string.size() >= new_indent);
}
// first n-1 elements // first n-1 elements
auto i = val.m_data.m_value.object->cbegin(); auto i = val.m_data.m_value.object->cbegin();
@@ -200,11 +196,7 @@ class serializer
// variable to hold indentation for recursive calls // variable to hold indentation for recursive calls
const auto new_indent = current_indent + indent_step; const auto new_indent = current_indent + indent_step;
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) reserve_indent(new_indent);
{
indent_string.resize((std::max)(indent_string.size() * 2, static_cast<std::size_t>(new_indent)), indent_char);
JSON_ASSERT(indent_string.size() >= new_indent);
}
// first n-1 elements // first n-1 elements
for (auto i = val.m_data.m_value.array->cbegin(); for (auto i = val.m_data.m_value.array->cbegin();
@@ -262,11 +254,7 @@ class serializer
// variable to hold indentation for recursive calls // variable to hold indentation for recursive calls
const auto new_indent = current_indent + indent_step; const auto new_indent = current_indent + indent_step;
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) reserve_indent(new_indent);
{
indent_string.resize((std::max)(indent_string.size() * 2, static_cast<std::size_t>(new_indent)), indent_char);
JSON_ASSERT(indent_string.size() >= new_indent);
}
o->write_characters(indent_string.c_str(), new_indent); o->write_characters(indent_string.c_str(), new_indent);
@@ -376,6 +364,25 @@ class serializer
} }
} }
/*!
@brief grow the indentation string so it can hold at least @a new_indent characters
The indentation string is grown by doubling its size, but at least to
@a new_indent characters, so that it can be used as a source for writing
@a new_indent indentation characters. The newly added characters use the
configured @ref indent_char.
@param[in] new_indent the required number of indentation characters
*/
void reserve_indent(const std::size_t new_indent)
{
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
{
indent_string.resize((std::max)(indent_string.size() * 2, new_indent), indent_char);
}
JSON_ASSERT(indent_string.size() >= new_indent);
}
JSON_PRIVATE_UNLESS_TESTED: JSON_PRIVATE_UNLESS_TESTED:
/*! /*!
@brief dump escaped string @brief dump escaped string
single_include/nlohmann/json.hpp
+22 -15
View File
@@ -19300,11 +19300,7 @@ class serializer
// variable to hold indentation for recursive calls // variable to hold indentation for recursive calls
const auto new_indent = current_indent + indent_step; const auto new_indent = current_indent + indent_step;
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) reserve_indent(new_indent);
{
indent_string.resize((std::max)(indent_string.size() * 2, static_cast<std::size_t>(new_indent)), indent_char);
JSON_ASSERT(indent_string.size() >= new_indent);
}
// first n-1 elements // first n-1 elements
auto i = val.m_data.m_value.object->cbegin(); auto i = val.m_data.m_value.object->cbegin();
@@ -19374,11 +19370,7 @@ class serializer
// variable to hold indentation for recursive calls // variable to hold indentation for recursive calls
const auto new_indent = current_indent + indent_step; const auto new_indent = current_indent + indent_step;
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) reserve_indent(new_indent);
{
indent_string.resize((std::max)(indent_string.size() * 2, static_cast<std::size_t>(new_indent)), indent_char);
JSON_ASSERT(indent_string.size() >= new_indent);
}
// first n-1 elements // first n-1 elements
for (auto i = val.m_data.m_value.array->cbegin(); for (auto i = val.m_data.m_value.array->cbegin();
@@ -19436,11 +19428,7 @@ class serializer
// variable to hold indentation for recursive calls // variable to hold indentation for recursive calls
const auto new_indent = current_indent + indent_step; const auto new_indent = current_indent + indent_step;
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) reserve_indent(new_indent);
{
indent_string.resize((std::max)(indent_string.size() * 2, static_cast<std::size_t>(new_indent)), indent_char);
JSON_ASSERT(indent_string.size() >= new_indent);
}
o->write_characters(indent_string.c_str(), new_indent); o->write_characters(indent_string.c_str(), new_indent);
@@ -19550,6 +19538,25 @@ class serializer
} }
} }
/*!
@brief grow the indentation string so it can hold at least @a new_indent characters
The indentation string is grown by doubling its size, but at least to
@a new_indent characters, so that it can be used as a source for writing
@a new_indent indentation characters. The newly added characters use the
configured @ref indent_char.
@param[in] new_indent the required number of indentation characters
*/
void reserve_indent(const std::size_t new_indent)
{
if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
{
indent_string.resize((std::max)(indent_string.size() * 2, new_indent), indent_char);
}
JSON_ASSERT(indent_string.size() >= new_indent);
}
JSON_PRIVATE_UNLESS_TESTED: JSON_PRIVATE_UNLESS_TESTED:
/*! /*!
@brief dump escaped string @brief dump escaped string
tests/src/unit-serialization.cpp
+10 -8
View File
@@ -311,14 +311,16 @@ TEST_CASE("dump for basic_json with long double number_float_t")
SECTION("round-trip dump/parse") SECTION("round-trip dump/parse")
{ {
constexpr std::array<long double, 13> values = constexpr std::array<long double, 13> values =
{{ {
0.0L, -0.0L, 1.0L, -1.0L, {
0.5L, -0.5L, 1.5L, -2.25L, 0.0L, -0.0L, 1.0L, -1.0L,
1.23e45L, 1.23e-45L, 0.5L, -0.5L, 1.5L, -2.25L,
(std::numeric_limits<long double>::min)(), 1.23e45L, 1.23e-45L,
std::numeric_limits<long double>::lowest(), (std::numeric_limits<long double>::min)(),
(std::numeric_limits<long double>::max)() std::numeric_limits<long double>::lowest(),
}}; (std::numeric_limits<long double>::max)()
}
};
for (long double v : values) for (long double v : values)
{ {