cerc-io/solidity
11
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

Add userDefinedFunctionType helper function

Browse Source
This commit is contained in:
wechman
2022-09-28 13:09:30 +02:00
parent 577a5bb7a4
commit 5cf88593fd
5 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/analysis/TypeChecker.cpp
+8 -21
View File
@@ -1740,14 +1740,7 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
if (userDefinedOperatorResult)
_operation.annotation().userDefinedFunction = userDefinedOperatorResult;
FunctionType const* userDefinedFunctionType = nullptr;
if (userDefinedOperatorResult)
userDefinedFunctionType = &dynamic_cast<FunctionType const&>(
userDefinedOperatorResult.get()->libraryFunction() ?
*userDefinedOperatorResult.get()->typeViaContractName() :
*userDefinedOperatorResult.get()->type()
);
FunctionType const* userDefinedFunctionType = _operation.userDefinedFunctionType();
TypeResult builtinResult = subExprType->unaryOperatorResult(op);
solAssert(!builtinResult || !userDefinedOperatorResult);
@@ -1790,20 +1783,14 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
_operation.annotation().isConstant = false;
// Check if the operator is built-in or user-defined.
Result<FunctionDefinition const*> userDefinedOperatorResult = leftType->operatorDefinition(
Result<FunctionDefinition const*> operatorDefinitionResult = leftType->operatorDefinition(
_operation.getOperator(),
*currentDefinitionScope(),
false // _unaryOperation
);
if (userDefinedOperatorResult)
_operation.annotation().userDefinedFunction = userDefinedOperatorResult;
FunctionType const* userDefinedFunctionType = nullptr;
if (userDefinedOperatorResult)
userDefinedFunctionType = &dynamic_cast<FunctionType const&>(
userDefinedOperatorResult.get()->libraryFunction() ?
*userDefinedOperatorResult.get()->typeViaContractName() :
*userDefinedOperatorResult.get()->type()
);
if (operatorDefinitionResult)
_operation.annotation().userDefinedFunction = operatorDefinitionResult;
FunctionType const* userDefinedFunctionType = _operation.userDefinedFunctionType();
_operation.annotation().isPure =
*_operation.leftExpression().annotation().isPure &&
*_operation.rightExpression().annotation().isPure &&
@@ -1812,12 +1799,12 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
TypeResult builtinResult = leftType->binaryOperatorResult(_operation.getOperator(), rightType);
// Either the operator is user-defined or built-in.
solAssert(!userDefinedOperatorResult || !builtinResult);
solAssert(!operatorDefinitionResult || !builtinResult);
Type const* commonType = leftType;
if (builtinResult)
commonType = builtinResult.get();
else if (userDefinedOperatorResult)
else if (operatorDefinitionResult)
{
Type const* normalizedParameterType = userDefinedFunctionType->parameterTypes().at(0);
Type const* normalizedLeftType = leftType;
@@ -1860,7 +1847,7 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
" and " +
rightType->humanReadableName() + "." +
(!builtinResult.message().empty() ? " " + builtinResult.message() : "") +
(!userDefinedOperatorResult.message().empty() ? " " + userDefinedOperatorResult.message() : "")
(!operatorDefinitionResult.message().empty() ? " " + operatorDefinitionResult.message() : "")
);
_operation.annotation().commonType = commonType;