mirror of
https://github.com/nlohmann/json.git
synced 2026-10-27 00:08:55 +00:00
json_view: pointer tokens that cannot be array indices create objects
editable_document::set() chose an array for a null parent whenever the token consisted of digits, so "01" threw parse_error.106 and the empty token threw, while basic_json::operator[](json_pointer) has created an object for such tokens since #5358. This broke unit-json_view_edit_values on develop. Use the same RFC 6901 array index test as basic_json. Also re-indent the unflatten test that the astyle check flagged. Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
3 files changed
+16
-8
No files matched your search
@@ -1313,7 +1313,7 @@ class basic_json_document
|
||||
/// member is set (added if missing), an array element assigned, and "-"
|
||||
/// or the size of the array appends. A null parent becomes what
|
||||
/// basic_json's operator[](json_pointer) makes of it: an array for "-"
|
||||
/// and for digits (padded with nulls up to the index), an object otherwise.
|
||||
/// and for array indices (padded with nulls up to the index), an object otherwise.
|
||||
template<typename V>
|
||||
view_type set(const json_pointer& ptr, V&& value)
|
||||
{
|
||||
@@ -1329,7 +1329,11 @@ class basic_json_document
|
||||
{
|
||||
return push_back(parent, std::forward<V>(value));
|
||||
}
|
||||
const bool digits = std::all_of(token.begin(), token.end(), [](const char c)
|
||||
// (a token that cannot be an array index, such as "01" or "", names an
|
||||
// object member, as in basic_json)
|
||||
const bool digits = !token.empty()
|
||||
&& (token.size() == 1 || token[0] != '0')
|
||||
&& std::all_of(token.begin(), token.end(), [](const char c)
|
||||
{
|
||||
return c >= '0' && c <= '9';
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user