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

Experimental disabling of 'wantGeneric=false' for inner delegates/tuples

Browse source
This commit is contained in:
Brian Fiete 2022-01-01 06:36:48 -05:00
parent 156585773d
commit ef6b52a0ac
4 changed files with 54 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

34
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -7674,8 +7674,16 @@ BfType* BfModule::ResolveGenericType(BfType* unspecializedType, BfTypeVector* ty
}
if ((genericParam->mGenericParamKind == BfGenericParamKind_Method) && (methodGenericArguments != NULL))
{
if (genericParam->mGenericParamIdx < (int)methodGenericArguments->size())
return FixIntUnknown((*methodGenericArguments)[genericParam->mGenericParamIdx]);
if (genericParam->mGenericParamIdx < (int)methodGenericArguments->size())
{
auto resolvedType = FixIntUnknown((*methodGenericArguments)[genericParam->mGenericParamIdx]);
if ((resolvedType != NULL) && (resolvedType->IsGenericParam()))
{
auto genericParamType = (BfGenericParamType*)resolvedType;
//BF_ASSERT(genericParamType->mGenericParamKind != BfGenericParamKind_Method);
}
return resolvedType;
}
BF_ASSERT(allowFail);
}
return unspecializedType;
@ -7785,7 +7793,7 @@ BfType* BfModule::ResolveGenericType(BfType* unspecializedType, BfTypeVector* ty
if (newGenericArg->IsVar())
return newGenericArg;
if (newGenericArg->IsGenericParam())
if (newGenericArg->IsTypeGenericParam())
wantGeneric = true;
if (newGenericArg->IsUnspecializedType())
isUnspecialized = true;
@ -7804,6 +7812,9 @@ BfType* BfModule::ResolveGenericType(BfType* unspecializedType, BfTypeVector* ty
if (unspecializedGenericTupleType == NULL)
wantGeneric = false;
//TODO:
wantGeneric = false;
auto baseType = (BfTypeInstance*)ResolveTypeDef(mContext->mCompiler->mValueTypeTypeDef);
BfTypeInstance* tupleType = NULL;
@ -7909,7 +7920,7 @@ BfType* BfModule::ResolveGenericType(BfType* unspecializedType, BfTypeVector* ty
bool isUnspecialized = false;
auto _CheckType = [&](BfType* type)
{
if (type->IsGenericParam())
if (type->IsTypeGenericParam())
wantGeneric = true;
if (type->IsUnspecializedType())
isUnspecialized = true;
@ -7943,6 +7954,9 @@ BfType* BfModule::ResolveGenericType(BfType* unspecializedType, BfTypeVector* ty
if (unspecializedGenericDelegateType == NULL)
wantGeneric = false;
//TODO:
wantGeneric = false;
BfTypeInstance* delegateType = NULL;
auto baseDelegateType = ResolveTypeDef(mCompiler->mDelegateTypeDef)->ToTypeInstance();
@ -10605,7 +10619,7 @@ BfType* BfModule::ResolveTypeRef(BfTypeReference* typeRef, BfPopulateType popula
else
fieldName = StrFormat("%d", fieldIdx);
if (type->IsGenericParam())
if (type->IsTypeGenericParam())
wantGeneric = true;
if (type->IsUnspecializedType())
isUnspecialized = true;
@ -10621,6 +10635,9 @@ BfType* BfModule::ResolveTypeRef(BfTypeReference* typeRef, BfPopulateType popula
if ((mCurTypeInstance == NULL) || (!mCurTypeInstance->IsGenericTypeInstance()))
wantGeneric = false;
//TODO:
wantGeneric = false;
auto baseType = (BfTypeInstance*)ResolveTypeDef(mContext->mCompiler->mValueTypeTypeDef, BfPopulateType_Identity);
BfTypeInstance* tupleType = NULL;
if (wantGeneric)
@ -10776,8 +10793,8 @@ BfType* BfModule::ResolveTypeRef(BfTypeReference* typeRef, BfPopulateType popula
bool isUnspecialized = false;
auto _CheckType = [&](BfType* type)
{
if (type->IsGenericParam())
wantGeneric = true;
if (type->IsTypeGenericParam())
wantGeneric = true;
if (type->IsUnspecializedType())
isUnspecialized = true;
};
@ -10857,6 +10874,9 @@ BfType* BfModule::ResolveTypeRef(BfTypeReference* typeRef, BfPopulateType popula
if ((mCurTypeInstance == NULL) || (!mCurTypeInstance->IsGenericTypeInstance()))
wantGeneric = false;
//TODO:
wantGeneric = false;
BfTypeInstance* baseDelegateType = NULL;
if (mCompiler->mDelegateTypeDef != NULL)
baseDelegateType = ResolveTypeDef(mCompiler->mDelegateTypeDef)->ToTypeInstance();