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/libsolidity/SMTCheckerJSONTest.cpp
+3 -2
View File
@@ -18,6 +18,7 @@
#include <test/libsolidity/SMTCheckerJSONTest.h>
#include <test/Options.h>
#include <libsolidity/interface/StandardCompiler.h>
#include <libdevcore/CommonIO.h>
#include <libdevcore/JSON.h>
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/join.hpp>
@@ -43,7 +44,7 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename, langutil::EVMVersion _ev
string jsonFilename = _filename.substr(0, _filename.size() - 4) + ".json";
if (
!jsonParseFile(jsonFilename, m_smtResponses) ||
!jsonParseStrict(readFileAsString(jsonFilename), m_smtResponses) ||
!m_smtResponses.isObject()
)
BOOST_THROW_EXCEPTION(runtime_error("Invalid JSON file."));
@@ -158,7 +159,7 @@ Json::Value SMTCheckerTest::buildJson(string const& _extra)
sources += "}";
string input = "{" + language + ", " + sources + "}";
Json::Value source;
if (!jsonParse(input, source))
if (!jsonParseStrict(input, source))
BOOST_THROW_EXCEPTION(runtime_error("Could not build JSON from string: " + input));
return source;
}