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

Allowing conversion from bytes to bytesNN in type checker.

Browse Source
This commit is contained in:
Djordje Mijovic 2021-03-04 08:52:17 +01:00
parent 15decd2413
commit b40c3bcc32
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsolidity/analysis/TypeChecker.cpp
View File

@ -1710,8 +1710,7 @@ Type const* TypeChecker::typeCheckTypeConversionAndRetrieveReturnType(
{ {
if (auto argArrayType = dynamic_cast<ArrayType const*>(argType)) if (auto argArrayType = dynamic_cast<ArrayType const*>(argType))
{ {
auto resultArrayType = dynamic_cast<ArrayType const*>(resultType); if (auto resultArrayType = dynamic_cast<ArrayType const*>(resultType))
solAssert(!!resultArrayType, "");
solAssert( solAssert(
argArrayType->location() != DataLocation::Storage || argArrayType->location() != DataLocation::Storage ||
( (
@ -1723,6 +1722,11 @@ Type const* TypeChecker::typeCheckTypeConversionAndRetrieveReturnType(
), ),
"Invalid explicit conversion to storage type." "Invalid explicit conversion to storage type."
); );
else
solAssert(
argArrayType->isByteArray() && !argArrayType->isString() && resultType->category() == Type::Category::FixedBytes,
""
);
} }
} }
else else

11
libsolidity/ast/Types.cpp
View File

@ -1570,9 +1570,9 @@ BoolResult ArrayType::isExplicitlyConvertibleTo(Type const& _convertTo) const
{ {
if (isImplicitlyConvertibleTo(_convertTo)) if (isImplicitlyConvertibleTo(_convertTo))
return true; return true;
// allow conversion bytes <-> string // allow conversion bytes <-> string and bytes -> bytesNN
if (_convertTo.category() != category()) if (_convertTo.category() != category())
return false; return isByteArray() && !isString() && _convertTo.category() == Type::Category::FixedBytes;
auto& convertTo = dynamic_cast<ArrayType const&>(_convertTo); auto& convertTo = dynamic_cast<ArrayType const&>(_convertTo);
if (convertTo.location() != location()) if (convertTo.location() != location())
return false; return false;
@ -1929,6 +1929,13 @@ BoolResult ArraySliceType::isImplicitlyConvertibleTo(Type const& _other) const
); );
} }
BoolResult ArraySliceType::isExplicitlyConvertibleTo(Type const& _convertTo) const
{
return
isImplicitlyConvertibleTo(_convertTo) ||
m_arrayType.isExplicitlyConvertibleTo(_convertTo);
}
string ArraySliceType::richIdentifier() const string ArraySliceType::richIdentifier() const
{ {
return m_arrayType.richIdentifier() + "_slice"; return m_arrayType.richIdentifier() + "_slice";

1
libsolidity/ast/Types.h
View File

@ -889,6 +889,7 @@ public:
Category category() const override { return Category::ArraySlice; } Category category() const override { return Category::ArraySlice; }
BoolResult isImplicitlyConvertibleTo(Type const& _other) const override; BoolResult isImplicitlyConvertibleTo(Type const& _other) const override;
BoolResult isExplicitlyConvertibleTo(Type const& _convertTo) const override;
std::string richIdentifier() const override; std::string richIdentifier() const override;
bool operator==(Type const& _other) const override; bool operator==(Type const& _other) const override;
unsigned calldataEncodedSize(bool) const override { solAssert(false, ""); } unsigned calldataEncodedSize(bool) const override { solAssert(false, ""); }