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

Support for internal property overrides in extensions

Browse source
This commit is contained in:
Brian Fiete 2020-10-26 13:52:04 -07:00
parent c4ff32826e
commit 71f5448f32
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -756,10 +756,10 @@ void BfModule::CheckMemberNames(BfTypeInstance* typeInst)
if (memberMap.TryGetValue(memberRef.mName, &prevMemberRef)) if (memberMap.TryGetValue(memberRef.mName, &prevMemberRef))
{ {
//auto& prevMemberRef = itr->second; //auto& prevMemberRef = itr->second;
MemberRef* firstMemberRef = &memberRef; MemberRef* firstMemberRef = &memberRef;
MemberRef* secondMemberRef = prevMemberRef; MemberRef* secondMemberRef = prevMemberRef;
bool showPrevious = false; bool showPrevious = false;
BfError* error = NULL; BfError* error = NULL;
if (prevMemberRef->mTypeInst != typeInst) if (prevMemberRef->mTypeInst != typeInst)
@ -801,6 +801,20 @@ void BfModule::CheckMemberNames(BfTypeInstance* typeInst)
{ {
std::swap(firstMemberRef, secondMemberRef); std::swap(firstMemberRef, secondMemberRef);
} }
if (typeInst->mTypeDef->mIsCombinedPartial)
{
if ((firstMemberRef->mKindName == "property") && (secondMemberRef->mKindName == "property"))
{
auto firstPropertyDef = (BfPropertyDef*)firstMemberRef->mMemberDef;
auto secondPropertyDef = (BfPropertyDef*)secondMemberRef->mMemberDef;
if (auto secondPropertyDeclaration = BfNodeDynCast<BfPropertyDeclaration>(secondPropertyDef->mFieldDeclaration))
{
if ((secondPropertyDeclaration->mVirtualSpecifier != NULL) && (secondPropertyDeclaration->mVirtualSpecifier->mToken == BfToken_Override))
continue;
}
}
}
if (secondMemberRef->mNameNode != NULL) if (secondMemberRef->mNameNode != NULL)
error = Fail(StrFormat("A %s named '%s' has already been declared.", secondMemberRef->mKindName.c_str(), memberRef.mName.c_str()), secondMemberRef->mNameNode, true); error = Fail(StrFormat("A %s named '%s' has already been declared.", secondMemberRef->mKindName.c_str(), memberRef.mName.c_str()), secondMemberRef->mNameNode, true);