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

Merge pull request #4342 from rnaby/l/a/Types

Browse Source 
RationalNumberType::isImplicitlyConvertibleTo Refactor
This commit is contained in:
chriseth 2018-06-26 17:54:09 +02:00 committed by GitHub
commit 503eb8caa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libsolidity/ast/Types.cpp
View File

@ -856,7 +856,9 @@ tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal
bool RationalNumberType::isImplicitlyConvertibleTo(Type const& _convertTo) const bool RationalNumberType::isImplicitlyConvertibleTo(Type const& _convertTo) const
{ {
if (_convertTo.category() == Category::Integer) switch (_convertTo.category())
{
case Category::Integer:
{ {
if (isFractional()) if (isFractional())
return false; return false;
@ -870,31 +872,33 @@ bool RationalNumberType::isImplicitlyConvertibleTo(Type const& _convertTo) const
{ {
if (m_value.numerator() <= (u256(-1) >> (256 - targetType.numBits() + forSignBit))) if (m_value.numerator() <= (u256(-1) >> (256 - targetType.numBits() + forSignBit)))
return true; return true;
return false;
}
if (targetType.isSigned())
{
if (-m_value.numerator() <= (u256(1) << (targetType.numBits() - forSignBit)))
return true;
} }
else if (targetType.isSigned() && -m_value.numerator() <= (u256(1) << (targetType.numBits() - forSignBit)))
return true;
return false; return false;
} }
else if (_convertTo.category() == Category::FixedPoint) case Category::FixedPoint:
{ {
if (auto fixed = fixedPointType()) if (auto fixed = fixedPointType())
return fixed->isImplicitlyConvertibleTo(_convertTo); return fixed->isImplicitlyConvertibleTo(_convertTo);
else return false;
return false;
} }
else if (_convertTo.category() == Category::FixedBytes) case Category::FixedBytes:
{ {
FixedBytesType const& fixedBytes = dynamic_cast<FixedBytesType const&>(_convertTo); FixedBytesType const& fixedBytes = dynamic_cast<FixedBytesType const&>(_convertTo);
if (!isFractional()) if (isFractional())
{
if (integerType())
return fixedBytes.numBytes() * 8 >= integerType()->numBits();
return false;
}
else
return false; return false;
if (integerType())
return fixedBytes.numBytes() * 8 >= integerType()->numBits();
return false;
}
default:
return false;
} }
return false;
} }
bool RationalNumberType::isExplicitlyConvertibleTo(Type const& _convertTo) const bool RationalNumberType::isExplicitlyConvertibleTo(Type const& _convertTo) const