aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
diff options
context:
space:
mode:
Diffstat (limited to 'libsolidity')
-rw-r--r--libsolidity/analysis/TypeChecker.cpp30
-rw-r--r--libsolidity/ast/Types.cpp2
2 files changed, 26 insertions, 6 deletions
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 9846a0d0..1748b518 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -34,6 +34,29 @@ using namespace std;
using namespace dev;
using namespace dev::solidity;
+namespace
+{
+
+bool typeSupportedByOldABIEncoder(Type const& _type)
+{
+ if (_type.dataStoredIn(DataLocation::Storage))
+ return true;
+ else if (_type.category() == Type::Category::Struct)
+ return false;
+ else if (_type.category() == Type::Category::Array)
+ {
+ auto const& arrayType = dynamic_cast<ArrayType const&>(_type);
+ auto base = arrayType.baseType();
+ if (!typeSupportedByOldABIEncoder(*base))
+ return false;
+ else if (base->category() == Type::Category::Array && base->isDynamicallySized())
+ return false;
+ }
+ return true;
+}
+
+}
+
bool TypeChecker::checkTypeRequirements(ASTNode const& _contract)
{
@@ -561,13 +584,12 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
m_errorReporter.fatalTypeError(var->location(), "Internal or recursive type is not allowed for public or external functions.");
if (
_function.visibility() > FunctionDefinition::Visibility::Internal &&
- type(*var)->category() == Type::Category::Struct &&
- !type(*var)->dataStoredIn(DataLocation::Storage) &&
- !_function.sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::ABIEncoderV2)
+ !_function.sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::ABIEncoderV2) &&
+ !typeSupportedByOldABIEncoder(*type(*var))
)
m_errorReporter.typeError(
var->location(),
- "Structs are only supported in the new experimental ABI encoder. "
+ "This type is only supported in the new experimental ABI encoder. "
"Use \"pragma experimental ABIEncoderV2;\" to enable the feature."
);
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 771ae643..6a9707f3 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -1589,8 +1589,6 @@ bool ArrayType::canBeUsedExternally(bool _inLibrary) const
return true;
else if (!m_baseType->canBeUsedExternally(_inLibrary))
return false;
- else if (m_baseType->category() == Category::Array && m_baseType->isDynamicallySized())
- return false;
else
return true;
}