cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Drop non-strict version of jsonParse* and always use jsonParseStrict

Browse Source
This commit is contained in:
Alex Beregszaszi
2019-12-03 16:20:23 +01:00
parent 7ace66ad59
commit 7156c908be
5 changed files with 4 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libdevcore/JSON.cpp
-41
View File
@@ -69,47 +69,6 @@ BOOST_AUTO_TEST_CASE(json_compact_print)
BOOST_CHECK("{\"1\":1,\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":2}}" == jsonCompactPrint(json));
}
BOOST_AUTO_TEST_CASE(parse_json_not_strict)
{
Json::Value json;
std::string errors;
// just parse a valid json input
BOOST_CHECK(jsonParse("{\"1\":1,\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":2}}", json, &errors));
BOOST_CHECK(json["1"] == 1);
BOOST_CHECK(json["2"] == "2");
BOOST_CHECK(json["3"]["3.1"] == "3.1");
BOOST_CHECK(json["3"]["3.2"] == 2);
// trailing garbage is allowed here
BOOST_CHECK(jsonParse("{\"1\":2,\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":3}}}}}}}}}}", json, &errors));
BOOST_CHECK(json["1"] == 2);
BOOST_CHECK(json["2"] == "2");
BOOST_CHECK(json["3"]["3.1"] == "3.1");
BOOST_CHECK(json["3"]["3.2"] == 3);
// comments are allowed
BOOST_CHECK(jsonParse(
"{\"1\":3, // awesome comment\n\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":4}}", json, &errors
));
BOOST_CHECK(json["1"] == 3);
BOOST_CHECK(json["2"] == "2");
BOOST_CHECK(json["3"]["3.1"] == "3.1");
BOOST_CHECK(json["3"]["3.2"] == 4);
// root element other than object or array is allowed
BOOST_CHECK(jsonParse("[]", json, &errors));
BOOST_CHECK(jsonParse("{}", json, &errors));
BOOST_CHECK(jsonParse("1", json, &errors));
BOOST_CHECK(json == 1);
BOOST_CHECK(jsonParse("\"hello\"", json, &errors));
BOOST_CHECK(json == "hello");
// non-UTF-8 escapes allowed
BOOST_CHECK(jsonParse("[ \"\x80\xec\x80\" ]", json, &errors));
BOOST_CHECK(json[0] == "\x80\xec\x80");
}
BOOST_AUTO_TEST_CASE(parse_json_strict)
{
Json::Value json;