From 9a4bec7e474a310c7f93ff3b84928e0e9ba9cce6 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@ethereum.org>
Date: Mon, 15 Oct 2018 11:52:35 +0200
Subject: Renaming libjulia to libyul

---
 libyul/optimiser/MainFunction.cpp | 54 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 libyul/optimiser/MainFunction.cpp

(limited to 'libyul/optimiser/MainFunction.cpp')

diff --git a/libyul/optimiser/MainFunction.cpp b/libyul/optimiser/MainFunction.cpp
new file mode 100644
index 00000000..dfc19574
--- /dev/null
+++ b/libyul/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 <libyul/optimiser/MainFunction.h>
+
+#include <libyul/optimiser/NameCollector.h>
+#include <libyul/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);
+}
-- 
cgit v1.2.3


From 1304361b9c48438d5c55903492b5f11c3dac73e5 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@ethereum.org>
Date: Mon, 15 Oct 2018 11:58:51 +0200
Subject: Renaming namespace dev::julia to dev::yul.

---
 libyul/optimiser/MainFunction.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libyul/optimiser/MainFunction.cpp')

diff --git a/libyul/optimiser/MainFunction.cpp b/libyul/optimiser/MainFunction.cpp
index dfc19574..c8f35207 100644
--- a/libyul/optimiser/MainFunction.cpp
+++ b/libyul/optimiser/MainFunction.cpp
@@ -30,7 +30,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 using namespace dev::solidity;
 
 void MainFunction::operator()(Block& _block)
-- 
cgit v1.2.3


From 674e17c2a895eff6729357d8c10db709ac368b79 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 29 Oct 2018 15:12:02 +0100
Subject: Performance: Replace string by special single-copy YulString class.

---
 libyul/optimiser/MainFunction.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libyul/optimiser/MainFunction.cpp')

diff --git a/libyul/optimiser/MainFunction.cpp b/libyul/optimiser/MainFunction.cpp
index c8f35207..f3306598 100644
--- a/libyul/optimiser/MainFunction.cpp
+++ b/libyul/optimiser/MainFunction.cpp
@@ -40,12 +40,12 @@ void MainFunction::operator()(Block& _block)
 	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, "");
+	assertThrow(NameCollector(_block).names().count(YulString{"main"}) == 0, OptimizerException, "");
 
 	Block& block = boost::get<Block>(_block.statements[0]);
 	FunctionDefinition main{
 		block.location,
-		"main",
+		YulString{"main"},
 		{},
 		{},
 		std::move(block)
-- 
cgit v1.2.3