From 87405f3387de730f33846ea80484ad00eb77a596 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Fri, 24 Jan 2025 08:21:07 -0800 Subject: [PATCH] Fix for external break in mixin declaration --- IDEHelper/Compiler/BfModule.cpp | 1 + IDEHelper/Compiler/BfStmtEvaluator.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/IDEHelper/Compiler/BfModule.cpp b/IDEHelper/Compiler/BfModule.cpp index 364633cc..7b888eb6 100644 --- a/IDEHelper/Compiler/BfModule.cpp +++ b/IDEHelper/Compiler/BfModule.cpp @@ -16293,6 +16293,7 @@ BfScopeData* BfModule::FindScope(BfAstNode* scopeName, BfMixinState* fromMixinSt if (!inMixinDecl) Fail(StrFormat("Unable to locate label '%s'", findLabel.c_str()), scopeName); + return NULL; } if (auto scopeNode = BfNodeDynCast(scopeName)) diff --git a/IDEHelper/Compiler/BfStmtEvaluator.cpp b/IDEHelper/Compiler/BfStmtEvaluator.cpp index c7c0eb43..d4af5cd5 100644 --- a/IDEHelper/Compiler/BfStmtEvaluator.cpp +++ b/IDEHelper/Compiler/BfStmtEvaluator.cpp @@ -5608,7 +5608,7 @@ void BfModule::Visit(BfContinueStatement* continueStmt) breakData = FindBreakData(continueStmt->mLabel); if ((breakData != NULL) && (!breakData->mIRContinueBlock)) { - Fail(StrFormat("'continue' not applicable in '%s", continueStmt->mLabel->ToString().c_str()), continueStmt); + Fail(StrFormat("'continue' not applicable in '%s'", continueStmt->mLabel->ToString().c_str()), continueStmt); return; } }