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

Improved @this

Browse source
This commit is contained in:
Brian Fiete 2022-02-15 06:48:27 -05:00
parent 22a3b47de2
commit 9dcafb7db8
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -4325,9 +4325,12 @@ BfTypedValue BfExprEvaluator::LookupIdentifier(BfAstNode* refNode, const StringI
if ((mModule->mCurMethodState != NULL) && (mModule->mCurMethodState->mClosureState != NULL) && (findName == "@this"))
{
if (mModule->mCurMethodState->mClosureState->mCapturing)
{
if (mModule->mCurMethodState->mClosureState->mDelegateType != NULL)
{
mModule->mCurMethodState->mClosureState->mCapturedDelegateSelf = true;
return mModule->GetDefaultTypedValue(mModule->ResolveTypeDef(mModule->mCompiler->mDelegateTypeDef));
return mModule->GetDefaultTypedValue(mModule->mCurMethodState->mClosureState->mDelegateType);
}
}
else
{
@ -13112,6 +13115,8 @@ BfLambdaInstance* BfExprEvaluator::GetLambdaInstance(BfLambdaBindExpression* lam
else
closureState.mReturnType = mModule->mContext->mBfObjectType;
closureState.mCapturing = true;
if (delegateTypeInstance->IsDelegate())
closureState.mDelegateType = delegateTypeInstance;
closureState.mDeclaringMethodIsMutating = mModule->mCurMethodInstance->mMethodDef->mIsMutating;
methodState.mClosureState = &closureState;
closureState.mClosureType = outerClosure;

2
IDEHelper/Compiler/BfModule.h
View file

@ -696,6 +696,7 @@ public:
BfClosureInstanceInfo* mClosureInstanceInfo;
BfMethodDef* mClosureMethodDef;
BfType* mReturnType;
BfTypeInstance* mDelegateType;
BfTypeInstance* mClosureType;
BfDeferredLocalMethod* mActiveDeferredLocalMethod;
Array<BfLocalVariable> mConstLocals; // Locals not inserted into the captured 'this'
@ -719,6 +720,7 @@ public:
mReturnTypeInferState = BfReturnTypeInferState_None;
mActiveDeferredLocalMethod = NULL;
mReturnType = NULL;
mDelegateType = NULL;
mClosureType = NULL;
}
};