Move function grouper tests.

7 files changed, 102 insertions, 85 deletions

diff --git a/test/libjulia/FunctionGrouper.cpp b/test/libjulia/FunctionGrouper.cpp
deleted file mode 100644
index f1e83449..00000000
--- a/test/libjulia/FunctionGrouper.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-    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/>.
-*/
-/**
- * @date 2017
- * Unit tests for the Yul function grouper.
- */
-
-#include <test/libjulia/Common.h>
-
-#include <libjulia/optimiser/FunctionGrouper.h>
-
-#include <libsolidity/inlineasm/AsmPrinter.h>
-
-#include <boost/test/unit_test.hpp>
-
-using namespace std;
-using namespace dev::julia;
-using namespace dev::julia::test;
-using namespace dev::solidity;
-
-#define CHECK(_original, _expectation)\
-do\
-{\
-	assembly::AsmPrinter p(true);\
-	Block b = disambiguate(_original);\
-	(FunctionGrouper{})(b);\
-	string result = p(b);\
-	BOOST_CHECK_EQUAL(result, format(_expectation));\
-}\
-while(false)
-
-BOOST_AUTO_TEST_SUITE(YulFunctionGrouper)
-
-BOOST_AUTO_TEST_CASE(smoke_test)
-{
-	CHECK("{ }", "{ { } }");
-}
-
-BOOST_AUTO_TEST_CASE(single_fun)
-{
-	CHECK(
-		"{ let a:u256 function f() {} }",
-		"{ { let a:u256 } function f() {} }"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(multi_fun_mixed)
-{
-	CHECK(
-		"{ let a:u256 function f() { let b:u256 } let c:u256 function g() { let d:u256 } let e:u256 }",
-		"{ { let a:u256 let c:u256 let e:u256 } function f() { let b:u256 } function g() { let d:u256 } }"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(nested_fun)
-{
-	CHECK(
-		"{ let a:u256 function f() { let b:u256 function g() { let c:u256} let d:u256 } }",
-		"{ { let a:u256 } function f() { let b:u256 function g() { let c:u256} let d:u256 } }"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(empty_block)
-{
-	CHECK(
-		"{ let a:u256 { } function f() -> x:bool { let b:u256 := 4:u256 {} for {} f() {} {} } }",
-		"{ { let a:u256 { } } function f() -> x:bool { let b:u256 := 4:u256 {} for {} f() {} {} } }"
-	);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/libjulia/YulOptimizerTest.cpp b/test/libjulia/YulOptimizerTest.cpp
index e8c88b67..31707890 100644
--- a/test/libjulia/YulOptimizerTest.cpp
+++ b/test/libjulia/YulOptimizerTest.cpp
@@ -25,6 +25,7 @@
 #include <libjulia/optimiser/CommonSubexpressionEliminator.h>
 #include <libjulia/optimiser/NameCollector.h>
 #include <libjulia/optimiser/ExpressionSplitter.h>
+#include <libjulia/optimiser/FunctionGrouper.h>
 
 #include <libsolidity/parsing/Scanner.h>
 #include <libsolidity/inlineasm/AsmPrinter.h>
@@ -95,6 +96,11 @@ bool YulOptimizerTest::run(ostream& _stream, string const& _linePrefix, bool con
 		nameDispenser.m_usedNames = NameCollector(*m_ast).names();
 		ExpressionSplitter{nameDispenser}(*m_ast);
 	}
+	else if (m_optimizerStep == "functionGrouper")
+	{
+		disambiguate();
+		(FunctionGrouper{})(*m_ast);
+	}
 	else
 	{
 		FormattedScope(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Invalid optimizer step: " << m_optimizerStep << endl;
diff --git a/test/libjulia/yulOptimizerTests/functionGrouper/empty_block.yul b/test/libjulia/yulOptimizerTests/functionGrouper/empty_block.yul
new file mode 100644
index 00000000..f0d49d7b
--- /dev/null
+++ b/test/libjulia/yulOptimizerTests/functionGrouper/empty_block.yul
@@ -0,0 +1,24 @@
+// yul
+{ let a:u256 { } function f() -> x:bool { let b:u256 := 4:u256 {} for {} f() {} {} } }
+// ----
+// functionGrouper
+// {
+//     {
+//         let a:u256
+//         {
+//         }
+//     }
+//     function f() -> x:bool
+//     {
+//         let b:u256 := 4:u256
+//         {
+//         }
+//         for {
+//         }
+//         f()
+//         {
+//         }
+//         {
+//         }
+//     }
+// }
diff --git a/test/libjulia/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul b/test/libjulia/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
new file mode 100644
index 00000000..c830d5da
--- /dev/null
+++ b/test/libjulia/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
@@ -0,0 +1,24 @@
+// yul
+{
+    let a:u256
+    function f() { let b:u256 }
+    let c:u256 function g() { let d:u256 }
+    let e:u256
+}
+// ----
+// functionGrouper
+// {
+//     {
+//         let a:u256
+//         let c:u256
+//         let e:u256
+//     }
+//     function f()
+//     {
+//         let b:u256
+//     }
+//     function g()
+//     {
+//         let d:u256
+//     }
+// }
diff --git a/test/libjulia/yulOptimizerTests/functionGrouper/nested_fun.yul b/test/libjulia/yulOptimizerTests/functionGrouper/nested_fun.yul
new file mode 100644
index 00000000..4a8be86a
--- /dev/null
+++ b/test/libjulia/yulOptimizerTests/functionGrouper/nested_fun.yul
@@ -0,0 +1,27 @@
+// yul
+{
+    let a:u256
+    function f() {
+        let b:u256
+        function g() {
+            let c:u256
+        }
+        let d:u256
+    }
+}
+// ----
+// functionGrouper
+// {
+//     {
+//         let a:u256
+//     }
+//     function f()
+//     {
+//         let b:u256
+//         function g()
+//         {
+//             let c:u256
+//         }
+//         let d:u256
+//     }
+// }
diff --git a/test/libjulia/yulOptimizerTests/functionGrouper/single_fun.yul b/test/libjulia/yulOptimizerTests/functionGrouper/single_fun.yul
new file mode 100644
index 00000000..149a44eb
--- /dev/null
+++ b/test/libjulia/yulOptimizerTests/functionGrouper/single_fun.yul
@@ -0,0 +1,14 @@
+// yul
+{
+	let a:u256 function f() {}
+}
+// ----
+// functionGrouper
+// {
+//     {
+//         let a:u256
+//     }
+//     function f()
+//     {
+//     }
+// }
diff --git a/test/libjulia/yulOptimizerTests/functionGrouper/smoke.yul b/test/libjulia/yulOptimizerTests/functionGrouper/smoke.yul
new file mode 100644
index 00000000..650a163e
--- /dev/null
+++ b/test/libjulia/yulOptimizerTests/functionGrouper/smoke.yul
@@ -0,0 +1,7 @@
+{ }
+// ----
+// functionGrouper
+// {
+//     {
+//     }
+// }