Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-09 03:52:19 +02:00
Code Activity

Make multivariable for loops work 'for (int i = 0, j = 10; i < j; i++, j--)'

Browse source
This commit is contained in:
Brian Fiete 2022-01-21 06:57:35 -05:00
parent 0dbe75cf65
commit e0077fd4ef
1 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
IDEHelper/Compiler/BfReducer.cpp
View file

@ -3157,6 +3157,38 @@ BfStatement* BfReducer::CreateForStatement(BfAstNode* node)
auto stmt = CreateStatementAfter(forStatement); auto stmt = CreateStatementAfter(forStatement);
if (stmt == NULL) if (stmt == NULL)
return forStatement; return forStatement;
if (!initializers.IsEmpty())
{
// Try to convert 'int i = 0, j = 0` into two variable declarations instead of a var decl and an assignment
if (auto prevExprStmt = BfNodeDynCast<BfExpressionStatement>(initializers.back()))
{
if (auto prevVarDecl = BfNodeDynCast<BfVariableDeclaration>(prevExprStmt->mExpression))
{
if (auto exprStmt = BfNodeDynCast<BfExpressionStatement>(stmt))
{
if (auto assignExpr = BfNodeDynCast<BfAssignmentExpression>(exprStmt->mExpression))
{
if (assignExpr->mOp != BfAssignmentOp_Assign)
continue;
if (auto identifierNode = BfNodeDynCast<BfIdentifierNode>(assignExpr->mLeft))
{
auto varDecl = mAlloc->Alloc<BfVariableDeclaration>();
ReplaceNode(assignExpr, varDecl);
varDecl->mTypeRef = prevVarDecl->mTypeRef;
varDecl->mNameNode = identifierNode;
varDecl->mEqualsNode = assignExpr->mOpToken;
varDecl->mInitializer = assignExpr->mRight;
varDecl->mModSpecifier = prevVarDecl->mModSpecifier;
exprStmt->mExpression = varDecl;
}
}
}
}
}
}
initializers.push_back(stmt); initializers.push_back(stmt);
MoveNode(stmt, forStatement); MoveNode(stmt, forStatement);
} }