xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Teach JSON parser negative numbers

Browse Source
This commit is contained in:
Dan Rosén 2019-10-22 21:14:32 +02:00
parent 3c34de7fe7
commit c792986768
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/json_ui.cc
View File

@ -257,7 +257,7 @@ void JsonUI::set_on_key(OnKeyCallback callback)
using JsonArray = Vector<Value>; using JsonArray = Vector<Value>;
using JsonObject = HashMap<String, Value>; using JsonObject = HashMap<String, Value>;
static bool is_digit(char c) { return c >= '0' and c <= '9'; } static bool is_digit_or_minus(char c) { return (c >= '0' and c <= '9') or c == '-'; }
struct JsonResult { Value value; const char* new_pos; }; struct JsonResult { Value value; const char* new_pos; };
@ -266,10 +266,10 @@ JsonResult parse_json(const char* pos, const char* end)
if (not skip_while(pos, end, is_blank)) if (not skip_while(pos, end, is_blank))
return {}; return {};
if (is_digit(*pos)) if (is_digit_or_minus(*pos))
{ {
auto digit_end = pos; auto digit_end = pos;
skip_while(digit_end, end, is_digit); skip_while(digit_end, end, is_digit_or_minus);
return { Value{str_to_int({pos, digit_end})}, digit_end }; return { Value{str_to_int({pos, digit_end})}, digit_end };
} }
if (end - pos > 4 and StringView{pos, pos+4} == "true") if (end - pos > 4 and StringView{pos, pos+4} == "true")
@ -523,6 +523,11 @@ UnitTest test_json_parser{[]()
kak_assert(value.as<JsonArray>().at(1).as<int>() == 20); kak_assert(value.as<JsonArray>().at(1).as<int>() == 20);
} }
{
auto value = parse_json("-1").value;
kak_assert(value.as<int>() == -1);
}
{ {
auto value = parse_json("{}").value; auto value = parse_json("{}").value;
kak_assert(value and value.is_a<JsonObject>()); kak_assert(value and value.is_a<JsonObject>());