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

Call a function to parse structurals

This commit is contained in:
John Keiser 2020-06-05 10:49:19 -07:00
parent a5beffda78
commit 5e69fb782a
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,23 +368,17 @@ struct structural_parser {
really_inline void log_error(const char *error) { really_inline void log_error(const char *error) {
logger::log_line(structurals, "", "ERROR", error); logger::log_line(structurals, "", "ERROR", error);
} }
}; }; // struct structural_parser
// Redefine FAIL_IF to use goto since it'll be used inside the function now // Redefine FAIL_IF to use goto since it'll be used inside the function now
#undef FAIL_IF #undef FAIL_IF
#define FAIL_IF(EXPR) { if (EXPR) { goto error; } } #define FAIL_IF(EXPR) { if (EXPR) { goto error; } }
} // namespace stage2 WARN_UNUSED static error_code parse_structurals(dom_parser_implementation &dom_parser, dom::document &doc) noexcept {
dom_parser.doc = &doc;
/************
* The JSON is parsed to a tape, see the accompanying tape.md file
* for documentation.
***********/
WARN_UNUSED error_code dom_parser_implementation::stage2(dom::document &_doc) noexcept {
this->doc = &_doc;
static constexpr stage2::unified_machine_addresses addresses = INIT_ADDRESSES(); static constexpr stage2::unified_machine_addresses addresses = INIT_ADDRESSES();
stage2::structural_parser parser(*this); stage2::structural_parser parser(dom_parser);
error_code result = parser.start(len, addresses.finish); error_code result = parser.start(dom_parser.len, addresses.finish);
if (result) { return result; } if (result) { return result; }
// //
@ -398,7 +392,7 @@ WARN_UNUSED error_code dom_parser_implementation::stage2(dom::document &_doc) no
FAIL_IF( parser.start_array(addresses.finish) ); FAIL_IF( parser.start_array(addresses.finish) );
// Make sure the outer array is closed before continuing; otherwise, there are ways we could get // 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 // into memory corruption. See https://github.com/simdjson/simdjson/issues/906
if (buf[structural_indexes[n_structural_indexes - 1]] != ']') { if (parser.structurals.buf[parser.structurals.structural_indexes[dom_parser.n_structural_indexes - 1]] != ']') {
goto error; goto error;
} }
goto array_begin; goto array_begin;
@ -505,6 +499,16 @@ error:
return parser.error(); return parser.error();
} }
} // namespace stage2
/************
* The JSON is parsed to a tape, see the accompanying tape.md file
* for documentation.
***********/
WARN_UNUSED error_code dom_parser_implementation::stage2(dom::document &_doc) noexcept {
return stage2::parse_structurals(*this, _doc);
}
namespace stage2 { namespace stage2 {
struct streaming_structural_parser: structural_parser { struct streaming_structural_parser: structural_parser {