cerc-io/solidity
16
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

ast, codegen: disallow conversion between different enum types

Browse Source
This commit is contained in:
Yoichi Hirai 2016-11-09 17:02:25 +01:00
parent 4b6e7e0677
commit 20c2ca3992
No known key found for this signature in database
GPG Key ID: E7B75D080FCF7992
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -8,6 +8,7 @@ Features:
Bugfixes: Bugfixes:
* Parser: disallow empty enum definitions. * Parser: disallow empty enum definitions.
* Type checker: disallow conversion between different enum types.
### 0.4.4 (2016-10-31) ### 0.4.4 (2016-10-31)

2
libsolidity/ast/Types.cpp
View File

@ -1585,7 +1585,7 @@ size_t EnumType::numberOfMembers() const
bool EnumType::isExplicitlyConvertibleTo(Type const& _convertTo) const bool EnumType::isExplicitlyConvertibleTo(Type const& _convertTo) const
{ {
return _convertTo.category() == category() || _convertTo.category() == Category::Integer; return _convertTo == *this || _convertTo.category() == Category::Integer;
} }
unsigned EnumType::memberValue(ASTString const& _member) const unsigned EnumType::memberValue(ASTString const& _member) const

2
libsolidity/codegen/CompilerUtils.cpp
View File

@ -348,7 +348,7 @@ void CompilerUtils::convertType(Type const& _typeOnStack, Type const& _targetTyp
} }
break; break;
case Type::Category::Enum: case Type::Category::Enum:
solAssert(targetTypeCategory == Type::Category::Integer || targetTypeCategory == Type::Category::Enum, ""); solAssert(_targetType == _typeOnStack || targetTypeCategory == Type::Category::Integer, "");
break; break;
case Type::Category::FixedPoint: case Type::Category::FixedPoint:
solAssert(false, "Not yet implemented - FixedPointType."); solAssert(false, "Not yet implemented - FixedPointType.");