Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-14 14:24:10 +02:00
Code Activity

Fix for globals namespace conflicting with extension name

Browse source
This commit is contained in:
Brian Fiete 2020-07-15 15:32:06 -07:00
parent a2047f444d
commit 37fc1a08e1
3 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
IDEHelper/Compiler/BfCompiler.cpp
View file

@ -2841,7 +2841,7 @@ void BfCompiler::UpdateRevisedTypes()
if (nextTypeDef->mNextRevision != NULL) if (nextTypeDef->mNextRevision != NULL)
nextTypeDef = nextTypeDef->mNextRevision; nextTypeDef = nextTypeDef->mNextRevision;
if ((nextTypeDef->mIsCombinedPartial) || (nextTypeDef->mDefState == BfTypeDef::DefState_Deleted) || (nextTypeDef->mTypeCode == BfTypeCode_Extension) || if ((nextTypeDef->mIsCombinedPartial) || (nextTypeDef->mDefState == BfTypeDef::DefState_Deleted) || (nextTypeDef->mTypeCode == BfTypeCode_Extension) ||
(typeDef->mFullName != nextTypeDef->mFullName) || (typeDef->mGenericParamDefs.size() != nextTypeDef->mGenericParamDefs.size())) (typeDef->mFullNameEx != nextTypeDef->mFullNameEx) || (typeDef->mGenericParamDefs.size() != nextTypeDef->mGenericParamDefs.size()))
{ {
nextTypeDefItr.MoveToNextHashMatch(); nextTypeDefItr.MoveToNextHashMatch();
continue; continue;
@ -2981,12 +2981,10 @@ void BfCompiler::UpdateRevisedTypes()
auto checkTypeDefEntry = mSystem->mTypeDefs.mHashHeads[bucketIdx]; auto checkTypeDefEntry = mSystem->mTypeDefs.mHashHeads[bucketIdx];
while (checkTypeDefEntry != NULL) while (checkTypeDefEntry != NULL)
{ {
// This clears the mPartialUsed flag for the whole bucket
auto checkTypeDef = checkTypeDefEntry->mValue; auto checkTypeDef = checkTypeDefEntry->mValue;
if ((checkTypeDefEntry->mHash == outerTypeDefEntry->mHash) && if ((checkTypeDef->mIsPartial) || (checkTypeDef->mIsCombinedPartial))
(checkTypeDef->NameEquals(outerTypeDef)))
{
checkTypeDef->mPartialUsed = false; checkTypeDef->mPartialUsed = false;
}
checkTypeDefEntry = checkTypeDefEntry->mNext; checkTypeDefEntry = checkTypeDefEntry->mNext;
} }
hadPartials = true; hadPartials = true;
@ -3230,6 +3228,8 @@ void BfCompiler::UpdateRevisedTypes()
checkTypeDef->mIsPartial = true; checkTypeDef->mIsPartial = true;
checkTypeDef->mDefState = BfTypeDef::DefState_Defined; checkTypeDef->mDefState = BfTypeDef::DefState_Defined;
mSystem->AddToCompositePartial(mPassInstance, compositeTypeDef, checkTypeDef); mSystem->AddToCompositePartial(mPassInstance, compositeTypeDef, checkTypeDef);
BfLogSysM("AddToCompositePartial %p added to %p\n", checkTypeDef, compositeTypeDef);
} }
mSystem->FinishCompositePartial(compositeTypeDef); mSystem->FinishCompositePartial(compositeTypeDef);

7
IDEHelper/Compiler/BfDefBuilder.cpp
View file

@ -1643,10 +1643,17 @@ void BfDefBuilder::Visit(BfTypeDeclaration* typeDeclaration)
mCurTypeDef->mNameEx->mRefCount++; mCurTypeDef->mNameEx->mRefCount++;
} }
if (!fullName.IsEmpty()) if (!fullName.IsEmpty())
{
if (mCurTypeDef->IsGlobalsContainer())
{
mCurTypeDef->mFullNameEx.Set(fullName.mParts, fullName.mSize, &mCurTypeDef->mNameEx, 1);
}
else
{ {
mCurTypeDef->mFullNameEx = fullName; mCurTypeDef->mFullNameEx = fullName;
mCurTypeDef->mFullNameEx.mParts[mCurTypeDef->mFullNameEx.mSize - 1] = mCurTypeDef->mNameEx; mCurTypeDef->mFullNameEx.mParts[mCurTypeDef->mFullNameEx.mSize - 1] = mCurTypeDef->mNameEx;
} }
}
if (auto defineBlock = BfNodeDynCast<BfBlock>(typeDeclaration->mDefineNode)) if (auto defineBlock = BfNodeDynCast<BfBlock>(typeDeclaration->mDefineNode))
{ {

5
IDEHelper/Compiler/BfSystem.cpp
View file

@ -841,6 +841,8 @@ void BfTypeDef::ReportMemory(MemReporter* memReporter)
bool BfTypeDef::NameEquals(BfTypeDef* otherTypeDef) bool BfTypeDef::NameEquals(BfTypeDef* otherTypeDef)
{ {
if (mName != otherTypeDef->mName)
return false;
// We can't just check mFullnames, because a namespace of "A" with a type named "B.C" would match // We can't just check mFullnames, because a namespace of "A" with a type named "B.C" would match
// a namespace of "A.B" with a type named "C" // a namespace of "A.B" with a type named "C"
if (mNamespace.mSize != otherTypeDef->mNamespace.mSize) if (mNamespace.mSize != otherTypeDef->mNamespace.mSize)
@ -2596,6 +2598,9 @@ void BfSystem::InjectNewRevision(BfTypeDef* typeDef)
BF_ASSERT(typeDef->mNameEx == nextTypeDef->mNameEx); BF_ASSERT(typeDef->mNameEx == nextTypeDef->mNameEx);
//typeDef->mNameEx = nextTypeDef->mNameEx; //typeDef->mNameEx = nextTypeDef->mNameEx;
//typeDef->mFullName = nextTypeDef->mFullName; //typeDef->mFullName = nextTypeDef->mFullName;
BF_ASSERT(typeDef->mFullNameEx == nextTypeDef->mFullNameEx);
typeDef->mProtection = nextTypeDef->mProtection; typeDef->mProtection = nextTypeDef->mProtection;
if ((typeDef->mTypeCode != BfTypeCode_Extension) && (!typeDef->mIsCombinedPartial)) if ((typeDef->mTypeCode != BfTypeCode_Extension) && (!typeDef->mIsCombinedPartial))
BF_ASSERT(nextTypeDef->mTypeCode != BfTypeCode_Extension); BF_ASSERT(nextTypeDef->mTypeCode != BfTypeCode_Extension);