mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Adapt tests directory to C++ namespace changes.
This commit is contained in:
committed by
Daniel Kirchner
parent
6b23412fae
commit
ed45b000d1
@@ -34,11 +34,10 @@
|
||||
#include <string>
|
||||
|
||||
using namespace std;
|
||||
using namespace langutil;
|
||||
using namespace solidity::frontend;
|
||||
using namespace solidity::langutil;
|
||||
|
||||
namespace yul
|
||||
{
|
||||
namespace test
|
||||
namespace solidity::yul::test
|
||||
{
|
||||
|
||||
namespace
|
||||
@@ -49,9 +48,9 @@ std::pair<bool, ErrorList> parse(string const& _source)
|
||||
try
|
||||
{
|
||||
AssemblyStack asmStack(
|
||||
dev::test::Options::get().evmVersion(),
|
||||
solidity::test::Options::get().evmVersion(),
|
||||
AssemblyStack::Language::StrictAssembly,
|
||||
dev::solidity::OptimiserSettings::none()
|
||||
solidity::frontend::OptimiserSettings::none()
|
||||
);
|
||||
bool success = asmStack.parseAndAnalyze("source", _source);
|
||||
return {success, asmStack.errors()};
|
||||
@@ -108,7 +107,7 @@ do \
|
||||
{ \
|
||||
Error err = expectError((text), false); \
|
||||
BOOST_CHECK(err.type() == (Error::Type::typ)); \
|
||||
BOOST_CHECK(dev::solidity::searchErrorMessage(err, (substring))); \
|
||||
BOOST_CHECK(::solidity::frontend::test::searchErrorMessage(err, (substring))); \
|
||||
} while(0)
|
||||
|
||||
BOOST_AUTO_TEST_SUITE(YulObjectParser)
|
||||
@@ -240,9 +239,9 @@ BOOST_AUTO_TEST_CASE(to_string)
|
||||
)";
|
||||
expectation = boost::replace_all_copy(expectation, "\t", " ");
|
||||
AssemblyStack asmStack(
|
||||
dev::test::Options::get().evmVersion(),
|
||||
solidity::test::Options::get().evmVersion(),
|
||||
AssemblyStack::Language::StrictAssembly,
|
||||
dev::solidity::OptimiserSettings::none()
|
||||
solidity::frontend::OptimiserSettings::none()
|
||||
);
|
||||
BOOST_REQUIRE(asmStack.parseAndAnalyze("source", code));
|
||||
BOOST_CHECK_EQUAL(asmStack.print(), expectation);
|
||||
@@ -294,4 +293,3 @@ BOOST_AUTO_TEST_CASE(non_existing_objects)
|
||||
BOOST_AUTO_TEST_SUITE_END()
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user