Add structs and enums to contract types.

This commit is contained in:
chriseth
2015-12-18 16:50:14 +01:00
parent 938ed70935
commit 54e3637d23
4 changed files with 59 additions and 14 deletions
+9 -7
View File
@@ -913,14 +913,16 @@ void ExpressionCompiler::endVisit(MemberAccess const& _memberAccess)
if (dynamic_cast<ContractType const*>(type.actualType().get()))
{
auto const& funType = dynamic_cast<FunctionType const&>(*_memberAccess.annotation().type);
if (funType.location() != FunctionType::Location::Internal)
m_context << funType.externalIdentifier();
else
if (auto funType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type.get()))
{
auto const* function = dynamic_cast<FunctionDefinition const*>(_memberAccess.annotation().referencedDeclaration);
solAssert(!!function, "Function not found in member access");
m_context << m_context.functionEntryLabel(*function).pushTag();
if (funType->location() != FunctionType::Location::Internal)
m_context << funType->externalIdentifier();
else
{
auto const* function = dynamic_cast<FunctionDefinition const*>(_memberAccess.annotation().referencedDeclaration);
solAssert(!!function, "Function not found in member access");
m_context << m_context.functionEntryLabel(*function).pushTag();
}
}
}
else if (auto enumType = dynamic_cast<EnumType const*>(type.actualType().get()))