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 'int unknown' generic inference issue

Browse source
This commit is contained in:
Brian Fiete 2021-01-19 12:06:13 -08:00
parent 66ab699abf
commit 20d8ae279c
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -320,6 +320,8 @@ bool BfGenericInferContext::InferGenericArgument(BfMethodInstance* methodInstanc
} }
if ((*mCheckMethodGenericArguments)[wantGenericParam->mGenericParamIdx] == NULL) if ((*mCheckMethodGenericArguments)[wantGenericParam->mGenericParamIdx] == NULL)
mInferredCount++; mInferredCount++;
if ((argType != NULL) && (argType->IsIntUnknown()))
argType = mModule->FixIntUnknown(argType);
(*mCheckMethodGenericArguments)[wantGenericParam->mGenericParamIdx] = argType; (*mCheckMethodGenericArguments)[wantGenericParam->mGenericParamIdx] = argType;
if (!mPrevArgValues.IsEmpty()) if (!mPrevArgValues.IsEmpty())
mPrevArgValues[wantGenericParam->mGenericParamIdx] = argValue; mPrevArgValues[wantGenericParam->mGenericParamIdx] = argValue;

5
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -582,10 +582,6 @@ void BfModule::InitType(BfType* resolvedTypeRef, BfPopulateType populateType)
if (resolvedTypeRef->IsGenericTypeInstance()) if (resolvedTypeRef->IsGenericTypeInstance())
{ {
auto genericTypeInst = (BfTypeInstance*)resolvedTypeRef; auto genericTypeInst = (BfTypeInstance*)resolvedTypeRef;
//BF_ASSERT(genericTypeInst->mGenericParams.size() <= genericTypeInst->mTypeGenericArguments.size());
// BF_ASSERT((genericTypeInst->mGenericParams.size() == 0) ||
// (genericTypeInst->mGenericParams.size() == genericTypeInst->mTypeGenericArguments.size()));
for (auto typeGenericArg : genericTypeInst->mGenericTypeInfo->mTypeGenericArguments) for (auto typeGenericArg : genericTypeInst->mGenericTypeInfo->mTypeGenericArguments)
{ {
BF_ASSERT((typeGenericArg->mRebuildFlags & BfTypeRebuildFlag_Deleted) == 0); BF_ASSERT((typeGenericArg->mRebuildFlags & BfTypeRebuildFlag_Deleted) == 0);
@ -598,6 +594,7 @@ void BfModule::InitType(BfType* resolvedTypeRef, BfPopulateType populateType)
PopulateType(genericArg, BfPopulateType_Declaration); PopulateType(genericArg, BfPopulateType_Declaration);
} }
} }
BF_ASSERT(!typeGenericArg->IsIntUnknown());
} }
} }