jasder
/
simdjson
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Don't pass depth to end_scope

This commit is contained in:
John Keiser 2020-05-11 05:06:41 -07:00
parent edaa8f811f
commit 54fe302907
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/simdjson/document.h
View File

@ -1042,7 +1042,7 @@ public:
really_inline bool on_number_u64(uint64_t value) noexcept; ///< @private
really_inline bool on_number_double(double value) noexcept; ///< @private
really_inline void end_scope(uint32_t depth) noexcept; ///< @private
really_inline void end_scope(uint32_t start_tape_index, uint32_t count) noexcept; ///< @private
private:
/**
* The maximum document length this parser will automatically support.

13
src/document_parser_callbacks.h
View File

@ -44,19 +44,19 @@ really_inline bool parser::on_end_document(uint32_t depth) noexcept {
// write our doc.tape location to the header scope
// The root scope gets written *at* the previous location.
write_tape(containing_scope[depth].tape_index, internal::tape_type::ROOT);
end_scope(depth);
end_scope(containing_scope[depth].tape_index, containing_scope[depth].count);
return true;
}
really_inline bool parser::on_end_object(uint32_t depth) noexcept {
// write our doc.tape location to the header scope
write_tape(containing_scope[depth].tape_index, internal::tape_type::END_OBJECT);
end_scope(depth);
end_scope(containing_scope[depth].tape_index, containing_scope[depth].count);
return true;
}
really_inline bool parser::on_end_array(uint32_t depth) noexcept {
// write our doc.tape location to the header scope
write_tape(containing_scope[depth].tape_index, internal::tape_type::END_ARRAY);
end_scope(depth);
end_scope(containing_scope[depth].tape_index, containing_scope[depth].count);
return true;
}
@ -117,13 +117,12 @@ really_inline void parser::write_tape(uint64_t val, internal::tape_type t) noexc
}
// this function is responsible for annotating the start of the scope
really_inline void parser::end_scope(uint32_t depth) noexcept {
scope_descriptor d = containing_scope[depth];
really_inline void parser::end_scope(uint32_t start_tape_index, uint32_t count) noexcept {
// count can overflow if it exceeds 24 bits... so we saturate
// the convention being that a cnt of 0xffffff or more is undetermined in value (>= 0xffffff).
const uint32_t cntsat = d.count > 0xFFFFFF ? 0xFFFFFF : d.count;
const uint32_t cntsat = count > 0xFFFFFF ? 0xFFFFFF : count;
// This is a load and an OR. It would be possible to just write once at doc.tape[d.tape_index]
doc.tape[d.tape_index] |= current_loc | (uint64_t(cntsat) << 32);
doc.tape[start_tape_index] |= current_loc | (uint64_t(cntsat) << 32);
}
} // namespace simdjson