Fix #13557: Tokenizer: Use same simplification for 'int x{0}' and 'int x(0)' (#7223)

Author: olabetskyi

Diff for: lib/tokenize.cpp

@@ -7686,7 +7686,7 @@ void Tokenizer::simplifyInitVar()
         if (tok->str() == "return")
             continue;
 
-        if (Token::Match(tok, "class|struct|union| %type% *| %name% ( &| %any% ) ;")) {
+        if (Token::Match(tok, "class|struct|union| %type% *| %name% (|{ &| %any% )|} ;")) {
             tok = initVar(tok);
         } else if (Token::Match(tok, "%type% *| %name% ( %type% (")) {
             const Token* tok2 = tok->tokAt(2);
@@ -7730,12 +7730,13 @@ Token * Tokenizer::initVar(Token * tok)
     // check initializer..
     if (tok->tokAt(2)->isStandardType() || tok->strAt(2) == "void")
         return tok;
-    if (!tok->tokAt(2)->isNumber() && !Token::Match(tok->tokAt(2), "%type% (") && tok->strAt(2) != "&" && tok->tokAt(2)->varId() == 0)
+    if (!tok->tokAt(2)->isNumber() && !Token::Match(tok->tokAt(2), "%type% (|{") && tok->strAt(2) != "&" && tok->tokAt(2)->varId() == 0)
         return tok;
 
     // insert '; var ='
     tok->insertToken(";");
     tok->next()->insertToken(tok->str());
+    tok->next()->isSplittedVarDeclEq(true);
     tok->tokAt(2)->varId(tok->varId());
     tok = tok->tokAt(2);
     tok->insertToken("=");

Diff for: test/testtokenize.cpp

@@ -284,6 +284,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(simplifyInitVar);
         TEST_CASE(simplifyInitVar2);
         TEST_CASE(simplifyInitVar3);
+        TEST_CASE(simplifyInitVar4);
 
         TEST_CASE(bitfields1);
         TEST_CASE(bitfields2);
@@ -4490,6 +4491,15 @@ class TestTokenizer : public TestFixture {
                       "}", tokenizeAndStringify(code));
     }
 
+    void simplifyInitVar4() {
+        const char code[] = "void f() {\n"
+                            "    uint32_t x{0};\n"
+                            "}";
+        ASSERT_EQUALS("void f ( ) {\n"
+                      "uint32_t x ; x = 0 ;\n"
+                      "}", tokenizeAndStringify(code));
+    }
+
     void bitfields1() {
         const char code1[] = "struct A { bool x : 1; };";
         ASSERT_EQUALS("struct A { bool x ; } ;", tokenizeAndStringify(code1));

Diff for: test/testunusedvar.cpp

@@ -2083,7 +2083,10 @@ class TestUnusedVar : public TestFixture {
                               "{\n"
                               "    int i(0);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", errout_str());
+        ASSERT_EQUALS(
+            "[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n"
+            "[test.cpp:3]: (style) Variable 'i' is assigned a value that is never used.\n", // duplicate
+            errout_str());
 
         // if a is undefined then Cppcheck can't determine if "int i(a)" is a
         // * variable declaration
@@ -2099,7 +2102,10 @@ class TestUnusedVar : public TestFixture {
                               "    int j = 0;\n"
                               "    int i(j);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'i' is assigned a value that is never used.\n", errout_str());
+        ASSERT_EQUALS(
+            "[test.cpp:4]: (style) Variable 'i' is assigned a value that is never used.\n"
+            "[test.cpp:4]: (style) Variable 'i' is assigned a value that is never used.\n", // duplicate
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -2138,7 +2144,10 @@ class TestUnusedVar : public TestFixture {
                               "    int * j = Data;\n"
                               "    int * i(j);\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:4]: (style) Variable 'i' is assigned a value that is never used.\n", errout_str());
+        ASSERT_EQUALS(
+            "[test.cpp:4]: (style) Variable 'i' is assigned a value that is never used.\n"
+            "[test.cpp:4]: (style) Variable 'i' is assigned a value that is never used.\n", // duplicate
+            errout_str());
 
         functionVariableUsage("void foo()\n"
                               "{\n"
@@ -6841,7 +6850,10 @@ class TestUnusedVar : public TestFixture {
         functionVariableUsage("void f(int* p) {\n"
                               "    int* q{ p };\n"
                               "}\n");
-        ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'q' is assigned a value that is never used.\n", errout_str());
+        ASSERT_EQUALS(
+            "[test.cpp:2]: (style) Variable 'q' is assigned a value that is never used.\n"
+            "[test.cpp:2]: (style) Variable 'q' is assigned a value that is never used.\n", // duplicate
+            errout_str());
     }
 
     void localvarRangeBasedFor() {

Diff for: test/testvarid.cpp

@@ -2917,11 +2917,11 @@ class TestVarID : public TestFixture {
     }
 
     void varid_cpp11initialization() {
-        ASSERT_EQUALS("1: int i@1 { 1 } ;\n"
+        ASSERT_EQUALS("1: int i@1 ; i@1 = 1 ;\n"
                       "2: std :: vector < int > vec@2 { 1 , 2 , 3 } ;\n"
                       "3: namespace n { int z@3 ; } ;\n"
                       "4: int & j@4 { i@1 } ;\n"
-                      "5: int k@5 { 1 } ; int l@6 { 2 } ;\n",
+                      "5: int k@5 ; k@5 = 1 ; int l@6 ; l@6 = 2 ;\n",
                       tokenize("int i{1};\n"
                                "std::vector<int> vec{1, 2, 3};\n"
                                "namespace n { int z; };\n"
@@ -2940,7 +2940,7 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS("1: class A : public B , public C :: D , public E < F > :: G < H > {\n"
                       "2: int i@1 ;\n"
                       "3: A ( int i@2 ) : B { i@2 } , C :: D { i@2 } , E < F > :: G < H > { i@2 } , i@1 { i@2 } {\n"
-                      "4: int j@3 { i@2 } ;\n"
+                      "4: int j@3 ; j@3 = i@2 ;\n"
                       "5: }\n"
                       "6: } ;\n",
                       tokenize("class A: public B, public C::D, public E<F>::G<H> {\n"