coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2025-12-06 16:57:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ChaiScript/ChaiScript into develop

Browse Source
This commit is contained in:
Jason Turner 2018-03-01 11:12:36 -07:00
commit ef47b4582e
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/chaiscript/utility/json.hpp
View File

@ -392,7 +392,7 @@ class JSON
bool skip = true;
for( auto &p : *internal.Map ) {
if( !skip ) { s += ",\n"; }
s += ( pad + "\"" + p.first + "\" : " + p.second.dump( depth + 1, tab ) );
s += ( pad + "\"" + json_escape(p.first) + "\" : " + p.second.dump( depth + 1, tab ) );
skip = false;
}
s += ( "\n" + pad.erase( 0, 2 ) + "}" ) ;

2
include/chaiscript/utility/json_wrap.hpp
View File

@ -110,7 +110,7 @@ namespace chaiscript
{
return json::JSON(bn.get_as<double>());
} else {
return json::JSON(bn.get_as<long>());
return json::JSON(bn.get_as<std::int64_t>());
}
} catch (const chaiscript::detail::exception::bad_any_cast &) {
// not a number

1
unittests/json_15.chai
View File

@ -16,3 +16,4 @@ assert_equal(to_json(from_json("null")), "null")
assert_equal(from_json(to_json(["a": 5, "b": "stuff"])), ["a": 5, "b": "stuff"])
auto x = [3.5, true, false, "test", [], Vector(), Map()]
assert_equal(from_json(to_json(x)), x)
assert_equal(from_json(to_json(["aa\\zz":"aa\\zz"])), ["aa\\zz": "aa\\zz"])

1
unittests/json_3.chai
View File

@ -1,2 +1,3 @@
assert_equal(from_json("100"), 100)
assert_equal(from_json("-100"), -100)
assert_equal(to_json(4294967295), "4294967295")