Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-15 14:54:09 +02:00
Code Activity

Fix defer on null conditional

Browse source
This commit is contained in:
Brian Fiete 2022-01-08 11:26:56 -05:00
parent 92ee27fc26
commit 5c42ea6d2d
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
IDEHelper/Compiler/BfStmtEvaluator.cpp
View file

@ -60,6 +60,10 @@ bool BfModule::AddDeferredCallEntry(BfDeferredCallEntry* deferredCallEntry, BfSc
// We don't need to do a "clear handlers" if we're just adding another dyn to an existing dyn list // We don't need to do a "clear handlers" if we're just adding another dyn to an existing dyn list
bool isDyn = mCurMethodState->mCurScope->IsDyn(scopeData); bool isDyn = mCurMethodState->mCurScope->IsDyn(scopeData);
if (mCurMethodState->mPendingNullConditional != NULL)
isDyn = true;
if (!isDyn) if (!isDyn)
{ {
mCurMethodState->mCurScope->ClearHandlers(scopeData); mCurMethodState->mCurScope->ClearHandlers(scopeData);
@ -6851,6 +6855,8 @@ void BfModule::Visit(BfDeferStatement* deferStmt)
expressionEvaluator.mDeferCallRef = exprStmt->mExpression; expressionEvaluator.mDeferCallRef = exprStmt->mExpression;
expressionEvaluator.mDeferScopeAlloc = scope; expressionEvaluator.mDeferScopeAlloc = scope;
expressionEvaluator.VisitChild(exprStmt->mExpression); expressionEvaluator.VisitChild(exprStmt->mExpression);
if (mCurMethodState->mPendingNullConditional != NULL)
FlushNullConditional(expressionEvaluator.mResult, true);
} }
else if (auto deleteStmt = BfNodeDynCast<BfDeleteStatement>(deferStmt->mTargetNode)) else if (auto deleteStmt = BfNodeDynCast<BfDeleteStatement>(deferStmt->mTargetNode))
{ {