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

Fall through goto labels where possible

This commit is contained in:
John Keiser 2020-08-07 10:07:39 -07:00
parent 1b56211a70
commit 57eba21ee5
1 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/generic/stage2/json_iterator.h
View File

@ -41,6 +41,25 @@ public:
return next_structural == dom_parser.structural_indexes.get();
}
simdjson_really_inline void log_value(const char *type) {
logger::log_line(*this, "", type, "");
}
simdjson_really_inline void log_start_value(const char *type) {
logger::log_line(*this, "+", type, "");
if (logger::LOG_ENABLED) { logger::log_depth++; }
}
simdjson_really_inline void log_end_value(const char *type) {
if (logger::LOG_ENABLED) { logger::log_depth--; }
logger::log_line(*this, "-", type, "");
}
simdjson_really_inline void log_error(const char *error) {
logger::log_line(*this, "", "ERROR", error);
}
private:
template<typename T>
SIMDJSON_WARN_UNUSED simdjson_really_inline bool empty_object(T &visitor) {
if (peek_next_char() == '}') {
@ -63,24 +82,6 @@ public:
simdjson_really_inline uint8_t last_structural() {
return buf[dom_parser.structural_indexes[dom_parser.n_structural_indexes - 1]];
}
simdjson_really_inline void log_value(const char *type) {
logger::log_line(*this, "", type, "");
}
simdjson_really_inline void log_start_value(const char *type) {
logger::log_line(*this, "+", type, "");
if (logger::LOG_ENABLED) { logger::log_depth++; }
}
simdjson_really_inline void log_end_value(const char *type) {
if (logger::LOG_ENABLED) { logger::log_depth--; }
logger::log_line(*this, "-", type, "");
}
simdjson_really_inline void log_error(const char *error) {
logger::log_line(*this, "", "ERROR", error);
}
};
template<bool STREAMING, typename T>
@ -116,10 +117,11 @@ SIMDJSON_WARN_UNUSED simdjson_really_inline error_code json_iterator::walk_docum
}
switch (*value) {
case '{': if (!empty_object(visitor)) { goto object_begin; }; goto document_end;
case '[': if (!empty_array(visitor)) { goto array_begin; }; goto document_end;
default: SIMDJSON_TRY( visitor.root_primitive(*this, value) ); goto document_end;
case '{': if (!empty_object(visitor)) { goto object_begin; }; break;
case '[': if (!empty_array(visitor)) { goto array_begin; }; break;
default: SIMDJSON_TRY( visitor.root_primitive(*this, value) ); break;
}
goto document_end;
//
// Object parser states
@ -132,14 +134,13 @@ object_begin:
if (advance() != '"') { log_error("Object does not start with a key"); return TAPE_ERROR; }
visitor.increment_count(*this);
SIMDJSON_TRY( visitor.key(*this, value) );
goto object_field;
object_field:
if (simdjson_unlikely( advance() != ':' )) { log_error("Missing colon after key in object"); return TAPE_ERROR; }
switch (advance()) {
case '{': if (!empty_object(visitor)) { goto object_begin; }; goto object_continue;
case '[': if (!empty_array(visitor)) { goto array_begin; }; goto object_continue;
default: SIMDJSON_TRY( visitor.primitive(*this, value) );
case '{': if (!empty_object(visitor)) { goto object_begin; }; break;
case '[': if (!empty_array(visitor)) { goto array_begin; }; break;
default: SIMDJSON_TRY( visitor.primitive(*this, value) ); break;
}
object_continue:
@ -170,9 +171,9 @@ array_begin:
array_value:
switch (advance()) {
case '{': if (!empty_object(visitor)) { goto object_begin; }; goto array_continue;
case '[': if (!empty_array(visitor)) { goto array_begin; }; goto array_continue;
default: SIMDJSON_TRY( visitor.primitive(*this, value) );
case '{': if (!empty_object(visitor)) { goto object_begin; }; break;
case '[': if (!empty_array(visitor)) { goto array_begin; }; break;
default: SIMDJSON_TRY( visitor.primitive(*this, value) ); break;
}
array_continue:
@ -187,10 +188,7 @@ document_end:
dom_parser.next_structural_index = uint32_t(next_structural - &dom_parser.structural_indexes[0]);
if (depth != 0) {
log_error("Unclosed objects or arrays!");
return TAPE_ERROR;
}
if (depth != 0) { log_error("Unclosed objects or arrays!"); return TAPE_ERROR; }
// If we didn't make it to the end, it's an error
if ( !STREAMING && dom_parser.next_structural_index != dom_parser.n_structural_indexes ) {