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

Add all path declarations in IdentifierPath annotation

Browse Source
This commit is contained in:
Marenz 2022-06-08 18:12:27 +02:00
parent c3ea86612e
commit 18784cff81
4 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libsolidity/analysis/NameAndTypeResolver.cpp
View File

@ -185,8 +185,18 @@ vector<Declaration const*> NameAndTypeResolver::nameFromCurrentScope(ASTString c
} }
Declaration const* NameAndTypeResolver::pathFromCurrentScope(vector<ASTString> const& _path) const Declaration const* NameAndTypeResolver::pathFromCurrentScope(vector<ASTString> const& _path) const
{
if (auto declarations = pathFromCurrentScopeWithAllDeclarations(_path); !declarations.empty())
return declarations.back();
return nullptr;
}
std::vector<Declaration const*> NameAndTypeResolver::pathFromCurrentScopeWithAllDeclarations(std::vector<ASTString> const& _path) const
{ {
solAssert(!_path.empty(), ""); solAssert(!_path.empty(), "");
vector<Declaration const*> pathDeclarations;
vector<Declaration const*> candidates = m_currentScope->resolveName( vector<Declaration const*> candidates = m_currentScope->resolveName(
_path.front(), _path.front(),
/* _recursive */ true, /* _recursive */ true,
@ -197,13 +207,19 @@ Declaration const* NameAndTypeResolver::pathFromCurrentScope(vector<ASTString> c
for (size_t i = 1; i < _path.size() && candidates.size() == 1; i++) for (size_t i = 1; i < _path.size() && candidates.size() == 1; i++)
{ {
if (!m_scopes.count(candidates.front())) if (!m_scopes.count(candidates.front()))
return nullptr; return {};
pathDeclarations.push_back(candidates.front());
candidates = m_scopes.at(candidates.front())->resolveName(_path[i], false); candidates = m_scopes.at(candidates.front())->resolveName(_path[i], false);
} }
if (candidates.size() == 1) if (candidates.size() == 1)
return candidates.front(); {
pathDeclarations.push_back(candidates.front());
return pathDeclarations;
}
else else
return nullptr; return {};
} }
void NameAndTypeResolver::warnHomonymDeclarations() const void NameAndTypeResolver::warnHomonymDeclarations() const

4
libsolidity/analysis/NameAndTypeResolver.h
View File

@ -93,6 +93,10 @@ public:
/// Should only be called during the initial resolving phase. /// Should only be called during the initial resolving phase.
/// @note Returns a null pointer if any component in the path was not unique or not found. /// @note Returns a null pointer if any component in the path was not unique or not found.
Declaration const* pathFromCurrentScope(std::vector<ASTString> const& _path) const; Declaration const* pathFromCurrentScope(std::vector<ASTString> const& _path) const;
/// Resolves a path starting from the "current" scope, but also searches parent scopes.
/// Should only be called during the initial resolving phase.
/// @note Returns an empty vector if any component in the path was not unique or not found otherwise all declarations along the path are returned.
std::vector<Declaration const*> pathFromCurrentScopeWithAllDeclarations(std::vector<ASTString> const& _path) const;
/// Generate and store warnings about declarations with the same name. /// Generate and store warnings about declarations with the same name.
void warnHomonymDeclarations() const; void warnHomonymDeclarations() const;

7
libsolidity/analysis/ReferencesResolver.cpp
View File

@ -173,14 +173,15 @@ void ReferencesResolver::endVisit(ModifierDefinition const&)
void ReferencesResolver::endVisit(IdentifierPath const& _path) void ReferencesResolver::endVisit(IdentifierPath const& _path)
{ {
Declaration const* declaration = m_resolver.pathFromCurrentScope(_path.path()); std::vector<Declaration const*> declarations = m_resolver.pathFromCurrentScopeWithAllDeclarations(_path.path());
if (!declaration) if (declarations.empty())
{ {
m_errorReporter.fatalDeclarationError(7920_error, _path.location(), "Identifier not found or not unique."); m_errorReporter.fatalDeclarationError(7920_error, _path.location(), "Identifier not found or not unique.");
return; return;
} }
_path.annotation().referencedDeclaration = declaration; _path.annotation().referencedDeclaration = declarations.back();
_path.annotation().pathDeclarations = std::move(declarations);
} }
bool ReferencesResolver::visit(InlineAssembly const& _inlineAssembly) bool ReferencesResolver::visit(InlineAssembly const& _inlineAssembly)

3
libsolidity/ast/ASTAnnotations.h
View File

@ -256,6 +256,9 @@ struct IdentifierPathAnnotation: ASTAnnotation
Declaration const* referencedDeclaration = nullptr; Declaration const* referencedDeclaration = nullptr;
/// What kind of lookup needs to be done (static, virtual, super) find the declaration. /// What kind of lookup needs to be done (static, virtual, super) find the declaration.
util::SetOnce<VirtualLookup> requiredLookup; util::SetOnce<VirtualLookup> requiredLookup;
/// Declaration of each path element.
std::vector<Declaration const*> pathDeclarations;
}; };
struct ExpressionAnnotation: ASTAnnotation struct ExpressionAnnotation: ASTAnnotation