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

Incorporate extern constraints from method in lookupField

Browse source
This commit is contained in:
Brian Fiete 2022-01-20 10:39:57 -05:00
parent 8cd20d4866
commit 83bed6b004
1 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -4351,11 +4351,11 @@ BfTypedValue BfExprEvaluator::LookupField(BfAstNode* targetSrc, BfTypedValue tar
if (isUnspecializedSection) if (isUnspecializedSection)
{ {
auto origTarget = target;
if (genericParamInst->mTypeConstraint != NULL) if (genericParamInst->mTypeConstraint != NULL)
{ {
target.mType = genericParamInst->mTypeConstraint; target.mType = genericParamInst->mTypeConstraint;
if (target.mType->IsWrappableType())
target.mType = mModule->GetWrappedStructType(target.mType);
} }
else else
target.mType = mModule->mContext->mBfObjectType; target.mType = mModule->mContext->mBfObjectType;
@ -4364,6 +4364,28 @@ BfTypedValue BfExprEvaluator::LookupField(BfAstNode* targetSrc, BfTypedValue tar
{ {
target.mType = mModule->GetPrimitiveType(BfTypeCode_Var); target.mType = mModule->GetPrimitiveType(BfTypeCode_Var);
} }
if (origTarget.mType->IsTypeGenericParam())
{
// Check for extern constraint in method generic params
if ((mModule->mCurMethodInstance != NULL) && (mModule->mCurMethodInstance->mMethodInfoEx != NULL))
{
for (auto genericParam : mModule->mCurMethodInstance->mMethodInfoEx->mGenericParams)
{
if (genericParam->mExternType == origTarget.mType)
{
if (genericParam->mTypeConstraint != NULL)
{
target.mType = genericParam->mTypeConstraint;
break;
}
}
}
}
}
if (target.mType->IsWrappableType())
target.mType = mModule->GetWrappedStructType(target.mType);
} }
else else
{ {