Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 19:48:20 +02:00
Code Activity

Fixed binary operator selection issues

Browse source
This commit is contained in:
Brian Fiete 2021-01-22 06:41:41 -08:00
parent 9df5442a37
commit 2ee2860994
2 changed files with 104 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -20796,7 +20796,7 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
if ((leftValue.mValue.IsConst()) && (rightValue.mValue.IsConst()))
skipOpOverload = true;
}
if (!skipOpOverload)
{
BfBinaryOp findBinaryOp = binaryOp;
@ -20843,7 +20843,7 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
break;
bool foundExactMatch = false;
Array<BfOperatorDef*> oppositeOperatorDefs;
SizedArray<BfOperatorDef*, 8> oppositeOperatorDefs;
for (auto operatorDef : checkType->mTypeDef->mOperators)
{
@ -21135,10 +21135,19 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
if (pass == 1)
break;
findBinaryOp = BfGetFlippedBinaryOp(findBinaryOp);
if (findBinaryOp == BfBinaryOp_None)
break;
auto flippedBinaryOp = BfGetFlippedBinaryOp(findBinaryOp);
if (flippedBinaryOp != BfBinaryOp_None)
findBinaryOp = flippedBinaryOp;
}
auto prevResultType = resultType;
if (leftValue.mType->IsPrimitiveType())
resultType = leftValue.mType;
if (rightValue.mType->IsPrimitiveType())
resultType = rightValue.mType;
if ((prevResultType->IsTypedPrimitive()) && (resultType->IsPrimitiveType()))
explicitCast = true;
}
}