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

♻️ adjust write_u_escape signature

Browse Source 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-07-06 08:33:49 +02:00
parent ce576f6316
commit feeab08982
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nlohmann/detail/output/serializer.hpp
+6 -7
View File
@@ -465,12 +465,12 @@ class serializer
{ {
if (codepoint <= 0xFFFF) if (codepoint <= 0xFFFF)
{ {
bytes = write_u_escape(bytes, static_cast<std::uint16_t>(codepoint)); write_u_escape(bytes, static_cast<std::uint16_t>(codepoint));
} }
else else
{ {
bytes = write_u_escape(bytes, static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u))); write_u_escape(bytes, static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)));
bytes = write_u_escape(bytes, static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu))); write_u_escape(bytes, static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu)));
} }
} }
else else
@@ -684,14 +684,13 @@ class serializer
* string escaping hot path. It writes exactly six characters ('\\', 'u' and * string escaping hot path. It writes exactly six characters ('\\', 'u' and
* four hex digits) at position @a pos of @a string_buffer via a nibble * four hex digits) at position @a pos of @a string_buffer via a nibble
* lookup table, avoiding the format-string parsing and locale machinery of * lookup table, avoiding the format-string parsing and locale machinery of
* `snprintf`. * `snprintf`. Advances @a pos by the number of bytes written (6).
* *
* @param[in] pos position in @a string_buffer to write at; there must * @param[in] pos position in @a string_buffer to write at; there must
* be at least 6 bytes of headroom * be at least 6 bytes of headroom
* @param[in] codeunit 16-bit value to encode * @param[in] codeunit 16-bit value to encode
* @return position just after the written escape sequence (@a pos + 6)
*/ */
std::size_t write_u_escape(std::size_t pos, std::uint16_t codeunit) noexcept void write_u_escape(std::size_t& pos, std::uint16_t codeunit) noexcept
{ {
JSON_ASSERT(string_buffer.size() - pos >= 6); JSON_ASSERT(string_buffer.size() - pos >= 6);
constexpr const char* nibble_to_hex = "0123456789abcdef"; constexpr const char* nibble_to_hex = "0123456789abcdef";
@@ -701,7 +700,7 @@ class serializer
string_buffer[pos + 3] = nibble_to_hex[(codeunit >> 8u) & 0x0Fu]; string_buffer[pos + 3] = nibble_to_hex[(codeunit >> 8u) & 0x0Fu];
string_buffer[pos + 4] = nibble_to_hex[(codeunit >> 4u) & 0x0Fu]; string_buffer[pos + 4] = nibble_to_hex[(codeunit >> 4u) & 0x0Fu];
string_buffer[pos + 5] = nibble_to_hex[codeunit & 0x0Fu]; string_buffer[pos + 5] = nibble_to_hex[codeunit & 0x0Fu];
return pos + 6; pos += 6;
} }
// templates to avoid warnings about useless casts // templates to avoid warnings about useless casts
single_include/nlohmann/json.hpp
+6 -7
View File
@@ -19752,12 +19752,12 @@ class serializer
{ {
if (codepoint <= 0xFFFF) if (codepoint <= 0xFFFF)
{ {
bytes = write_u_escape(bytes, static_cast<std::uint16_t>(codepoint)); write_u_escape(bytes, static_cast<std::uint16_t>(codepoint));
} }
else else
{ {
bytes = write_u_escape(bytes, static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u))); write_u_escape(bytes, static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)));
bytes = write_u_escape(bytes, static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu))); write_u_escape(bytes, static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu)));
} }
} }
else else
@@ -19971,14 +19971,13 @@ class serializer
* string escaping hot path. It writes exactly six characters ('\\', 'u' and * string escaping hot path. It writes exactly six characters ('\\', 'u' and
* four hex digits) at position @a pos of @a string_buffer via a nibble * four hex digits) at position @a pos of @a string_buffer via a nibble
* lookup table, avoiding the format-string parsing and locale machinery of * lookup table, avoiding the format-string parsing and locale machinery of
* `snprintf`. * `snprintf`. Advances @a pos by the number of bytes written (6).
* *
* @param[in] pos position in @a string_buffer to write at; there must * @param[in] pos position in @a string_buffer to write at; there must
* be at least 6 bytes of headroom * be at least 6 bytes of headroom
* @param[in] codeunit 16-bit value to encode * @param[in] codeunit 16-bit value to encode
* @return position just after the written escape sequence (@a pos + 6)
*/ */
std::size_t write_u_escape(std::size_t pos, std::uint16_t codeunit) noexcept void write_u_escape(std::size_t& pos, std::uint16_t codeunit) noexcept
{ {
JSON_ASSERT(string_buffer.size() - pos >= 6); JSON_ASSERT(string_buffer.size() - pos >= 6);
constexpr const char* nibble_to_hex = "0123456789abcdef"; constexpr const char* nibble_to_hex = "0123456789abcdef";
@@ -19988,7 +19987,7 @@ class serializer
string_buffer[pos + 3] = nibble_to_hex[(codeunit >> 8u) & 0x0Fu]; string_buffer[pos + 3] = nibble_to_hex[(codeunit >> 8u) & 0x0Fu];
string_buffer[pos + 4] = nibble_to_hex[(codeunit >> 4u) & 0x0Fu]; string_buffer[pos + 4] = nibble_to_hex[(codeunit >> 4u) & 0x0Fu];
string_buffer[pos + 5] = nibble_to_hex[codeunit & 0x0Fu]; string_buffer[pos + 5] = nibble_to_hex[codeunit & 0x0Fu];
return pos + 6; pos += 6;
} }
// templates to avoid warnings about useless casts // templates to avoid warnings about useless casts