Fixed danmar#7030 (Tokenizer::simplifyTypedef: Label)

danmar · danmar · commit 6cf25825de42 · 2015-10-15T16:56:22.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -1187,7 +1187,7 @@ void Tokenizer::simplifyTypedef()
                                 tok2->tokAt(-3)->deleteNext(2);
                                 simplifyType = true;
                             }
-                        } else if (Token::Match(tok2->previous(), "case %type% :")) {
+                        } else if (Token::Match(tok2->previous(), "case|;|{|} %type% :")) {
                             tok2 = tok2->next();
                         } else if (duplicateTypedef(&tok2, typeName, typeDef, structs)) {
                             // skip to end of scope if not already there
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
@@ -149,6 +149,7 @@ class TestSimplifyTypedef : public TestFixture {
         TEST_CASE(simplifyTypedef110); // ticket #6268
         TEST_CASE(simplifyTypedef111); // ticket #6345
         TEST_CASE(simplifyTypedef112); // ticket #6048
+        TEST_CASE(simplifyTypedef113); // ticket #7030
 
         TEST_CASE(simplifyTypedefFunction1);
         TEST_CASE(simplifyTypedefFunction2); // ticket #1685
@@ -2406,6 +2407,13 @@ class TestSimplifyTypedef : public TestFixture {
         ASSERT_EQUALS("", errout.str());
     }
 
+    void simplifyTypedef113() {     // ticket #7030
+        const char code[] = "typedef int T;\n"
+                            "void f() { T:; }";
+        const char expected[] = "void f ( ) { T : ; }";
+        ASSERT_EQUALS(expected, tok(code));
+    }
+
     void simplifyTypedefFunction1() {
         {
             const char code[] = "typedef void (*my_func)();\n"

Original file line number	Diff line number	Diff line change
`@@ -1187,7 +1187,7 @@ void Tokenizer::simplifyTypedef()`
`1187`	`1187`	`tok2->tokAt(-3)->deleteNext(2);`
`1188`	`1188`	`simplifyType = true;`
`1189`	`1189`	`}`
`1190`		`- } else if (Token::Match(tok2->previous(), "case %type% :")) {`
	`1190`	`+ } else if (Token::Match(tok2->previous(), "case\|;\|{\|} %type% :")) {`
`1191`	`1191`	`tok2 = tok2->next();`
`1192`	`1192`	`} else if (duplicateTypedef(&tok2, typeName, typeDef, structs)) {`
`1193`	`1193`	`// skip to end of scope if not already there`