Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 03:28:20 +02:00
Code Activity

Fixed 'reduced definition' issue

Browse source
This commit is contained in:
Brian Fiete 2019-12-21 09:35:58 -08:00
parent 9aebffa954
commit 01aea25d7e
4 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
IDEHelper/DbgModule.cpp
View file

@ -1186,7 +1186,7 @@ DbgExtType DbgType::CalcExtType()
}
DbgLanguage DbgType::GetLanguage()
{
{
return mLanguage;
}
@ -1451,9 +1451,10 @@ DbgType* DbgType::GetPrimaryType()
mPrimaryType = this;
if (mPriority <= DbgTypePriority_Normal)
{
{
if ((mCompileUnit != NULL) &&
((mCompileUnit->mLanguage == DbgLanguage_Beef) || (mTypeCode == DbgType_Namespace) || (mIsDeclaration)))
((mCompileUnit->mLanguage == DbgLanguage_Beef)|| (mLanguage == DbgLanguage_Beef) ||
(mTypeCode == DbgType_Namespace) || (mIsDeclaration)))
{
mPrimaryType = mCompileUnit->mDbgModule->GetPrimaryType(this);
mPrimaryType->PopulateType();
@ -2761,7 +2762,7 @@ void DbgModule::MapTypes(int startingTypeIdx)
{
for (auto member : dbgType->mMemberList)
if ((member->mIsStatic) && (member->mLocationData != NULL))
dbgType->mDefinedMembersCount++;
dbgType->mDefinedMembersSize++;
}
if ((dbgType->mTypeName != NULL) && (strcmp(dbgType->mTypeName, "@") == 0))
@ -2855,12 +2856,13 @@ void DbgModule::MapTypes(int startingTypeIdx)
continue;
}
if (prevType->mDefinedMembersCount > 0)
if (prevType->mDefinedMembersSize > 0)
{
if (dbgType->mDefinedMembersCount > 0)
if (dbgType->mDefinedMembersSize > 0)
{
// We create an 'alternates' list for all types that define at least one static field
prevType->mAlternates.PushFront(dbgType, &mAlloc);
if (prevType->mHasStaticMembers)
prevType->mAlternates.PushFront(dbgType, &mAlloc);
}
continue;
}