Merge pull request #4148 from ethereum/develop

Merge develop into release for 0.4.24

1 files changed, 54 insertions, 0 deletions

diff --git a/libjulia/optimiser/MainFunction.cpp b/libjulia/optimiser/MainFunction.cpp
new file mode 100644
index 00000000..bcd2f178
--- /dev/null
+++ b/libjulia/optimiser/MainFunction.cpp
@@ -0,0 +1,54 @@
+/*
+	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 <http://www.gnu.org/licenses/>.
+*/
+/**
+ * Changes the topmost block to be a function with a specific name ("main") which has no
+ * inputs nor outputs.
+ */
+
+#include <libjulia/optimiser/MainFunction.h>
+
+#include <libjulia/optimiser/NameCollector.h>
+#include <libjulia/Exceptions.h>
+
+#include <libsolidity/inlineasm/AsmData.h>
+
+#include <libdevcore/CommonData.h>
+
+using namespace std;
+using namespace dev;
+using namespace dev::julia;
+using namespace dev::solidity;
+
+void MainFunction::operator()(Block& _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)
+		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
+	assertThrow(NameCollector(_block).names().count("main") == 0, OptimizerException, "");
+
+	Block& block = boost::get<Block>(_block.statements[0]);
+	FunctionDefinition main{
+		block.location,
+		"main",
+		{},
+		{},
+		std::move(block)
+	};
+	_block.statements[0] = std::move(main);
+}