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:
+10
-10
@@ -37,10 +37,10 @@
|
||||
|
||||
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; });
|
||||
|
||||
@@ -52,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(),
|
||||
@@ -83,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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user