diff options
| author | chriseth <chris@ethereum.org> | 2017-08-04 20:27:53 +0800 |
|---|---|---|
| committer | chriseth <chris@ethereum.org> | 2017-08-05 01:06:24 +0800 |
| commit | 060d229a22c14b7e597107c81283cde40f180f7f (patch) | |
| tree | 4180047501014ffc7d8d193b8b8675b1bad05d79 | |
| parent | 32acadf43d655413e65428475a35e7ef3bf8fb78 (diff) | |
| download | dexon-solidity-060d229a22c14b7e597107c81283cde40f180f7f.tar.gz dexon-solidity-060d229a22c14b7e597107c81283cde40f180f7f.tar.zst dexon-solidity-060d229a22c14b7e597107c81283cde40f180f7f.zip | |
Search for shadowee starting from parent scope.
| -rw-r--r-- | libsolidity/analysis/DeclarationContainer.h | 1 | ||||
| -rw-r--r-- | libsolidity/analysis/NameAndTypeResolver.cpp | 27 |
2 files changed, 4 insertions, 24 deletions
diff --git a/libsolidity/analysis/DeclarationContainer.h b/libsolidity/analysis/DeclarationContainer.h index 9c7c89e7..301998b7 100644 --- a/libsolidity/analysis/DeclarationContainer.h +++ b/libsolidity/analysis/DeclarationContainer.h @@ -53,6 +53,7 @@ public: bool registerDeclaration(Declaration const& _declaration, ASTString const* _name = nullptr, bool _invisible = false, bool _update = false); std::vector<Declaration const*> resolveName(ASTString const& _name, bool _recursive = false) const; ASTNode const* enclosingNode() const { return m_enclosingNode; } + DeclarationContainer const* enclosingContainer() const { return m_enclosingContainer; } std::map<ASTString, std::vector<Declaration const*>> const& declarations() const { return m_declarations; } /// @returns whether declaration is valid, and if not also returns previous declaration. Declaration const* conflictingDeclaration(Declaration const& _declaration, ASTString const* _name = nullptr) const; diff --git a/libsolidity/analysis/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp index 83de2b3e..523e7176 100644 --- a/libsolidity/analysis/NameAndTypeResolver.cpp +++ b/libsolidity/analysis/NameAndTypeResolver.cpp @@ -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())) { |