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

Move current_string_buf_loc to stage 2

This commit is contained in:
John Keiser 2020-05-11 06:11:32 -07:00
parent cd6f204c77
commit dbb3316511
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/simdjson/document.h
View File

@ -985,9 +985,6 @@ public:
std::unique_ptr<char[]> ret_address{};
#endif
/** @private Next write location in the string buf for stage 2 parsing */
uint8_t *current_string_buf_loc{};
/** @private Use `if (parser.parse(...).error())` instead */
bool valid{false};
/** @private Use `parser.parse(...).error()` instead */

14
src/generic/stage2_build_tape.h
View File

@ -139,6 +139,8 @@ struct number_writer {
struct structural_parser {
structural_iterator structurals;
parser &doc_parser;
/** Next write location in the string buf for stage 2 parsing */
uint8_t *current_string_buf_loc{};
uint32_t depth;
really_inline structural_parser(
@ -209,20 +211,20 @@ struct structural_parser {
really_inline uint8_t *on_start_string() noexcept {
/* we advance the point, accounting for the fact that we have a NULL
* termination */
write_tape(doc_parser.current_string_buf_loc - doc_parser.doc.string_buf.get(), internal::tape_type::STRING);
return doc_parser.current_string_buf_loc + sizeof(uint32_t);
write_tape(current_string_buf_loc - doc_parser.doc.string_buf.get(), internal::tape_type::STRING);
return current_string_buf_loc + sizeof(uint32_t);
}
really_inline bool on_end_string(uint8_t *dst) noexcept {
uint32_t str_length = uint32_t(dst - (doc_parser.current_string_buf_loc + sizeof(uint32_t)));
uint32_t str_length = uint32_t(dst - (current_string_buf_loc + sizeof(uint32_t)));
// TODO check for overflow in case someone has a crazy string (>=4GB?)
// But only add the overflow check when the document itself exceeds 4GB
// Currently unneeded because we refuse to parse docs larger or equal to 4GB.
memcpy(doc_parser.current_string_buf_loc, &str_length, sizeof(uint32_t));
memcpy(current_string_buf_loc, &str_length, sizeof(uint32_t));
// NULL termination is still handy if you expect all your strings to
// be NULL terminated? It comes at a small cost
*dst = 0;
doc_parser.current_string_buf_loc = dst + 1;
current_string_buf_loc = dst + 1;
return true;
}
@ -376,7 +378,7 @@ struct structural_parser {
}
really_inline void init() {
doc_parser.current_string_buf_loc = doc_parser.doc.string_buf.get();
current_string_buf_loc = doc_parser.doc.string_buf.get();
doc_parser.current_loc = 0;
doc_parser.valid = false;
doc_parser.error = UNINITIALIZED;