Merge pull request #5491 from ethereum/libyul-as-library

Libyul as static library (version 3 ;( )

9 files changed, 64 insertions, 80 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index acfc7d00..10b78bdc 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -27,7 +27,7 @@ add_executable(soltest ${sources} ${headers}
     ${liblll_sources} ${liblll_headers}
     ${libsolidity_sources} ${libsolidity_headers}
 )
-target_link_libraries(soltest PRIVATE libsolc solidity evmasm devcore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
+target_link_libraries(soltest PRIVATE libsolc yul solidity evmasm devcore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
 
 if (LLL)
     target_link_libraries(soltest PRIVATE lll)
diff --git a/test/boostTest.cpp b/test/boostTest.cpp
index 6ff6d2d2..7cb0c143 100644
--- a/test/boostTest.cpp
+++ b/test/boostTest.cpp
@@ -144,7 +144,7 @@ test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
 		master,
 		dev::test::Options::get().testPath / "libyul",
 		"yulOptimizerTests",
-		dev::yul::test::YulOptimizerTest::create
+		yul::test::YulOptimizerTest::create
 	) > 0, "no Yul Optimizer tests found");
 	if (!dev::test::Options::get().disableSMT)
 	{
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index 8913483f..d7785287 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -23,25 +23,24 @@
 
 #include <test/Options.h>
 
+#include <libsolidity/interface/SourceReferenceFormatter.h>
+
 #include <libyul/optimiser/Disambiguator.h>
+#include <libyul/AsmParser.h>
+#include <libyul/AsmAnalysis.h>
+#include <libyul/AsmPrinter.h>
 
 #include <liblangutil/Scanner.h>
-
-#include <libsolidity/inlineasm/AsmParser.h>
-#include <libsolidity/inlineasm/AsmAnalysis.h>
-#include <libsolidity/inlineasm/AsmPrinter.h>
-
-#include <libsolidity/interface/SourceReferenceFormatter.h>
 #include <liblangutil/ErrorReporter.h>
 
 #include <boost/test/unit_test.hpp>
 
 using namespace std;
 using namespace langutil;
-using namespace dev::yul;
+using namespace yul;
 using namespace dev::solidity;
 
-void dev::yul::test::printErrors(ErrorList const& _errors, Scanner const& _scanner)
+void yul::test::printErrors(ErrorList const& _errors, Scanner const& _scanner)
 {
 	SourceReferenceFormatter formatter(cout, [&](std::string const&) -> Scanner const& { return _scanner; });
 
@@ -53,18 +52,18 @@ void dev::yul::test::printErrors(ErrorList const& _errors, Scanner const& _scann
 }
 
 
-pair<shared_ptr<Block>, shared_ptr<assembly::AsmAnalysisInfo>> dev::yul::test::parse(string const& _source, bool _yul)
+pair<shared_ptr<Block>, shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(string const& _source, bool _yul)
 {
-	auto flavour = _yul ? assembly::AsmFlavour::Yul : assembly::AsmFlavour::Strict;
+	auto flavour = _yul ? yul::AsmFlavour::Yul : yul::AsmFlavour::Strict;
 	ErrorList errors;
 	ErrorReporter errorReporter(errors);
 	auto scanner = make_shared<Scanner>(CharStream(_source), "");
-	auto parserResult = assembly::Parser(errorReporter, flavour).parse(scanner, false);
+	auto parserResult = yul::Parser(errorReporter, flavour).parse(scanner, false);
 	if (parserResult)
 	{
 		BOOST_REQUIRE(errorReporter.errors().empty());
-		auto analysisInfo = make_shared<assembly::AsmAnalysisInfo>();
-		assembly::AsmAnalyzer analyzer(
+		auto analysisInfo = make_shared<yul::AsmAnalysisInfo>();
+		yul::AsmAnalyzer analyzer(
 			*analysisInfo,
 			errorReporter,
 			dev::test::Options::get().evmVersion(),
@@ -84,13 +83,13 @@ pair<shared_ptr<Block>, shared_ptr<assembly::AsmAnalysisInfo>> dev::yul::test::p
 	return {};
 }
 
-assembly::Block dev::yul::test::disambiguate(string const& _source, bool _yul)
+yul::Block yul::test::disambiguate(string const& _source, bool _yul)
 {
 	auto result = parse(_source, _yul);
 	return boost::get<Block>(Disambiguator(*result.second, {})(*result.first));
 }
 
-string dev::yul::test::format(string const& _source, bool _yul)
+string yul::test::format(string const& _source, bool _yul)
 {
-	return assembly::AsmPrinter(_yul)(*parse(_source, _yul).first);
+	return yul::AsmPrinter(_yul)(*parse(_source, _yul).first);
 }
diff --git a/test/libyul/Common.h b/test/libyul/Common.h
index 390e214f..a1c64ca5 100644
--- a/test/libyul/Common.h
+++ b/test/libyul/Common.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>
 
 #include <string>
 #include <vector>
@@ -34,26 +34,21 @@ class Error;
 using ErrorList = std::vector<std::shared_ptr<Error const>>;
 }
 
-namespace dev
-{
-namespace solidity
-{
-namespace assembly
+namespace yul
 {
 struct AsmAnalysisInfo;
 }
-}
+
 namespace yul
 {
 namespace test
 {
 
 void printErrors(langutil::ErrorList const& _errors, langutil::Scanner const& _scanner);
-std::pair<std::shared_ptr<solidity::assembly::Block>, std::shared_ptr<solidity::assembly::AsmAnalysisInfo>>
+std::pair<std::shared_ptr<Block>, std::shared_ptr<AsmAnalysisInfo>>
 parse(std::string const& _source, bool _yul = true);
-solidity::assembly::Block disambiguate(std::string const& _source, bool _yul = true);
+Block disambiguate(std::string const& _source, bool _yul = true);
 std::string format(std::string const& _source, bool _yul = true);
 
 }
 }
-}
diff --git a/test/libyul/Inliner.cpp b/test/libyul/Inliner.cpp
index 66810298..631cda08 100644
--- a/test/libyul/Inliner.cpp
+++ b/test/libyul/Inliner.cpp
@@ -26,8 +26,7 @@
 #include <libyul/optimiser/FullInliner.h>
 #include <libyul/optimiser/FunctionHoister.h>
 #include <libyul/optimiser/FunctionGrouper.h>
-
-#include <libsolidity/inlineasm/AsmPrinter.h>
+#include <libyul/AsmPrinter.h>
 
 #include <boost/test/unit_test.hpp>
 
@@ -36,8 +35,8 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::yul;
-using namespace dev::yul::test;
+using namespace yul;
+using namespace yul::test;
 using namespace dev::solidity;
 
 namespace
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
index 4aa3dd5c..6f946362 100644
--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@@ -23,9 +23,9 @@
 
 #include <test/libsolidity/ErrorCheck.h>
 
-#include <libsolidity/inlineasm/AsmParser.h>
-#include <libsolidity/inlineasm/AsmAnalysis.h>
-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
+#include <libyul/AsmParser.h>
+#include <libyul/AsmAnalysis.h>
+#include <libyul/AsmAnalysisInfo.h>
 #include <liblangutil/Scanner.h>
 #include <liblangutil/ErrorReporter.h>
 
@@ -36,11 +36,10 @@
 #include <memory>
 
 using namespace std;
+using namespace dev;
 using namespace langutil;
 
-namespace dev
-{
-namespace solidity
+namespace yul
 {
 namespace test
 {
@@ -53,16 +52,16 @@ bool parse(string const& _source, ErrorReporter& errorReporter)
 	try
 	{
 		auto scanner = make_shared<Scanner>(CharStream(_source));
-		auto parserResult = assembly::Parser(errorReporter, assembly::AsmFlavour::Yul).parse(scanner, false);
+		auto parserResult = yul::Parser(errorReporter, yul::AsmFlavour::Yul).parse(scanner, false);
 		if (parserResult)
 		{
-			assembly::AsmAnalysisInfo analysisInfo;
-			return (assembly::AsmAnalyzer(
+			yul::AsmAnalysisInfo analysisInfo;
+			return (yul::AsmAnalyzer(
 				analysisInfo,
 				errorReporter,
 				dev::test::Options::get().evmVersion(),
 				boost::none,
-				assembly::AsmFlavour::Yul
+				yul::AsmFlavour::Yul
 			)).analyze(*parserResult);
 		}
 	}
@@ -117,7 +116,7 @@ do \
 { \
 	Error err = expectError((text), false); \
 	BOOST_CHECK(err.type() == (Error::Type::typ)); \
-	BOOST_CHECK(searchErrorMessage(err, (substring))); \
+	BOOST_CHECK(dev::solidity::searchErrorMessage(err, (substring))); \
 } while(0)
 
 BOOST_AUTO_TEST_SUITE(YulParser)
@@ -303,5 +302,4 @@ BOOST_AUTO_TEST_CASE(if_statement_invalid)
 BOOST_AUTO_TEST_SUITE_END()
 
 }
-}
 } // end namespaces
diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index 6b2b81c3..9c2da493 100644
--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -21,9 +21,6 @@
 
 #include <test/Options.h>
 
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/Scanner.h>
-
 #include <libyul/optimiser/BlockFlattener.h>
 #include <libyul/optimiser/VarDeclPropagator.h>
 #include <libyul/optimiser/Disambiguator.h>
@@ -43,12 +40,14 @@
 #include <libyul/optimiser/SSATransform.h>
 #include <libyul/optimiser/RedundantAssignEliminator.h>
 #include <libyul/optimiser/Suite.h>
-
-#include <libsolidity/inlineasm/AsmPrinter.h>
-#include <libsolidity/inlineasm/AsmParser.h>
-#include <libsolidity/inlineasm/AsmAnalysis.h>
+#include <libyul/AsmPrinter.h>
+#include <libyul/AsmParser.h>
+#include <libyul/AsmAnalysis.h>
 #include <libsolidity/interface/SourceReferenceFormatter.h>
 
+#include <liblangutil/ErrorReporter.h>
+#include <liblangutil/Scanner.h>
+
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
 
@@ -56,8 +55,8 @@
 
 using namespace dev;
 using namespace langutil;
-using namespace dev::yul;
-using namespace dev::yul::test;
+using namespace yul;
+using namespace yul::test;
 using namespace dev::solidity;
 using namespace dev::solidity::test;
 using namespace std;
@@ -93,9 +92,9 @@ YulOptimizerTest::YulOptimizerTest(string const& _filename)
 
 bool YulOptimizerTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
 {
-	assembly::AsmPrinter printer{m_yul};
+	yul::AsmPrinter printer{m_yul};
 	shared_ptr<Block> ast;
-	shared_ptr<assembly::AsmAnalysisInfo> analysisInfo;
+	shared_ptr<yul::AsmAnalysisInfo> analysisInfo;
 	if (!parse(_stream, _linePrefix, _formatted))
 		return false;
 
@@ -257,19 +256,19 @@ void YulOptimizerTest::printIndented(ostream& _stream, string const& _output, st
 
 bool YulOptimizerTest::parse(ostream& _stream, string const& _linePrefix, bool const _formatted)
 {
-	assembly::AsmFlavour flavour = m_yul ? assembly::AsmFlavour::Yul : assembly::AsmFlavour::Strict;
+	yul::AsmFlavour flavour = m_yul ? yul::AsmFlavour::Yul : yul::AsmFlavour::Strict;
 	ErrorList errors;
 	ErrorReporter errorReporter(errors);
 	shared_ptr<Scanner> scanner = make_shared<Scanner>(CharStream(m_source), "");
-	m_ast = assembly::Parser(errorReporter, flavour).parse(scanner, false);
+	m_ast = yul::Parser(errorReporter, flavour).parse(scanner, false);
 	if (!m_ast || !errorReporter.errors().empty())
 	{
 		FormattedScope(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
 		printErrors(_stream, errorReporter.errors(), *scanner);
 		return false;
 	}
-	m_analysisInfo = make_shared<assembly::AsmAnalysisInfo>();
-	assembly::AsmAnalyzer analyzer(
+	m_analysisInfo = make_shared<yul::AsmAnalysisInfo>();
+	yul::AsmAnalyzer analyzer(
 		*m_analysisInfo,
 		errorReporter,
 		dev::test::Options::get().evmVersion(),
diff --git a/test/libyul/YulOptimizerTest.h b/test/libyul/YulOptimizerTest.h
index d11ff8fb..72c4299f 100644
--- a/test/libyul/YulOptimizerTest.h
+++ b/test/libyul/YulOptimizerTest.h
@@ -26,22 +26,18 @@ class Error;
 using ErrorList = std::vector<std::shared_ptr<Error const>>;
 }
 
-namespace dev
-{
-namespace solidity
-{
-namespace assembly
+namespace yul
 {
 struct AsmAnalysisInfo;
 struct Block;
 }
-}
+
 namespace yul
 {
 namespace test
 {
 
-class YulOptimizerTest: public solidity::test::TestCase
+class YulOptimizerTest: public dev::solidity::test::TestCase
 {
 public:
 	static std::unique_ptr<TestCase> create(std::string const& _filename)
@@ -68,11 +64,10 @@ private:
 	std::string m_optimizerStep;
 	std::string m_expectation;
 
-	std::shared_ptr<solidity::assembly::Block> m_ast;
-	std::shared_ptr<solidity::assembly::AsmAnalysisInfo> m_analysisInfo;
+	std::shared_ptr<Block> m_ast;
+	std::shared_ptr<AsmAnalysisInfo> m_analysisInfo;
 	std::string m_obtainedResult;
 };
 
 }
 }
-}
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index 8bc807d4..7a147137 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -21,12 +21,12 @@
 #include <libdevcore/CommonIO.h>
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/Scanner.h>
-#include <libsolidity/inlineasm/AsmAnalysis.h>
-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
+#include <libyul/AsmAnalysis.h>
+#include <libyul/AsmAnalysisInfo.h>
 #include <libsolidity/parsing/Parser.h>
-#include <libsolidity/inlineasm/AsmData.h>
-#include <libsolidity/inlineasm/AsmParser.h>
-#include <libsolidity/inlineasm/AsmPrinter.h>
+#include <libyul/AsmData.h>
+#include <libyul/AsmParser.h>
+#include <libyul/AsmPrinter.h>
 #include <libsolidity/interface/SourceReferenceFormatter.h>
 
 #include <libyul/optimiser/BlockFlattener.h>
@@ -60,8 +60,7 @@ using namespace std;
 using namespace dev;
 using namespace langutil;
 using namespace dev::solidity;
-using namespace dev::solidity::assembly;
-using namespace dev::yul;
+using namespace yul;
 
 namespace po = boost::program_options;
 
@@ -83,14 +82,14 @@ public:
 	{
 		ErrorReporter errorReporter(m_errors);
 		shared_ptr<Scanner> scanner = make_shared<Scanner>(CharStream(_input), "");
-		m_ast = assembly::Parser(errorReporter, assembly::AsmFlavour::Strict).parse(scanner, false);
+		m_ast = yul::Parser(errorReporter, yul::AsmFlavour::Strict).parse(scanner, false);
 		if (!m_ast || !errorReporter.errors().empty())
 		{
 			cout << "Error parsing source." << endl;
 			printErrors(*scanner);
 			return false;
 		}
-		m_analysisInfo = make_shared<assembly::AsmAnalysisInfo>();
+		m_analysisInfo = make_shared<yul::AsmAnalysisInfo>();
 		AsmAnalyzer analyzer(
 			*m_analysisInfo,
 			errorReporter,
@@ -118,7 +117,7 @@ public:
 				return;
 			if (!disambiguated)
 			{
-				*m_ast = boost::get<assembly::Block>(Disambiguator(*m_analysisInfo)(*m_ast));
+				*m_ast = boost::get<yul::Block>(Disambiguator(*m_analysisInfo)(*m_ast));
 				m_analysisInfo.reset();
 				m_nameDispenser = make_shared<NameDispenser>(*m_ast);
 				disambiguated = true;
@@ -187,7 +186,7 @@ public:
 
 private:
 	ErrorList m_errors;
-	shared_ptr<assembly::Block> m_ast;
+	shared_ptr<yul::Block> m_ast;
 	shared_ptr<AsmAnalysisInfo> m_analysisInfo;
 	shared_ptr<NameDispenser> m_nameDispenser;
 };