Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-16 23:34:10 +02:00
Code Activity

Fixed fallthrough inside 'if' or another break scope

Browse source
This commit is contained in:
Brian Fiete 2022-04-16 13:40:30 -07:00
parent a3cae3d674
commit 69fbaf670d
1 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

32
IDEHelper/Compiler/BfStmtEvaluator.cpp
View file

@ -5362,7 +5362,7 @@ void BfModule::Visit(BfContinueStatement* continueStmt)
// Our mixin may just require that we're injected into a breakable scope // Our mixin may just require that we're injected into a breakable scope
} }
else else
Fail("'Continue' not applicable in this block", continueStmt); Fail("'continue' not applicable in this block", continueStmt);
return; return;
} }
@ -5417,12 +5417,36 @@ void BfModule::Visit(BfContinueStatement* continueStmt)
void BfModule::Visit(BfFallthroughStatement* fallthroughStmt) void BfModule::Visit(BfFallthroughStatement* fallthroughStmt)
{ {
UpdateSrcPos(fallthroughStmt); UpdateSrcPos(fallthroughStmt);
if ((mCurMethodState->mBreakData == NULL) || (!mCurMethodState->mBreakData->mIRFallthroughBlock)) BfBreakData* breakData = mCurMethodState->mBreakData;
while (breakData != NULL)
{ {
Fail("'Fallthrough' not applicable in this block", fallthroughStmt); if (breakData->mIRFallthroughBlock)
break;
breakData = breakData->mPrevBreakData;
}
if (mCurMethodState->mInDeferredBlock)
{
auto checkScope = mCurMethodState->mCurScope;
while (checkScope != NULL)
{
if (checkScope == breakData->mScope)
break;
if (checkScope->mIsDeferredBlock)
{
Fail("The fallthrough crosses a deferred block boundary", fallthroughStmt);
return;
}
checkScope = checkScope->mPrevScope;
}
}
if (breakData == NULL)
{
Fail("'fallthrough' not applicable in this block", fallthroughStmt);
return; return;
} }
EmitDeferredScopeCalls(true, mCurMethodState->mBreakData->mScope, mCurMethodState->mBreakData->mIRFallthroughBlock); EmitDeferredScopeCalls(true, breakData->mScope, breakData->mIRFallthroughBlock);
mCurMethodState->mLeftBlockUncond = true; // Not really a return, but handled the same way mCurMethodState->mLeftBlockUncond = true; // Not really a return, but handled the same way
if (mCurMethodState->mDeferredLocalAssignData != NULL) if (mCurMethodState->mDeferredLocalAssignData != NULL)
mCurMethodState->mDeferredLocalAssignData->mHadFallthrough = true; mCurMethodState->mDeferredLocalAssignData->mHadFallthrough = true;