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

Fixed dependency adding of interfaces

Browse source
This commit is contained in:
Brian Fiete 2020-05-29 10:11:09 -07:00
parent c101eb19dd
commit c8055f0a38
3 changed files with 9 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

13
IDEHelper/Compiler/BfContext.cpp
View file

@ -1428,12 +1428,6 @@ void BfContext::DeleteType(BfType* type, bool deferDepRebuilds)
BfTypeInstance* typeInst = type->ToTypeInstance(); BfTypeInstance* typeInst = type->ToTypeInstance();
if (typeInst != NULL) if (typeInst != NULL)
{ {
// if (typeInst->mTypeDef->IsGlobalsContainer())
// {
// bool worked = mSystem->mGlobalsMap.Remove(typeInst->mTypeDef->mNamespace);
// BF_ASSERT(worked);
// }
if (mCompiler->mHotState != NULL) if (mCompiler->mHotState != NULL)
{ {
if ((typeInst->mHotTypeData != NULL) && (typeInst->mHotTypeData->mPendingDataChange)) if ((typeInst->mHotTypeData != NULL) && (typeInst->mHotTypeData->mPendingDataChange))
@ -1540,11 +1534,6 @@ void BfContext::DeleteType(BfType* type, bool deferDepRebuilds)
mFailTypes.Add(dependentTypeInst); mFailTypes.Add(dependentTypeInst);
else else
{ {
// BfTypeProcessRequest* typeProcessRequest = mPopulateTypeWorkList.Alloc();
// typeProcessRequest->mType = dependentType;
// typeProcessRequest->mRebuildType = true;
// mCompiler->mStats.mTypesQueued++;
// mCompiler->UpdateCompletion();
rebuildTypeQueue.Add(dependentType); rebuildTypeQueue.Add(dependentType);
} }
} }
@ -2109,7 +2098,9 @@ void BfContext::VerifyTypeLookups(BfTypeInstance* typeInst)
BfTypeDef* ambiguousTypeDef = NULL; BfTypeDef* ambiguousTypeDef = NULL;
BfTypeDef* result = mSystem->FindTypeDef(lookupEntry.mName, lookupEntry.mNumGenericParams, useTypeDef->mProject, useTypeDef->mNamespaceSearch, &ambiguousTypeDef); BfTypeDef* result = mSystem->FindTypeDef(lookupEntry.mName, lookupEntry.mNumGenericParams, useTypeDef->mProject, useTypeDef->mNamespaceSearch, &ambiguousTypeDef);
if (result != lookupEntryPair.mValue.mTypeDef) if (result != lookupEntryPair.mValue.mTypeDef)
{
isDirty = true; isDirty = true;
}
else else
lookupEntry.mAtomUpdateIdx = atomUpdateIdx; lookupEntry.mAtomUpdateIdx = atomUpdateIdx;
} }

20
IDEHelper/Compiler/BfDefBuilder.cpp
View file

@ -89,11 +89,7 @@ void BfDefBuilder::Process(BfPassInstance* passInstance, BfSource* bfSource, boo
mSystem->mNeedsTypesHandledByCompiler = true; mSystem->mNeedsTypesHandledByCompiler = true;
mPassInstance = passInstance; mPassInstance = passInstance;
/*if (parser->mCursorIdx == -1)
{
//gDefBuilderPerfManager.StartRecording();
}*/
bool isAutocomplete = false; bool isAutocomplete = false;
if ((mResolvePassData != NULL) && (mResolvePassData->mAutoComplete != NULL)) if ((mResolvePassData != NULL) && (mResolvePassData->mAutoComplete != NULL))
{ {
@ -106,12 +102,6 @@ void BfDefBuilder::Process(BfPassInstance* passInstance, BfSource* bfSource, boo
mFullRefresh = fullRefresh; mFullRefresh = fullRefresh;
// for (auto typeDef : mSystem->mTypeDefs)
// {
// if ((!typeDef->mIsCombinedPartial) && (typeDef->GetLastSource() == bfSource->mPrevRevision))
// typeDef->mDefState = BfTypeDef::DefState_AwaitingNewVersion;
// }
if (bfSource->mPrevRevision != NULL) if (bfSource->mPrevRevision != NULL)
{ {
for (auto typeDef : bfSource->mPrevRevision->mTypeDefs) for (auto typeDef : bfSource->mPrevRevision->mTypeDefs)
@ -216,8 +206,7 @@ void BfDefBuilder::ParseGenericParams(BfGenericParamsDeclaration* genericParamsD
checkTypeDef = checkTypeDef->mOuterType; checkTypeDef = checkTypeDef->mOuterType;
} }
auto genericParamDef = new BfGenericParamDef(); auto genericParamDef = new BfGenericParamDef();
//genericParamDef->mOwner = mCurActualTypeDef;
genericParamDef->mName = name; genericParamDef->mName = name;
genericParamDef->mNameNodes.Add(genericParamNode); genericParamDef->mNameNodes.Add(genericParamNode);
genericParamDef->mGenericParamFlags = BfGenericParamFlag_None; genericParamDef->mGenericParamFlags = BfGenericParamFlag_None;
@ -1508,11 +1497,6 @@ void BfDefBuilder::Visit(BfTypeDeclaration* typeDeclaration)
{ {
BfTypeDef* prevDef = NULL; BfTypeDef* prevDef = NULL;
// auto checkTypeDef = mSystem->mTypeDefs.Find(fullName);
// while (checkTypeDef != NULL)
auto itr = mSystem->mTypeDefs.TryGet(fullName); auto itr = mSystem->mTypeDefs.TryGet(fullName);
while (itr) while (itr)
{ {

9
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -2176,6 +2176,8 @@ bool BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateTy
typeInterfaceInst.mStartVirtualIdx = -1; typeInterfaceInst.mStartVirtualIdx = -1;
typeInterfaceInst.mIsRedeclared = false; typeInterfaceInst.mIsRedeclared = false;
typeInstance->mInterfaces.push_back(typeInterfaceInst); typeInstance->mInterfaces.push_back(typeInterfaceInst);
AddDependency(checkInterface, typeInstance, BfDependencyMap::DependencyFlag_ImplementsInterface);
// Interfaces can list other interfaces in their declaration, so pull those in too // Interfaces can list other interfaces in their declaration, so pull those in too
for (auto depIFace : checkInterface->mInterfaces) for (auto depIFace : checkInterface->mInterfaces)
@ -3501,10 +3503,9 @@ void BfModule::DoTypeInstanceMethodProcessing(BfTypeInstance* typeInstance)
auto checkTypeInstance = typeInstance; auto checkTypeInstance = typeInstance;
while (checkTypeInstance != NULL) while (checkTypeInstance != NULL)
{ {
for (auto&& interfaceEntry : checkTypeInstance->mInterfaces) // These may have been already added
{ for (auto&& interfaceEntry : checkTypeInstance->mInterfaces)
AddDependency(interfaceEntry.mInterfaceType, typeInstance, BfDependencyMap::DependencyFlag_ImplementsInterface); AddDependency(interfaceEntry.mInterfaceType, typeInstance, BfDependencyMap::DependencyFlag_ImplementsInterface);
}
checkTypeInstance = checkTypeInstance->GetImplBaseType(); checkTypeInstance = checkTypeInstance->GetImplBaseType();
} }