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

[TMP] More granular type errors for suffix parameter mismatch

Browse Source
This commit is contained in:
Kamil Śliwak 2022-07-07 20:18:19 +02:00
parent 155c93580f
commit 1cf0ab1b04
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libsolidity/analysis/TypeChecker.cpp
View File

@ -3748,10 +3748,20 @@ void TypeChecker::endVisit(Literal const& _literal)
else else
{ {
FunctionType const& functionType = dynamic_cast<FunctionType const&>(*declaration->type()); FunctionType const& functionType = dynamic_cast<FunctionType const&>(*declaration->type());
if ( auto const* rationalType = dynamic_cast<RationalNumberType const*>(type);
dynamic_cast<RationalNumberType const*>(type) &&
dynamic_cast<RationalNumberType const*>(type)->isFractional() optional<string> parameterCountMessage;
) if (functionType.parameterTypes().size() == 0)
parameterCountMessage = "Functions that take no arguments cannot be used as literal suffixes.";
else if (functionType.parameterTypes().size() >= 3)
parameterCountMessage = "Functions that take 3 or more arguments cannot be used as literal suffixes.";
else if (functionType.parameterTypes().size() == 2 && !rationalType->isFractional())
parameterCountMessage = "Functions that take 2 arguments can only be used as literal suffixes for fractional numbers.";
optional<string> parameterTypeMessage;
if (parameterCountMessage.has_value())
m_errorReporter.typeError(4778_error, _literal.location(), parameterCountMessage.value());
else if (functionType.parameterTypes().size() == 2)
{ {
auto&& [mantissa, exponent] = dynamic_cast<RationalNumberType const*>(type)->mantissaExponent(); auto&& [mantissa, exponent] = dynamic_cast<RationalNumberType const*>(type)->mantissaExponent();
solAssert((mantissa && exponent) || (!mantissa && !exponent)); solAssert((mantissa && exponent) || (!mantissa && !exponent));
@ -3763,26 +3773,17 @@ void TypeChecker::endVisit(Literal const& _literal)
"that fit the range of parameters of the suffix function." "that fit the range of parameters of the suffix function."
); );
else if ( else if (
functionType.parameterTypes().size() != 2 ||
!mantissa->isImplicitlyConvertibleTo(*functionType.parameterTypes().at(0)) || !mantissa->isImplicitlyConvertibleTo(*functionType.parameterTypes().at(0)) ||
!exponent->isImplicitlyConvertibleTo(*functionType.parameterTypes().at(1)) !exponent->isImplicitlyConvertibleTo(*functionType.parameterTypes().at(1))
) )
m_errorReporter.typeError( // TODO: Is this triggered when the argument is out of range? Test.
4778_error, parameterTypeMessage = "The type of the literal cannot be converted to the parameters of the suffix function.";
_literal.location(),
"TODO Fractional number, types to do match."
);
} }
else else if (!type->isImplicitlyConvertibleTo(*functionType.parameterTypes().front()))
if ( parameterTypeMessage = "The type of the literal cannot be converted to the parameter of the suffix function.";
functionType.parameterTypes().size() != 1 ||
!type->isImplicitlyConvertibleTo(*functionType.parameterTypes().front()) if (parameterTypeMessage.has_value())
) m_errorReporter.typeError(8838_error, _literal.location(), parameterTypeMessage.value());
m_errorReporter.typeError(
8838_error,
_literal.location(),
"The type of the literal cannot be converted to the parameter of the suffix function."
);
isPure = functionType.isPure(); isPure = functionType.isPure();
if (functionType.returnParameterTypes().size() == 1) if (functionType.returnParameterTypes().size() == 1)