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

Fixed string interpolation scoping, {{ }} escaping

Browse source
This commit is contained in:
Brian Fiete 2021-01-04 06:33:39 -08:00
parent f9b9b15214
commit 2ac2fe70fb
7 changed files with 67 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

19
IDEHelper/Compiler/BfStmtEvaluator.cpp
View file

@ -3090,15 +3090,23 @@ void BfModule::VisitEmbeddedStatement(BfAstNode* stmt, BfExprEvaluator* exprEval
if ((block != NULL) && (openBrace != NULL))
UpdateSrcPos(openBrace);
if (mCurMethodState != NULL)
if ((flags & BfEmbeddedStatementFlags_Unscoped) != 0)
{
bool isIgnore = mBfIRBuilder->mIgnoreWrites;
SetAndRestoreValue<BfExprEvaluator*> prevExprEvaluator(mCurMethodState->mCurScope->mExprEvaluator, exprEvaluator);
VisitCodeBlock(block);
}
else if (mCurMethodState != NULL)
{
bool isIgnore = mBfIRBuilder->mIgnoreWrites;
mCurMethodState->mInHeadScope = false;
BfScopeData scopeData;
if (IsTargetingBeefBackend())
scopeData.mValueScopeStart = mBfIRBuilder->CreateValueScopeStart();
mCurMethodState->AddScope(&scopeData);
if (block != NULL)
{
@ -3391,7 +3399,7 @@ void BfModule::VisitCodeBlock(BfBlock* block)
}
else
{
FailAfter("Expression block cannot be used here. Consider adding semicolon if a statement was intended.", expr);
FailAfter("Expression block cannot be used here. Consider adding semicolon if a statement was intended.", expr);
}
}
}
@ -6843,6 +6851,11 @@ void BfModule::Visit(BfBlock* block)
VisitEmbeddedStatement(block);
}
void BfModule::Visit(BfUnscopedBlock* block)
{
VisitEmbeddedStatement(block, NULL, BfEmbeddedStatementFlags_Unscoped);
}
void BfModule::Visit(BfLabeledBlock* labeledBlock)
{
VisitEmbeddedStatement(labeledBlock);