Tokenizer::simplifyStaticConst(): Support "struct" and operator:: (cppcheck-opensource#7403)

PKEuS · PKEuS · commit b65cacf4b108 · 2016-05-04T12:33:19.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -5805,7 +5805,7 @@ void Tokenizer::simplifyStaticConst()
             // Look backwards to find the beginning of the declaration
             Token* leftTok = tok;
             for (; leftTok; leftTok = leftTok->previous()) {
-                if (!Token::Match(leftTok, "%type%|static|const|extern") ||
+                if (!Token::Match(leftTok, "%type%|static|const|extern|struct|::") ||
                     (isCPP() && Token::Match(leftTok, "private:|protected:|public:|operator")))
                     break;
             }
diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
@@ -667,7 +667,7 @@ class TestSymbolDatabase: public TestFixture {
     void isVariableDeclarationPointerConst() {
         reset();
         givenACodeSampleToTokenize var("std::string const* s;");
-        bool result = si.isVariableDeclaration(var.tokens(), vartok, typetok);
+        bool result = si.isVariableDeclaration(var.tokens()->next(), vartok, typetok);
         ASSERT_EQUALS(true, result);
         Variable v(vartok, typetok, vartok->previous(), 0, Public, 0, 0, &settings.library);
         ASSERT(false == v.isArray());
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -3933,7 +3933,7 @@ class TestTokenizer : public TestFixture {
                              "    a::b const *p = 0;\n"
                              "}\n";
         ASSERT_EQUALS("void f ( ) {\n"
-                      "a :: b const * p ; p = 0 ;\n"
+                      "const a :: b * p ; p = 0 ;\n"
                       "}"
                       , tokenizeAndStringify(code1));
 
@@ -3942,7 +3942,7 @@ class TestTokenizer : public TestFixture {
                              "    ::a::b const *p = 0;\n"
                              "}\n";
         ASSERT_EQUALS("void f ( ) {\n"
-                      ":: a :: b const * p ; p = 0 ;\n"
+                      "const :: a :: b * p ; p = 0 ;\n"
                       "}"
                       , tokenizeAndStringify(code2));
     }
diff --git a/test/testvarid.cpp b/test/testvarid.cpp
@@ -830,7 +830,7 @@ class TestVarID : public TestFixture {
         {
             const char code[] = "void f(FOO::BAR const);\n";
             ASSERT_EQUALS("\n\n##file 0\n"
-                          "1: void f ( FOO :: BAR const ) ;\n",
+                          "1: void f ( const FOO :: BAR ) ;\n",
                           tokenize(code));
         }
         {

Original file line number	Diff line number	Diff line change
`@@ -5805,7 +5805,7 @@ void Tokenizer::simplifyStaticConst()`
`5805`	`5805`	`// Look backwards to find the beginning of the declaration`
`5806`	`5806`	`Token* leftTok = tok;`
`5807`	`5807`	`for (; leftTok; leftTok = leftTok->previous()) {`
`5808`		`- if (!Token::Match(leftTok, "%type%\|static\|const\|extern") \|\|`
	`5808`	`+ if (!Token::Match(leftTok, "%type%\|static\|const\|extern\|struct\|::") \|\|`
`5809`	`5809`	`(isCPP() && Token::Match(leftTok, "private:\|protected:\|public:\|operator")))`
`5810`	`5810`	`break;`
`5811`	`5811`	`}`
Original file line number	Diff line number	Diff line change
`@@ -830,7 +830,7 @@ class TestVarID : public TestFixture {`
`830`	`830`	`{`
`831`	`831`	`const char code[] = "void f(FOO::BAR const);\n";`
`832`	`832`	`ASSERT_EQUALS("\n\n##file 0\n"`
`833`		`- "1: void f ( FOO :: BAR const ) ;\n",`
	`833`	`+ "1: void f ( const FOO :: BAR ) ;\n",`
`834`	`834`	`tokenize(code));`
`835`	`835`	`}`
`836`	`836`	`{`