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

Fixed member field lookup from generic constraint

Browse source
This commit is contained in:
Brian Fiete 2020-11-16 08:47:45 -08:00
parent bb4f0df653
commit 234b3591eb
1 changed files with 37 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

37
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -3781,6 +3781,43 @@ void BfExprEvaluator::FixitAddMember(BfTypeInstance* typeInst, BfType* fieldType
BfTypedValue BfExprEvaluator::LookupField(BfAstNode* targetSrc, BfTypedValue target, const StringImpl& fieldName, BfLookupFieldFlags flags) BfTypedValue BfExprEvaluator::LookupField(BfAstNode* targetSrc, BfTypedValue target, const StringImpl& fieldName, BfLookupFieldFlags flags)
{ {
if ((target.mType != NULL && (target.mType->IsGenericParam())))
{
auto genericParamInst = mModule->GetGenericParamInstance((BfGenericParamType*)target.mType);
if (mModule->mCurMethodInstance->mIsUnspecialized)
{
if (genericParamInst->mTypeConstraint != NULL)
target.mType = genericParamInst->mTypeConstraint;
else
target.mType = mModule->mContext->mBfObjectType;
if ((genericParamInst->mGenericParamFlags & BfGenericParamFlag_Var) != 0)
{
target.mType = mModule->GetPrimitiveType(BfTypeCode_Var);
}
}
else
{
if ((genericParamInst->mGenericParamFlags & BfGenericParamFlag_Var) != 0)
{
//target.mType = mModule->ResolveGenericType(mResult.mType);
}
else if (genericParamInst->mTypeConstraint != NULL)
{
target = mModule->Cast(targetSrc, target, genericParamInst->mTypeConstraint);
BF_ASSERT(target);
}
else
{
// This shouldn't occur - this would infer that we are accessing a member of Object or something...
//target.mType = mModule->ResolveGenericType(mResult.mType);
}
}
}
if ((target.mType != NULL) && (target.mType->IsVar()))
return BfTypedValue(mModule->GetDefaultValue(target.mType), target.mType, true);
BfTypeInstance* startCheckType = mModule->mCurTypeInstance; BfTypeInstance* startCheckType = mModule->mCurTypeInstance;
mPropDef = NULL; mPropDef = NULL;
mPropDefBypassVirtual = false; mPropDefBypassVirtual = false;