Format, add tests

Author: web-flow

test/testtoken.cpp

@@ -64,6 +64,7 @@ class TestToken : public TestFixture {
         TEST_CASE(multiCompare3);                   // false positive for %or% on code using "|="
         TEST_CASE(multiCompare4);
         TEST_CASE(multiCompare5);
+        TEST_CASE(multiCompare6);
         TEST_CASE(charTypes);
         TEST_CASE(stringTypes);
         TEST_CASE(getStrLength);
@@ -322,6 +323,17 @@ class TestToken : public TestFixture {
         ASSERT_EQUALS(true, TokenTest::multiCompare(&tok, "+|%or%|%oror%", 0) >= 0);
     }
 
+    void multiCompare6() const {
+        {
+            const SimpleTokenList stl("x %= y;");
+            ASSERT_EQUALS(true, Token::Match(stl.front(), "%name% %= %name%"));
+        }
+        {
+            const SimpleTokenList stl("x += y;");
+            ASSERT_EQUALS(false, Token::Match(stl.front(), "%name% %= %name%"));
+        }
+    }
+
     void charTypes() const {
         auto tokensFrontBack = std::make_shared<TokensFrontBack>();
         Token tok(list, std::move(tokensFrontBack));

test/testvalueflow.cpp

@@ -5807,27 +5807,33 @@ class TestValueFlow : public TestFixture {
         ASSERT_EQUALS(false, testValueOfX(code, 3U, 1));
 
         code = "int f(int a) {\n"
-            "    int x = a ^ a;\n"
-            "    return x;\n"
-            "}\n";
+               "    int x = a ^ a;\n"
+               "    return x;\n"
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
 
         code = "int f(int a) {\n"
-            "    int x = a /= a;\n"
-            "    return x;\n"
-            "}\n";
+               "    int x = a /= a;\n"
+               "    return x;\n"
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 1));
 
         code = "int f(int a) {\n"
-            "    int x = a -= a;\n"
-            "    return x;\n"
-            "}\n";
+               "    int x = a -= a;\n"
+               "    return x;\n"
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
 
         code = "int f(int a) {\n"
-            "    int x = a %= a;\n"
-            "    return x;\n"
-            "}\n";
+               "    int x = a %= a;\n"
+               "    return x;\n"
+               "}\n";
+        ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
+
+        code = "int f(int a) {\n"
+               "    int x = a ^= a;\n"
+               "    return x;\n"
+               "}\n";
         ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
     }