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

New function/delegate casting rules, similar to tuple rules

Browse source
This commit is contained in:
Brian Fiete 2020-03-31 07:46:01 -07:00
parent c62dbdf811
commit de6a68911a
8 changed files with 143 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

35
IDEHelper/Compiler/BfResolvedTypeUtils.cpp
View file

@ -676,18 +676,22 @@ int BfMethodInstance::GetImplicitParamCount()
return 0;
}
String BfMethodInstance::GetParamName(int paramIdx)
void BfMethodInstance::GetParamName(int paramIdx, StringImpl& name)
{
if (paramIdx == -1)
{
BF_ASSERT(!mMethodDef->mIsStatic);
return "this";
name = "this";
return;
}
if ((mMethodInfoEx != NULL) && (mMethodInfoEx->mClosureInstanceInfo != NULL) && (mMethodDef->mIsLocalMethod))
{
if (paramIdx < (int)mMethodInfoEx->mClosureInstanceInfo->mCaptureEntries.size())
return mMethodInfoEx->mClosureInstanceInfo->mCaptureEntries[paramIdx].mName;
{
name = mMethodInfoEx->mClosureInstanceInfo->mCaptureEntries[paramIdx].mName;
return;
}
}
BfMethodParam* methodParam = &mParams[paramIdx];
@ -696,11 +700,19 @@ String BfMethodInstance::GetParamName(int paramIdx)
{
BfMethodInstance* invokeMethodInstance = methodParam->GetDelegateParamInvoke();
if (methodParam->mDelegateParamNameCombine)
return paramDef->mName + "__" + invokeMethodInstance->GetParamName(methodParam->mDelegateParamIdx);
name = paramDef->mName + "__" + invokeMethodInstance->GetParamName(methodParam->mDelegateParamIdx);
else
return invokeMethodInstance->GetParamName(methodParam->mDelegateParamIdx);
invokeMethodInstance->GetParamName(methodParam->mDelegateParamIdx, name);
return;
}
return paramDef->mName;
name = paramDef->mName;
}
String BfMethodInstance::GetParamName(int paramIdx)
{
String paramName;
GetParamName(paramIdx, paramName);
return paramName;
}
BfType* BfMethodInstance::GetParamType(int paramIdx, bool useResolvedType)
@ -2644,11 +2656,6 @@ int BfResolvedTypeSet::Hash(BfTypeReference* typeRef, LookupContext* ctx, BfHash
BfTypeReference* fieldType = param->mTypeRef;
hashVal = ((hashVal ^ (Hash(fieldType, ctx, BfHashFlag_AllowRef))) << 5) - hashVal;
hashVal = ((hashVal ^ (HashNode(param->mNameNode))) << 5) - hashVal;
if (param->mNameNode == NULL)
{
ctx->mFailed = true;
}
}
return hashVal;
@ -3158,7 +3165,11 @@ bool BfResolvedTypeSet::Equals(BfType* lhs, BfTypeReference* rhs, LookupContext*
{
if (!Equals(lhsInvokeMethodInstance->GetParamType(paramIdx), rhsDelegateType->mParams[paramIdx]->mTypeRef, ctx))
return false;
if (lhsInvokeMethodInstance->GetParamName(paramIdx) != rhsDelegateType->mParams[paramIdx]->mNameNode->ToString())
StringView rhsParamName;
if (rhsDelegateType->mParams[paramIdx]->mNameNode != NULL)
rhsParamName = rhsDelegateType->mParams[paramIdx]->mNameNode->ToStringView();
if (lhsInvokeMethodInstance->GetParamName(paramIdx) != rhsParamName)
return false;
}
return true;