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 #1009 from pirapira/separate_exceptions

Browse Source 
Separate the try/catch blocks on JSON and formal methods output generation
This commit is contained in:
chriseth 2016-09-07 15:13:41 +02:00 committed by GitHub
commit c641ca26ec
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); contractData["assembly"] = compiler.streamAssembly(unused, contractName, _sources, true);
output["contracts"][contractName] = contractData; output["contracts"][contractName] = contractData;
} }
}
catch (...)
{
output["errors"].append("Unknown exception while generating contract data output.");
}
try
{
// Do not taint the internal error list // Do not taint the internal error list
ErrorList formalErrors; ErrorList formalErrors;
if (compiler.prepareFormalAnalysis(&formalErrors)) if (compiler.prepareFormalAnalysis(&formalErrors))
@ -239,7 +246,14 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback
)); ));
output["formal"]["errors"] = errors; 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. // Indices into this array are used to abbreviate source names in source locations.
output["sourceList"] = Json::Value(Json::arrayValue); output["sourceList"] = Json::Value(Json::arrayValue);
for (auto const& source: compiler.sourceNames()) for (auto const& source: compiler.sourceNames())
@ -250,7 +264,7 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback
} }
catch (...) catch (...)
{ {
output["errors"].append("Unknown exception while generating compiler output."); output["errors"].append("Unknown exception while generating source name output.");
} }
} }