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

Do not use solAssert within libjulia

Browse Source
This commit is contained in:
Alex Beregszaszi
2018-05-09 12:28:49 +02:00
parent 7bbfd77e8e
commit 591c591af0
19 changed files with 53 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjulia/optimiser/MainFunction.cpp
+5 -6
View File
@@ -22,11 +22,10 @@
#include <libjulia/optimiser/MainFunction.h>
#include <libjulia/optimiser/NameCollector.h>
#include <libjulia/Exceptions.h>
#include <libsolidity/inlineasm/AsmData.h>
#include <libsolidity/interface/Exceptions.h>
#include <libdevcore/CommonData.h>
using namespace std;
@@ -36,12 +35,12 @@ using namespace dev::solidity;
void MainFunction::operator()(Block& _block)
{
solAssert(_block.statements.size() >= 1, "");
solAssert(_block.statements[0].type() == typeid(Block), "");
assertThrow(_block.statements.size() >= 1, OptimizerException, "");
assertThrow(_block.statements[0].type() == typeid(Block), OptimizerException, "");
for (size_t i = 1; i < _block.statements.size(); ++i)
solAssert(_block.statements.at(i).type() == typeid(FunctionDefinition), "");
assertThrow(_block.statements.at(i).type() == typeid(FunctionDefinition), OptimizerException, "");
/// @todo this should handle scopes properly and instead of an assertion it should rename the conflicting function
solAssert(NameCollector(_block).names().count("main") == 0, "");
assertThrow(NameCollector(_block).names().count("main") == 0, OptimizerException, "");
Block& block = boost::get<Block>(_block.statements[0]);
FunctionDefinition main{