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 pull request #346 from chriseth/importAliases

Browse Source 
Allow aliases during import.
This commit is contained in:
chriseth
2016-01-13 17:29:34 +01:00
parent 02c1aacd25 f20a604c5a
commit d2f18c73f7
4 changed files with 81 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/analysis/DeclarationContainer.cpp
+6 -5
View File
@@ -49,6 +49,8 @@ Declaration const* DeclarationContainer::conflictingDeclaration(
if (!dynamic_cast<FunctionDefinition const*>(declaration))
return declaration;
}
else if (declarations.size() == 1 && declarations.front() == &_declaration)
return nullptr;
else if (!declarations.empty())
return declarations.front();
@@ -73,13 +75,12 @@ bool DeclarationContainer::registerDeclaration(
m_declarations.erase(*_name);
m_invisibleDeclarations.erase(*_name);
}
else if (conflictingDeclaration(_declaration))
else if (conflictingDeclaration(_declaration, _name))
return false;
if (_invisible)
m_invisibleDeclarations[*_name].push_back(&_declaration);
else
m_declarations[*_name].push_back(&_declaration);
vector<Declaration const*>& decls = _invisible ? m_invisibleDeclarations[*_name] : m_declarations[*_name];
if (!contains(decls, &_declaration))
decls.push_back(&_declaration);
return true;
}
libsolidity/analysis/NameAndTypeResolver.cpp
+46 -11
View File
@@ -76,23 +76,58 @@ bool NameAndTypeResolver::performImports(SourceUnit& _sourceUnit, map<string, So
string const& path = imp->annotation().absolutePath;
if (!_sourceUnits.count(path))
{
reportDeclarationError( node->location(),
"Import \"" +
path +
"\" (referenced as \"" +
imp->path() +
"\") not found."
reportDeclarationError(
imp->location(),
"Import \"" + path + "\" (referenced as \"" + imp->path() + "\") not found."
);
error = true;
continue;
}
auto scope = m_scopes.find(_sourceUnits.at(path));
solAssert(scope != end(m_scopes), "");
if (!imp->symbolAliases().empty())
for (auto const& alias: imp->symbolAliases())
{
auto declarations = scope->second->resolveName(alias.first->name(), false);
if (declarations.empty())
{
reportDeclarationError(
imp->location(),
"Declaration \"" +
alias.first->name() +
"\" not found in \"" +
path +
"\" (referenced as \"" +
imp->path() +
"\")."
);
error = true;
}
else
for (Declaration const* declaration: declarations)
{
ASTString const* name = alias.second ? alias.second.get() : &declaration->name();
if (!target.registerDeclaration(*declaration, name))
{
reportDeclarationError(
imp->location(),
"Identifier \"" + *name + "\" already declared."
);
error = true;
}
}
}
else if (imp->name().empty())
{
auto scope = m_scopes.find(_sourceUnits.at(path));
solAssert(scope != end(m_scopes), "");
for (auto const& nameAndDeclaration: scope->second->declarations())
for (auto const& declaration: nameAndDeclaration.second)
target.registerDeclaration(*declaration, &nameAndDeclaration.first);
}
if (!target.registerDeclaration(*declaration, &nameAndDeclaration.first))
{
reportDeclarationError(
imp->location(),
"Identifier \"" + nameAndDeclaration.first + "\" already declared."
);
error = true;
}
}
return !error;
}