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

Better fix for VerifyTypeLookups

Browse source
This commit is contained in:
Brian Fiete 2021-02-28 11:41:00 -08:00
parent a412452bac
commit c598944f52
4 changed files with 87 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

14
IDEHelper/Compiler/BfContext.cpp
View file

@ -2276,8 +2276,18 @@ void BfContext::VerifyTypeLookups(BfTypeInstance* typeInst)
// so the mNextRevision will be ignored
auto useTypeDef = lookupEntry.mUseTypeDef;
BfTypeDef* ambiguousTypeDef = NULL;
BfTypeDef* result = typeInst->mModule->FindTypeDefRaw(lookupEntry.mName, lookupEntry.mNumGenericParams, typeInst, useTypeDef, NULL);
if (result != lookupEntryPair.mValue.mTypeDef)
BfTypeLookupResult* lookupResult = &lookupEntryPair.mValue;
BfTypeLookupResultCtx lookupResultCtx;
lookupResultCtx.mResult = lookupResult;
lookupResultCtx.mIsVerify = true;
BfTypeDef* result = typeInst->mModule->FindTypeDefRaw(lookupEntry.mName, lookupEntry.mNumGenericParams, typeInst, useTypeDef, NULL, &lookupResultCtx);
if ((result == NULL) && (lookupResult->mFoundInnerType))
{
// Allow this- if there were new types added then the types would be rebuilt already
}
else if (result != lookupResult->mTypeDef)
{
isDirty = true;
}

2
IDEHelper/Compiler/BfModule.h
View file

@ -1823,7 +1823,7 @@ public:
void ShowAmbiguousTypeError(BfAstNode* refNode, BfTypeDef* typeDef, BfTypeDef* otherTypeDef);
void ShowGenericArgCountError(BfAstNode* typeRef, int wantedGenericParams);
BfTypeDef* GetActiveTypeDef(BfTypeInstance* typeInstanceOverride = NULL, bool useMixinDecl = false); // useMixinDecl is useful for type lookup, but we don't want the decl project to limit what methods the user can call
BfTypeDef* FindTypeDefRaw(const BfAtomComposite& findName, int numGenericArgs, BfTypeInstance* typeInstance, BfTypeDef* useTypeDef, BfTypeLookupError* error);
BfTypeDef* FindTypeDefRaw(const BfAtomComposite& findName, int numGenericArgs, BfTypeInstance* typeInstance, BfTypeDef* useTypeDef, BfTypeLookupError* error, BfTypeLookupResultCtx* lookupResultCtx = NULL);
BfTypeDef* FindTypeDef(const BfAtomComposite& findName, int numGenericArgs = 0, BfTypeInstance* typeInstanceOverride = NULL, BfTypeLookupError* error = NULL);
BfTypeDef* FindTypeDef(const StringImpl& typeName, int numGenericArgs = 0, BfTypeInstance* typeInstanceOverride = NULL, BfTypeLookupError* error = NULL);
BfTypeDef* FindTypeDef(BfTypeReference* typeRef, BfTypeInstance* typeInstanceOverride = NULL, BfTypeLookupError* error = NULL, int numGenericParams = 0, BfResolveTypeRefFlags resolveFlags = (BfResolveTypeRefFlags)0);

22
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -8382,7 +8382,7 @@ BfTypeDef* BfModule::GetActiveTypeDef(BfTypeInstance* typeInstanceOverride, bool
return useTypeDef;
}
BfTypeDef* BfModule::FindTypeDefRaw(const BfAtomComposite& findName, int numGenericArgs, BfTypeInstance* typeInstance, BfTypeDef* useTypeDef, BfTypeLookupError* error)
BfTypeDef* BfModule::FindTypeDefRaw(const BfAtomComposite& findName, int numGenericArgs, BfTypeInstance* typeInstance, BfTypeDef* useTypeDef, BfTypeLookupError* error, BfTypeLookupResultCtx* lookupResultCtx)
{
if ((findName.mSize == 1) && (findName.mParts[0]->mIsSystemType))
{
@ -8408,6 +8408,15 @@ BfTypeDef* BfModule::FindTypeDefRaw(const BfAtomComposite& findName, int numGene
BfTypeDef* protErrorTypeDef = NULL;
BfTypeInstance* protErrorOuterType = NULL;
BfTypeDef* foundInnerType = NULL;
if ((lookupResultCtx != NULL) && (lookupResultCtx->mIsVerify))
{
if (lookupResultCtx->mResult->mFoundInnerType)
return lookupCtx.mBestTypeDef;
}
else
{
if ((!lookupCtx.HasValidMatch()) && (typeInstance != NULL))
{
std::function<bool(BfTypeInstance*)> _CheckType = [&](BfTypeInstance* typeInstance)
@ -8420,6 +8429,8 @@ BfTypeDef* BfModule::FindTypeDefRaw(const BfAtomComposite& findName, int numGene
{
if (mSystem->FindTypeDef(findName, numGenericArgs, useTypeDef->mProject, checkTypeInst->mTypeDef->mFullNameEx, allowPrivate, &lookupCtx))
{
foundInnerType = lookupCtx.mBestTypeDef;
if (lookupCtx.HasValidMatch())
return true;
@ -8459,6 +8470,7 @@ BfTypeDef* BfModule::FindTypeDefRaw(const BfAtomComposite& findName, int numGene
_CheckType(typeInstance);
}
}
if (!lookupCtx.HasValidMatch())
{
@ -8515,6 +8527,9 @@ BfTypeDef* BfModule::FindTypeDefRaw(const BfAtomComposite& findName, int numGene
if ((protErrorTypeDef != NULL) && (lookupCtx.mBestTypeDef == protErrorTypeDef) && (error != NULL) && (error->mRefNode != NULL))
Fail(StrFormat("'%s.%s' is inaccessible due to its protection level", TypeToString(protErrorOuterType).c_str(), findName.ToString().c_str()), error->mRefNode); // CS0122
if ((lookupResultCtx != NULL) && (lookupResultCtx->mResult != NULL) && (!lookupResultCtx->mIsVerify) && (foundInnerType != NULL) && (foundInnerType == lookupCtx.mBestTypeDef))
lookupResultCtx->mResult->mFoundInnerType = true;
return lookupCtx.mBestTypeDef;
}
@ -8569,7 +8584,10 @@ BfTypeDef* BfModule::FindTypeDef(const BfAtomComposite& findName, int numGeneric
BfTypeLookupError localError;
BfTypeLookupError* errorPtr = (error != NULL) ? error : &localError;
auto typeDef = FindTypeDefRaw(findName, numGenericArgs, typeInstance, useTypeDef, errorPtr);
BfTypeLookupResultCtx lookupResultCtx;
lookupResultCtx.mResult = resultPtr;
auto typeDef = FindTypeDefRaw(findName, numGenericArgs, typeInstance, useTypeDef, errorPtr, &lookupResultCtx);
if (prevAllocSize != typeInstance->mLookupResults.size())
{

14
IDEHelper/Compiler/BfResolvedTypeUtils.h
View file

@ -1668,11 +1668,25 @@ struct BfTypeLookupResult
{
BfTypeDef* mTypeDef;
bool mForceLookup;
bool mFoundInnerType;
BfTypeLookupResult()
{
mTypeDef = NULL;
mForceLookup = false;
mFoundInnerType = false;
}
};
struct BfTypeLookupResultCtx
{
BfTypeLookupResult* mResult;
bool mIsVerify;
BfTypeLookupResultCtx()
{
mResult = NULL;
mIsVerify = false;
}
};