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

Added 'concrete' constraint

Browse source
This commit is contained in:
Brian Fiete 2021-01-13 09:24:15 -08:00
parent 51ed3df320
commit e3f51e39ed
12 changed files with 90 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

9
IDEHelper/Compiler/BfSystem.cpp
View file

@ -2733,8 +2733,7 @@ void BfSystem::InjectNewRevision(BfTypeDef* typeDef)
typeDef->mIsDelegate = nextTypeDef->mIsDelegate;
typeDef->mIsFunction = nextTypeDef->mIsFunction;
typeDef->mIsClosure = nextTypeDef->mIsClosure;
typeDef->mIsAbstract = nextTypeDef->mIsAbstract;
typeDef->mIsConcrete = nextTypeDef->mIsConcrete;
typeDef->mIsAbstract = nextTypeDef->mIsAbstract;
typeDef->mIsStatic = nextTypeDef->mIsStatic;
typeDef->mHasAppendCtor = nextTypeDef->mHasAppendCtor;
typeDef->mHasCEOnCompile = nextTypeDef->mHasCEOnCompile;
@ -2839,8 +2838,7 @@ void BfSystem::AddToCompositePartial(BfPassInstance* passInstance, BfTypeDef* co
typeDef->mFullNameEx = partialTypeDef->mFullNameEx;
typeDef->mProtection = partialTypeDef->mProtection;
typeDef->mIsDelegate = partialTypeDef->mIsDelegate;
typeDef->mIsAbstract = partialTypeDef->mIsAbstract;
typeDef->mIsConcrete = partialTypeDef->mIsConcrete;
typeDef->mIsAbstract = partialTypeDef->mIsAbstract;
typeDef->mIsStatic = partialTypeDef->mIsStatic;
typeDef->mHasAppendCtor = partialTypeDef->mHasAppendCtor;
typeDef->mHasCtorNoBody = partialTypeDef->mHasCtorNoBody;
@ -2879,8 +2877,7 @@ void BfSystem::AddToCompositePartial(BfPassInstance* passInstance, BfTypeDef* co
}
// Merge attributes together
typeDef->mIsAbstract |= partialTypeDef->mIsAbstract;
typeDef->mIsConcrete |= partialTypeDef->mIsConcrete;
typeDef->mIsAbstract |= partialTypeDef->mIsAbstract;
typeDef->mIsStatic |= partialTypeDef->mIsStatic;
typeDef->mHasAppendCtor |= partialTypeDef->mHasAppendCtor;
typeDef->mHasCEOnCompile |= partialTypeDef->mHasCEOnCompile;