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

Static local methods and variables, fixed erroneous 'this' capture

Browse source
This commit is contained in:
Brian Fiete 2022-02-11 10:38:57 -05:00
parent 3c74588e10
commit d9725dda7c
6 changed files with 97 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
IDEHelper/Compiler/BfReducer.cpp
View file

@ -4068,9 +4068,12 @@ BfAstNode* BfReducer::DoCreateStatement(BfAstNode* node, CreateStmtFlags createS
continuingVariable = BfNodeDynCast<BfVariableDeclaration>(exprStmt->mExpression);
}
}
else if ((token == BfToken_Const) || (token == BfToken_ReadOnly))
else if ((token == BfToken_Const) || (token == BfToken_ReadOnly) || (token == BfToken_Static))
{
auto stmt = CreateStatementAfter(tokenNode, (CreateStmtFlags)(CreateStmtFlags_FindTrailingSemicolon | CreateStmtFlags_ForceVariableDecl));
auto flags = (CreateStmtFlags)(CreateStmtFlags_FindTrailingSemicolon | CreateStmtFlags_ForceVariableDecl);
if (token == BfToken_Static)
flags = (CreateStmtFlags)(flags | CreateStmtFlags_AllowLocalFunction);
auto stmt = CreateStatementAfter(tokenNode, flags);
if (auto exprStmt = BfNodeDynCast<BfExpressionStatement>(stmt))
{
if (auto variableDecl = BfNodeDynCast<BfVariableDeclaration>(exprStmt->mExpression))
@ -4080,10 +4083,20 @@ BfAstNode* BfReducer::DoCreateStatement(BfAstNode* node, CreateStmtFlags createS
Fail(StrFormat("'%s' already specified", BfTokenToString(variableDecl->mModSpecifier->GetToken())), variableDecl->mModSpecifier);
}
MEMBER_SET(variableDecl, mModSpecifier, tokenNode);
exprStmt->SetSrcStart(variableDecl->mSrcStart);
exprStmt->SetSrcStart(tokenNode->mSrcStart);
return stmt;
}
}
if (auto localMethod = BfNodeDynCast<BfLocalMethodDeclaration>(stmt))
{
if (localMethod->mMethodDeclaration->mStaticSpecifier != NULL)
{
Fail(StrFormat("'%s' already specified", BfTokenToString(localMethod->mMethodDeclaration->mStaticSpecifier->GetToken())), localMethod->mMethodDeclaration->mStaticSpecifier);
}
MEMBER_SET(localMethod->mMethodDeclaration, mStaticSpecifier, tokenNode);
localMethod->SetSrcStart(tokenNode->mSrcStart);
return localMethod;
}
Fail(StrFormat("Unexpected '%s' specifier", BfTokenToString(tokenNode->GetToken())), tokenNode);
return stmt;