Skip to content

Commit 4b7aaba

Browse files
committed
AST: assignment operators are executed from right to left
1 parent d3e8bbd commit 4b7aaba

2 files changed

Lines changed: 16 additions & 2 deletions

File tree

‎lib/tokenlist.cpp‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,13 +417,25 @@ static void compileUnaryOp(Token *&tok, void (*f)(Token *&, std::stack<Token*> &
417417
op.push(unaryop);
418418
}
419419

420+
static bool isAssignment(const Token *tok)
421+
{
422+
return (tok->str() == "=" ||
423+
tok->str() == "<<=" ||
424+
tok->str() == ">>=" ||
425+
(tok->str().size() == 2U && tok->str()[1] == '=' && std::strchr("+-*/%&|^",tok->str()[0])));
426+
}
427+
420428
static void compileBinOp(Token *&tok, void (*f)(Token *&, std::stack<Token*> &, unsigned int depth), std::stack<Token*> &op, unsigned int depth)
421429
{
422430
Token *binop = tok;
423431
tok = tok->next();
424432
if (tok)
425433
f(tok,op, depth);
426434

435+
// Assignment operators are executed in right-to-left order
436+
if (tok && isAssignment(binop) && isAssignment(tok))
437+
compileBinOp(tok,f,op,depth);
438+
427439
// TODO: Should we check if op is empty.
428440
// * Is it better to add assertion that it isn't?
429441
// * Write debug warning if it's empty?
@@ -714,8 +726,7 @@ static void compileAssign(Token *&tok, std::stack<Token*> &op, unsigned int dept
714726
{
715727
compileTernaryOp(tok,op, depth);
716728
while (tok) {
717-
if (tok->str() == "=" || tok->str() == "<<=" || tok->str() == ">>=" ||
718-
(tok->str().size() == 2U && tok->str()[1] == '=' && std::strchr("+-*/%&|^",tok->str()[0]))) {
729+
if (isAssignment(tok)) {
719730
compileBinOp(tok, compileTernaryOp, op, depth);
720731
} else break;
721732
}

‎test/testtokenize.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10332,6 +10332,9 @@ class TestTokenizer : public TestFixture {
1033210332
ASSERT_EQUALS("ab|=", testAst("a|=b;"));
1033310333
ASSERT_EQUALS("ab^=", testAst("a^=b;"));
1033410334

10335+
// assignments are executed from right to left
10336+
ASSERT_EQUALS("abc==", testAst("a=b=c;"));
10337+
1033510338
ASSERT_EQUALS("a\"\"=", testAst("a=\"\""));
1033610339
ASSERT_EQUALS("a\'\'=", testAst("a=\'\'"));
1033710340
testAst("char a[1]=\"\";"); // don't crash

0 commit comments

Comments
 (0)