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

Follow the renames from the review of the view builder

Browse Source 
The review of #5620 renamed document_data's tape/tape_size/tape_cap to
nodes/node_count/node_capacity and made the decode arena a
std::vector<char>; adapt the code of this change to it.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann committed 2026-10-16 19:41:16 +02:00
1 parent 4a370d89cb
commit b3922cdcdf
4 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/detail/view/edit.hpp
+1 -1
View File
@@ -363,7 +363,7 @@ class editor
const std::uint8_t linked = slot->flags & node_flags::linked; const std::uint8_t linked = slot->flags & node_flags::linked;
if (e.region == nullptr) if (e.region == nullptr)
{ {
if (is_container(*slot) && slot->next > 1 && slot != m_doc.tape && linked == 0) if (is_container(*slot) && slot->next > 1 && slot != m_doc.nodes && linked == 0)
{ {
// The slot spans its old elements in the enclosing sequence, but // The slot spans its old elements in the enclosing sequence, but
// a scalar is one node: the enclosing container first switches to // a scalar is one node: the enclosing container first switches to
include/nlohmann/detail/view/edit_storage.hpp
+3 -3
View File
@@ -202,9 +202,9 @@ inline node* block_of(document_data& d, node* n, std::size_t extra)
inline node* find_parent(const document_data& d, const node* target) inline node* find_parent(const document_data& d, const node* target)
{ {
const std::less<const node*> lt{}; const std::less<const node*> lt{};
const node* lo = d.tape; const node* lo = d.nodes;
const node* hi = d.tape + d.tape_size; const node* hi = d.nodes + d.node_count;
const node* c = d.tape; const node* c = d.nodes;
if (lt(target, lo) || !lt(target, hi)) if (lt(target, lo) || !lt(target, hi))
{ {
if (!d.edits) if (!d.edits)
single_include/nlohmann/json_view.hpp
Generated
+4 -4
View File
@@ -3010,9 +3010,9 @@ inline node* block_of(document_data& d, node* n, std::size_t extra)
inline node* find_parent(const document_data& d, const node* target) inline node* find_parent(const document_data& d, const node* target)
{ {
const std::less<const node*> lt{}; const std::less<const node*> lt{};
const node* lo = d.tape; const node* lo = d.nodes;
const node* hi = d.tape + d.tape_size; const node* hi = d.nodes + d.node_count;
const node* c = d.tape; const node* c = d.nodes;
if (lt(target, lo) || !lt(target, hi)) if (lt(target, lo) || !lt(target, hi))
{ {
if (!d.edits) if (!d.edits)
@@ -3760,7 +3760,7 @@ class editor
const std::uint8_t linked = slot->flags & node_flags::linked; const std::uint8_t linked = slot->flags & node_flags::linked;
if (e.region == nullptr) if (e.region == nullptr)
{ {
if (is_container(*slot) && slot->next > 1 && slot != m_doc.tape && linked == 0) if (is_container(*slot) && slot->next > 1 && slot != m_doc.nodes && linked == 0)
{ {
// The slot spans its old elements in the enclosing sequence, but // The slot spans its old elements in the enclosing sequence, but
// a scalar is one node: the enclosing container first switches to // a scalar is one node: the enclosing container first switches to
tests/src/unit-json_view_builder.cpp
+1 -1
View File
@@ -376,7 +376,7 @@ TEST_CASE("json_view builder")
const built shallow = build(nested, false, false, false); const built shallow = build(nested, false, false, false);
REQUIRE(shallow.ok); REQUIRE(shallow.ok);
shallow.data->max_depth = 1; shallow.data->max_depth = 1;
CHECK(nlohmann::detail::view::materialize<json>(*shallow.data, shallow.data->nodes) == json::parse(nested)); CHECK(nlohmann::detail::view::materialize<json, false>(*shallow.data, shallow.data->nodes) == json::parse(nested));
// the open containers beyond 64 levels live on the heap // the open containers beyond 64 levels live on the heap
for (const std::size_t depth : for (const std::size_t depth :