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

Extract referencedDeclaration as helper.

Browse Source
This commit is contained in:
chriseth
2021-03-24 17:01:50 +01:00
parent 13d3b35141
commit 99fcf62736
6 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/ast/ASTUtils.cpp
+9 -14
View File
@@ -28,26 +28,21 @@ bool isConstantVariableRecursive(VariableDeclaration const& _varDecl)
{
solAssert(_varDecl.isConstant(), "Constant variable expected");
auto referencedDeclaration = [&](Expression const* _e) -> VariableDeclaration const*
{
if (auto identifier = dynamic_cast<Identifier const*>(_e))
return dynamic_cast<VariableDeclaration const*>(identifier->annotation().referencedDeclaration);
else if (auto memberAccess = dynamic_cast<MemberAccess const*>(_e))
return dynamic_cast<VariableDeclaration const*>(memberAccess->annotation().referencedDeclaration);
return nullptr;
};
auto visitor = [&](VariableDeclaration const& _variable, util::CycleDetector<VariableDeclaration>& _cycleDetector, size_t _depth)
auto visitor = [](VariableDeclaration const& _variable, util::CycleDetector<VariableDeclaration>& _cycleDetector, size_t _depth)
{
solAssert(_depth < 256, "Recursion depth limit reached");
if (!_variable.value())
// This should result in an error later on.
return;
if (auto referencedVarDecl = referencedDeclaration(_variable.value().get()))
if (auto referencedVarDecl = dynamic_cast<VariableDeclaration const*>(
ASTNode::referencedDeclaration(*_variable.value()))
)
if (referencedVarDecl->isConstant())
if (_cycleDetector.run(*referencedVarDecl))
return;
_cycleDetector.run(*referencedVarDecl);
};
return util::CycleDetector<VariableDeclaration>(visitor).run(_varDecl);
return util::CycleDetector<VariableDeclaration>(visitor).run(_varDecl) != nullptr;
}
VariableDeclaration const* rootConstVariableDeclaration(VariableDeclaration const& _varDecl)