mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Isolating libyul library API into its own namespace yul.
This commit is contained in:
@@ -55,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;
|
||||
@@ -92,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;
|
||||
|
||||
@@ -256,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(),
|
||||
|
||||
Reference in New Issue
Block a user