From 8afd0ea0305ed5043466b4f5dfebebe4aac75c9a Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 8 Feb 2018 19:04:20 +0000 Subject: Introduce Julia filter to encapsulate top level Block as a FunctionDefinition (wasm specific) --- libjulia/optimiser/MainFunction.cpp | 55 +++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 libjulia/optimiser/MainFunction.cpp (limited to 'libjulia/optimiser/MainFunction.cpp') diff --git a/libjulia/optimiser/MainFunction.cpp b/libjulia/optimiser/MainFunction.cpp new file mode 100644 index 00000000..0b3e674b --- /dev/null +++ b/libjulia/optimiser/MainFunction.cpp @@ -0,0 +1,55 @@ +/* + This file is part of solidity. + + solidity is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + solidity is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with solidity. If not, see . +*/ +/** + * Changes the topmost block to be a function with a specific name ("main") which has no + * inputs nor outputs. + */ + +#include + +#include + +#include + +#include + +#include + +using namespace std; +using namespace dev; +using namespace dev::julia; +using namespace dev::solidity; + +void MainFunction::operator()(Block& _block) +{ + solAssert(_block.statements.size() >= 1, ""); + solAssert(_block.statements[0].type() == typeid(Block), ""); + for (size_t i = 1; i < _block.statements.size(); ++i) + solAssert(_block.statements.at(i).type() == typeid(FunctionDefinition), ""); + /// @todo this should handle scopes properly and instead of an assertion it should rename the conflicting function + solAssert(NameCollector(_block).names().count("main") == 0, ""); + + Block& block = boost::get(_block.statements[0]); + FunctionDefinition main{ + block.location, + "main", + {}, + {}, + std::move(block) + }; + _block.statements[0] = std::move(main); +} -- cgit v1.2.3 From 591c591af05f29bf42b8b162a4fcda5a9a8fae9f Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 9 May 2018 11:43:14 +0200 Subject: Do not use solAssert within libjulia --- libjulia/optimiser/MainFunction.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'libjulia/optimiser/MainFunction.cpp') diff --git a/libjulia/optimiser/MainFunction.cpp b/libjulia/optimiser/MainFunction.cpp index 0b3e674b..bcd2f178 100644 --- a/libjulia/optimiser/MainFunction.cpp +++ b/libjulia/optimiser/MainFunction.cpp @@ -22,11 +22,10 @@ #include #include +#include #include -#include - #include 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.statements[0]); FunctionDefinition main{ -- cgit v1.2.3