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

Merge pull request #4570 from ethereum/cleanup-catch-statements

Browse Source 
More consistent catch statements
This commit is contained in:
Alex Beregszaszi 2018-07-25 10:31:57 +01:00 committed by GitHub
commit ff8e930054
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/formal/CVC4Interface.cpp
View File

@ -115,7 +115,7 @@ pair<CheckResult, vector<string>> CVC4Interface::check(vector<Expression> const&
values.push_back(toString(m_solver.getValue(toCVC4Expr(e)))); values.push_back(toString(m_solver.getValue(toCVC4Expr(e))));
} }
} }
catch (CVC4::Exception & e) catch (CVC4::Exception const&)
{ {
result = CheckResult::ERROR; result = CheckResult::ERROR;
values.clear(); values.clear();

4
libsolidity/interface/StandardCompiler.cpp
View File

@ -600,7 +600,7 @@ string StandardCompiler::compile(string const& _input)
if (!jsonParseStrict(_input, input, &errors)) if (!jsonParseStrict(_input, input, &errors))
return jsonCompactPrint(formatFatalError("JSONError", errors)); return jsonCompactPrint(formatFatalError("JSONError", errors));
} }
catch(...) catch (...)
{ {
return "{\"errors\":\"[{\"type\":\"JSONError\",\"component\":\"general\",\"severity\":\"error\",\"message\":\"Error parsing input JSON.\"}]}"; return "{\"errors\":\"[{\"type\":\"JSONError\",\"component\":\"general\",\"severity\":\"error\",\"message\":\"Error parsing input JSON.\"}]}";
} }
@ -613,7 +613,7 @@ string StandardCompiler::compile(string const& _input)
{ {
return jsonCompactPrint(output); return jsonCompactPrint(output);
} }
catch(...) catch (...)
{ {
return "{\"errors\":\"[{\"type\":\"JSONError\",\"component\":\"general\",\"severity\":\"error\",\"message\":\"Error writing output JSON.\"}]}"; return "{\"errors\":\"[{\"type\":\"JSONError\",\"component\":\"general\",\"severity\":\"error\",\"message\":\"Error writing output JSON.\"}]}";
} }

2
test/tools/isoltest.cpp
View File

@ -119,7 +119,7 @@ TestTool::Result TestTool::process()
"Exception during syntax test: " << _e.what() << endl; "Exception during syntax test: " << _e.what() << endl;
return Result::Exception; return Result::Exception;
} }
catch(...) catch (...)
{ {
FormattedScope(cout, m_formatted, {BOLD, RED}) << FormattedScope(cout, m_formatted, {BOLD, RED}) <<
"Unknown exception during syntax test." << endl; "Unknown exception during syntax test." << endl;