cerc-io/solidity
10
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

Refactor formatError

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-03-29 15:40:15 +01:00
parent 2c15e2b541
commit b3c6b1e936
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libsolidity/interface/StandardCompiler.cpp
View File

@ -30,18 +30,31 @@ using namespace std;
using namespace dev; using namespace dev;
using namespace dev::solidity; using namespace dev::solidity;
Json::Value formatFatalError(string const& _type, string const& _description) Json::Value formatError(
bool _warning,
string const& _type,
string const& _component,
string const& _message,
string const& _formattedMessage = "",
Json::Value const& _sourceLocation = Json::Value()
)
{ {
Json::Value error = Json::objectValue; Json::Value error = Json::objectValue;
error["type"] = _type; error["type"] = _type;
error["component"] = "general"; error["component"] = _component;
error["severity"] = "error"; error["severity"] = _warning ? "warning" : "error";
error["message"] = _description; error["message"] = _message;
error["formattedMessage"] = (_formattedMessage.length() > 0) ? _formattedMessage : _message;
if (_sourceLocation.isObject())
error["sourceLocation"] = _sourceLocation;
return error;
}
Json::Value formatFatalError(string const& _type, string const& _message)
{
Json::Value output = Json::objectValue; Json::Value output = Json::objectValue;
output["errors"] = Json::arrayValue; output["errors"] = Json::arrayValue;
output["errors"].append(error); output["errors"].append(formatError(false, _type, "general", _message));
return output; return output;
} }