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

Use parse_primitive (negative perf!)

This commit is contained in:
John Keiser 2020-08-03 18:39:41 -07:00
parent 6ef9395419
commit 03aaf189c1
2 changed files with 56 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/generic/stage2/structural_parser.h
View File

@ -123,34 +123,27 @@ WARN_UNUSED really_inline error_code structural_parser::parse(T &builder) noexce
{
const uint8_t *value = advance();
switch (*value) {
case '{': {
if (empty_object(builder)) { goto document_end; }
SIMDJSON_TRY( start_object(builder) );
goto object_begin;
}
case '[': {
if (empty_array(builder)) { goto document_end; }
SIMDJSON_TRY( start_array(builder) );
// Make sure the outer array is closed before continuing; otherwise, there are ways we could get
// into memory corruption. See https://github.com/simdjson/simdjson/issues/906
if (!STREAMING) {
if (buf[dom_parser.structural_indexes[dom_parser.n_structural_indexes - 1]] != ']') {
return TAPE_ERROR;
}
case '{': {
if (empty_object(builder)) { goto document_end; }
SIMDJSON_TRY( start_object(builder) );
goto object_begin;
}
case '[': {
if (empty_array(builder)) { goto document_end; }
SIMDJSON_TRY( start_array(builder) );
// Make sure the outer array is closed before continuing; otherwise, there are ways we could get
// into memory corruption. See https://github.com/simdjson/simdjson/issues/906
if (!STREAMING) {
if (buf[dom_parser.structural_indexes[dom_parser.n_structural_indexes - 1]] != ']') {
return TAPE_ERROR;
}
}
goto array_begin;
}
default: {
SIMDJSON_TRY( builder.parse_root_primitive(*this, value) );
goto document_end;
}
goto array_begin;
}
case '"': SIMDJSON_TRY( builder.parse_string(*this, value) ); goto document_end;
case 't': SIMDJSON_TRY( builder.parse_root_true_atom(*this, value) ); goto document_end;
case 'f': SIMDJSON_TRY( builder.parse_root_false_atom(*this, value) ); goto document_end;
case 'n': SIMDJSON_TRY( builder.parse_root_null_atom(*this, value) ); goto document_end;
case '-':
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
SIMDJSON_TRY( builder.parse_root_number(*this, value) ); goto document_end;
default:
log_error("Document starts with a non-value character");
return TAPE_ERROR;
}
}
@ -182,17 +175,9 @@ object_field: {
SIMDJSON_TRY( start_array(builder) );
goto array_begin;
}
case '"': SIMDJSON_TRY( builder.parse_string(*this, value) ); break;
case 't': SIMDJSON_TRY( builder.parse_true_atom(*this, value) ); break;
case 'f': SIMDJSON_TRY( builder.parse_false_atom(*this, value) ); break;
case 'n': SIMDJSON_TRY( builder.parse_null_atom(*this, value) ); break;
case '-':
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
SIMDJSON_TRY( builder.parse_number(*this, value) ); break;
default:
log_error("Non-value found when value was expected!");
return TAPE_ERROR;
default: {
SIMDJSON_TRY( builder.parse_primitive(*this, value) );
}
}
} // object_field:
@ -241,17 +226,9 @@ array_value: {
SIMDJSON_TRY( start_array(builder) );
goto array_begin;
}
case '"': SIMDJSON_TRY( builder.parse_string(*this, value) ); break;
case 't': SIMDJSON_TRY( builder.parse_true_atom(*this, value) ); break;
case 'f': SIMDJSON_TRY( builder.parse_false_atom(*this, value) ); break;
case 'n': SIMDJSON_TRY( builder.parse_null_atom(*this, value) ); break;
case '-':
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
SIMDJSON_TRY( builder.parse_number(*this, value) ); break;
default:
log_error("Non-value found when value was expected!");
return TAPE_ERROR;
default: {
SIMDJSON_TRY( builder.parse_primitive(*this, value) );
}
}
} // array_value:

30
src/generic/stage2/tape_builder.h
View File

@ -16,6 +16,36 @@ struct tape_builder {
private:
friend struct structural_parser;
really_inline error_code parse_root_primitive(structural_parser &parser, const uint8_t *value) {
switch (*value) {
case '"': return parse_string(parser, value);
case 't': return parse_root_true_atom(parser, value);
case 'f': return parse_root_false_atom(parser, value);
case 'n': return parse_root_null_atom(parser, value);
case '-':
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
return parse_root_number(parser, value);
default:
parser.log_error("Document starts with a non-value character");
return TAPE_ERROR;
}
}
really_inline error_code parse_primitive(structural_parser &parser, const uint8_t *value) {
switch (*value) {
case '"': return parse_string(parser, value);
case 't': return parse_true_atom(parser, value);
case 'f': return parse_false_atom(parser, value);
case 'n': return parse_null_atom(parser, value);
case '-':
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
return parse_number(parser, value);
default:
parser.log_error("Non-value found when value was expected!");
return TAPE_ERROR;
}
}
really_inline void empty_object(structural_parser &parser) {
parser.log_value("empty object");
empty_container(parser, internal::tape_type::START_OBJECT, internal::tape_type::END_OBJECT);