diff options
Diffstat (limited to 'libsolidity/ast')
| -rw-r--r-- | libsolidity/ast/Types.cpp | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp index e5a120ee..2e9b56a1 100644 --- a/libsolidity/ast/Types.cpp +++ b/libsolidity/ast/Types.cpp @@ -1044,12 +1044,14 @@ MemberList::MemberMap ContractType::nativeMembers(ContractDefinition const*) con } } else + { for (auto const& it: m_contract.interfaceFunctions()) members.push_back(MemberList::Member( it.second->declaration().name(), it.second->asMemberFunction(m_contract.isLibrary()), &it.second->declaration() )); + } return members; } @@ -1860,6 +1862,12 @@ MemberList::MemberMap TypeType::nativeMembers(ContractDefinition const* _current if (m_actualType->category() == Category::Contract) { ContractDefinition const& contract = dynamic_cast<ContractType const&>(*m_actualType).contractDefinition(); + bool isBase = false; + if (_currentScope != nullptr) + { + auto const& currentBases = _currentScope->annotation().linearizedBaseContracts; + isBase = (find(currentBases.begin(), currentBases.end(), &contract) != currentBases.end()); + } if (contract.isLibrary()) for (auto const& it: contract.interfaceFunctions()) members.push_back(MemberList::Member( @@ -1867,14 +1875,19 @@ MemberList::MemberMap TypeType::nativeMembers(ContractDefinition const* _current it.second->asMemberFunction(true), // use callcode &it.second->declaration() )); - else if (_currentScope != nullptr) + if (isBase) { - auto const& currentBases = _currentScope->annotation().linearizedBaseContracts; - if (find(currentBases.begin(), currentBases.end(), &contract) != currentBases.end()) - // We are accessing the type of a base contract, so add all public and protected - // members. Note that this does not add inherited functions on purpose. - for (Declaration const* decl: contract.inheritableMembers()) - members.push_back(MemberList::Member(decl->name(), decl->type(), decl)); + // We are accessing the type of a base contract, so add all public and protected + // members. Note that this does not add inherited functions on purpose. + for (Declaration const* decl: contract.inheritableMembers()) + members.push_back(MemberList::Member(decl->name(), decl->type(), decl)); + } + else + { + for (auto const& stru: contract.definedStructs()) + members.push_back(MemberList::Member(stru->name(), stru->type(), stru)); + for (auto const& enu: contract.definedEnums()) + members.push_back(MemberList::Member(enu->name(), enu->type(), enu)); } } else if (m_actualType->category() == Category::Enum) |