Fixed #8259 (Don't combine &= for anonymous reference parameters)

danmar · danmar · commit c0272fc2efb1 · 2018-04-01T10:27:16.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -1832,7 +1832,7 @@ void Tokenizer::combineOperators()
             const char c2 = tok->next()->str()[0];
 
             // combine +-*/ and =
-            if (c2 == '=' && (std::strchr("+-*/%&|^=!<>", c1))) {
+            if (c2 == '=' && (std::strchr("+-*/%|^=!<>", c1))) {
                 tok->str(tok->str() + c2);
                 tok->deleteNext();
                 continue;
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -911,6 +911,7 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("; public: ;", tokenizeAndStringify(";public:;", false));
         ASSERT_EQUALS("; __published: ;", tokenizeAndStringify(";__published:;", false));
         ASSERT_EQUALS("a . public : ;", tokenizeAndStringify("a.public:;", false));
+        ASSERT_EQUALS("void f ( x & = 2 ) ;", tokenizeAndStringify("void f(x &= 2);", false));
     }
 
     void concatenateNegativeNumber() {

Original file line number	Diff line number	Diff line change
`@@ -911,6 +911,7 @@ class TestTokenizer : public TestFixture {`
`911`	`911`	`ASSERT_EQUALS("; public: ;", tokenizeAndStringify(";public:;", false));`
`912`	`912`	`ASSERT_EQUALS("; __published: ;", tokenizeAndStringify(";__published:;", false));`
`913`	`913`	`ASSERT_EQUALS("a . public : ;", tokenizeAndStringify("a.public:;", false));`
	`914`	`+ ASSERT_EQUALS("void f ( x & = 2 ) ;", tokenizeAndStringify("void f(x &= 2);", false));`
`914`	`915`	`}`
`915`	`916`
`916`	`917`	`void concatenateNegativeNumber() {`