Distribute and run LLMs with a single file.
C++ cross-platformggufllama-cpplocal-ailocal-inferencelocal-llmopen-source-aisingle-file-executablespeech-to-text
Upgrade to latest json.cpp code
Justine Tunney8c51aad18f02
diff --git a/llamafile/server/json.cpp b/llamafile/server/json.cppindex 930f1e82..4cd4ba5a 100644--- a/llamafile/server/json.cpp+++ b/llamafile/server/json.cpp@@ -16,12 +16,13 @@// limitations under the License.#include "json.h"-#include "utils.h"--#include <cosmo.h>-#include <ctype.h>#include <stdckdint.h>+#include <cctype>+#include <climits>+#include <cstdint>+#include <cstdlib>+#include "double-conversion/double-to-string.h"#include "double-conversion/string-to-double.h"@@ -46,6 +47,34 @@#define BADUTF8 11#define EVILUTF8 12+#define UTF16_MASK 0xfc00+#define UTF16_MOAR 0xd800 // 0xD800..0xDBFF+#define UTF16_CONT 0xdc00 // 0xDC00..0xDFFF++#define READ32LE(S) \+ ((uint_least32_t)(255 & (S)[3]) << 030 | \+ (uint_least32_t)(255 & (S)[2]) << 020 | \+ (uint_least32_t)(255 & (S)[1]) << 010 | \+ (uint_least32_t)(255 & (S)[0]) << 000)++#define ThomPikeCont(x) (0200 == (0300 & (x)))+#define ThomPikeByte(x) ((x) & (((1 << ThomPikeMsb(x)) - 1) | 3))+#define ThomPikeLen(x) (7 - ThomPikeMsb(x))+#define ThomPikeMsb(x) ((255 & (x)) < 252 ? Bsr(255 & ~(x)) : 1)+#define ThomPikeMerge(x, y) ((x) << 6 | (077 & (y)))++#define IsSurrogate(wc) ((0xf800 & (wc)) == 0xd800)+#define IsHighSurrogate(wc) (((wc) & UTF16_MASK) == UTF16_MOAR)+#define IsLowSurrogate(wc) (((wc) & UTF16_MASK) == UTF16_CONT)+#define MergeUtf16(hi, lo) ((((hi) - 0xD800) << 10) + ((lo) - 0xDC00) + 0x10000)+#define EncodeUtf16(wc) \+ ((0x0000 <= (wc) && (wc) <= 0xFFFF) || (0xE000 <= (wc) && (wc) <= 0xFFFF) \+ ? (wc) \+ : 0x10000 <= (wc) && (wc) <= 0x10FFFF \+ ? (((((wc) - 0x10000) >> 10) + 0xD800) | \+ (unsigned)((((wc) - 0x10000) & 1023) + 0xDC00) << 16) \+ : 0xFFFD)+static const char kJsonStr[256] = {1, 1, 1, 1, 1, 1, 1, 1, // 0000 ascii (0)1, 1, 1, 1, 1, 1, 1, 1, // 0010@@ -92,6 +121,25 @@ static const char kEscapeLiteral[128] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, // 0x70};+alignas(signed char) static const signed char kHexToInt[256] = {+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x00+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x10+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x20+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, // 0x30+ -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x40+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x50+ -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x60+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x70+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x80+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x90+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xa0+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xb0+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xc0+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xd0+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xe0+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0xf0+};+static const double_conversion::DoubleToStringConverter kDoubleToJson(double_conversion::DoubleToStringConverter::UNIQUE_ZERO |double_conversion::DoubleToStringConverter::EMIT_POSITIVE_EXPONENT_SIGN,@@ -113,6 +161,36 @@ static const double_conversion::StringToDoubleConverter kJsonToDouble("Infinity","NaN");+#if defined(__GNUC__) || defined(__clang__)+#define Bsr(x) (__builtin_clz(x) ^ (sizeof(int) * CHAR_BIT - 1))+#else+static int+Bsr(int x)+{+ int r = 0;+ if (x & 0xFFFF0000u) {+ x >>= 16;+ r |= 16;+ }+ if (x & 0xFF00) {+ x >>= 8;+ r |= 8;+ }+ if (x & 0xF0) {+ x >>= 4;+ r |= 4;+ }+ if (x & 0xC) {+ x >>= 2;+ r |= 2;+ }+ if (x & 0x2) {+ r |= 1;+ }+ return r;+}+#endif+static doubleStringToDouble(const char* s, size_t n, int* out_processed){@@ -125,6 +203,46 @@ StringToDouble(const char* s, size_t n, int* out_processed)return res;}+static char*+UlongToString(char* p, unsigned long long x)+{+ char t;+ size_t i, a, b;+ i = 0;+ do {+ p[i++] = x % 10 + '0';+ x = x / 10;+ } while (x > 0);+ p[i] = '\0';+ if (i) {+ for (a = 0, b = i - 1; a < b; ++a, --b) {+ t = p[a];+ p[a] = p[b];+ p[b] = t;+ }+ }+ return p + i;+}++static char*+LongToString(char* p, long long x)+{+ if (x < 0)+ *p++ = '-', x = -(unsigned long long)x;+ return UlongToString(p, x);+}++Json::Json(unsigned long long value)+{+ if (value <= LLONG_MAX) {+ type_ = Long;+ long_value = value;+ } else {+ type_ = Double;+ double_value = value;+ }+}+Json::~Json(){clear();@@ -176,7 +294,7 @@ Json::Json(const Json& other) : type_(other.type_)new (&object_value) std::map<std::string, Json>(other.object_value);break;default:- __builtin_trap();+ abort();}}@@ -212,7 +330,7 @@ Json::operator=(const Json& other)std::map<std::string, Json>(other.object_value);break;default:- __builtin_trap();+ abort();}}return *this;@@ -246,7 +364,7 @@ Json::Json(Json&& other) noexcept : type_(other.type_)std::map<std::string, Json>(std::move(other.object_value));break;default:- __builtin_trap();+ abort();}other.type_ = Null;}@@ -284,7 +402,7 @@ Json::operator=(Json&& other) noexceptstd::map<std::string, Json>(std::move(other.object_value));break;default:- __builtin_trap();+ abort();}other.type_ = Null;}@@ -306,15 +424,15 @@ Json::getNumber() constcase Double:return double_value;default:- __builtin_trap();+ abort();}}-long+long longJson::getLong() const{if (!isLong())- __builtin_trap();+ abort();return long_value;}@@ -322,7 +440,7 @@ boolJson::getBool() const{if (!isBool())- __builtin_trap();+ abort();return bool_value;}@@ -330,7 +448,7 @@ floatJson::getFloat() const{if (!isFloat())- __builtin_trap();+ abort();return float_value;}@@ -338,7 +456,7 @@ doubleJson::getDouble() const{if (!isDouble())- __builtin_trap();+ abort();return double_value;}@@ -346,7 +464,7 @@ std::string&Json::getString(){if (!isString())- __builtin_trap();+ abort();return string_value;}@@ -354,7 +472,7 @@ std::vector<Json>&Json::getArray(){if (!isArray())- __builtin_trap();+ abort();return array_value;}@@ -362,7 +480,7 @@ std::map<std::string, Json>&Json::getObject(){if (!isObject())- __builtin_trap();+ abort();return object_value;}@@ -390,19 +508,19 @@ Json::setFloat(float value)}void-Json::setLong(long value)+Json::setDouble(double value){clear();- type_ = Long;- long_value = value;+ type_ = Double;+ double_value = value;}void-Json::setDouble(double value)+Json::setLong(long long value){clear();- type_ = Double;- double_value = value;+ type_ = Long;+ long_value = value;}void@@ -422,21 +540,13 @@ Json::setString(std::string&& value)}void-Json::setString(const std::string& value)+Json::setString(const JSON_STRING_VIEW_& value){clear();type_ = String;new (&string_value) std::string(value);}-void-Json::setString(const std::string_view& value)-{- clear();- type_ = String;- new (&string_value) std::string_view(value);-}-voidJson::setArray(){@@ -454,7 +564,7 @@ Json::setObject()}Json&-Json::operator[](size_t index) noexcept+Json::operator[](size_t index){if (type_ != Array) {clear();@@ -467,7 +577,7 @@ Json::operator[](size_t index) noexcept}Json&-Json::operator[](const std::string& key) noexcept+Json::operator[](const std::string& key){if (type_ != Object) {clear();@@ -477,7 +587,7 @@ Json::operator[](const std::string& key) noexcept}std::string-Json::toString() const noexcept+Json::toString() const{std::string b;marshal(b, false, 0);@@ -485,7 +595,7 @@ Json::toString() const noexcept}std::string-Json::toStringPretty() const noexcept+Json::toStringPretty() const{std::string b;marshal(b, true, 0);@@ -493,7 +603,7 @@ Json::toStringPretty() const noexcept}void-Json::marshal(std::string& b, bool pretty, int indent) const noexcept+Json::marshal(std::string& b, bool pretty, int indent) const{switch (type_) {case Null:@@ -506,8 +616,8 @@ Json::marshal(std::string& b, bool pretty, int indent) const noexceptb += bool_value ? "true" : "false";break;case Long: {- char buf[21];- b.append(buf, FormatInt64(buf, long_value) - buf);+ char buf[64];+ b.append(buf, LongToString(buf, long_value) - buf);break;}case Float: {@@ -575,12 +685,12 @@ Json::marshal(std::string& b, bool pretty, int indent) const noexceptbreak;}default:- __builtin_trap();+ abort();}}void-Json::stringify(std::string& b, const std::string_view& s) noexcept+Json::stringify(std::string& b, const JSON_STRING_VIEW_& s){b += '"';serialize(b, s);@@ -588,11 +698,11 @@ Json::stringify(std::string& b, const std::string_view& s) noexcept}void-Json::serialize(std::string& sb, const std::string_view& s) noexcept+Json::serialize(std::string& sb, const JSON_STRING_VIEW_& s){- uint64_t w;size_t i, j, m;wint_t x, a, b;+ unsigned long long w;for (i = 0; i < s.size();) {x = s[i++] & 255;if (x >= 0300) {@@ -651,7 +761,7 @@ Json::serialize(std::string& sb, const std::string_view& s) noexcept} while ((w >>= 16));break;default:- __builtin_trap();+ abort();}}}@@ -659,8 +769,8 @@ Json::serialize(std::string& sb, const std::string_view& s) noexceptJson::StatusJson::parse(Json& json, const char*& p, const char* e, int context, int depth){- long x;char w[4];+ long long x;const char* a;int A, B, C, D, c, d, i, u;if (!depth)@@ -763,7 +873,15 @@ Json::parse(Json& json, const char*& p, const char* e, int context, int depth)json.setLong(0);return success;- case '1' ... '9': // integer+ case '1':+ case '2':+ case '3':+ case '4':+ case '5':+ case '6':+ case '7':+ case '8':+ case '9': // integerif (context & (COLON | COMMA | KEY))goto OnColonCommaKey;for (x = (c - '0') * d; p < e; ++p) {@@ -1038,20 +1156,22 @@ Json::parse(Json& json, const char*& p, const char* e, int context, int depth)case UTF8_4_F0:if (p + 3 <= e && (p[0] & 0377) < 0220 &&- (((uint32_t)(p[+2] & 0377) << 030 |- (uint32_t)(p[+1] & 0377) << 020 |- (uint32_t)(p[+0] & 0377) << 010 |- (uint32_t)(p[-1] & 0377) << 000) &+ (((uint_least32_t)(p[+2] & 0377) << 030 |+ (uint_least32_t)(p[+1] & 0377) << 020 |+ (uint_least32_t)(p[+0] & 0377) << 010 |+ (uint_least32_t)(p[-1] & 0377) << 000) &0xC0C0C000) == 0x80808000) {return overlong_utf8_0xffff;}// fallthroughcase UTF8_4:if (p + 3 <= e && //- ((A = ((uint32_t)(p[+2] & 0377) << 030 | //- (uint32_t)(p[+1] & 0377) << 020 | //- (uint32_t)(p[+0] & 0377) << 010 | //- (uint32_t)(p[-1] & 0377) << 000)) & //+ ((A =+ ((uint_least32_t)(p[+2] & 0377) << 030 | //+ (uint_least32_t)(p[+1] & 0377) << 020 | //+ (uint_least32_t)(p[+0] & 0377) << 010 | //+ (uint_least32_t)(p[-1] & 0377)+ << 000)) & //0xC0C0C000) == 0x80808000) { //A = (A & 7) << 18 | //(A & (077 << 010)) << (12 - 010) | //@@ -1079,10 +1199,9 @@ Json::parse(Json& json, const char*& p, const char* e, int context, int depth)case C1:return c1_control_code_in_string;default:- __builtin_unreachable();+ abort();}}- __builtin_unreachable();}}}@@ -1092,7 +1211,7 @@ Json::parse(Json& json, const char*& p, const char* e, int context, int depth)}std::pair<Json::Status, Json>-Json::parse(const std::string_view& s)+Json::parse(const JSON_STRING_VIEW_& s){Json::Status s2;std::pair<Json::Status, Json> res;@@ -1100,13 +1219,9 @@ Json::parse(const std::string_view& s)const char* e = s.data() + s.size();res.first = parse(res.second, p, e, 0, DEPTH);if (res.first == Json::success) {- if (!res.second.isObject() && !res.second.isArray()) {- res.first = json_payload_should_be_object_or_array;- } else {- s2 = parse(res.second, p, e, 0, DEPTH);- if (s2 != absent_value)- res.first = trailing_content;- }+ s2 = parse(res.second, p, e, 0, DEPTH);+ if (s2 != absent_value)+ res.first = trailing_content;}return res;}@@ -1181,9 +1296,7 @@ Json::StatusToString(Json::Status status)return "c1_control_code_in_string";case non_del_c0_control_code_in_string:return "non_del_c0_control_code_in_string";- case json_payload_should_be_object_or_array:- return "json_payload_should_be_object_or_array";default:- __builtin_trap();+ abort();}}diff --git a/llamafile/server/json.h b/llamafile/server/json.hindex 1b60c2e3..b77e5097 100644--- a/llamafile/server/json.h+++ b/llamafile/server/json.h@@ -20,6 +20,12 @@#include <string>#include <vector>+#if __cplusplus >= 201703L+#define JSON_STRING_VIEW_ std::string_view+#else+#define JSON_STRING_VIEW_ std::string+#endif+class Json{public:@@ -70,7 +76,6 @@ class Jsonobject_key_must_be_string,c1_control_code_in_string,non_del_c0_control_code_in_string,- json_payload_should_be_object_or_array,};private:@@ -78,9 +83,9 @@ class Jsonunion{bool bool_value;- long long_value;float float_value;double double_value;+ long long long_value;std::string string_value;std::vector<Json> array_value;std::map<std::string, Json> object_value;@@ -88,13 +93,14 @@ class Jsonpublic:static const char* StatusToString(Status);- static std::pair<Status, Json> parse(const std::string_view&);+ static std::pair<Status, Json> parse(const JSON_STRING_VIEW_&);Json(const Json&);Json(Json&&) noexcept;+ Json(unsigned long long);~Json();- Json(const nullptr_t = nullptr) : type_(Null)+ Json(const std::nullptr_t = nullptr) : type_(Null){}@@ -102,19 +108,11 @@ class Json{}- Json(float value) : type_(Float), float_value(value)- {- }-- Json(double value) : type_(Double), double_value(value)- {- }-Json(int value) : type_(Long), long_value(value){}- Json(long value) : type_(Long), long_value(value)+ Json(float value) : type_(Float), float_value(value){}@@ -122,30 +120,23 @@ class Json{}- Json(unsigned long value)+ Json(long long value) : type_(Long), long_value(value){- if (value <= LONG_MAX) {- type_ = Long;- long_value = value;- } else {- type_ = Double;- double_value = value;- }}- Json(const char* value) : type_(String), string_value(value)+ Json(double value) : type_(Double), double_value(value){}- Json(std::string&& value) : type_(String), string_value(std::move(value))+ Json(const char* value) : type_(String), string_value(value){}- Json(const std::string& value) : type_(String), string_value(value)+ Json(std::string&& value) : type_(String), string_value(std::move(value)){}- Json(const std::string_view& value) : type_(String), string_value(value)+ Json(const JSON_STRING_VIEW_& value) : type_(String), string_value(value){}@@ -200,44 +191,43 @@ class Json}bool getBool() const;- long getLong() const;float getFloat() const;double getDouble() const;double getNumber() const;+ long long getLong() const;std::string& getString();std::vector<Json>& getArray();std::map<std::string, Json>& getObject();void setNull();void setBool(bool);- void setLong(long);void setFloat(float);void setDouble(double);+ void setLong(long long);void setString(const char*);void setString(std::string&&);- void setString(const std::string&);- void setString(const std::string_view&);+ void setString(const JSON_STRING_VIEW_&);void setArray();void setObject();- std::string toString() const noexcept;- std::string toStringPretty() const noexcept;+ std::string toString() const;+ std::string toStringPretty() const;Json& operator=(const Json&);Json& operator=(Json&&) noexcept;- Json& operator[](size_t) noexcept;- Json& operator[](const std::string&) noexcept;+ Json& operator[](size_t);+ Json& operator[](const std::string&);- operator std::string() const noexcept+ operator std::string() const{return toString();}private:void clear();- void marshal(std::string&, bool, int) const noexcept;- static void stringify(std::string&, const std::string_view&) noexcept;- static void serialize(std::string&, const std::string_view&) noexcept;+ void marshal(std::string&, bool, int) const;+ static void stringify(std::string&, const JSON_STRING_VIEW_&);+ static void serialize(std::string&, const JSON_STRING_VIEW_&);static Status parse(Json&, const char*&, const char*, int, int);};diff --git a/llamafile/server/json_test.cpp b/llamafile/server/json_test.cppindex deb197b3..22a46305 100644--- a/llamafile/server/json_test.cpp+++ b/llamafile/server/json_test.cpp@@ -17,13 +17,14 @@#include "json.h"-#include <cosmo.h>-#include <stdio.h>-#include <stdlib.h>+#include <cstdio>+#include <cstdlib>+#include <time.h>-#include "llamafile/macros.h"+#define ARRAYLEN(A) \+ ((sizeof(A) / sizeof(*(A))) / ((unsigned)!(sizeof(A) % sizeof(*(A)))))-using namespace std::string_literals;+#define STRING(sl) std::string(sl, sizeof(sl) - 1)static const char kHuge[] = R"(["JSON Test Pattern pass1",@@ -86,19 +87,42 @@ static const char kHuge[] = R"([#define BENCH(ITERATIONS, WORK_PER_RUN, CODE) \do { \- struct timespec start = timespec_real(); \+ struct timespec start = now(); \for (int __i = 0; __i < ITERATIONS; ++__i) { \asm volatile("" ::: "memory"); \CODE; \} \long long work = (WORK_PER_RUN) * (ITERATIONS); \- double nanos = \- (timespec_tonanos(timespec_sub(timespec_real(), start)) + work - \- 1) / \- (double)work; \+ double nanos = (tonanos(tub(now(), start)) + work - 1) / (double)work; \printf("%10g ns %2dx %s\n", nanos, (ITERATIONS), #CODE); \} while (0)+struct timespec+now(void)+{+ struct timespec ts;+ timespec_get(&ts, TIME_UTC);+ return ts;+}++struct timespec+tub(struct timespec a, struct timespec b)+{+ a.tv_sec -= b.tv_sec;+ if (a.tv_nsec < b.tv_nsec) {+ a.tv_nsec += 1000000000;+ a.tv_sec--;+ }+ a.tv_nsec -= b.tv_nsec;+ return a;+}++int64_t+tonanos(struct timespec x)+{+ return x.tv_sec * 1000000000ull + x.tv_nsec;+}+voidobject_test(){@@ -188,7 +212,6 @@ static const structstd::string json;} kJsonTestSuite[] = {{ Json::absent_value, "" },- { Json::json_payload_should_be_object_or_array, "null" },{ Json::trailing_content, "[] []" },{ Json::illegal_character, "[nan]" },{ Json::bad_negative, "[-nan]" },@@ -205,8 +228,6 @@ static const struct{ Json::depth_exceeded,"[[[[[[[[[[[[[[[[[[[[\"Too deep\"]]]]]]]]]]]]]]]]]]]]" },{ Json::missing_colon, "{\"Missing colon\" null}" },- { Json::json_payload_should_be_object_or_array,- "\"A JSON payload should be an object or array, not a string.\"" },{ Json::unexpected_colon, "{\"Double colon\":: null}" },{ Json::unexpected_comma, "{\"Comma instead of colon\", null}" },{ Json::unexpected_colon, "[\"Colon instead of comma\": false]" },@@ -298,8 +319,7 @@ static const struct{ Json::illegal_character, " [a\xe5] " },{ Json::unexpected_comma, " {\"x\", null} " },{ Json::illegal_character, " [\"x\", truth] " },- { Json::json_payload_should_be_object_or_array, " 123\x00 "s },- { Json::illegal_character, "\x00"s },+ { Json::illegal_character, STRING("\x00") },{ Json::trailing_content, "\n[\"x\"]]" },{ Json::unexpected_octal, " [012] " },{ Json::unexpected_octal, " [-012] " },@@ -324,8 +344,8 @@ static const struct{ Json::bad_double, " [0.e1] " },{ Json::bad_double, " [-2.] " },{ Json::illegal_character, " \xef\xbb\xbf{} " },- { Json::illegal_character, " [\x00\"\x00\xe9\x00\"\x00]\x00 "s },- { Json::illegal_character, " \x00[\x00\"\x00\xe9\x00\"\x00] "s },+ { Json::illegal_character, STRING(" [\x00\"\x00\xe9\x00\"\x00]\x00 ") },+ { Json::illegal_character, STRING(" \x00[\x00\"\x00\xe9\x00\"\x00] ") },{ Json::malformed_utf8, " [\"\xe0\xff\"] " },{ Json::illegal_utf8_character, " [\"\xfc\x80\x80\x80\x80\x80\"] " },{ Json::illegal_utf8_character, " [\"\xfc\x83\xbf\xbf\xbf\xbf\"] " },@@ -352,16 +372,16 @@ round_trip_test()for (size_t i = 0; i < ARRAYLEN(kRoundTrip); ++i) {std::pair<Json::Status, Json> res = Json::parse(kRoundTrip[i].before);if (res.first != Json::success) {- printf("error: Json::parse returned Json::%s but wanted Json::%s: "- "%`'s\n",- Json::StatusToString(res.first),- Json::StatusToString(Json::success),- kRoundTrip[i].before.c_str());+ printf(+ "error: Json::parse returned Json::%s but wanted Json::%s: %s\n",+ Json::StatusToString(res.first),+ Json::StatusToString(Json::success),+ kRoundTrip[i].before.c_str());exit(10);}if (res.second.toString() != kRoundTrip[i].after) {- printf("error: Json::parse(%`'s).toString() was %`'s but should "- "have been %`'s\n",+ printf("error: Json::parse(%s).toString() was %s but should have "+ "been %s\n",kRoundTrip[i].before.c_str(),res.second.toString().c_str(),kRoundTrip[i].after.c_str());@@ -376,11 +396,11 @@ json_test_suite()for (size_t i = 0; i < ARRAYLEN(kJsonTestSuite); ++i) {std::pair<Json::Status, Json> res = Json::parse(kJsonTestSuite[i].json);if (res.first != kJsonTestSuite[i].error) {- printf("error: Json::parse returned Json::%s but wanted Json::%s: "- "%`'s\n",- Json::StatusToString(res.first),- Json::StatusToString(kJsonTestSuite[i].error),- kJsonTestSuite[i].json.c_str());+ printf(+ "error: Json::parse returned Json::%s but wanted Json::%s: %s\n",+ Json::StatusToString(res.first),+ Json::StatusToString(kJsonTestSuite[i].error),+ kJsonTestSuite[i].json.c_str());exit(12);}}@@ -399,6 +419,4 @@ main()BENCH(2000, 1, parse_test());BENCH(2000, 1, round_trip_test());BENCH(2000, 1, json_test_suite());-- CheckForMemoryLeaks();}