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

Separate the try/catch blocks on JSON output generation and formal method output generation.

Browse Source 
For the reason, see @axic's comment here https://github.com/ethereum/solidity/pull/994#discussion_r77272236
and the following discussion.
This commit is contained in:
Yoichi Hirai 2016-09-05 17:09:33 +02:00
parent 940c5a8612
commit 3f2027ee5f
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
solc/jsonCompiler.cpp
View File

@ -223,7 +223,14 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback
contractData["assembly"] = compiler.streamAssembly(unused, contractName, _sources, true);
output["contracts"][contractName] = contractData;
}
}
catch (...)
{
output["errors"].append("Unknown exception while generating contract data output.");
}
try
{
// Do not taint the internal error list
ErrorList formalErrors;
if (compiler.prepareFormalAnalysis(&formalErrors))
@ -239,7 +246,14 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback
));
output["formal"]["errors"] = errors;
}
}
catch (...)
{
output["errors"].append("Unknown exception while generating formal method output.");
}
try
{
// Indices into this array are used to abbreviate source names in source locations.
output["sourceList"] = Json::Value(Json::arrayValue);
for (auto const& source: compiler.sourceNames())
@ -250,7 +264,7 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback
}
catch (...)
{
output["errors"].append("Unknown exception while generating compiler output.");
output["errors"].append("Unknown exception while generating source name output.");
}
}