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

Search for shadowee starting from parent scope.

Browse Source
This commit is contained in:
chriseth
2017-08-04 19:06:24 +02:00
parent 32acadf43d
commit 060d229a22
2 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/analysis/NameAndTypeResolver.cpp
+3 -24
View File
@@ -439,23 +439,6 @@ 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,
@@ -469,13 +452,9 @@ bool DeclarationRegistrationHelper::registerDeclaration(
_errorLocation = &_declaration.location();
Declaration const* shadowedDeclaration = nullptr;
if (_warnOnShadow && !_declaration.name().empty())
for (auto const* decl: _container.resolveName(_declaration.name(), true))
if (decl != &_declaration && !isOverloadedFunction(*decl, _declaration))
{
shadowedDeclaration = decl;
break;
}
if (_warnOnShadow && !_declaration.name().empty() && _container.enclosingContainer())
for (auto const* decl: _container.enclosingContainer()->resolveName(_declaration.name(), true))
shadowedDeclaration = decl;
if (!_container.registerDeclaration(_declaration, _name, !_declaration.isVisibleInContract()))
{