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

Fix inherited properties on interface

Browse source
This commit is contained in:
Fusioon 2025-03-12 03:02:38 +01:00
parent 9c79d8aa6c
commit 410a6ead6a
1 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -5886,6 +5886,7 @@ BfTypedValue BfExprEvaluator::LookupField(BfAstNode* targetSrc, BfTypedValue tar
flags = (BfLookupFieldFlags)(flags | BfLookupFieldFlag_IsFailurePass); flags = (BfLookupFieldFlags)(flags | BfLookupFieldFlag_IsFailurePass);
bool isBaseLookup = false; bool isBaseLookup = false;
int checkInterfaceIdx = 0;
while (curCheckType != NULL) while (curCheckType != NULL)
{ {
if (((flags & BfLookupFieldFlag_CheckingOuter) != 0) && ((mBfEvalExprFlags & BfEvalExprFlags_Comptime) != 0)) if (((flags & BfLookupFieldFlag_CheckingOuter) != 0) && ((mBfEvalExprFlags & BfEvalExprFlags_Comptime) != 0))
@ -6243,10 +6244,18 @@ BfTypedValue BfExprEvaluator::LookupField(BfAstNode* targetSrc, BfTypedValue tar
} }
} }
if ((!isBaseLookup) && (startCheckType->IsInterface() && (checkInterfaceIdx < (int)startCheckType->mInterfaces.size())))
{
curCheckType = startCheckType->mInterfaces[checkInterfaceIdx].mInterfaceType;
checkInterfaceIdx++;
}
else
{
isBaseLookup = true; isBaseLookup = true;
curCheckType = curCheckType->mBaseType; curCheckType = curCheckType->mBaseType;
} }
} }
}
auto outerTypeDef = mModule->GetOuterType(startCheckType); auto outerTypeDef = mModule->GetOuterType(startCheckType);
if (outerTypeDef != NULL) if (outerTypeDef != NULL)
@ -19919,6 +19928,19 @@ BfModuleMethodInstance BfExprEvaluator::GetPropertyMethodInstance(BfMethodDef* m
if (bestIFaceEntry != NULL) if (bestIFaceEntry != NULL)
{ {
if ((checkTypeInst->IsInterface()))
{
auto propTypeInst = bestIFaceEntry->mInterfaceType->ToTypeInstance();
if (propTypeInst == NULL)
{
mModule->Fail("INTERNAL ERROR: Invalid property target", mPropSrc);
return BfModuleMethodInstance();
}
BF_ASSERT(propTypeInst->mTypeDef->mFullNameEx == methodDef->mDeclaringType->mFullNameEx);
return mModule->GetMethodInstance(propTypeInst, methodDef, BfTypeVector(), mPropGetMethodFlags);
}
auto ifaceMethodEntry = checkTypeInst->mInterfaceMethodTable[bestIFaceEntry->mStartInterfaceTableIdx + methodDef->mIdx]; auto ifaceMethodEntry = checkTypeInst->mInterfaceMethodTable[bestIFaceEntry->mStartInterfaceTableIdx + methodDef->mIdx];
BfMethodInstance* bestMethodInstance = ifaceMethodEntry.mMethodRef; BfMethodInstance* bestMethodInstance = ifaceMethodEntry.mMethodRef;
if (bestMethodInstance != NULL) if (bestMethodInstance != NULL)