From 5d5a17cc9c89b9414ebfb534845bbc2bf36e812c Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 24 Mar 2020 16:38:43 +1100 Subject: [PATCH] Add test/data/json-quirks.json --- script/print-json-token-debug-format.c | 31 +++++++++++++++++++ test/c/std/json.c | 40 +++++++++++++++++++++++++ test/data/json-quirks.json | 16 ++++++++++ test/data/json-quirks.tokens | Bin 0 -> 960 bytes 4 files changed, 87 insertions(+) create mode 100644 test/data/json-quirks.json create mode 100644 test/data/json-quirks.tokens diff --git a/script/print-json-token-debug-format.c b/script/print-json-token-debug-format.c index 7d4827fc..7e5001a1 100644 --- a/script/print-json-token-debug-format.c +++ b/script/print-json-token-debug-format.c @@ -139,6 +139,7 @@ struct { bool all_tokens; bool human_readable; + bool quirks; } flags = {0}; const char* // @@ -171,6 +172,10 @@ parse_flags(int argc, char** argv) { flags.human_readable = true; continue; } + if (!strcmp(arg, "q") || !strcmp(arg, "quirks")) { + flags.quirks = true; + continue; + } return "main: unrecognized flag argument"; } @@ -218,6 +223,32 @@ main1(int argc, char** argv) { return wuffs_base__status__message(&init_status); } + if (flags.quirks) { + uint32_t quirks[] = { + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_A, + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_CAPITAL_U, + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_E, + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_QUESTION_MARK, + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_SINGLE_QUOTE, + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_V, + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_X, + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_ZERO, + WUFFS_JSON__QUIRK_ALLOW_COMMENT_BLOCK, + WUFFS_JSON__QUIRK_ALLOW_COMMENT_LINE, + WUFFS_JSON__QUIRK_ALLOW_EXTRA_COMMA, + WUFFS_JSON__QUIRK_ALLOW_INF_NAN_NUMBERS, + WUFFS_JSON__QUIRK_ALLOW_LEADING_ASCII_RECORD_SEPARATOR, + WUFFS_JSON__QUIRK_ALLOW_LEADING_UNICODE_BYTE_ORDER_MARK, + WUFFS_JSON__QUIRK_ALLOW_TRAILING_NEW_LINE, + WUFFS_JSON__QUIRK_REPLACE_INVALID_UTF_8, + 0, + }; + uint32_t i; + for (i = 0; quirks[i]; i++) { + wuffs_json__decoder__set_quirk_enabled(&dec, quirks[i], true); + } + } + uint64_t pos = 0; while (true) { wuffs_base__status status = diff --git a/test/c/std/json.c b/test/c/std/json.c index 0819511b..0eb64ec4 100644 --- a/test/c/std/json.c +++ b/test/c/std/json.c @@ -783,6 +783,11 @@ golden_test json_nobel_prizes_gt = { .src_filename = "test/data/nobel-prizes.json", }; +golden_test json_json_quirks_gt = { + .want_filename = "test/data/json-quirks.tokens", + .src_filename = "test/data/json-quirks.json", +}; + // ---------------- JSON Tests const char* // @@ -811,6 +816,41 @@ test_wuffs_json_decode_interface() { &json_australian_abc_gt)); } + { + uint32_t quirks[] = { + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_A, + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_CAPITAL_U, + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_E, + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_QUESTION_MARK, + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_SINGLE_QUOTE, + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_V, + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_X, + WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_ZERO, + WUFFS_JSON__QUIRK_ALLOW_COMMENT_BLOCK, + WUFFS_JSON__QUIRK_ALLOW_COMMENT_LINE, + WUFFS_JSON__QUIRK_ALLOW_EXTRA_COMMA, + WUFFS_JSON__QUIRK_ALLOW_INF_NAN_NUMBERS, + WUFFS_JSON__QUIRK_ALLOW_LEADING_ASCII_RECORD_SEPARATOR, + WUFFS_JSON__QUIRK_ALLOW_LEADING_UNICODE_BYTE_ORDER_MARK, + WUFFS_JSON__QUIRK_ALLOW_TRAILING_NEW_LINE, + WUFFS_JSON__QUIRK_REPLACE_INVALID_UTF_8, + 0, + }; + + wuffs_json__decoder dec; + CHECK_STATUS("initialize", + wuffs_json__decoder__initialize( + &dec, sizeof dec, WUFFS_VERSION, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); + uint32_t i; + for (i = 0; quirks[i]; i++) { + wuffs_json__decoder__set_quirk_enabled(&dec, quirks[i], true); + } + CHECK_STRING(do_test__wuffs_base__token_decoder( + wuffs_json__decoder__upcast_as__wuffs_base__token_decoder(&dec), + &json_json_quirks_gt)); + } + return NULL; } diff --git a/test/data/json-quirks.json b/test/data/json-quirks.json new file mode 100644 index 00000000..5d3a8779 --- /dev/null +++ b/test/data/json-quirks.json @@ -0,0 +1,16 @@ +[ + 123, + nan, + +INFINITY, + "escaped \a\b\e\f\n\r\t\v\0\'\"\?\\\/ things", + { + "ABC\u0394E": // U+00000394 GREEK CAPITAL LETTER DELTA. + "mno\U0001F4A9q", /* U+0001F4A9 PILE OF POO. */ + /* And now for some + * invalid Unicode. */ + "ABC\uD800E": // Unpaired surrogate. + "mno\U12345678q", // Out of range. + }, + "w\x58\x59z", + "invÿlid UTF-8", +] diff --git a/test/data/json-quirks.tokens b/test/data/json-quirks.tokens new file mode 100644 index 0000000000000000000000000000000000000000..d9a82968b9a2c6b9160a14da9f218dd09d269463 GIT binary patch literal 960 zcmZQzU|?ZjWB>z31_eO|1_pKpW-yn5m4OAs;zjTo8WH61{Vf)i2tDe^=5!@8KB|e4+$Lx21W)4PejhgwM>t zJcWUQA(nv=!iUPop_!k^pat?47=yyS7tQ=WH1j7ia6!ytX8f{}fq`K*n)!3k%%9I7 z3pN`>FflMN>}SvcF~Jzbe}`t@do=q#A^h|IF9QR^4>bFJqS^O{K^$y0h+t%3U=&3) zpHU3ed`3xB^BLt)&1Y0VHJ?$L0hG!?rh}q{fzcEZKMGC^42+g&_F18sXN{D;8yFZE rozdi7(CqU-GtU#v{XQ`L%nYFLVf1C-gv1Xdz8S;N%!@?0S3n5>cw8k6 literal 0 HcmV?d00001