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

Fixed bugs related to generic delegate type references

Browse source
This commit is contained in:
Brian Fiete 2020-02-13 07:55:50 -08:00
parent cd26d44a62
commit 7b9c994066
8 changed files with 240 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

57
IDEHelper/Compiler/BfResolvedTypeUtils.cpp
View file

@ -2754,6 +2754,34 @@ bool BfResolvedTypeSet::Equals(BfType* lhs, BfType* rhs, LookupContext* ctx)
return lhsClosure->mClosureHash == rhsClosure->mClosureHash;
}
if (lhs->IsDelegateFromTypeRef() || lhs->IsFunctionFromTypeRef())
{
if (!rhs->IsDelegateFromTypeRef() && !rhs->IsFunctionFromTypeRef())
return false;
if (lhs->IsDelegate() != rhs->IsDelegate())
return false;
BfDelegateType* lhsDelegateType = (BfDelegateType*)lhs;
BfDelegateType* rhsDelegateType = (BfDelegateType*)rhs;
if (lhsDelegateType->mTypeDef->mIsDelegate != rhsDelegateType->mTypeDef->mIsDelegate)
return false;
auto lhsMethodDef = lhsDelegateType->mTypeDef->mMethods[0];
auto rhsMethodDef = rhsDelegateType->mTypeDef->mMethods[0];
if (lhsDelegateType->mReturnType != rhsDelegateType->mReturnType)
return false;
if (lhsDelegateType->mParams.size() != rhsDelegateType->mParams.size())
return false;
for (int paramIdx = 0; paramIdx < lhsDelegateType->mParams.size(); paramIdx++)
{
if (lhsDelegateType->mParams[paramIdx] != rhsDelegateType->mParams[paramIdx])
return false;
if (lhsMethodDef->mParams[paramIdx]->mName != rhsMethodDef->mParams[paramIdx]->mName)
return false;
}
return true;
}
if (lhs->IsGenericTypeInstance())
{
if (!rhs->IsGenericTypeInstance())
@ -2874,34 +2902,7 @@ bool BfResolvedTypeSet::Equals(BfType* lhs, BfType* rhs, LookupContext* ctx)
return (lhsMethodRefType->mMethodRef == rhsMethodRefType->mMethodRef) &&
(lhsMethodRefType->mOwner == rhsMethodRefType->mOwner) &&
(lhsMethodRefType->mOwnerRevision == rhsMethodRefType->mOwnerRevision);
}
else if (lhs->IsDelegateFromTypeRef() || lhs->IsFunctionFromTypeRef())
{
if (!rhs->IsDelegateFromTypeRef() && !rhs->IsFunctionFromTypeRef())
return false;
if (lhs->IsDelegate() != rhs->IsDelegate())
return false;
BfDelegateType* lhsDelegateType = (BfDelegateType*)lhs;
BfDelegateType* rhsDelegateType = (BfDelegateType*)rhs;
if (lhsDelegateType->mTypeDef->mIsDelegate != rhsDelegateType->mTypeDef->mIsDelegate)
return false;
auto lhsMethodDef = lhsDelegateType->mTypeDef->mMethods[0];
auto rhsMethodDef = rhsDelegateType->mTypeDef->mMethods[0];
if (lhsDelegateType->mReturnType != rhsDelegateType->mReturnType)
return false;
if (lhsDelegateType->mParams.size() != rhsDelegateType->mParams.size())
return false;
for (int paramIdx = 0; paramIdx < lhsDelegateType->mParams.size(); paramIdx++)
{
if (lhsDelegateType->mParams[paramIdx] != rhsDelegateType->mParams[paramIdx])
return false;
if (lhsMethodDef->mParams[paramIdx]->mName != rhsMethodDef->mParams[paramIdx]->mName)
return false;
}
return true;
}
}
else if ((lhs->IsConstExprValue()) || (rhs->IsConstExprValue()))
{
if (!lhs->IsConstExprValue() || !rhs->IsConstExprValue())