Don't send comma to stage 2

jkeiser · jkeiser · commit 76348beeb93b · 2020-01-20T17:46:53.000-08:00
diff --git a/src/generic/stage1_find_marks.h b/src/generic/stage1_find_marks.h
@@ -401,7 +401,7 @@ really_inline uint64_t json_structural_scanner::find_potential_structurals(const
   // backslash detection before we can determine a string. We may be able to safely shove those
   // processes into a branch.
   //
-  return (start_value & ~space) | open | close | separator;
+  return (start_value & ~space) | open | close | colon;
 }
 
 //
diff --git a/src/generic/stage2_build_tape.h b/src/generic/stage2_build_tape.h
@@ -348,8 +348,7 @@ unified_machine(const uint8_t *buf, size_t len, ParsedJson &pj) {
 
 object_continue:
   switch (parser.advance_char()) {
-  case ',':
-    FAIL_IF( parser.advance_char() != '"' );
+  case '"':
     FAIL_IF( parser.parse_string() );
     goto object_key_state;
   case '}':
@@ -375,15 +374,10 @@ unified_machine(const uint8_t *buf, size_t len, ParsedJson &pj) {
   GOTO( parser.parse_value(addresses, addresses.array_continue) );
 
 array_continue:
-  switch (parser.advance_char()) {
-  case ',':
-    parser.advance_char();
-    goto main_array_switch;
-  case ']':
+  if (parser.advance_char() == ']') {
     goto scope_end;
-  default:
-    goto error;
   }
+  goto main_array_switch;
 
 finish:
   return parser.finish();

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ really_inline uint64_t json_structural_scanner::find_potential_structurals(const`
`401`	`401`	`// backslash detection before we can determine a string. We may be able to safely shove those`
`402`	`402`	`// processes into a branch.`
`403`	`403`	`//`
`404`		`- return (start_value & ~space) \| open \| close \| separator;`
	`404`	`+ return (start_value & ~space) \| open \| close \| colon;`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`//`