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

Do not mark overloaded functions as shadowing

Browse Source
This commit is contained in:
Alex Beregszaszi
2017-08-04 19:06:23 +02:00
committed by chriseth
parent dc0f85c4fb
commit 32acadf43d
4 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/analysis/NameAndTypeResolver.cpp
+18 -1
View File
@@ -439,6 +439,23 @@ DeclarationRegistrationHelper::DeclarationRegistrationHelper(
solAssert(m_currentScope == _currentScope, "Scopes not correctly closed.");
}
bool DeclarationRegistrationHelper::isOverloadedFunction(
Declaration const& _declaration1,
Declaration const& _declaration2
)
{
auto const* function1 = dynamic_cast<FunctionDefinition const*>(&_declaration1);
auto const* function2 = dynamic_cast<FunctionDefinition const*>(&_declaration2);
if (!function1 || !function2)
return false;
if (function1->parameters() != function2->parameters())
return true;
return false;
}
bool DeclarationRegistrationHelper::registerDeclaration(
DeclarationContainer& _container,
Declaration const& _declaration,
@@ -454,7 +471,7 @@ bool DeclarationRegistrationHelper::registerDeclaration(
Declaration const* shadowedDeclaration = nullptr;
if (_warnOnShadow && !_declaration.name().empty())
for (auto const* decl: _container.resolveName(_declaration.name(), true))
if (decl != &_declaration)
if (decl != &_declaration && !isOverloadedFunction(*decl, _declaration))
{
shadowedDeclaration = decl;
break;
libsolidity/analysis/NameAndTypeResolver.h
+2
View File
@@ -169,6 +169,8 @@ private:
void closeCurrentScope();
void registerDeclaration(Declaration& _declaration, bool _opensScope);
static bool isOverloadedFunction(Declaration const& _declaration1, Declaration const& _declaration2);
/// @returns the canonical name of the current scope.
std::string currentCanonicalName() const;