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

Remove parse_* from visitor method names

This commit is contained in:
John Keiser 2020-08-06 12:45:13 -07:00
parent 5a3c3134ec
commit a67e83e24e
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,11 +101,10 @@ SIMDJSON_WARN_UNUSED simdjson_really_inline error_code structural_parser::walk_d
} }
switch (*value) { switch (*value) {
case '{': if (!empty_object(visitor)) { goto object_begin; }; break; case '{': if (!empty_object(visitor)) { goto object_begin; }; goto document_end;
case '[': if (!empty_array(visitor)) { goto array_begin; }; break; case '[': if (!empty_array(visitor)) { goto array_begin; }; goto document_end;
default: SIMDJSON_TRY( visitor.parse_root_primitive(*this, value) ); default: SIMDJSON_TRY( visitor.root_primitive(*this, value) ); goto document_end;
} }
goto document_end;
// //
// Object parser states // Object parser states
@ -118,15 +117,15 @@ object_begin:
value = advance(); value = advance();
if (*value != '"') { log_error("Object does not start with a key"); return TAPE_ERROR; } if (*value != '"') { log_error("Object does not start with a key"); return TAPE_ERROR; }
visitor.increment_count(*this); visitor.increment_count(*this);
SIMDJSON_TRY( visitor.parse_key(*this, value) ); SIMDJSON_TRY( visitor.key(*this, value) );
goto object_field; goto object_field;
object_field: object_field:
if (simdjson_unlikely( advance_char() != ':' )) { log_error("Missing colon after key in object"); return TAPE_ERROR; } if (simdjson_unlikely( advance_char() != ':' )) { log_error("Missing colon after key in object"); return TAPE_ERROR; }
switch (*(value = advance())) { switch (*(value = advance())) {
case '{': if (!empty_object(visitor)) { goto object_begin; }; break; case '{': if (!empty_object(visitor)) { goto object_begin; }; goto object_continue;
case '[': if (!empty_array(visitor)) { goto array_begin; }; break; case '[': if (!empty_array(visitor)) { goto array_begin; }; goto object_continue;
default: SIMDJSON_TRY( visitor.parse_primitive(*this, value) ); default: SIMDJSON_TRY( visitor.primitive(*this, value) );
} }
object_continue: object_continue:
@ -135,7 +134,7 @@ object_continue:
visitor.increment_count(*this); visitor.increment_count(*this);
value = advance(); value = advance();
if (simdjson_unlikely( *value != '"' )) { log_error("Key string missing at beginning of field in object"); return TAPE_ERROR; } if (simdjson_unlikely( *value != '"' )) { log_error("Key string missing at beginning of field in object"); return TAPE_ERROR; }
SIMDJSON_TRY( visitor.parse_key(*this, value) ); SIMDJSON_TRY( visitor.key(*this, value) );
goto object_field; goto object_field;
} }
case '}': case '}':
@ -163,9 +162,9 @@ array_begin:
array_value: array_value:
switch (*(value = advance())) { switch (*(value = advance())) {
case '{': if (!empty_object(visitor)) { goto object_begin; }; break; case '{': if (!empty_object(visitor)) { goto object_begin; }; goto array_continue;
case '[': if (!empty_array(visitor)) { goto array_begin; }; break; case '[': if (!empty_array(visitor)) { goto array_begin; }; goto array_continue;
default: SIMDJSON_TRY( visitor.parse_primitive(*this, value) ); default: SIMDJSON_TRY( visitor.primitive(*this, value) );
} }
array_continue: array_continue:
@ -193,7 +192,7 @@ document_end:
return SUCCESS; return SUCCESS;
} // parse_structurals() } // walk_document()
} // namespace stage2 } // namespace stage2
} // namespace SIMDJSON_IMPLEMENTATION } // namespace SIMDJSON_IMPLEMENTATION

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

