j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🚧 respect ensure_ascii parameter #1198

Browse source
This commit is contained in:
Niels Lohmann 2018-10-22 09:18:16 +02:00
parent e5dce64115
commit c7af027cbb
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
3 changed files with 47 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/nlohmann/detail/output/serializer.hpp
View file

@ -436,12 +436,21 @@ class serializer
if (error_handler == error_handler_t::replace) if (error_handler == error_handler_t::replace)
{ {
// add a replacement character // add a replacement character
if (ensure_ascii)
{
string_buffer[bytes++] = '\\'; string_buffer[bytes++] = '\\';
string_buffer[bytes++] = 'u'; string_buffer[bytes++] = 'u';
string_buffer[bytes++] = 'f'; string_buffer[bytes++] = 'f';
string_buffer[bytes++] = 'f'; string_buffer[bytes++] = 'f';
string_buffer[bytes++] = 'f'; string_buffer[bytes++] = 'f';
string_buffer[bytes++] = 'd'; string_buffer[bytes++] = 'd';
}
else
{
string_buffer[bytes++] = '\xEF';
string_buffer[bytes++] = '\xBF';
string_buffer[bytes++] = '\xBD';
}
bytes_after_last_accept = bytes; bytes_after_last_accept = bytes;
} }
@ -497,7 +506,14 @@ class serializer
// write all accepted bytes // write all accepted bytes
o->write_characters(string_buffer.data(), bytes_after_last_accept); o->write_characters(string_buffer.data(), bytes_after_last_accept);
// add a replacement character // add a replacement character
if (ensure_ascii)
{
o->write_characters("\\ufffd", 6); o->write_characters("\\ufffd", 6);
}
else
{
o->write_characters("\xEF\xBF\xBD", 3);
}
break; break;
} }
} }

16
single_include/nlohmann/json.hpp
View file

@ -10388,12 +10388,21 @@ class serializer
if (error_handler == error_handler_t::replace) if (error_handler == error_handler_t::replace)
{ {
// add a replacement character // add a replacement character
if (ensure_ascii)
{
string_buffer[bytes++] = '\\'; string_buffer[bytes++] = '\\';
string_buffer[bytes++] = 'u'; string_buffer[bytes++] = 'u';
string_buffer[bytes++] = 'f'; string_buffer[bytes++] = 'f';
string_buffer[bytes++] = 'f'; string_buffer[bytes++] = 'f';
string_buffer[bytes++] = 'f'; string_buffer[bytes++] = 'f';
string_buffer[bytes++] = 'd'; string_buffer[bytes++] = 'd';
}
else
{
string_buffer[bytes++] = '\xEF';
string_buffer[bytes++] = '\xBF';
string_buffer[bytes++] = '\xBD';
}
bytes_after_last_accept = bytes; bytes_after_last_accept = bytes;
} }
@ -10449,7 +10458,14 @@ class serializer
// write all accepted bytes // write all accepted bytes
o->write_characters(string_buffer.data(), bytes_after_last_accept); o->write_characters(string_buffer.data(), bytes_after_last_accept);
// add a replacement character // add a replacement character
if (ensure_ascii)
{
o->write_characters("\\ufffd", 6); o->write_characters("\\ufffd", 6);
}
else
{
o->write_characters("\xEF\xBF\xBD", 3);
}
break; break;
} }
} }

8
test/src/unit-unicode.cpp
View file

@ -86,10 +86,6 @@ void check_utf8dump(bool success_expected, int byte1, int byte2 = -1, int byte3
// all dumps should agree on the string // all dumps should agree on the string
CHECK(s_strict == s_ignored); CHECK(s_strict == s_ignored);
CHECK(s_strict == s_replaced); CHECK(s_strict == s_replaced);
// check that ignore/replace string does not contain a replacement character
CHECK(s_ignored.find("\\ufffd") == std::string::npos);
CHECK(s_replaced.find("\\ufffd") == std::string::npos);
} }
else else
{ {
@ -98,10 +94,8 @@ void check_utf8dump(bool success_expected, int byte1, int byte2 = -1, int byte3
// ignore and replace must create different dumps // ignore and replace must create different dumps
CHECK(s_ignored != s_replaced); CHECK(s_ignored != s_replaced);
// check that ignore string does not contain a replacement character
CHECK(s_ignored.find("\\ufffd") == std::string::npos);
// check that replace string contains a replacement character // check that replace string contains a replacement character
CHECK(s_replaced.find("\\ufffd") != std::string::npos); CHECK(s_replaced.find("\xEF\xBF\xBD") != std::string::npos);
} }