From: Roman Khabibov <roman.habibov@tarantool.org> To: Alexander Turenko <alexander.turenko@tarantool.org> Cc: tarantool-patches@dev.tarantool.org, Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH v2 1/2] json: make error messages more readable Date: Sat, 21 Dec 2019 17:56:17 +0300 [thread overview] Message-ID: <ACFB4E66-8A71-419A-94E0-6C9862EA0565@tarantool.org> (raw) In-Reply-To: <a427872128d30bd769e63a1254af774c1a24aa28.1576420905.git.roman.habibov@tarantool.org> commit a427872128d30bd769e63a1254af774c1a24aa28 Author: Roman Khabibov <roman.habibov@tarantool.org> Date: Wed Oct 9 17:07:41 2019 +0300 json: make error messages more readable Print tokens themselves instead of token names "T_*" in the error messages. Part of #4339 diff --git a/test/app-tap/json.test.lua b/test/app-tap/json.test.lua index fadfc74ec..6d511e686 100755 --- a/test/app-tap/json.test.lua +++ b/test/app-tap/json.test.lua @@ -22,7 +22,7 @@ end tap.test("json", function(test) local serializer = require('json') - test:plan(40) + test:plan(51) test:test("unsigned", common.test_unsigned, serializer) test:test("signed", common.test_signed, serializer) @@ -154,4 +154,34 @@ tap.test("json", function(test) _, err_msg = pcall(serializer.decode, '{"hello": "world",\n 100: 200}') test:ok(string.find(err_msg, 'line 2 at character 2') ~= nil, 'mistake on second line') + + -- + -- gh-4339: Make sure that tokens 'T_*' are absent in error + -- messages and a context is printed. + -- + _, err_msg = pcall(serializer.decode, '{{: "world"}') + test:ok(string.find(err_msg, '\'{\'') ~= nil, '"{" instead of T_OBJ_BEGIN') + _, err_msg = pcall(serializer.decode, '{"a": "world"}}') + test:ok(string.find(err_msg, '\'}\'') ~= nil, '"}" instead of T_OBJ_END') + _, err_msg = pcall(serializer.decode, '{[: "world"}') + test:ok(string.find(err_msg, '\'[\'', 1, true) ~= nil, + '"[" instead of T_ARR_BEGIN') + _, err_msg = pcall(serializer.decode, '{]: "world"}') + test:ok(string.find(err_msg, '\']\'', 1, true) ~= nil, + '"]" instead of T_ARR_END') + _, err_msg = pcall(serializer.decode, '{1: "world"}') + test:ok(string.find(err_msg, 'int') ~= nil, 'int instead of T_INT') + _, err_msg = pcall(serializer.decode, '{1.0: "world"}') + test:ok(string.find(err_msg, 'number') ~= nil, 'number instead of T_NUMBER') + _, err_msg = pcall(serializer.decode, '{true: "world"}') + test:ok(string.find(err_msg, 'boolean') ~= nil, + 'boolean instead of T_BOOLEAN') + _, err_msg = pcall(serializer.decode, '{null: "world"}') + test:ok(string.find(err_msg, 'null') ~= nil, 'null instead of T_NULL') + _, err_msg = pcall(serializer.decode, '{:: "world"}') + test:ok(string.find(err_msg, 'colon') ~= nil, 'colon instead of T_COLON') + _, err_msg = pcall(serializer.decode, '{,: "world"}') + test:ok(string.find(err_msg, 'comma') ~= nil, 'comma instead of T_COMMA') + _, err_msg = pcall(serializer.decode, '{') + test:ok(string.find(err_msg, 'end') ~= nil, 'end instead of T_END') end) diff --git a/third_party/lua-cjson/lua_cjson.c b/third_party/lua-cjson/lua_cjson.c index 3d25814f3..e68b52847 100644 --- a/third_party/lua-cjson/lua_cjson.c +++ b/third_party/lua-cjson/lua_cjson.c @@ -72,23 +72,23 @@ typedef enum { } json_token_type_t; static const char *json_token_type_name[] = { - "T_OBJ_BEGIN", - "T_OBJ_END", - "T_ARR_BEGIN", - "T_ARR_END", - "T_STRING", - "T_UINT", - "T_INT", - "T_NUMBER", - "T_BOOLEAN", - "T_NULL", - "T_COLON", - "T_COMMA", - "T_END", - "T_WHITESPACE", - "T_LINEFEED", - "T_ERROR", - "T_UNKNOWN", + "'{'", + "'}'", + "'['", + "']'", + "string", + "unsigned int", + "int", + "number", + "boolean", + "null", + "colon", + "comma", + "end", + "whitespace", + "line feed", + "error", + "unknown symbol", NULL }; @@ -914,7 +914,7 @@ static void json_parse_object_context(lua_State *l, json_parse_t *json) } if (token.type != T_COMMA) - json_throw_parse_error(l, json, "comma or object end", &token); + json_throw_parse_error(l, json, "comma or '}'", &token); json_next_token(json, &token); } @@ -954,7 +954,7 @@ static void json_parse_array_context(lua_State *l, json_parse_t *json) } if (token.type != T_COMMA) - json_throw_parse_error(l, json, "comma or array end", &token); + json_throw_parse_error(l, json, "comma or ']'", &token); json_next_token(json, &token); }
next prev parent reply other threads:[~2019-12-21 14:56 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-15 14:42 [Tarantool-patches] [PATCH v2 0/2] Improve json error mesages Roman Khabibov 2019-12-15 14:42 ` [Tarantool-patches] [PATCH v2 1/2] json: make error messages more readable Roman Khabibov 2019-12-21 14:56 ` Roman Khabibov [this message] 2019-12-15 14:42 ` [Tarantool-patches] [PATCH v2 2/2] json: print context in error mesages Roman Khabibov 2019-12-19 23:19 ` Vladislav Shpilevoy 2019-12-21 14:56 ` Roman Khabibov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=ACFB4E66-8A71-419A-94E0-6C9862EA0565@tarantool.org \ --to=roman.habibov@tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 1/2] json: make error messages more readable' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox