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

Improved errors of invalid typealias generics

Browse source
This commit is contained in:
Brian Fiete 2020-12-29 16:05:19 -08:00
parent 5c88091760
commit 74098aa9eb
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -306,7 +306,7 @@ bool BfModule::FinishGenericParams(BfType* resolvedTypeRef)
bool BfModule::ValidateGenericConstraints(BfTypeReference* typeRef, BfTypeInstance* genericTypeInst, bool ignoreErrors) bool BfModule::ValidateGenericConstraints(BfTypeReference* typeRef, BfTypeInstance* genericTypeInst, bool ignoreErrors)
{ {
if ((mCurTypeInstance != NULL) && (mCurTypeInstance->IsTypeAlias())) if ((mCurTypeInstance != NULL) && (mCurTypeInstance->IsTypeAlias()) && (mCurTypeInstance->IsGenericTypeInstance()))
{ {
// Don't validate constraints during the population of a concrete generic type alias instance, we want to // Don't validate constraints during the population of a concrete generic type alias instance, we want to
// throw those errors at the usage sites // throw those errors at the usage sites
@ -327,8 +327,12 @@ bool BfModule::ValidateGenericConstraints(BfTypeReference* typeRef, BfTypeInstan
auto underlyingType = genericTypeInst->GetUnderlyingType(); auto underlyingType = genericTypeInst->GetUnderlyingType();
if ((underlyingType != NULL) && (underlyingType->IsGenericTypeInstance())) if ((underlyingType != NULL) && (underlyingType->IsGenericTypeInstance()))
{ {
auto underlyingGenericType = underlyingType->ToGenericTypeInstance();
PopulateType(underlyingType, BfPopulateType_Declaration); PopulateType(underlyingType, BfPopulateType_Declaration);
return ValidateGenericConstraints(typeRef, (BfTypeInstance*)underlyingType, ignoreErrors); bool result = ValidateGenericConstraints(typeRef, underlyingGenericType, ignoreErrors);
if (underlyingGenericType->mGenericTypeInfo->mHadValidateErrors)
genericTypeInst->mGenericTypeInfo->mHadValidateErrors = true;
return result;
} }
return true; return true;
} }
@ -7285,18 +7289,18 @@ BfType* BfModule::ResolveTypeResult(BfTypeReference* typeRef, BfType* resolvedTy
if (curGenericTypeInstance->mGenericTypeInfo->mHadValidateErrors) if (curGenericTypeInstance->mGenericTypeInfo->mHadValidateErrors)
doValidate = false; doValidate = false;
} }
if ((mContext->mCurTypeState != NULL) && (mContext->mCurTypeState->mCurBaseTypeRef != NULL)) // We validate constraints for base types later if ((mContext->mCurTypeState != NULL) && (mContext->mCurTypeState->mCurBaseTypeRef != NULL) && (!mContext->mCurTypeState->mTypeInstance->IsTypeAlias())) // We validate constraints for base types later
doValidate = false; doValidate = false;
} }
if (doValidate) if (doValidate)
ValidateGenericConstraints(typeRef, genericTypeInstance, false); ValidateGenericConstraints(typeRef, genericTypeInstance, false);
} }
if (populateType != BfPopulateType_IdentityNoRemapAlias) if (populateType != BfPopulateType_IdentityNoRemapAlias)
{ {
while ((resolvedTypeRef != NULL) && (resolvedTypeRef->IsTypeAlias())) while ((resolvedTypeRef != NULL) && (resolvedTypeRef->IsTypeAlias()))
{ {
if (mCurTypeInstance != NULL) if (mCurTypeInstance != NULL)
AddDependency(resolvedTypeRef, mCurTypeInstance, BfDependencyMap::DependencyFlag_NameReference); AddDependency(resolvedTypeRef, mCurTypeInstance, BfDependencyMap::DependencyFlag_NameReference);
if ((typeInstance->mCustomAttributes != NULL) && (!typeRef->IsTemporary())) if ((typeInstance->mCustomAttributes != NULL) && (!typeRef->IsTemporary()))