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

Fix JsonStream reference to parser on_error

This commit is contained in:
John Keiser 2020-03-03 17:54:52 -08:00
parent b23dd28a06
commit 1c922d3b73
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/simdjson/inline/jsonstream.h
View File

@ -211,10 +211,12 @@ int JsonStream<string_container>::json_parse(document::parser &parser) {
if (unlikely(parser.capacity() == 0)) {
const bool allocok = parser.allocate_capacity(_batch_size);
if (!allocok) {
return parser.on_error(MEMALLOC);
parser.valid = false;
return parser.error = MEMALLOC;
}
} else if (unlikely(parser.capacity() < _batch_size)) {
return parser.on_error(CAPACITY);
parser.valid = false;
return parser.error = CAPACITY;
}
if (unlikely(load_next_batch)) {
advance(current_buffer_loc);
@ -223,12 +225,14 @@ int JsonStream<string_container>::json_parse(document::parser &parser) {
_batch_size = internal::trimmed_length_safe_utf8((const char *)buf(), _batch_size);
auto stage1_is_ok = (error_code)simdjson::active_implementation->stage1(buf(), _batch_size, parser, true);
if (stage1_is_ok != simdjson::SUCCESS) {
return parser.on_error(stage1_is_ok);
parser.valid = false;
return parser.error = stage1_is_ok;
}
size_t last_index = internal::find_last_json_buf_idx(buf(), _batch_size, parser);
if (last_index == 0) {
if (parser.n_structural_indexes == 0) {
return parser.on_error(EMPTY);
parser.valid = false;
return parser.error = EMPTY;
}
} else {
parser.n_structural_indexes = last_index + 1;