cerc-io/solidity
11
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 CallGraph structure to a separate module

Browse Source
This commit is contained in:
Kamil Śliwak
2021-02-23 10:47:02 +01:00
parent 769a7687c6
commit 6c28120f19
10 changed files with 171 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/analysis/FunctionCallGraph.cpp
+6 -6
View File
@@ -53,12 +53,12 @@ using namespace solidity::langutil;
using namespace solidity::frontend;
using EdgeMap = map<
FunctionCallGraphBuilder::Node,
set<FunctionCallGraphBuilder::Node, FunctionCallGraphBuilder::CompareByID>,
FunctionCallGraphBuilder::CompareByID
CallGraph::Node,
set<CallGraph::Node, CallGraph::CompareByID>,
CallGraph::CompareByID
>;
using EdgeNames = set<tuple<string, string>>;
using CallGraphMap = map<string, FunctionCallGraphBuilder::ContractCallGraph const*>;
using CallGraphMap = map<string, CallGraph const*>;
namespace
{
@@ -131,7 +131,7 @@ void checkCallGraphExpectations(
)
{
auto getContractName = [](ContractDefinition const* _contract){ return _contract->name(); };
auto eventToString = [](EventDefinition const* _event){ return toString(FunctionCallGraphBuilder::Node(_event)); };
auto eventToString = [](EventDefinition const* _event){ return toString(CallGraph::Node(_event)); };
auto notEmpty = [](set<string> const& _set){ return !_set.empty(); };
soltestAssert(
@@ -157,7 +157,7 @@ void checkCallGraphExpectations(
for (string const& contractName: _expectedEdges | views::keys)
{
soltestAssert(_callGraphs.at(contractName) != nullptr, "");
FunctionCallGraphBuilder::ContractCallGraph const& callGraph = *_callGraphs.at(contractName);
CallGraph const& callGraph = *_callGraphs.at(contractName);
edges[contractName] = edgeNames(callGraph.edges);
if (!callGraph.createdContracts.empty())