cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplifies zero-length check for fixed-size arrays.

Browse Source
This commit is contained in:
Erik Kundt 2018-09-22 03:07:12 +02:00
parent 13a5890cc3
commit e6d87e54c8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsolidity/analysis/ReferencesResolver.cpp
View File

@ -231,8 +231,6 @@ void ReferencesResolver::endVisit(Mapping const& _typeName)
void ReferencesResolver::endVisit(ArrayTypeName const& _typeName) void ReferencesResolver::endVisit(ArrayTypeName const& _typeName)
{ {
TypePointer baseType = _typeName.baseType().annotation().type; TypePointer baseType = _typeName.baseType().annotation().type;
auto arrayType = dynamic_cast<ArrayType const*>(baseType.get());
bool isFixedSizeArray = (arrayType && arrayType->isByteArray()) || !baseType->isDynamicallySized();
if (!baseType) if (!baseType)
{ {
solAssert(!m_errorReporter.errors().empty(), ""); solAssert(!m_errorReporter.errors().empty(), "");
@ -243,12 +241,14 @@ void ReferencesResolver::endVisit(ArrayTypeName const& _typeName)
if (Expression const* length = _typeName.length()) if (Expression const* length = _typeName.length())
{ {
TypePointer lengthTypeGeneric = length->annotation().type; TypePointer lengthTypeGeneric = length->annotation().type;
auto arrayType = dynamic_cast<ArrayType const*>(baseType.get());
bool isByteOrFixedSizeArray = (arrayType && arrayType->isByteArray()) || !baseType->isDynamicallySized();
if (!lengthTypeGeneric) if (!lengthTypeGeneric)
lengthTypeGeneric = ConstantEvaluator(m_errorReporter).evaluate(*length); lengthTypeGeneric = ConstantEvaluator(m_errorReporter).evaluate(*length);
RationalNumberType const* lengthType = dynamic_cast<RationalNumberType const*>(lengthTypeGeneric.get()); RationalNumberType const* lengthType = dynamic_cast<RationalNumberType const*>(lengthTypeGeneric.get());
if (!lengthType || !lengthType->mobileType()) if (!lengthType || !lengthType->mobileType())
fatalTypeError(length->location(), "Invalid array length, expected integer literal or constant expression."); fatalTypeError(length->location(), "Invalid array length, expected integer literal or constant expression.");
else if (lengthType->isZero() && isFixedSizeArray) else if (lengthType->isZero() && isByteOrFixedSizeArray)
fatalTypeError(length->location(), "Array with zero length specified."); fatalTypeError(length->location(), "Array with zero length specified.");
else if (lengthType->isFractional()) else if (lengthType->isFractional())
fatalTypeError(length->location(), "Array with fractional length specified."); fatalTypeError(length->location(), "Array with fractional length specified.");