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

Merge branch 'origin/develop' into develop_060

Browse Source
This commit is contained in:
chriseth
2019-10-02 16:29:36 +02:00
parent 634da933fa 2d150b659e
commit f884373142
21 changed files with 175 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/analysis/NameAndTypeResolver.cpp
+4 -4
View File
@@ -91,13 +91,13 @@ bool NameAndTypeResolver::performImports(SourceUnit& _sourceUnit, map<string, So
if (!imp->symbolAliases().empty())
for (auto const& alias: imp->symbolAliases())
{
auto declarations = scope->second->resolveName(alias.first->name(), false);
auto declarations = scope->second->resolveName(alias.symbol->name(), false);
if (declarations.empty())
{
m_errorReporter.declarationError(
imp->location(),
"Declaration \"" +
alias.first->name() +
alias.symbol->name() +
"\" not found in \"" +
path +
"\" (referenced as \"" +
@@ -109,7 +109,7 @@ bool NameAndTypeResolver::performImports(SourceUnit& _sourceUnit, map<string, So
else
for (Declaration const* declaration: declarations)
if (!DeclarationRegistrationHelper::registerDeclaration(
target, *declaration, alias.second.get(), &imp->location(), true, false, m_errorReporter
target, *declaration, alias.alias.get(), &alias.location, true, false, m_errorReporter
))
error = true;
}
@@ -523,7 +523,7 @@ bool DeclarationRegistrationHelper::registerDeclaration(
{
if (dynamic_cast<MagicVariableDeclaration const*>(shadowedDeclaration))
_errorReporter.warning(
_declaration.location(),
*_errorLocation,
"This declaration shadows a builtin symbol."
);
else