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

Added support for "case when" (valueless) switch cases

Browse source
This commit is contained in:
Brian Fiete 2020-02-23 06:14:14 -08:00
parent 3fd81fc966
commit 857c1c384a
5 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
IDEHelper/Compiler/BfReducer.cpp
View file

@ -3264,11 +3264,15 @@ BfSwitchStatement* BfReducer::CreateSwitchStatement(BfTokenNode* tokenNode)
{
auto nextNode = mVisitorPos.GetNext();
whenToken = BfNodeDynCast<BfTokenNode>(nextNode);
if ((whenToken != NULL) && (whenToken->GetToken() != BfToken_When))
if ((whenToken != NULL) && (whenToken->GetToken() == BfToken_When))
{
mVisitorPos.MoveNext();
}
else
whenToken = NULL;
}
if (whenToken != NULL)
{
{
auto whenExpr = mAlloc->Alloc<BfWhenExpression>();
whenExpr->mWhenToken = whenToken;
ReplaceNode(whenToken, whenExpr);

14
IDEHelper/Compiler/BfStmtEvaluator.cpp
View file

@ -4397,6 +4397,20 @@ void BfModule::Visit(BfSwitchStatement* switchStmt)
lastDefaultBlock = notEqBB;
}
if ((whenExpr != NULL) && (switchCase->mCaseExpressions.size() == 1))
{
// This was a "case when" expression, always matches
mayHaveMatch = true;
auto notEqBB = mBfIRBuilder->CreateBlock(StrFormat("switch.notEq_when.%d", blockIdx));
mBfIRBuilder->CreateBr(caseBlock);
mBfIRBuilder->AddBlock(notEqBB);
mBfIRBuilder->SetInsertPoint(notEqBB);
lastNotEqBlock = notEqBB;
}
if (lastDefaultBlock)
mBfIRBuilder->SetSwitchDefaultDest(switchStatement, lastDefaultBlock);