cerc-io/solidity
15
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

Fix shadowing for imports with aliases.

Browse Source
This commit is contained in:
chriseth 2018-02-16 11:03:56 +01:00
parent decfa0eed0
commit 4272d16f30
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsolidity/analysis/NameAndTypeResolver.cpp
View File

@ -457,9 +457,10 @@ bool DeclarationRegistrationHelper::registerDeclaration(
if (!_errorLocation) if (!_errorLocation)
_errorLocation = &_declaration.location(); _errorLocation = &_declaration.location();
string name = _name ? *_name : _declaration.name();
Declaration const* shadowedDeclaration = nullptr; Declaration const* shadowedDeclaration = nullptr;
if (_warnOnShadow && !_declaration.name().empty() && _container.enclosingContainer()) if (_warnOnShadow && !name.empty() && _container.enclosingContainer())
for (auto const* decl: _container.enclosingContainer()->resolveName(_declaration.name(), true)) for (auto const* decl: _container.enclosingContainer()->resolveName(name, true))
shadowedDeclaration = decl; shadowedDeclaration = decl;
if (!_container.registerDeclaration(_declaration, _name, !_declaration.isVisibleInContract())) if (!_container.registerDeclaration(_declaration, _name, !_declaration.isVisibleInContract()))