cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move type definitions to test namespace

Browse Source
This commit is contained in:
r0qs 2023-08-22 16:43:59 +02:00
parent 5e68617a2e
commit 2ab40e3fb3
No known key found for this signature in database
GPG Key ID: 61503DBA6667276C
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
test/libyul/DominatorTest.cpp
View File

@ -28,29 +28,29 @@ using namespace solidity::yul;
namespace solidity::yul::test namespace solidity::yul::test
{ {
typedef std::pair<std::string, std::string> Edge;
struct Vertex {
std::string name;
std::vector<std::shared_ptr<Vertex>> successors;
bool operator<(Vertex const& _other) const
{
return name < _other.name;
}
};
struct ForEachVertexSuccessorTest {
template<typename Callable>
void operator()(Vertex _v, Callable&& _callable) const
{
for (auto const& w: _v.successors)
_callable(*w);
}
};
struct ImmediateDominatorTest struct ImmediateDominatorTest
{ {
struct Vertex {
std::string name;
std::vector<std::shared_ptr<Vertex>> successors;
bool operator<(Vertex const& _other) const
{
return name < _other.name;
}
};
typedef std::pair<std::string, std::string> Edge;
struct ForEachVertexSuccessorTest {
template<typename Callable>
void operator()(Vertex _v, Callable&& _callable) const
{
for (auto const& w: _v.successors)
_callable(*w);
}
};
size_t numVertices; size_t numVertices;
std::shared_ptr<Vertex> entry; std::shared_ptr<Vertex> entry;
std::map<std::string, std::shared_ptr<Vertex>> vertices; std::map<std::string, std::shared_ptr<Vertex>> vertices;
@ -60,11 +60,10 @@ struct ImmediateDominatorTest
class DominatorFixture class DominatorFixture
{ {
typedef ImmediateDominatorTest::Vertex Vertex;
protected: protected:
static std::shared_ptr<ImmediateDominatorTest> prepareTestDefinition( static std::shared_ptr<ImmediateDominatorTest> prepareTestDefinition(
std::vector<std::string> _vertices, std::vector<std::string> _vertices,
std::vector<ImmediateDominatorTest::Edge> _edges, std::vector<Edge> _edges,
std::vector<size_t> _expectedIdom, std::vector<size_t> _expectedIdom,
std::map<std::string, size_t> _expectedDFSIndices std::map<std::string, size_t> _expectedDFSIndices
) )
@ -97,11 +96,7 @@ protected:
} }
}; };
typedef ImmediateDominatorTest::Edge Edge; typedef Dominator<Vertex, ForEachVertexSuccessorTest> DominatorFinder;
typedef Dominator<
ImmediateDominatorTest::Vertex,
ImmediateDominatorTest::ForEachVertexSuccessorTest
> DominatorFinder;
BOOST_AUTO_TEST_SUITE(Dominators) BOOST_AUTO_TEST_SUITE(Dominators)