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

Use user defined function return type as user defined operator type

Browse Source
This commit is contained in:
wechman 2022-07-06 09:17:59 +02:00
parent 58d19a51c6
commit 6482f5bb17
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/analysis/TypeChecker.cpp
View File

@ -1835,7 +1835,7 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
*userDefinedFunctionType->parameterTypes().at(0) == *userDefinedFunctionType->parameterTypes().at(0) ==
*userDefinedFunctionType->parameterTypes().at(1) *userDefinedFunctionType->parameterTypes().at(1)
); );
commonType = userDefinedFunctionType->parameterTypes().at(0); commonType = userDefinedFunctionType->returnParameterTypes().at(0);
} }
_operation.annotation().commonType = commonType; _operation.annotation().commonType = commonType;

2
libsolidity/codegen/ir/IRGeneratorForStatements.cpp
View File

@ -775,7 +775,7 @@ bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
{ {
setLocation(_binOp); setLocation(_binOp);
// TOOD make this nicer // TODO: make this nicer
if (_binOp.annotation().userDefinedFunction) if (_binOp.annotation().userDefinedFunction)
{ {
_binOp.leftExpression().accept(*this); _binOp.leftExpression().accept(*this);

2
libsolidity/parsing/Parser.cpp
View File

@ -990,7 +990,7 @@ ASTPointer<UsingForDirective> Parser::parseUsingDirective()
}; };
if (!util::contains(overridable, operator_)) if (!util::contains(overridable, operator_))
parserError( parserError(
1885_error, 4403_error,
("The operator " + string{TokenTraits::toString(operator_)} + " cannot be user-implemented. This is only possible for the following operators: ") + ("The operator " + string{TokenTraits::toString(operator_)} + " cannot be user-implemented. This is only possible for the following operators: ") +
util::joinHumanReadable(overridable | ranges::views::transform([](Token _t) { return string{TokenTraits::toString(_t)}; })) util::joinHumanReadable(overridable | ranges::views::transform([](Token _t) { return string{TokenTraits::toString(_t)}; }))
); );

8
test/libsolidity/syntaxTests/operators/custom/operator_not_user_implemented.sol
View File

@ -4,7 +4,7 @@ using {
} for int256; } for int256;
// ---- // ----
// ParserError 1885: (22-24): The operator << cannot be user-implemented. This is only possible for the following operators: |, &, ^, +, -, *, /, %, ==, !=, <, >, <=, >=, ~ // ParserError 4403: (22-24): The operator << cannot be user-implemented. This is only possible for the following operators: |, &, ^, +, -, *, /, %, ==, !=, <, >, <=, >=, ~
// ParserError 1885: (36-38): The operator >> cannot be user-implemented. This is only possible for the following operators: |, &, ^, +, -, *, /, %, ==, !=, <, >, <=, >=, ~ // ParserError 4403: (36-38): The operator >> cannot be user-implemented. This is only possible for the following operators: |, &, ^, +, -, *, /, %, ==, !=, <, >, <=, >=, ~
// ParserError 1885: (51-53): The operator ** cannot be user-implemented. This is only possible for the following operators: |, &, ^, +, -, *, /, %, ==, !=, <, >, <=, >=, ~ // ParserError 4403: (51-53): The operator ** cannot be user-implemented. This is only possible for the following operators: |, &, ^, +, -, *, /, %, ==, !=, <, >, <=, >=, ~
// ParserError 1885: (62-63): The operator ! cannot be user-implemented. This is only possible for the following operators: |, &, ^, +, -, *, /, %, ==, !=, <, >, <=, >=, ~ // ParserError 4403: (62-63): The operator ! cannot be user-implemented. This is only possible for the following operators: |, &, ^, +, -, *, /, %, ==, !=, <, >, <=, >=, ~