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 static initializer

Browse source
This commit is contained in:
Brian Fiete 2021-01-02 13:20:10 -08:00
parent 9d1a5d9f3d
commit 1893988195
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
IDEHelper/Compiler/BfSystem.cpp
View file

@ -2949,7 +2949,7 @@ void BfSystem::FinishCompositePartial(BfTypeDef* compositeTypeDef)
bool hasInitializers = false;
for (auto methodDef : partialTypeDef->mMethods)
{
if (methodDef->mMethodType == BfMethodType_Init)
if ((methodDef->mMethodType == BfMethodType_Init) && (!methodDef->mIsStatic))
hasInitializers = true;
auto& hasMethods = allHasMethods[isExtension ? 1 : 0][methodDef->mIsStatic ? 1 : 0];
if (methodDef->mMethodType == BfMethodType_Ctor)
@ -3012,6 +3012,12 @@ void BfSystem::FinishCompositePartial(BfTypeDef* compositeTypeDef)
// methodDef->mIsMutating = true;
// }
if (compositeTypeDef->mName->ToString() == "Core")
{
NOP;
}
// Static ctor
if ((allHasMethods[0][1].mCtor == 0) && (allHasMethods[1][1].mCtor > 1))
{
auto methodDef = BfDefBuilder::AddMethod(nextRevision, BfMethodType_Ctor, BfProtection_Public, true, "");