cerc-io/solidity
16
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 #2212 from ethereum/cli-assemble-errors

Browse Source 
Catch errors gracefully in CLI assembler
This commit is contained in:
Alex Beregszaszi 2017-05-06 11:18:32 +01:00 committed by GitHub
commit 822c90573c
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
solc/CommandLineInterface.cpp
View File

@ -985,13 +985,26 @@ bool CommandLineInterface::assemble()
map<string, shared_ptr<Scanner>> scanners;
for (auto const& src: m_sourceCodes)
{
auto scanner = make_shared<Scanner>(CharStream(src.second), src.first);
scanners[src.first] = scanner;
if (!m_assemblyStacks[src.first].parse(scanner))
successful = false;
else
//@TODO we should not just throw away the result here
m_assemblyStacks[src.first].assemble();
try
{
auto scanner = make_shared<Scanner>(CharStream(src.second), src.first);
scanners[src.first] = scanner;
if (!m_assemblyStacks[src.first].parse(scanner))
successful = false;
else
//@TODO we should not just throw away the result here
m_assemblyStacks[src.first].assemble();
}
catch (Exception const& _exception)
{
cerr << "Exception in assembler: " << boost::diagnostic_information(_exception) << endl;
return false;
}
catch (...)
{
cerr << "Unknown exception in assembler." << endl;
return false;
}
}
for (auto const& stack: m_assemblyStacks)
{