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

Fixed issue with local methods in generic types

Browse source
This commit is contained in:
Brian Fiete 2020-09-27 23:07:29 -07:00
parent 5403cdb748
commit ee4ae8f9ed
3 changed files with 35 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -19315,12 +19315,16 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
} }
// Valueless types always compare as 'equal' // Valueless types always compare as 'equal'
if ((leftValue.mType == rightValue.mType) && (leftValue.mType->IsValuelessType())) if (leftValue.mType == rightValue.mType)
{ {
auto boolType = mModule->GetPrimitiveType(BfTypeCode_Boolean); mModule->PopulateType(leftValue.mType);
bool isEqual = (binaryOp == BfBinaryOp_Equality) || (binaryOp == BfBinaryOp_StrictEquality); if (leftValue.mType->IsValuelessType())
mResult = BfTypedValue(mModule->GetConstValue(isEqual ? 1 : 0, boolType), boolType); {
return; auto boolType = mModule->GetPrimitiveType(BfTypeCode_Boolean);
bool isEqual = (binaryOp == BfBinaryOp_Equality) || (binaryOp == BfBinaryOp_StrictEquality);
mResult = BfTypedValue(mModule->GetConstValue(isEqual ? 1 : 0, boolType), boolType);
return;
}
} }
} }

8
IDEHelper/Compiler/BfModule.cpp
View file

@ -9474,14 +9474,14 @@ BfMethodInstance* BfModule::GetRawMethodByName(BfTypeInstance* typeInstance, con
} }
BfMethodInstance* BfModule::GetUnspecializedMethodInstance(BfMethodInstance* methodInstance, bool useUnspecializedType) BfMethodInstance* BfModule::GetUnspecializedMethodInstance(BfMethodInstance* methodInstance, bool useUnspecializedType)
{ {
if ((methodInstance->mMethodInfoEx != NULL) && (methodInstance->mMethodInfoEx->mMethodGenericArguments.size() != 0)) if ((methodInstance->mMethodInfoEx != NULL) && (methodInstance->mMethodInfoEx->mMethodGenericArguments.size() != 0))
methodInstance = methodInstance->mMethodInstanceGroup->mDefault; methodInstance = methodInstance->mMethodInstanceGroup->mDefault;
auto owner = methodInstance->mMethodInstanceGroup->mOwner; auto owner = methodInstance->mMethodInstanceGroup->mOwner;
if (!useUnspecializedType) if (!useUnspecializedType)
return GetRawMethodInstanceAtIdx(owner, methodInstance->mMethodDef->mIdx); return methodInstance;
if (!owner->IsGenericTypeInstance()) if (!owner->IsGenericTypeInstance())
return methodInstance; return methodInstance;
@ -17320,9 +17320,9 @@ void BfModule::ProcessMethod(BfMethodInstance* methodInstance, bool isInlineDup)
methodState.mGenericTypeBindings = &methodInstance->GetMethodInfoEx()->mGenericTypeBindings; methodState.mGenericTypeBindings = &methodInstance->GetMethodInfoEx()->mGenericTypeBindings;
} }
else if ((((methodInstance->mMethodInfoEx != NULL) && ((int)methodInstance->mMethodInfoEx->mMethodGenericArguments.size() > dependentGenericStartIdx)) || else if ((((methodInstance->mMethodInfoEx != NULL) && ((int)methodInstance->mMethodInfoEx->mMethodGenericArguments.size() > dependentGenericStartIdx)) ||
((mCurTypeInstance->IsGenericTypeInstance()) && (!isGenericVariation)))) ((mCurTypeInstance->IsGenericTypeInstance()) && (!isGenericVariation) && (!methodInstance->mMethodDef->mIsLocalMethod))))
{ {
unspecializedMethodInstance = GetUnspecializedMethodInstance(methodInstance); unspecializedMethodInstance = GetUnspecializedMethodInstance(methodInstance, !methodInstance->mMethodDef->mIsLocalMethod);
BF_ASSERT(unspecializedMethodInstance != methodInstance); BF_ASSERT(unspecializedMethodInstance != methodInstance);
if (!unspecializedMethodInstance->mHasBeenProcessed) if (!unspecializedMethodInstance->mHasBeenProcessed)

22
IDEHelper/Tests/src/LocalFunctions.bf
View file

@ -6,6 +6,25 @@ namespace Tests
{ {
class LocalFunctions class LocalFunctions
{ {
class ClassA<T>
{
public int Get<T2>()
{
int LocalA()
{
return 123;
}
int LocalB<T3>(T3 val) where T3 : IHashable
{
val.GetHashCode();
return 234;
}
return LocalA() + LocalB(1.2f);
}
}
[Test] [Test]
static void TestA() static void TestA()
{ {
@ -23,6 +42,9 @@ namespace Tests
FuncA(); FuncA();
Test.Assert(a == 101); Test.Assert(a == 101);
ClassA<int> ca = scope .();
Test.Assert(ca.Get<int16>() == 357);
} }
[Test] [Test]