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

Fixed default base ctor issues

Browse source
This commit is contained in:
Brian Fiete 2020-01-26 06:28:04 -08:00
parent c48c292f78
commit e6344c02b1
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
IDEHelper/Compiler/BfModule.cpp
View file

@ -14408,8 +14408,7 @@ void BfModule::EmitCtorBody(bool& skipBody)
(baseType->mTypeDef != mCompiler->mBfObjectTypeDef))
{
// Try to find a ctor without any params first
BfMethodDef* matchedMethod = NULL;
bool hadCtorWithAllDefaults = false;
BfMethodDef* matchedMethod = NULL;
for (int pass = 0; pass < 2; pass++)
{
@ -14422,22 +14421,13 @@ void BfModule::EmitCtorBody(bool& skipBody)
while (checkMethodDef != NULL)
{
bool allowMethod = checkMethodDef->mProtection > BfProtection_Private;
// Allow calling of the default base ctor if it is implicitly defined
if ((checkMethodDef->mMethodDeclaration == NULL) && (pass == 1) && (!hadCtorWithAllDefaults))
allowMethod = true;
bool allowMethod = checkMethodDef->mProtection > BfProtection_Private;
if ((checkMethodDef->mMethodType == BfMethodType_Ctor) && (!checkMethodDef->mIsStatic) && (allowMethod))
{
if (checkMethodDef->mParams.size() == 0)
{
matchedMethod = checkMethodDef;
}
else if ((checkMethodDef->mParams[0]->mParamDeclaration != NULL) && (checkMethodDef->mParams[0]->mParamDeclaration->mInitializer != NULL))
{
if (pass == 0)
hadCtorWithAllDefaults = true;
}
}
}
checkMethodDef = checkMethodDef->mNextWithSameName;
@ -14481,6 +14471,8 @@ void BfModule::EmitCtorBody(bool& skipBody)
if (targetType != NULL)
{
BfAutoParentNodeEntry autoParentNodeEntry(this, methodDeclaration);
auto autoComplete = mCompiler->GetAutoComplete();
auto wasCapturingMethodInfo = (autoComplete != NULL) && (autoComplete->mIsCapturingMethodMatchInfo);
if ((autoComplete != NULL) && (ctorDeclaration != NULL) && (ctorDeclaration->mInitializer != NULL))