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

Fixed operator constraint checking with generic operators

Browse source
This commit is contained in:
Brian Fiete 2021-01-20 11:23:28 -08:00
parent 48f2ec42f5
commit d0cfb37309
2 changed files with 56 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

61
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -20846,14 +20846,30 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
if ((flags & BfBinOpFlag_IsConstraintCheck) != 0)
{
// We can't do CheckMethod because circular referencing means we may have to evaluate this before our type is complete,
// which means before method processing has occurred
auto returnType = mModule->CheckOperator(checkType, operatorDef, args[0].mTypedValue, args[1].mTypedValue);
if (returnType != NULL)
if (operatorDef->mGenericParams.IsEmpty())
{
operatorConstraintReturnType = returnType;
methodMatcher.mBestMethodDef = operatorDef;
foundExactMatch = true;
// Fast check
auto returnType = mModule->CheckOperator(checkType, operatorDef, args[0].mTypedValue, args[1].mTypedValue);
if (returnType != NULL)
{
operatorConstraintReturnType = returnType;
methodMatcher.mBestMethodDef = operatorDef;
methodMatcher.mBestMethodTypeInstance = checkType;
foundExactMatch = true;
}
}
else
{
if (methodMatcher.CheckMethod(NULL, checkType, operatorDef, false))
{
auto rawMethodInstance = mModule->GetRawMethodInstance(checkType, operatorDef);
auto returnType = mModule->ResolveGenericType(rawMethodInstance->mReturnType, NULL, &methodMatcher.mBestMethodGenericArguments);
if (returnType != NULL)
{
operatorConstraintReturnType = returnType;
foundExactMatch = true;
}
}
}
}
else
@ -20877,13 +20893,32 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
{
if ((flags & BfBinOpFlag_IsConstraintCheck) != 0)
{
auto returnType = mModule->CheckOperator(checkType, oppositeOperatorDef, args[0].mTypedValue, args[1].mTypedValue);
if (returnType != NULL)
if (oppositeOperatorDef->mGenericParams.IsEmpty())
{
operatorConstraintReturnType = returnType;
methodMatcher.mBestMethodDef = oppositeOperatorDef;
methodMatcher.mSelfType = entry.mSrcType;
wasTransformedUsage = true;
// Fast check
auto returnType = mModule->CheckOperator(checkType, oppositeOperatorDef, args[0].mTypedValue, args[1].mTypedValue);
if (returnType != NULL)
{
operatorConstraintReturnType = returnType;
methodMatcher.mBestMethodDef = oppositeOperatorDef;
methodMatcher.mBestMethodTypeInstance = checkType;
methodMatcher.mSelfType = entry.mSrcType;
wasTransformedUsage = true;
}
}
else
{
if (methodMatcher.CheckMethod(NULL, checkType, oppositeOperatorDef, false))
{
auto rawMethodInstance = mModule->GetRawMethodInstance(checkType, oppositeOperatorDef);
auto returnType = mModule->ResolveGenericType(rawMethodInstance->mReturnType, NULL, &methodMatcher.mBestMethodGenericArguments);
if (returnType != NULL)
{
operatorConstraintReturnType = returnType;
methodMatcher.mSelfType = entry.mSrcType;
wasTransformedUsage = true;
}
}
}
}
else

8
IDEHelper/Tests/src/Nullable.bf
View file

@ -59,6 +59,11 @@ namespace Tests
Test.Assert(i == 100);
}
public static T DoAdd<T>(T lhs, T rhs) where T : operator T + T
{
return lhs + rhs;
}
[Test]
public static void TestOperators()
{
@ -84,6 +89,9 @@ namespace Tests
Test.Assert(iNull == 100);
Test.Assert(iNull != 99);
Test.Assert(!(iNull != 100));
Test.Assert(DoAdd(iNull, iNull) == 200);
Test.Assert(DoAdd(iNull, null) == null);
}
}
}