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 if-condition to function for re-use

Browse Source
This commit is contained in:
Mathias Baumann 2019-09-16 12:27:54 +02:00
parent 5434ba025e
commit f4c40080c4
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libsolidity/analysis/ContractLevelChecker.cpp
View File

@ -33,6 +33,18 @@ using namespace dev;
using namespace langutil; using namespace langutil;
using namespace dev::solidity; using namespace dev::solidity;
namespace {
template <class T>
bool hasEqualNameAndParameters(T const& _a, T const& _b)
{
return _a.name() == _b.name() &&
FunctionType(_a).asCallableFunction(false)->hasEqualParameterTypes(
*FunctionType(_b).asCallableFunction(false)
);
}
}
bool ContractLevelChecker::check(ContractDefinition const& _contract) bool ContractLevelChecker::check(ContractDefinition const& _contract)
{ {
@ -111,9 +123,7 @@ void ContractLevelChecker::findDuplicateDefinitions(map<string, vector<T>> const
SecondarySourceLocation ssl; SecondarySourceLocation ssl;
for (size_t j = i + 1; j < overloads.size(); ++j) for (size_t j = i + 1; j < overloads.size(); ++j)
if (FunctionType(*overloads[i]).asCallableFunction(false)->hasEqualParameterTypes( if (hasEqualNameAndParameters(*overloads[i], *overloads[j]))
*FunctionType(*overloads[j]).asCallableFunction(false))
)
{ {
ssl.append("Other declaration is here:", overloads[j]->location()); ssl.append("Other declaration is here:", overloads[j]->location());
reported.insert(j); reported.insert(j);