fix #8284: False positive: "Label 'class' is not used." for anonymous… (danmar#1011)

IOBYTE · amai2012 · commit 026d8f6859cc · 2017-12-05T16:50:04.000+01:00
* fix #8284: False positive: "Label 'class' is not used." for anonymous C++ class

Add support for annonymous derived structures and classes.

* Fix travis build (use findsimplematch).

* Fix bug in simplifyLabelsCaseDefault which was inserting ; in wrong place.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -2178,6 +2178,7 @@ const Token * Tokenizer::startOfExecutableScope(const Token * tok)
 
 void Tokenizer::simplifyLabelsCaseDefault()
 {
+    const bool cpp = isCPP();
     bool executablescope = false;
     unsigned int indentLevel = 0;
     for (Token *tok = list.front(); tok; tok = tok->next()) {
@@ -2233,8 +2234,10 @@ void Tokenizer::simplifyLabelsCaseDefault()
                 syntaxError(tok);
             }
         } else if (Token::Match(tok, "[;{}] %name% : !!;")) {
-            tok = tok->tokAt(2);
-            tok->insertToken(";");
+            if (!cpp || !Token::Match(tok->next(), "class|struct")) {
+                tok = tok->tokAt(2);
+                tok->insertToken(";");
+            }
         }
     }
 }
@@ -8506,6 +8509,8 @@ void Tokenizer::simplifyFuncInWhile()
 
 void Tokenizer::simplifyStructDecl()
 {
+    const bool cpp = isCPP();
+
     // A counter that is used when giving unique names for anonymous structs.
     unsigned int count = 0;
 
@@ -8523,6 +8528,13 @@ void Tokenizer::simplifyStructDecl()
                 tok->insertToken("Anonymous" + MathLib::toString(count++));
             }
         }
+        // check for derived anonymous class/struct
+        else if (cpp && Token::Match(tok, "class|struct :")) {
+            const Token *tok1 = Token::findsimplematch(tok, "{");
+            if (tok1 && Token::Match(tok1->link(), "} *|&| %type% ,|;|[|(|{")) {
+                tok->insertToken("Anonymous" + MathLib::toString(count++));
+            }
+        }
         // check for anonymous enum
         else if ((Token::simpleMatch(tok, "enum {") && Token::Match(tok->next()->link(), "} %type%| ,|;|[|(|{")) ||
                  (Token::Match(tok, "enum : %type% {") && Token::Match(tok->linkAt(3), "} %type%| ,|;|[|(|{"))) {
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -3067,6 +3067,13 @@ class TestSimplifyTokens : public TestFixture {
             const char expected[] = "void f ( ) { int A ; A = 1 ; int B ; B = 2 ; int C ; C = 3 ; int D ; int E ; E = 5 ; int F ; F = 6 ; }";
             ASSERT_EQUALS(expected, tok(code, false));
         }
+
+        // ticket #8284
+        {
+            const char code[] = "void f() { class : foo<int> { } abc; }";
+            const char expected[] = "void f ( ) { class Anonymous0 : foo < int > { } ; Anonymous0 abc ; }";
+            ASSERT_EQUALS(expected, tok(code, false));
+        }
     }
 
     void simplifyStructDecl2() { // ticket #2479 (segmentation fault)

Original file line number	Diff line number	Diff line change
`@@ -2178,6 +2178,7 @@ const Token * Tokenizer::startOfExecutableScope(const Token * tok)`
`2178`	`2178`
`2179`	`2179`	`void Tokenizer::simplifyLabelsCaseDefault()`
`2180`	`2180`	`{`
	`2181`	`+ const bool cpp = isCPP();`
`2181`	`2182`	`bool executablescope = false;`
`2182`	`2183`	`unsigned int indentLevel = 0;`
`2183`	`2184`	`for (Token *tok = list.front(); tok; tok = tok->next()) {`
`@@ -2233,8 +2234,10 @@ void Tokenizer::simplifyLabelsCaseDefault()`
`2233`	`2234`	`syntaxError(tok);`
`2234`	`2235`	`}`
`2235`	`2236`	`} else if (Token::Match(tok, "[;{}] %name% : !!;")) {`
`2236`		`- tok = tok->tokAt(2);`
`2237`		`- tok->insertToken(";");`
	`2237`	`+ if (!cpp \|\| !Token::Match(tok->next(), "class\|struct")) {`
	`2238`	`+ tok = tok->tokAt(2);`
	`2239`	`+ tok->insertToken(";");`
	`2240`	`+ }`
`2238`	`2241`	`}`
`2239`	`2242`	`}`
`2240`	`2243`	`}`
`@@ -8506,6 +8509,8 @@ void Tokenizer::simplifyFuncInWhile()`
`8506`	`8509`
`8507`	`8510`	`void Tokenizer::simplifyStructDecl()`
`8508`	`8511`	`{`
	`8512`	`+ const bool cpp = isCPP();`
	`8513`	`+`
`8509`	`8514`	`// A counter that is used when giving unique names for anonymous structs.`
`8510`	`8515`	`unsigned int count = 0;`
`8511`	`8516`
`@@ -8523,6 +8528,13 @@ void Tokenizer::simplifyStructDecl()`
`8523`	`8528`	`tok->insertToken("Anonymous" + MathLib::toString(count++));`
`8524`	`8529`	`}`
`8525`	`8530`	`}`
	`8531`	`+ // check for derived anonymous class/struct`
	`8532`	`+ else if (cpp && Token::Match(tok, "class\|struct :")) {`
	`8533`	`+ const Token *tok1 = Token::findsimplematch(tok, "{");`
	`8534`	`+ if (tok1 && Token::Match(tok1->link(), "} *\|&\| %type% ,\|;\|[\|(\|{")) {`
	`8535`	`+ tok->insertToken("Anonymous" + MathLib::toString(count++));`
	`8536`	`+ }`
	`8537`	`+ }`
`8526`	`8538`	`// check for anonymous enum`
`8527`	`8539`	`else if ((Token::simpleMatch(tok, "enum {") && Token::Match(tok->next()->link(), "} %type%\| ,\|;\|[\|(\|{")) \|\|`
`8528`	`8540`	`(Token::Match(tok, "enum : %type% {") && Token::Match(tok->linkAt(3), "} %type%\| ,\|;\|[\|(\|{"))) {`
Original file line number	Diff line number	Diff line change
`@@ -3067,6 +3067,13 @@ class TestSimplifyTokens : public TestFixture {`
`3067`	`3067`	`const char expected[] = "void f ( ) { int A ; A = 1 ; int B ; B = 2 ; int C ; C = 3 ; int D ; int E ; E = 5 ; int F ; F = 6 ; }";`
`3068`	`3068`	`ASSERT_EQUALS(expected, tok(code, false));`
`3069`	`3069`	`}`
	`3070`	`+`
	`3071`	`+ // ticket #8284`
	`3072`	`+ {`
	`3073`	`+ const char code[] = "void f() { class : foo<int> { } abc; }";`
	`3074`	`+ const char expected[] = "void f ( ) { class Anonymous0 : foo < int > { } ; Anonymous0 abc ; }";`
	`3075`	`+ ASSERT_EQUALS(expected, tok(code, false));`
	`3076`	`+ }`
`3070`	`3077`	`}`
`3071`	`3078`
`3072`	`3079`	`void simplifyStructDecl2() { // ticket #2479 (segmentation fault)`