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

Added function definition as secondary location in error msgs

Browse Source
This commit is contained in:
Matheus Aguiar 2023-03-08 15:30:03 -03:00 committed by Kamil Śliwak
parent 4adfb76467
commit 996db9f266
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libsolidity/analysis/TypeChecker.cpp
View File

@ -3993,11 +3993,25 @@ void TypeChecker::endVisit(Literal const& _literal)
suffixFunctionType->hasBoundFirstArgument() || suffixFunctionType->hasBoundFirstArgument() ||
!_literal.suffixFunction()->usableAsSuffix() !_literal.suffixFunction()->usableAsSuffix()
) )
{
auto suffixDefinitionLocation = SecondarySourceLocation{};
if (
suffixFunctionType &&
suffixFunctionType->hasDeclaration() &&
dynamic_cast<Declaration const*>(&suffixFunctionType->declaration())
)
suffixDefinitionLocation.append(
"Suffix defined here:",
dynamic_cast<Declaration const*>(&suffixFunctionType->declaration())->location()
);
m_errorReporter.typeError( m_errorReporter.typeError(
4438_error, 4438_error,
_literal.location(), _literal.location(),
suffixDefinitionLocation,
"The literal suffix must be either a subdenomination or a file-level suffix function." "The literal suffix must be either a subdenomination or a file-level suffix function."
); );
}
else else
{ {
solAssert(_literal.suffixFunction()); solAssert(_literal.suffixFunction());
@ -4015,6 +4029,10 @@ void TypeChecker::endVisit(Literal const& _literal)
m_errorReporter.typeError( m_errorReporter.typeError(
2505_error, 2505_error,
_literal.location(), _literal.location(),
SecondarySourceLocation().append(
"Suffix function defined here:",
dynamic_cast<FunctionDefinition const*>(&suffixFunctionType->declaration())->parameterList().location()
),
"Functions that take 2 arguments can only be used as literal suffixes for rational numbers." "Functions that take 2 arguments can only be used as literal suffixes for rational numbers."
); );
else else
@ -4040,7 +4058,15 @@ void TypeChecker::endVisit(Literal const& _literal)
solAssert(m_errorReporter.hasErrors()); solAssert(m_errorReporter.hasErrors());
if (parameterTypeMessage.has_value()) if (parameterTypeMessage.has_value())
m_errorReporter.typeError(8838_error, _literal.location(), parameterTypeMessage.value()); m_errorReporter.typeError(
8838_error,
_literal.location(),
SecondarySourceLocation().append(
"Suffix function defined here:",
dynamic_cast<FunctionDefinition const*>(&suffixFunctionType->declaration())->parameterList().location()
),
parameterTypeMessage.value()
);
if (suffixFunctionType->returnParameterTypes().size() == 1) if (suffixFunctionType->returnParameterTypes().size() == 1)
_literal.annotation().type = suffixFunctionType->returnParameterTypes().front(); _literal.annotation().type = suffixFunctionType->returnParameterTypes().front();