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

Fixed lookup for inner type declared in a generic base class

Browse source
This commit is contained in:
Brian Fiete 2024-09-09 11:18:36 -04:00
parent b7e47027c3
commit d9fd93ccbd
2 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

20
IDEHelper/Compiler/BfResolvedTypeUtils.cpp
View file

@ -3417,7 +3417,21 @@ BfTypeDef* BfResolvedTypeSet::FindRootCommonOuterType(BfTypeDef* outerType, Look
{ {
if (ctx->mModule->mCurTypeInstance == NULL) if (ctx->mModule->mCurTypeInstance == NULL)
return NULL; return NULL;
BfTypeDef* commonOuterType = ctx->mModule->FindCommonOuterType(ctx->mModule->mCurTypeInstance->mTypeDef, outerType);
BfTypeDef* commonOuterType = NULL;
auto checkOuterTypeInst = ctx->mModule->mCurTypeInstance;
while (checkOuterTypeInst != NULL)
{
commonOuterType = ctx->mModule->FindCommonOuterType(checkOuterTypeInst->mTypeDef, outerType);
if (commonOuterType != NULL)
{
outOuterTypeInstance = checkOuterTypeInst;
break;
}
checkOuterTypeInst = checkOuterTypeInst->mBaseType;
}
if ((commonOuterType == NULL) && (outerType != NULL)) if ((commonOuterType == NULL) && (outerType != NULL))
{ {
auto staticSearch = ctx->mModule->GetStaticSearch(); auto staticSearch = ctx->mModule->GetStaticSearch();
@ -3462,7 +3476,11 @@ int BfResolvedTypeSet::DoHash(BfTypeReference* typeRef, LookupContext* ctx, BfHa
auto outerType = ctx->mModule->mSystem->GetOuterTypeNonPartial(typeDef); auto outerType = ctx->mModule->mSystem->GetOuterTypeNonPartial(typeDef);
if (typeRef == ctx->mRootTypeRef) if (typeRef == ctx->mRootTypeRef)
{
commonOuterType = FindRootCommonOuterType(outerType, ctx, checkTypeInstance); commonOuterType = FindRootCommonOuterType(outerType, ctx, checkTypeInstance);
if ((checkTypeInstance != NULL) && (checkTypeInstance->IsBoxed()))
checkTypeInstance = checkTypeInstance->GetUnderlyingType()->ToTypeInstance();
}
else else
commonOuterType = ctx->mModule->FindCommonOuterType(ctx->mModule->mCurTypeInstance->mTypeDef, outerType); commonOuterType = ctx->mModule->FindCommonOuterType(ctx->mModule->mCurTypeInstance->mTypeDef, outerType);

7
IDEHelper/Tests/src/TypeLookup.bf
View file

@ -1,5 +1,7 @@
#pragma warning disable 168 #pragma warning disable 168
using System.Collections;
namespace Tests namespace Tests
{ {
class ClassE class ClassE
@ -120,4 +122,9 @@ namespace Tests
} }
} }
} }
class DictExt : Dictionary<int, float>
{
Entry mEntry;
}
} }