Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-12 21:34:11 +02:00
Code Activity

Fixed 'this' calls in mixins

Browse source
This commit is contained in:
Brian Fiete 2020-01-24 11:51:02 -08:00
parent fd64aa64d9
commit 49122ae6aa
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -6095,7 +6095,15 @@ BfTypedValue BfExprEvaluator::MatchMethod(BfAstNode* targetSrc, BfMethodBoundExp
{ {
checkNonStatic = false; checkNonStatic = false;
} }
else if (mModule->mCurMethodState->mTempKind != BfMethodState::TempKind_None) else
{
if (mModule->mCurMethodState->mMixinState != NULL)
{
targetTypeInst = mModule->mCurMethodState->mMixinState->mMixinMethodInstance->GetOwner();
curTypeDef = targetTypeInst->mTypeDef;
}
if (mModule->mCurMethodState->mTempKind != BfMethodState::TempKind_None)
{ {
checkNonStatic = mModule->mCurMethodState->mTempKind == BfMethodState::TempKind_NonStatic; checkNonStatic = mModule->mCurMethodState->mTempKind == BfMethodState::TempKind_NonStatic;
} }
@ -6103,6 +6111,7 @@ BfTypedValue BfExprEvaluator::MatchMethod(BfAstNode* targetSrc, BfMethodBoundExp
checkNonStatic = !mModule->mCurMethodInstance->mMethodDef->mIsStatic; checkNonStatic = !mModule->mCurMethodInstance->mMethodDef->mIsStatic;
} }
} }
}
bool isIndirectMethodCall = false; bool isIndirectMethodCall = false;
BfType* lookupType = targetType; BfType* lookupType = targetType;