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

Fixed type lookup for comptime emitted type refs in specialized generics

Browse source
This commit is contained in:
Brian Fiete 2023-03-14 07:01:44 -07:00
parent d34976864c
commit 723010fd9d
4 changed files with 103 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

62
IDEHelper/Compiler/BfSystem.cpp
View file

@ -2663,34 +2663,54 @@ bool BfSystem::FindTypeDef(const BfAtomComposite& findName, int numGenericArgs,
continue;
}
if ((typeDef->mFullName == *qualifiedFindNamePtr) && (CheckTypeDefReference(typeDef, project)))
if (typeDef->mFullName == *qualifiedFindNamePtr)
{
int curPri = 0;
if (typeDef->mProtection < minProtection)
curPri -= 1;
if (typeDef->IsGlobalsContainer())
curPri -= 2;
if (typeDef->mGenericParamDefs.size() != numGenericArgs)
bool isProjectValid = false;
if (CheckTypeDefReference(typeDef, project))
{
// Still allow SOME match even if we put in the wrong number of generic args
curPri -= 4;
isProjectValid = true;
}
if ((typeDef->mPartials.mSize > 0) && (typeDef->mPartials[0]->IsExtension()))
else if ((ctx != NULL) && (ctx->mCheckProjects != NULL))
{
// Is a failed extension
curPri -= 8;
for (auto checkProject : *ctx->mCheckProjects)
{
if (CheckTypeDefReference(typeDef, checkProject))
{
isProjectValid = true;
break;
}
}
}
if ((curPri > ctx->mBestPri) || (ctx->mBestTypeDef == NULL))
if (isProjectValid)
{
ctx->mBestTypeDef = typeDef;
ctx->mAmbiguousTypeDef = NULL;
ctx->mBestPri = curPri;
hadMatch = true;
}
else if (curPri == ctx->mBestPri)
{
ctx->mAmbiguousTypeDef = typeDef;
int curPri = 0;
if (typeDef->mProtection < minProtection)
curPri -= 1;
if (typeDef->IsGlobalsContainer())
curPri -= 2;
if (typeDef->mGenericParamDefs.size() != numGenericArgs)
{
// Still allow SOME match even if we put in the wrong number of generic args
curPri -= 4;
}
if ((typeDef->mPartials.mSize > 0) && (typeDef->mPartials[0]->IsExtension()))
{
// Is a failed extension
curPri -= 8;
}
if ((curPri > ctx->mBestPri) || (ctx->mBestTypeDef == NULL))
{
ctx->mBestTypeDef = typeDef;
ctx->mAmbiguousTypeDef = NULL;
ctx->mBestPri = curPri;
hadMatch = true;
}
else if (curPri == ctx->mBestPri)
{
ctx->mAmbiguousTypeDef = typeDef;
}
}
}
itr.MoveToNextHashMatch();