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

getInheritableMembers() does not look at BaseContracts

Browse Source 
- Also adding tests for improper accessing members of other contracts.
This commit is contained in:
Lefteris Karapetsas 2015-02-28 18:30:33 +01:00
parent efe8f9f8a0
commit bbaa9fef6c
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
AST.cpp
View File

@ -215,26 +215,23 @@ vector<ASTPointer<Declaration>> const& ContractDefinition::getInheritableMembers
{ {
set<string> memberSeen; set<string> memberSeen;
m_inheritableMembers.reset(new vector<ASTPointer<Declaration>>()); m_inheritableMembers.reset(new vector<ASTPointer<Declaration>>());
for (ContractDefinition const* contract: getLinearizedBaseContracts()) auto addInheritableMember = [&](ASTPointer<Declaration> const& _decl)
{ {
auto addInheritableMember = [&](ASTPointer<Declaration> const& _decl) if (memberSeen.count(_decl->getName()) == 0 && _decl->isVisibleInDerivedContracts())
{ {
if (memberSeen.count(_decl->getName()) == 0 && _decl->isVisibleInDerivedContracts()) memberSeen.insert(_decl->getName());
{ m_inheritableMembers->push_back(_decl);
memberSeen.insert(_decl->getName()); }
m_inheritableMembers->push_back(_decl); };
}
};
for (ASTPointer<FunctionDefinition> const& f: contract->getDefinedFunctions()) for (ASTPointer<FunctionDefinition> const& f: getDefinedFunctions())
addInheritableMember(f); addInheritableMember(f);
for (ASTPointer<VariableDeclaration> const& v: contract->getStateVariables()) for (ASTPointer<VariableDeclaration> const& v: getStateVariables())
addInheritableMember(v); addInheritableMember(v);
for (ASTPointer<StructDefinition> const& s: contract->getDefinedStructs()) for (ASTPointer<StructDefinition> const& s: getDefinedStructs())
addInheritableMember(s); addInheritableMember(s);
}
} }
return *m_inheritableMembers; return *m_inheritableMembers;
} }