Avoid switch fallthrough in ExpressionCompiler

This commit is contained in:
Alex Beregszaszi 2017-09-19 19:02:16 +01:00
parent 3e5d81578a
commit 74972f5fa6

View File

@ -1014,8 +1014,11 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
switch (_memberAccess.expression().annotation().type->category())
{
case Type::Category::Contract:
case Type::Category::Integer:
{
bool alsoSearchInteger = false;
if (_memberAccess.expression().annotation().type->category() == Type::Category::Contract)
{
ContractType const& type = dynamic_cast<ContractType const&>(*_memberAccess.expression().annotation().type);
if (type.isSuper())
{
@ -1044,11 +1047,13 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
// not found in contract, search in members inherited from address
alsoSearchInteger = true;
}
}
else
alsoSearchInteger = true;
if (!alsoSearchInteger)
break;
}
// fall-through
case Type::Category::Integer:
if (member == "balance")
{
utils().convertType(
@ -1067,6 +1072,7 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
else
solAssert(false, "Invalid member access to integer");
break;
}
case Type::Category::Function:
if (member == "selector")
{