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

More descriptive error message in TypeChecker::visit(UnaryOperation)

Browse Source
This commit is contained in:
wechman 2022-08-01 11:25:21 +02:00
parent e001f8346b
commit 6fcd717ab4
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libsolidity/analysis/TypeChecker.cpp
View File

@ -1731,24 +1731,24 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
// Check if the operator is built-in or user-defined. // Check if the operator is built-in or user-defined.
FunctionDefinition const* userDefinedOperator = subExprType->userDefinedOperator( Result<FunctionDefinition const*> userDefinedOperatorResult = subExprType->userDefinedOperator(
_operation.getOperator(), _operation.getOperator(),
*currentDefinitionScope(), *currentDefinitionScope(),
true // _unaryOperation true // _unaryOperation
); );
_operation.annotation().userDefinedFunction = userDefinedOperator; _operation.annotation().userDefinedFunction = userDefinedOperatorResult;
FunctionType const* userDefinedFunctionType = nullptr; FunctionType const* userDefinedFunctionType = nullptr;
if (userDefinedOperator) if (userDefinedOperatorResult)
userDefinedFunctionType = &dynamic_cast<FunctionType const&>( userDefinedFunctionType = &dynamic_cast<FunctionType const&>(
userDefinedOperator->libraryFunction() ? userDefinedOperatorResult.get()->libraryFunction() ?
*userDefinedOperator->typeViaContractName() : *userDefinedOperatorResult.get()->typeViaContractName() :
*userDefinedOperator->type() *userDefinedOperatorResult.get()->type()
); );
TypeResult builtinResult = subExprType->unaryOperatorResult(op); TypeResult builtinResult = subExprType->unaryOperatorResult(op);
solAssert(!builtinResult || !userDefinedOperator); solAssert(!builtinResult || !userDefinedOperatorResult);
if (userDefinedOperator) if (userDefinedOperatorResult)
{ {
solAssert(userDefinedFunctionType->parameterTypes().size() == 1); solAssert(userDefinedFunctionType->parameterTypes().size() == 1);
solAssert(userDefinedFunctionType->returnParameterTypes().size() == 1); solAssert(userDefinedFunctionType->returnParameterTypes().size() == 1);
@ -1762,7 +1762,10 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
_operation.annotation().type = builtinResult; _operation.annotation().type = builtinResult;
else else
{ {
string description = "Unary operator " + string(TokenTraits::toString(op)) + " cannot be applied to type " + subExprType->humanReadableName() + "." + (!builtinResult.message().empty() ? " " + builtinResult.message() : ""); string description =
"Unary operator " + string(TokenTraits::toString(op)) + " cannot be applied to type " + subExprType->humanReadableName() + "." +
(!builtinResult.message().empty() ? " " + builtinResult.message() : "") +
(!userDefinedOperatorResult.message().empty() ? " " + userDefinedOperatorResult.message() : "");
if (modifying) if (modifying)
// Cannot just report the error, ignore the unary operator, and continue, // Cannot just report the error, ignore the unary operator, and continue,
// because the sub-expression was already processed with requireLValue() // because the sub-expression was already processed with requireLValue()

2
test/libsolidity/syntaxTests/operators/custom/operator_invalid_return_parameters.sol
View File

@ -44,6 +44,6 @@ function f() pure {
// TypeError 7995: (90-92): The function "lt" needs to return exactly one value of type bool to be used for the operator <. // TypeError 7995: (90-92): The function "lt" needs to return exactly one value of type bool to be used for the operator <.
// TypeError 2271: (492-517): Operator + not compatible with types Int and Int. No matching user-defined operator found. // TypeError 2271: (492-517): Operator + not compatible with types Int and Int. No matching user-defined operator found.
// TypeError 2271: (523-548): Operator / not compatible with types Int and Int. No matching user-defined operator found. // TypeError 2271: (523-548): Operator / not compatible with types Int and Int. No matching user-defined operator found.
// TypeError 4907: (554-566): Unary operator - cannot be applied to type Int // TypeError 4907: (554-566): Unary operator - cannot be applied to type Int. No matching user-defined operator found.
// TypeError 2271: (572-597): Operator < not compatible with types Int and Int. No matching user-defined operator found. // TypeError 2271: (572-597): Operator < not compatible with types Int and Int. No matching user-defined operator found.
// TypeError 2271: (603-628): Operator > not compatible with types Int and Int. No matching user-defined operator found. // TypeError 2271: (603-628): Operator > not compatible with types Int and Int. No matching user-defined operator found.

2
test/libsolidity/syntaxTests/operators/custom/unary_operator_attached_to_two_arguments_function.sol → test/libsolidity/syntaxTests/operators/custom/unary_operator_attached_to_two_argument_function.sol
View File

@ -15,4 +15,4 @@ contract C {
// ---- // ----
// TypeError 1147: (32-38): The function "bitnot" needs to have exactly one parameter to be used for the operator ~. // TypeError 1147: (32-38): The function "bitnot" needs to have exactly one parameter to be used for the operator ~.
// TypeError 4907: (186-198): Unary operator ~ cannot be applied to type Int // TypeError 4907: (186-198): Unary operator ~ cannot be applied to type Int. No matching user-defined operator found.