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

Extract duplicate function or event finding logic

Browse Source
This commit is contained in:
Federico Bond 2017-09-29 19:45:56 -03:00
parent 6d95447955
commit 1e7b6875b7
2 changed files with 14 additions and 37 deletions
libsolidity/analysis
TypeChecker.cppTypeChecker.h

48
libsolidity/analysis/TypeChecker.cpp
View File

@ -184,39 +184,8 @@ void TypeChecker::checkContractDuplicateFunctions(ContractDefinition const& _con
msg msg
); );
} }
for (auto const& it: functions)
{
vector<FunctionDefinition const*> const& overloads = it.second;
set<size_t> reported;
for (size_t i = 0; i < overloads.size() && !reported.count(i); ++i)
{
SecondarySourceLocation ssl;
for (size_t j = i + 1; j < overloads.size(); ++j) findDuplicateDefinitions(functions, "Function with same name and arguments defined twice.");
if (FunctionType(*overloads[i]).hasEqualArgumentTypes(FunctionType(*overloads[j])))
{
ssl.append("Other declaration is here:", overloads[j]->location());
reported.insert(j);
}
if (ssl.infos.size() > 0)
{
string msg = "Function with same name and arguments defined twice.";
size_t occurrences = ssl.infos.size();
if (occurrences > 32)
{
ssl.infos.resize(32);
msg += " Truncated from " + boost::lexical_cast<string>(occurrences) + " to the first 32 occurrences.";
}
m_errorReporter.declarationError(
overloads[i]->location(),
ssl,
msg
);
}
}
}
} }
void TypeChecker::checkContractDuplicateEvents(ContractDefinition const& _contract) void TypeChecker::checkContractDuplicateEvents(ContractDefinition const& _contract)
@ -227,9 +196,15 @@ void TypeChecker::checkContractDuplicateEvents(ContractDefinition const& _contra
for (EventDefinition const* event: _contract.events()) for (EventDefinition const* event: _contract.events())
events[event->name()].push_back(event); events[event->name()].push_back(event);
for (auto const& it: events) findDuplicateDefinitions(events, "Event with same name and arguments defined twice.");
}
template <class T>
void TypeChecker::findDuplicateDefinitions(map<string, vector<T>> const& _definitions, string _message)
{
for (auto const& it: _definitions)
{ {
vector<EventDefinition const*> const& overloads = it.second; vector<T> const& overloads = it.second;
set<size_t> reported; set<size_t> reported;
for (size_t i = 0; i < overloads.size() && !reported.count(i); ++i) for (size_t i = 0; i < overloads.size() && !reported.count(i); ++i)
{ {
@ -244,18 +219,17 @@ void TypeChecker::checkContractDuplicateEvents(ContractDefinition const& _contra
if (ssl.infos.size() > 0) if (ssl.infos.size() > 0)
{ {
string msg = "Event with same name and arguments defined twice.";
size_t occurrences = ssl.infos.size(); size_t occurrences = ssl.infos.size();
if (occurrences > 32) if (occurrences > 32)
{ {
ssl.infos.resize(32); ssl.infos.resize(32);
msg += " Truncated from " + boost::lexical_cast<string>(occurrences) + " to the first 32 occurrences."; _message += " Truncated from " + boost::lexical_cast<string>(occurrences) + " to the first 32 occurrences.";
} }
m_errorReporter.declarationError( m_errorReporter.declarationError(
overloads[i]->location(), overloads[i]->location(),
ssl, ssl,
msg _message
); );
} }
} }

3
libsolidity/analysis/TypeChecker.h
View File

@ -109,6 +109,9 @@ private:
virtual void endVisit(ElementaryTypeNameExpression const& _expr) override; virtual void endVisit(ElementaryTypeNameExpression const& _expr) override;
virtual void endVisit(Literal const& _literal) override; virtual void endVisit(Literal const& _literal) override;
template <class T>
void findDuplicateDefinitions(std::map<std::string, std::vector<T>> const& _definitions, std::string _message);
bool contractDependenciesAreCyclic( bool contractDependenciesAreCyclic(
ContractDefinition const& _contract, ContractDefinition const& _contract,
std::set<ContractDefinition const*> const& _seenContracts = std::set<ContractDefinition const*>() std::set<ContractDefinition const*> const& _seenContracts = std::set<ContractDefinition const*>()