From 20d51e0929e5d732395d0d14280d9868fca1fa58 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Fri, 22 Jan 2021 07:38:46 -0800 Subject: [PATCH] Fixed primitive conversion in binary op --- IDEHelper/Compiler/BfExprEvaluator.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/IDEHelper/Compiler/BfExprEvaluator.cpp b/IDEHelper/Compiler/BfExprEvaluator.cpp index 2e3e2732..e67f4e2c 100644 --- a/IDEHelper/Compiler/BfExprEvaluator.cpp +++ b/IDEHelper/Compiler/BfExprEvaluator.cpp @@ -21141,13 +21141,10 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod } auto prevResultType = resultType; - if (leftValue.mType->IsPrimitiveType()) + if ((leftValue.mType->IsPrimitiveType()) && (!rightValue.mType->IsTypedPrimitive())) resultType = leftValue.mType; - if (rightValue.mType->IsPrimitiveType()) + if ((rightValue.mType->IsPrimitiveType()) && (!leftValue.mType->IsTypedPrimitive())) resultType = rightValue.mType; - - if ((prevResultType->IsTypedPrimitive()) && (resultType->IsPrimitiveType())) - explicitCast = true; } }