Fixes issue 221 (simdjson#222)

lemire · ioioioio · commit f76ee5e5ef57 · 2019-07-29T10:07:07.000-04:00
simdjson#221
diff --git a/jsonchecker/fail70.json b/jsonchecker/fail70.json
diff --git a/jsonchecker/pass19.json b/jsonchecker/pass19.json
@@ -0,0 +1 @@
+-1
diff --git a/src/parsedjson.cpp b/src/parsedjson.cpp
@@ -35,9 +35,11 @@ ParsedJson::ParsedJson(ParsedJson && p)
 
 WARN_UNUSED
 bool ParsedJson::allocateCapacity(size_t len, size_t maxdepth) {
-    if ((maxdepth == 0) || (len == 0)) {
-      std::cerr << "capacities must be non-zero " << std::endl;
-      return false;
+    if (maxdepth <= 0) {
+      maxdepth = 1; // don't let the user allocate nothing
+    }
+    if (len <= 0) {
+      len = 64; // allocating 0 bytes is wasteful.
     }
     if(len > SIMDJSON_MAXSIZE_BYTES) {
       return false;
diff --git a/tools/json2json.cpp b/tools/json2json.cpp
@@ -86,8 +86,8 @@ int main(int argc, char *argv[]) {
     return EXIT_FAILURE;
   }
   int res = simdjson::json_parse(p, pj); // do the parsing, return false on error
-  if (res) {
-    std::cerr << " Parsing failed. " << std::endl;
+  if (res != simdjson::SUCCESS) {
+    std::cerr << " Parsing failed. Error is '" << simdjson::errorMsg(res) << "'." << std::endl;
     return EXIT_FAILURE;
   }
   if (apidump) {
diff --git a/tools/jsonstats.cpp b/tools/jsonstats.cpp
@@ -46,6 +46,7 @@ stat_t simdjson_computestats(const simdjson::padded_string &p) {
   simdjson::ParsedJson pj = simdjson::build_parsed_json(p);
   answer.valid = pj.isValid();
   if (!answer.valid) {
+    std::cerr << pj.getErrorMsg() << std::endl;
     return answer;
   }
   answer.backslash_count = count_backslash(reinterpret_cast<const uint8_t*>(p.data()), p.size());

Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,8 @@ int main(int argc, char *argv[]) {`
`86`	`86`	`return EXIT_FAILURE;`
`87`	`87`	`}`
`88`	`88`	`int res = simdjson::json_parse(p, pj); // do the parsing, return false on error`
`89`		`- if (res) {`
`90`		`- std::cerr << " Parsing failed. " << std::endl;`
	`89`	`+ if (res != simdjson::SUCCESS) {`
	`90`	`+ std::cerr << " Parsing failed. Error is '" << simdjson::errorMsg(res) << "'." << std::endl;`
`91`	`91`	`return EXIT_FAILURE;`
`92`	`92`	`}`
`93`	`93`	`if (apidump) {`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ stat_t simdjson_computestats(const simdjson::padded_string &p) {`
`46`	`46`	`simdjson::ParsedJson pj = simdjson::build_parsed_json(p);`
`47`	`47`	`answer.valid = pj.isValid();`
`48`	`48`	`if (!answer.valid) {`
	`49`	`+ std::cerr << pj.getErrorMsg() << std::endl;`
`49`	`50`	`return answer;`
`50`	`51`	`}`
`51`	`52`	`answer.backslash_count = count_backslash(reinterpret_cast<const uint8_t*>(p.data()), p.size());`