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

Remove extraneous machine addresses

This commit is contained in:
John Keiser 2020-07-27 19:05:47 -07:00
parent bb65ebd8be
commit 2f67dab2b6
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,39 +13,23 @@ namespace SIMDJSON_IMPLEMENTATION {
namespace stage2 { namespace stage2 {
#ifdef SIMDJSON_USE_COMPUTED_GOTO #ifdef SIMDJSON_USE_COMPUTED_GOTO
#define INIT_ADDRESSES() { &&array_begin, &&array_continue, &&error, &&finish, &&object_begin, &&object_continue } #define INIT_ADDRESSES() { &&array_continue, &&finish, &&object_continue }
#define GOTO(address) { goto *(address); }
#define CONTINUE(address) { goto *(address); } #define CONTINUE(address) { goto *(address); }
#else // SIMDJSON_USE_COMPUTED_GOTO #else // SIMDJSON_USE_COMPUTED_GOTO
#define INIT_ADDRESSES() { '[', 'a', 'e', 'f', '{', 'o' }; #define INIT_ADDRESSES() { 0, 1, 2 };
#define GOTO(address) \
{ \
switch(address) { \
case '[': goto array_begin; \
case 'a': goto array_continue; \
case 'e': goto error; \
case 'f': goto finish; \
case '{': goto object_begin; \
case 'o': goto object_continue; \
} \
}
// For the more constrained end_xxx() situation
#define CONTINUE(address) \ #define CONTINUE(address) \
{ \ { \
switch(address) { \ switch(address) { \
case 'a': goto array_continue; \ case 0: goto array_continue; \
case 'o': goto object_continue; \ case 1: goto finish; \
case 'f': goto finish; \ case 2: goto object_continue; \
} \ } \
} }
#endif // SIMDJSON_USE_COMPUTED_GOTO #endif // SIMDJSON_USE_COMPUTED_GOTO
struct unified_machine_addresses { struct unified_machine_addresses {
ret_address_t array_begin;
ret_address_t array_continue; ret_address_t array_continue;
ret_address_t error;
ret_address_t finish; ret_address_t finish;
ret_address_t object_begin;
ret_address_t object_continue; ret_address_t object_continue;
}; };