Fix cppcheck-opensource#657: combineOperators(): &= gets split up incorrectly (cppcheck-opensource#658)

ludviggunne · web-flow · commit 3c2a66021ebc · 2026-06-02T12:54:27.000+02:00
diff --git a/simplecpp.cpp b/simplecpp.cpp
@@ -1040,7 +1040,7 @@ void simplecpp::TokenList::combineOperators()
                 continue;
             }
             const Token *prev = tok->previous;
-            while (prev && prev->isOneOf(";{}()"))
+            while (prev && prev->isOneOf(";{}("))
                 prev = prev->previous;
             executableScope.push(prev && prev->op == ')');
             continue;
diff --git a/test.cpp b/test.cpp
@@ -493,6 +493,7 @@ static void combineOperators_andequal()
     ASSERT_EQUALS("x &= 2 ;", preprocess("x &= 2;"));
     ASSERT_EQUALS("void f ( x & = 2 ) ;", preprocess("void f(x &= 2);"));
     ASSERT_EQUALS("f ( x &= 2 ) ;", preprocess("f(x &= 2);"));
+    ASSERT_EQUALS("f ( ) { return new int ( i &= 1 ) ; }", preprocess("f () { return new int(i &= 1); }"));
 }
 
 static void combineOperators_ellipsis()

Original file line number	Diff line number	Diff line change
`@@ -1040,7 +1040,7 @@ void simplecpp::TokenList::combineOperators()`
`1040`	`1040`	`continue;`
`1041`	`1041`	`}`
`1042`	`1042`	`const Token *prev = tok->previous;`
`1043`		`- while (prev && prev->isOneOf(";{}()"))`
	`1043`	`+ while (prev && prev->isOneOf(";{}("))`
`1044`	`1044`	`prev = prev->previous;`
`1045`	`1045`	`executableScope.push(prev && prev->op == ')');`
`1046`	`1046`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -493,6 +493,7 @@ static void combineOperators_andequal()`
`493`	`493`	`ASSERT_EQUALS("x &= 2 ;", preprocess("x &= 2;"));`
`494`	`494`	`ASSERT_EQUALS("void f ( x & = 2 ) ;", preprocess("void f(x &= 2);"));`
`495`	`495`	`ASSERT_EQUALS("f ( x &= 2 ) ;", preprocess("f(x &= 2);"));`
	`496`	`+ ASSERT_EQUALS("f ( ) { return new int ( i &= 1 ) ; }", preprocess("f () { return new int(i &= 1); }"));`
`496`	`497`	`}`
`497`	`498`
`498`	`499`	`static void combineOperators_ellipsis()`