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

Fix for calling private ctor from another ctor within the current type

Browse source
This commit is contained in:
Brian Fiete 2020-02-19 06:55:06 -08:00
parent f041caaeb8
commit 9ffdb94740
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -5602,11 +5602,14 @@ BfTypedValue BfExprEvaluator::MatchConstructor(BfAstNode* targetSrc, BfMethodBou
if (!isFailurePass) if (!isFailurePass)
{ {
if (callCtorBodyOnly) if (callCtorBodyOnly)
{
if (curTypeDef != targetType->mTypeDef)
{ {
// We're calling the base class's ctor from a derived class // We're calling the base class's ctor from a derived class
if (checkProt <= BfProtection_Private) if (checkProt <= BfProtection_Private)
continue; continue;
} }
}
else else
{ {
if (checkProt == BfProtection_Protected) // Treat protected constructors as private if (checkProt == BfProtection_Protected) // Treat protected constructors as private

5
IDEHelper/Compiler/BfModule.cpp
View file

@ -14219,11 +14219,6 @@ void BfModule::EmitCtorBody(bool& skipBody)
} }
} }
if (mCurTypeInstance->IsDelegate())
{
NOP;
}
BfAstNode* baseCtorNode = NULL; BfAstNode* baseCtorNode = NULL;
if ((ctorDeclaration != NULL) && (ctorDeclaration->mInitializer != NULL) && (ctorDeclaration->mInitializer->mTarget != NULL)) if ((ctorDeclaration != NULL) && (ctorDeclaration->mInitializer != NULL) && (ctorDeclaration->mInitializer->mTarget != NULL))
baseCtorNode = ctorDeclaration->mInitializer->mTarget; baseCtorNode = ctorDeclaration->mInitializer->mTarget;