@ -7,11 +7,6 @@ namespace SIMDJSON_IMPLEMENTATION {
namespace stage2 { namespace stage2 {
struct tape_builder { struct tape_builder {
/** Next location to write to tape */
tape_writer tape;
/** Next write location in the string buf for stage 2 parsing */
uint8_t *current_string_buf_loc;
template<bool STREAMING> template<bool STREAMING>
SIMDJSON_WARN_UNUSED static simdjson_really_inline error_code parse_document( SIMDJSON_WARN_UNUSED static simdjson_really_inline error_code parse_document(
dom_parser_implementation &dom_parser, dom_parser_implementation &dom_parser,
@ -22,12 +17,7 @@ struct tape_builder {
return iter.walk_document<STREAMING>(builder); return iter.walk_document<STREAMING>(builder);
} }
private: simdjson_really_inline error_code root_primitive(structural_parser &iter, const uint8_t *value) {
friend struct structural_parser;
simdjson_really_inline tape_builder(dom::document &doc) noexcept : tape{doc.tape.get()}, current_string_buf_loc{doc.string_buf.get()} {}
simdjson_really_inline error_code parse_root_primitive(structural_parser &iter, const uint8_t *value) {
switch (*value) { switch (*value) {
case '"': return parse_string(iter, value); case '"': return parse_string(iter, value);
case 't': return parse_root_true_atom(iter, value); case 't': return parse_root_true_atom(iter, value);
@ -42,7 +32,7 @@ private:
return TAPE_ERROR; return TAPE_ERROR;
} }
} }
simdjson_really_inline error_code parse_primitive(structural_parser &iter, const uint8_t *value) { simdjson_really_inline error_code primitive(structural_parser &iter, const uint8_t *value) {
switch (*value) { switch (*value) {
case '"': return parse_string(iter, value); case '"': return parse_string(iter, value);
case 't': return parse_true_atom(iter, value); case 't': return parse_true_atom(iter, value);
@ -96,10 +86,26 @@ private:
tape.append(start_tape_index, internal::tape_type::ROOT); tape.append(start_tape_index, internal::tape_type::ROOT);
tape_writer::write(iter.dom_parser.doc->tape[start_tape_index], next_tape_index(iter), internal::tape_type::ROOT); tape_writer::write(iter.dom_parser.doc->tape[start_tape_index], next_tape_index(iter), internal::tape_type::ROOT);
} }
SIMDJSON_WARN_UNUSED simdjson_really_inline error_code key(structural_parser &iter, const uint8_t *key) {
SIMDJSON_WARN_UNUSED simdjson_really_inline error_code parse_key(structural_parser &iter, const uint8_t *value) { return parse_string(iter, key, true);
return parse_string(iter, value, true);
} }
// increment_count increments the count of keys in an object or values in an array.
simdjson_really_inline void increment_count(structural_parser &iter) {
iter.dom_parser.open_containers[iter.depth].count++; // we have a key value pair in the object at parser.dom_parser.depth - 1
}
simdjson_really_inline bool in_array(structural_parser &iter) noexcept {
return iter.dom_parser.is_array[iter.depth];
}
private:
/** Next location to write to tape */
tape_writer tape;
/** Next write location in the string buf for stage 2 parsing */
uint8_t *current_string_buf_loc;
simdjson_really_inline tape_builder(dom::document &doc) noexcept : tape{doc.tape.get()}, current_string_buf_loc{doc.string_buf.get()} {}
SIMDJSON_WARN_UNUSED simdjson_really_inline error_code parse_string(structural_parser &iter, const uint8_t *value, bool key = false) { SIMDJSON_WARN_UNUSED simdjson_really_inline error_code parse_string(structural_parser &iter, const uint8_t *value, bool key = false) {
iter.log_value(key ? "key" : "string"); iter.log_value(key ? "key" : "string");
uint8_t *dst = on_start_string(iter); uint8_t *dst = on_start_string(iter);
@ -185,11 +191,6 @@ private:
return SUCCESS; return SUCCESS;
} }
// increment_count increments the count of keys in an object or values in an array.
simdjson_really_inline void increment_count(structural_parser &iter) {
iter.dom_parser.open_containers[iter.depth].count++; // we have a key value pair in the object at parser.dom_parser.depth - 1
}
// private: // private:
simdjson_really_inline uint32_t next_tape_index(structural_parser &iter) { simdjson_really_inline uint32_t next_tape_index(structural_parser &iter) {