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

Added support for indexer in initializer expression, reeval Add calls

Browse source
This commit is contained in:
Brian Fiete 2023-03-17 11:13:41 -07:00
parent ac6f58f118
commit 596dd2401d
7 changed files with 85 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

26
IDEHelper/Compiler/BfReducer.cpp
View file

@ -2093,7 +2093,12 @@ BfExpression* BfReducer::CreateExpression(BfAstNode* node, CreateExprFlags creat
}
else if (token == BfToken_LBracket)
{
exprLeft = CreateAttributedExpression(tokenNode, false);
if ((createExprFlags & CreateExprFlags_AllowAnonymousIndexer) != 0)
{
exprLeft = CreateIndexerExpression(NULL, tokenNode);
}
else
exprLeft = CreateAttributedExpression(tokenNode, false);
}
else if (token == BfToken_FatArrow)
{
@ -7570,7 +7575,7 @@ BfInitializerExpression* BfReducer::TryCreateInitializerExpression(BfAstNode* ta
BfAstNode* node = mVisitorPos.GetCurrent();
initializerExpr->mSrcEnd = node->mSrcEnd;
auto expr = CreateExpression(node);
auto expr = CreateExpression(node, BfReducer::CreateExprFlags_AllowAnonymousIndexer);
isDone = !mVisitorPos.MoveNext();
if (expr != NULL)
values.Add(expr);
@ -8167,15 +8172,24 @@ BfObjectCreateExpression* BfReducer::CreateObjectCreateExpression(BfAstNode* all
return objectCreateExpr;
}
BfExpression* BfReducer::CreateIndexerExpression(BfExpression* target)
BfExpression* BfReducer::CreateIndexerExpression(BfExpression* target, BfTokenNode* openBracketNode)
{
auto tokenNode = ExpectTokenAfter(target, BfToken_LBracket, BfToken_QuestionLBracket);
auto tokenNode = openBracketNode;
if (openBracketNode == NULL)
tokenNode = ExpectTokenAfter(target, BfToken_LBracket, BfToken_QuestionLBracket);
auto indexerExpr = mAlloc->Alloc<BfIndexerExpression>();
BfDeferredAstSizedArray<BfExpression*> arguments(indexerExpr->mArguments, mAlloc);
BfDeferredAstSizedArray<BfTokenNode*> commas(indexerExpr->mCommas, mAlloc);
indexerExpr->mTarget = target;
ReplaceNode(target, indexerExpr);
if (target != NULL)
{
indexerExpr->mTarget = target;
ReplaceNode(target, indexerExpr);
}
else
{
ReplaceNode(openBracketNode, indexerExpr);
}
indexerExpr->mOpenBracket = tokenNode;
MoveNode(indexerExpr->mOpenBracket, indexerExpr);