summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaxime Coste <frrrwww@gmail.com>2016-06-21 23:51:15 +0100
committerMaxime Coste <frrrwww@gmail.com>2016-06-21 23:51:15 +0100
commitc032306e04347fa666736c79171e34efc8735483 (patch)
tree736d8f2d3493f1ae8d532d4c1a5788533cb83c0e /src
parent796a2ad63d29753cb3bf7f9803eaf1e5cd98966e (diff)
parent97680827b8f5a7c287ad95f819bddf582b3a1d54 (diff)
Merge remote-tracking branch 'doppioandante/fix-json'
Diffstat (limited to 'src')
-rw-r--r--src/json_ui.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/json_ui.cc b/src/json_ui.cc
index 53da6ee7..fd234154 100644
--- a/src/json_ui.cc
+++ b/src/json_ui.cc
@@ -261,7 +261,7 @@ parse_json(const char* pos, const char* end)
{
auto digit_end = pos;
skip_while(digit_end, end, is_digit);
- return Result{ Value{str_to_int({pos, end})}, digit_end };
+ return Result{ Value{str_to_int({pos, digit_end})}, digit_end };
}
if (end - pos > 4 and StringView{pos, pos+4} == "true")
return Result{ Value{true}, pos+4 };
@@ -462,6 +462,12 @@ UnitTest test_json_parser{[]()
}
{
+ auto value = std::get<0>(parse_json("[10,20]"));
+ kak_assert(value and value.is_a<JsonArray>());
+ kak_assert(value.as<JsonArray>().at(1).as<int>() == 20);
+ }
+
+ {
auto value = std::get<0>(parse_json("{}"));
kak_assert(value and value.is_a<JsonObject>());
kak_assert(value.as<JsonObject>().empty());