diff options
| author | chriseth <chris@ethereum.org> | 2018-12-03 22:48:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-03 22:48:03 +0800 |
| commit | c8a2cb62832afb2dc09ccee6fd42c1516dfdb981 (patch) | |
| tree | 7977e9dcbbc215088c05b847f849871ef5d4ae66 /test/libyul/Parser.cpp | |
| parent | 1d4f565a64988a3400847d2655ca24f73f234bc6 (diff) | |
| parent | 590be1d84cea9850ce69b68be3dc5294b39041e5 (diff) | |
| download | dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.gz dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.bz2 dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.lz dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.xz dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.zst dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.zip | |
Merge pull request #5571 from ethereum/develop
Version 0.5.1
Diffstat (limited to 'test/libyul/Parser.cpp')
| -rw-r--r-- | test/libyul/Parser.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp index 3f329d28..caaf2719 100644 --- a/test/libyul/Parser.cpp +++ b/test/libyul/Parser.cpp @@ -23,11 +23,11 @@ #include <test/libsolidity/ErrorCheck.h> -#include <libsolidity/inlineasm/AsmParser.h> -#include <libsolidity/inlineasm/AsmAnalysis.h> -#include <libsolidity/inlineasm/AsmAnalysisInfo.h> -#include <libsolidity/parsing/Scanner.h> -#include <libsolidity/interface/ErrorReporter.h> +#include <libyul/AsmParser.h> +#include <libyul/AsmAnalysis.h> +#include <libyul/AsmAnalysisInfo.h> +#include <liblangutil/Scanner.h> +#include <liblangutil/ErrorReporter.h> #include <boost/optional.hpp> #include <boost/algorithm/string/replace.hpp> @@ -36,10 +36,10 @@ #include <memory> using namespace std; +using namespace dev; +using namespace langutil; -namespace dev -{ -namespace solidity +namespace yul { namespace test { @@ -51,17 +51,17 @@ 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 scanner = make_shared<Scanner>(CharStream(_source, "")); + 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); } } @@ -116,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) @@ -302,5 +302,4 @@ BOOST_AUTO_TEST_CASE(if_statement_invalid) BOOST_AUTO_TEST_SUITE_END() } -} } // end namespaces |