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 new generic constraint check with foreign 'var' generic param

Browse source
This commit is contained in:
Brian Fiete 2024-03-22 17:27:17 -04:00
parent cbdfe505ca
commit b8d9e9845f
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
IDEHelper/Compiler/BfModule.cpp
View file

@ -8397,6 +8397,8 @@ bool BfModule::CheckGenericConstraints(const BfGenericParamSource& genericParamS
checkGenericParamFlags = checkGenericParamInst->mGenericParamFlags; checkGenericParamFlags = checkGenericParamInst->mGenericParamFlags;
if (checkGenericParamInst->mTypeConstraint != NULL) if (checkGenericParamInst->mTypeConstraint != NULL)
checkArgType = checkGenericParamInst->mTypeConstraint; checkArgType = checkGenericParamInst->mTypeConstraint;
if (checkGenericParamInst->mGenericParamFlags & BfGenericParamFlag_Var)
checkArgType = GetPrimitiveType(BfTypeCode_Var);
// if ((checkGenericParamFlags & (BfGenericParamFlag_Struct | BfGenericParamFlag_StructPtr)) != 0) // if ((checkGenericParamFlags & (BfGenericParamFlag_Struct | BfGenericParamFlag_StructPtr)) != 0)
// { // {
@ -8660,6 +8662,7 @@ bool BfModule::CheckGenericConstraints(const BfGenericParamSource& genericParamS
convCheckConstraint = ResolveGenericType(convCheckConstraint, NULL, methodGenericArgs, mCurTypeInstance); convCheckConstraint = ResolveGenericType(convCheckConstraint, NULL, methodGenericArgs, mCurTypeInstance);
if (convCheckConstraint == NULL) if (convCheckConstraint == NULL)
return false; return false;
if ((checkArgType->IsMethodRef()) || (checkArgType->IsFunction())) if ((checkArgType->IsMethodRef()) || (checkArgType->IsFunction()))
{ {
if (convCheckConstraint->IsDelegate()) if (convCheckConstraint->IsDelegate())
@ -8693,7 +8696,7 @@ bool BfModule::CheckGenericConstraints(const BfGenericParamSource& genericParamS
else if ((checkArgType->IsFunction()) && (convCheckConstraint->IsInstanceOf(mCompiler->mFunctionTypeDef))) else if ((checkArgType->IsFunction()) && (convCheckConstraint->IsInstanceOf(mCompiler->mFunctionTypeDef)))
constraintMatched = true; constraintMatched = true;
} }
else if ((checkArgType == convCheckConstraint) || (TypeIsSubTypeOf(checkArgType->ToTypeInstance(), convCheckConstraint->ToTypeInstance()))) else if ((checkArgType == convCheckConstraint) || (checkArgType->IsVar()) || (TypeIsSubTypeOf(checkArgType->ToTypeInstance(), convCheckConstraint->ToTypeInstance())))
{ {
constraintMatched = true; constraintMatched = true;
} }