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

Fixed extension initializers and dtors. [NoExtension]. Extension warning

Browse source
This commit is contained in:
Brian Fiete 2020-10-22 11:33:13 -07:00
parent 6e71cbc765
commit b6db69d2b0
15 changed files with 235 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

29
IDEHelper/Compiler/BfReducer.cpp
View file

@ -9147,8 +9147,23 @@ bool BfReducer::ParseMethod(BfMethodDeclaration* methodDeclaration, SizedArrayIm
MEMBER_SET(ctorDecl, mInitializerColonToken, endToken);
mVisitorPos.MoveNext();
BfAstNode* invokeAfter = ctorDecl;
auto nextNode = mVisitorPos.GetNext();
endToken = ExpectTokenAfter(ctorDecl, BfToken_This, BfToken_Base);
BfAttributeDirective* attributeDirective = NULL;
if (auto nextToken = BfNodeDynCast<BfTokenNode>(nextNode))
{
if (nextToken->mToken == BfToken_LBracket)
{
mVisitorPos.MoveNext();
attributeDirective = CreateAttributeDirective(nextToken);
nextNode = mVisitorPos.GetNext();
if (attributeDirective != NULL)
invokeAfter = attributeDirective;
}
}
endToken = ExpectTokenAfter(invokeAfter, BfToken_This, BfToken_Base);
if (endToken != NULL)
{
auto invocationExpr = CreateInvocationExpression(endToken);
@ -9162,6 +9177,18 @@ bool BfReducer::ParseMethod(BfMethodDeclaration* methodDeclaration, SizedArrayIm
// In process of typing - just eat identifier so we don't error out on whole method
MoveNode(identifierAfter, ctorDecl);
}
if (attributeDirective != NULL)
{
BfAttributedExpression* attribExpr = mAlloc->Alloc<BfAttributedExpression>();
ReplaceNode(attributeDirective, attribExpr);
attribExpr->mAttributes = attributeDirective;
if (ctorDecl->mInitializer != NULL)
{
MEMBER_SET(attribExpr, mExpression, ctorDecl->mInitializer);
}
MEMBER_SET(ctorDecl, mInitializer, attribExpr);
}
}
endToken = NULL;