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/delete constraint checking

Browse source
This commit is contained in:
Brian Fiete 2021-10-31 10:04:04 -07:00
parent a17f57f4c6
commit e5d70947d9
1 changed files with 36 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

61
IDEHelper/Compiler/BfModule.cpp
View file

@ -7674,25 +7674,7 @@ bool BfModule::CheckGenericConstraints(const BfGenericParamSource& genericParamS
TypeToString(origCheckArgType).c_str(), genericParamInst->GetName().c_str(), GenericParamSourceToString(genericParamSource).c_str()), checkArgTypeRef); TypeToString(origCheckArgType).c_str(), genericParamInst->GetName().c_str(), GenericParamSourceToString(genericParamSource).c_str()), checkArgTypeRef);
return false; return false;
} }
if ((genericParamInst->mGenericParamFlags & BfGenericParamFlag_New) &&
((checkGenericParamFlags & (BfGenericParamFlag_New | BfGenericParamFlag_Var)) == 0))
{
if ((!ignoreErrors) && (PreFail()))
*errorOut = Fail(StrFormat("Must add 'where %s : new' constraint in order to use type as parameter '%s' for '%s'",
TypeToString(origCheckArgType).c_str(), genericParamInst->GetName().c_str(), GenericParamSourceToString(genericParamSource).c_str()), checkArgTypeRef);
return false;
}
if ((genericParamInst->mGenericParamFlags & BfGenericParamFlag_Delete) &&
((checkGenericParamFlags & (BfGenericParamFlag_Delete | BfGenericParamFlag_Var)) == 0))
{
if ((!ignoreErrors) && (PreFail()))
*errorOut = Fail(StrFormat("Must add 'where %s : delete' constraint in order to use type as parameter '%s' for '%s'",
TypeToString(origCheckArgType).c_str(), genericParamInst->GetName().c_str(), GenericParamSourceToString(genericParamSource).c_str()), checkArgTypeRef);
return false;
}
if ((genericParamInst->mGenericParamFlags & BfGenericParamFlag_Const) != 0) if ((genericParamInst->mGenericParamFlags & BfGenericParamFlag_Const) != 0)
{ {
if (((checkGenericParamFlags & BfGenericParamFlag_Const) == 0) && (!checkArgType->IsConstExprValue())) if (((checkGenericParamFlags & BfGenericParamFlag_Const) == 0) && (!checkArgType->IsConstExprValue()))
@ -7721,19 +7703,25 @@ bool BfModule::CheckGenericConstraints(const BfGenericParamSource& genericParamS
canDelete = true; canDelete = true;
else if (checkArgType->IsObjectOrInterface()) else if (checkArgType->IsObjectOrInterface())
canDelete = true; canDelete = true;
else if ((checkGenericParamFlags & BfGenericParamFlag_Delete) != 0) else if ((checkGenericParamFlags & (BfGenericParamFlag_Delete | BfGenericParamFlag_Var)) != 0)
canDelete = true; canDelete = true;
if (!canDelete) if (!canDelete)
{ {
if ((!ignoreErrors) && (PreFail())) if ((!ignoreErrors) && (PreFail()))
*errorOut = Fail(StrFormat("The type '%s' must be a deletable type in order to use it as parameter '%s' for '%s'", {
TypeToString(origCheckArgType).c_str(), genericParamInst->GetName().c_str(), GenericParamSourceToString(genericParamSource).c_str()), checkArgTypeRef); if (checkArgType->IsGenericParam())
*errorOut = Fail(StrFormat("Must add 'where %s : delete' constraint in order to use type as parameter '%s' for '%s'",
TypeToString(origCheckArgType).c_str(), genericParamInst->GetName().c_str(), GenericParamSourceToString(genericParamSource).c_str()), checkArgTypeRef);
else
*errorOut = Fail(StrFormat("The type '%s' must be a deletable type in order to use it as parameter '%s' for '%s'",
TypeToString(origCheckArgType).c_str(), genericParamInst->GetName().c_str(), GenericParamSourceToString(genericParamSource).c_str()), checkArgTypeRef);
}
return false; return false;
} }
} }
if ((genericParamInst->mGenericParamFlags & BfGenericParamFlag_New) != 0) if ((genericParamInst->mGenericParamFlags & BfGenericParamFlag_New) != 0)
{ {
bool canAlloc = false; bool canAlloc = false;
if (auto checkTypeInst = checkArgType->ToTypeInstance()) if (auto checkTypeInst = checkArgType->ToTypeInstance())
@ -7749,6 +7737,19 @@ bool BfModule::CheckGenericConstraints(const BfGenericParamSource& genericParamS
bool hadProtected = false; bool hadProtected = false;
while (checkMethodDef != NULL) while (checkMethodDef != NULL)
{ {
if (!checkMethodDef->mParams.IsEmpty())
{
auto firstParam = checkMethodDef->mParams[0];
if ((firstParam->mParamDeclaration != NULL) && (firstParam->mParamDeclaration->mInitializer != NULL))
{
// Allow all-default params
}
else
{
checkMethodDef = checkMethodDef->mNextWithSameName;
continue;
}
}
if (checkMethodDef->mProtection == BfProtection_Public) if (checkMethodDef->mProtection == BfProtection_Public)
{ {
canAlloc = true; canAlloc = true;
@ -7763,6 +7764,10 @@ bool BfModule::CheckGenericConstraints(const BfGenericParamSource& genericParamS
canAlloc = TypeIsSubTypeOf(mCurTypeInstance, checkTypeInst, false); canAlloc = TypeIsSubTypeOf(mCurTypeInstance, checkTypeInst, false);
} }
} }
else if (checkArgType->IsGenericParam())
{
canAlloc = (checkGenericParamFlags & (BfGenericParamFlag_New | BfGenericParamFlag_Var)) != 0;
}
else else
{ {
// Any primitive types and stuff can be allocated // Any primitive types and stuff can be allocated
@ -7772,8 +7777,14 @@ bool BfModule::CheckGenericConstraints(const BfGenericParamSource& genericParamS
if (!canAlloc) if (!canAlloc)
{ {
if ((!ignoreErrors) && (PreFail())) if ((!ignoreErrors) && (PreFail()))
*errorOut = Fail(StrFormat("The type '%s' must have an accessible default constructor in order to use it as parameter '%s' for '%s'", {
TypeToString(origCheckArgType).c_str(), genericParamInst->GetName().c_str(), GenericParamSourceToString(genericParamSource).c_str()), checkArgTypeRef); if (checkArgType->IsGenericParam())
*errorOut = Fail(StrFormat("Must add 'where %s : new' constraint in order to use type as parameter '%s' for '%s'",
TypeToString(origCheckArgType).c_str(), genericParamInst->GetName().c_str(), GenericParamSourceToString(genericParamSource).c_str()), checkArgTypeRef);
else
*errorOut = Fail(StrFormat("The type '%s' must have an accessible default constructor in order to use it as parameter '%s' for '%s'",
TypeToString(origCheckArgType).c_str(), genericParamInst->GetName().c_str(), GenericParamSourceToString(genericParamSource).c_str()), checkArgTypeRef);
}
return false; return false;
} }
} }