Log unconsumed input as an error

jkeiser · jkeiser · commit 5ecd17f49e42 · 2020-08-18T21:25:03.000-07:00
diff --git a/src/generic/stage2/json_iterator.h b/src/generic/stage2/json_iterator.h
@@ -204,7 +204,7 @@ SIMDJSON_WARN_UNUSED simdjson_really_inline error_code json_iterator::walk_docum
 
   // If we didn't make it to the end, it's an error
   if ( !STREAMING && dom_parser.next_structural_index != dom_parser.n_structural_indexes ) {
-    logger::log_string("More than one JSON value at the root of the document, or extra characters at the end of the JSON!");
+    log_error("More than one JSON value at the root of the document, or extra characters at the end of the JSON!");
     return TAPE_ERROR;
   }
 
diff --git a/src/generic/stage2/logger.h b/src/generic/stage2/logger.h
@@ -33,12 +33,6 @@ namespace logger {
     }
   }
 
-  static simdjson_really_inline void log_string(const char *message) {
-    if (LOG_ENABLED) {
-      printf("%s\n", message);
-    }
-  }
-
   // Logs a single line of 
   template<typename S>
   static simdjson_really_inline void log_line(S &structurals, const char *title_prefix, const char *title, const char *detail) {

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ SIMDJSON_WARN_UNUSED simdjson_really_inline error_code json_iterator::walk_docum`
`204`	`204`
`205`	`205`	`// If we didn't make it to the end, it's an error`
`206`	`206`	`if ( !STREAMING && dom_parser.next_structural_index != dom_parser.n_structural_indexes ) {`
`207`		`- logger::log_string("More than one JSON value at the root of the document, or extra characters at the end of the JSON!");`
	`207`	`+ log_error("More than one JSON value at the root of the document, or extra characters at the end of the JSON!");`
`208`	`208`	`return TAPE_ERROR;`
`209`	`209`	`}`
`210`	`210`
Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,6 @@ namespace logger {`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- static simdjson_really_inline void log_string(const char *message) {`
`37`		`- if (LOG_ENABLED) {`
`38`		`- printf("%s\n", message);`
`39`		`- }`
`40`		`- }`
`41`		`-`
`42`	`36`	`// Logs a single line of`
`43`	`37`	`template<typename S>`
`44`	`38`	`static simdjson_really_inline void log_line(S &structurals, const char title_prefix, const char title, const char *detail) {`