Fixed cppcheck-opensource#7147 (TemplateSimplifier: specialized template class with inheritance)

danmar · danmar · commit 8e79e5c1d3e9 · 2016-01-11T18:45:12.000+01:00
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
@@ -430,7 +430,7 @@ std::set<std::string> TemplateSimplifier::expandSpecialized(Token *tokens)
                     ostr << " ";
                 ostr << tok3->str();
             }
-            if (!Token::Match(tok3, "> (|{"))
+            if (!Token::Match(tok3, "> (|{|:"))
                 continue;
             s = ostr.str();
         }
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
@@ -101,6 +101,8 @@ class TestSimplifyTemplate : public TestFixture {
         TEST_CASE(templateParameters);
 
         TEST_CASE(templateNamePosition);
+
+        TEST_CASE(expandSpecialized);
     }
 
     std::string tok(const char code[], bool simplify = true, bool debugwarnings = false, Settings::PlatformType type = Settings::Native) {
@@ -1318,6 +1320,11 @@ class TestSimplifyTemplate : public TestFixture {
         TODO_ASSERT_EQUALS(7, -1, templateNamePositionHelper("template<class T> class A { unsigned foo(); }; "
                            "template<class T> unsigned A<T>::foo() { return 0; }", 19));
     }
+
+    void expandSpecialized() {
+        ASSERT_EQUALS("class A<int> { } ;", tok("template<> class A<int> {};"));
+        ASSERT_EQUALS("class A<int> : public B { } ;", tok("template<> class A<int> : public B {};"));
+    }
 };
 
 REGISTER_TEST(TestSimplifyTemplate)

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ std::set<std::string> TemplateSimplifier::expandSpecialized(Token *tokens)`
`430`	`430`	`ostr << " ";`
`431`	`431`	`ostr << tok3->str();`
`432`	`432`	`}`
`433`		`- if (!Token::Match(tok3, "> (\|{"))`
	`433`	`+ if (!Token::Match(tok3, "> (\|{\|:"))`
`434`	`434`	`continue;`
`435`	`435`	`s = ostr.str();`
`436`	`436`	`}`