From 90d4b84d955a9a73b7bd57e8ddd28b93203ae642 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Thu, 24 Dec 2020 12:37:54 -0800 Subject: [PATCH] Fixed constant string adding --- IDEHelper/Compiler/BfExprEvaluator.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/IDEHelper/Compiler/BfExprEvaluator.cpp b/IDEHelper/Compiler/BfExprEvaluator.cpp index 0ef22245..4c2d13e5 100644 --- a/IDEHelper/Compiler/BfExprEvaluator.cpp +++ b/IDEHelper/Compiler/BfExprEvaluator.cpp @@ -20002,6 +20002,13 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod } } + if ((binaryOp == BfBinaryOp_Add) && (resultType->IsInstanceOf(mModule->mCompiler->mStringTypeDef))) + { + // Allow failover to constant string addition + if ((leftValue.mValue.IsConst()) && (rightValue.mValue.IsConst())) + skipOpOverload = true; + } + if (!skipOpOverload) { BfBinaryOp findBinaryOp = binaryOp;