From a5f0caa17817bb165f28fc45380ed264725b1252 Mon Sep 17 00:00:00 2001 From: Khan M Rashedun-Naby Date: Fri, 15 Jun 2018 00:19:36 +0600 Subject: Simplification of typeSupportedByOldABIEncoder --- libsolidity/analysis/TypeChecker.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'libsolidity') diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index 671e4030..c19ca76d 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -41,15 +41,13 @@ bool typeSupportedByOldABIEncoder(Type const& _type) { if (_type.dataStoredIn(DataLocation::Storage)) return true; - else if (_type.category() == Type::Category::Struct) + if (_type.category() == Type::Category::Struct) return false; - else if (_type.category() == Type::Category::Array) + if (_type.category() == Type::Category::Array) { auto const& arrayType = dynamic_cast(_type); auto base = arrayType.baseType(); - if (!typeSupportedByOldABIEncoder(*base)) - return false; - else if (base->category() == Type::Category::Array && base->isDynamicallySized()) + if (!typeSupportedByOldABIEncoder(*base) || (base->category() == Type::Category::Array && base->isDynamicallySized())) return false; } return true; -- cgit