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

Fixed tuple duplicate name check circular dependency issue

Browse source
This commit is contained in:
Brian Fiete 2020-10-17 16:31:46 -07:00
parent 1a44732189
commit d46c60d956
3 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -2361,8 +2361,10 @@ void BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateTy
SetAndRestoreValue<BfTypeReference*> prevTypeRef(mContext->mCurTypeState->mCurBaseTypeRef, checkTypeRef);
SetAndRestoreValue<BfTypeDefineState> prevDefineState(typeInstance->mDefineState, BfTypeDefineState_ResolvingBaseType);
bool populateBase = !typeInstance->mTypeFailed;
auto checkType = ResolveTypeRef(checkTypeRef, populateBase ? BfPopulateType_Data : BfPopulateType_Declaration);
bool populateBase = !typeInstance->mTypeFailed;
auto checkType = ResolveTypeRef(checkTypeRef, BfPopulateType_Declaration);
if ((checkType != NULL) && (!checkType->IsInterface()) && (populateBase))
PopulateType(checkType, BfPopulateType_Data);
if (typeInstance->mDefineState >= BfTypeDefineState_Defined)
{
@ -7206,8 +7208,9 @@ BfType* BfModule::ResolveTypeResult(BfTypeReference* typeRef, BfType* resolvedTy
if (typeInstance->IsTuple())
{
if (typeInstance->mDefineState < BfTypeDefineState_Defined)
PopulateType(typeInstance);
//TODO: This can cause circular reference issues. Is there a case this is needed?
//if (typeInstance->mDefineState < BfTypeDefineState_Defined)
// PopulateType(typeInstance);
if (typeInstance->mHasDeclError)
{
if (auto tupleTypeRef = BfNodeDynCast<BfTupleTypeRef>(typeRef))