Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-11 04:52:21 +02:00
Code Activity

Valueless equality check fix, respecting equality operator overloads

Browse source
This commit is contained in:
Brian Fiete 2021-11-04 10:54:20 -07:00
parent 869d626412
commit fd08367e2b
1 changed files with 41 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

54
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -21478,19 +21478,6 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
return; return;
} }
} }
// Valueless types always compare as 'equal'
if (leftValue.mType == rightValue.mType)
{
mModule->PopulateType(leftValue.mType);
if (leftValue.mType->IsValuelessType())
{
auto boolType = mModule->GetPrimitiveType(BfTypeCode_Boolean);
bool isEqual = (binaryOp == BfBinaryOp_Equality) || (binaryOp == BfBinaryOp_StrictEquality);
mResult = BfTypedValue(mModule->GetConstValue(isEqual ? 1 : 0, boolType), boolType);
return;
}
}
} }
if ((leftValue.mType->IsTypeInstance()) || (leftValue.mType->IsGenericParam()) || if ((leftValue.mType->IsTypeInstance()) || (leftValue.mType->IsGenericParam()) ||
@ -22206,6 +22193,47 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
return; return;
} }
// Valueless types always compare as 'equal' if we can ensure no members could have an equality operator overload
if (leftValue.mType->IsComposite())
{
mModule->PopulateType(leftValue.mType);
if (leftValue.mType->IsValuelessType())
{
bool mayHaveEqualOverload = false;
auto leftTypeInst = leftValue.mType->ToTypeInstance();
if (leftTypeInst != NULL)
{
std::function<bool(BfType*)> _HasTypeInstance = [&](BfType* type)
{
if (type == NULL)
return false;
if (type->IsTypeInstance())
return true;
if (type->IsSizedArray())
return _HasTypeInstance(((BfSizedArrayType*)type)->mElementType);
return false;
};
for (auto& fieldInstance : leftTypeInst->mFieldInstances)
{
if (_HasTypeInstance(fieldInstance.mResolvedType))
mayHaveEqualOverload = true;
}
}
if (!mayHaveEqualOverload)
{
auto boolType = mModule->GetPrimitiveType(BfTypeCode_Boolean);
bool isEqual = (binaryOp == BfBinaryOp_Equality) || (binaryOp == BfBinaryOp_StrictEquality);
mResult = BfTypedValue(mModule->GetConstValue(isEqual ? 1 : 0, boolType), boolType);
return;
}
}
}
if (_CallValueTypeEquals()) if (_CallValueTypeEquals())
return; return;
} }