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

Mixin 'this' fix

This commit is contained in:
Brian Fiete 2020-11-06 12:25:02 -08:00
parent b3e225b360
commit bd6e21073e

View file

@ -13032,8 +13032,7 @@ BfTypedValue BfModule::ReferenceStaticField(BfFieldInstance* fieldInstance)
BfTypedValue BfModule::GetThis() BfTypedValue BfModule::GetThis()
{ {
auto useMethodState = mCurMethodState; auto useMethodState = mCurMethodState;
while ((useMethodState != NULL) && (useMethodState->mClosureState != NULL) && (useMethodState->mClosureState->mCapturing) && while ((useMethodState != NULL) && (useMethodState->mClosureState != NULL) && (useMethodState->mClosureState->mCapturing))
(useMethodState->mMixinState == NULL))
{ {
useMethodState = useMethodState->mPrevMethodState; useMethodState = useMethodState->mPrevMethodState;
} }
@ -13089,7 +13088,7 @@ BfTypedValue BfModule::GetThis()
// Check mixin state for 'this' // Check mixin state for 'this'
{ {
auto checkMethodState = useMethodState; auto checkMethodState = mCurMethodState;
while (checkMethodState != NULL) while (checkMethodState != NULL)
{ {
if (checkMethodState->mMixinState != NULL) if (checkMethodState->mMixinState != NULL)