mirror of
https://github.com/beefytech/Beef.git
synced 2025-06-08 03:28:20 +02:00
String interpolation fix with string literals inside brackets
This commit is contained in:
parent
ee3aa7fc26
commit
07a2e88960
1 changed files with 8 additions and 2 deletions
|
@ -3616,6 +3616,7 @@ void BfParser::ParseBlock(BfBlock* astNode, int depth, bool isInterpolate)
|
|||
SizedArray<BfAstNode*, 32> childArr;
|
||||
|
||||
int parenDepth = 0;
|
||||
int bracketDepth = 0;
|
||||
|
||||
while (true)
|
||||
{
|
||||
|
@ -3627,7 +3628,7 @@ void BfParser::ParseBlock(BfBlock* astNode, int depth, bool isInterpolate)
|
|||
isAsmBlock = true;
|
||||
}
|
||||
|
||||
NextToken(-1, isInterpolate && (parenDepth == 0) && (!forceAllowNext));
|
||||
NextToken(-1, isInterpolate && (parenDepth == 0) && (bracketDepth == 0) && (!forceAllowNext));
|
||||
forceAllowNext = false;
|
||||
|
||||
if (mPreprocessorIgnoredSectionNode != NULL)
|
||||
|
@ -3730,7 +3731,12 @@ void BfParser::ParseBlock(BfBlock* astNode, int depth, bool isInterpolate)
|
|||
else if (mToken == BfToken_RParen)
|
||||
parenDepth--;
|
||||
|
||||
if ((isInterpolate) && (parenDepth == 0))
|
||||
if (mToken == BfToken_LBracket)
|
||||
bracketDepth++;
|
||||
else if (mToken == BfToken_RBracket)
|
||||
bracketDepth--;
|
||||
|
||||
if ((isInterpolate) && (parenDepth == 0) && (bracketDepth == 0))
|
||||
{
|
||||
if (mToken == BfToken_Question)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue