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

Fixed local method 'this' inside mixins

Browse source
This commit is contained in:
Brian Fiete 2020-01-24 12:29:54 -08:00
parent ea0ccae3d5
commit 7de7245b33
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -12196,17 +12196,21 @@ void BfExprEvaluator::CheckLocalMethods(BfAstNode* targetSrc, BfTypeInstance* ty
}
}
else
{
{
BfLocalMethod* matchedLocalMethod = NULL;
BfLocalMethod* localMethod = NULL;
if (checkMethodState->mLocalMethodMap.TryGetValue(methodName, &localMethod))
{
auto typeInst = mModule->mCurTypeInstance;
if (checkMethodState->mMixinState != NULL)
typeInst = checkMethodState->mMixinState->mMixinMethodInstance->GetOwner();
while (localMethod != NULL)
{
auto methodDef = mModule->GetLocalMethodDef(localMethod);
if (methodDef->mMethodType == methodType)
{
methodMatcher.CheckMethod(mModule->mCurTypeInstance, methodDef, true);
methodMatcher.CheckMethod(typeInst, methodDef, true);
if (methodMatcher.mBestMethodDef == methodDef)
matchedLocalMethod = localMethod;
}