Fix #11386 debug: CheckClass::checkConst found unlinked template argument list (cppcheck-opensource#4614)

chrchr-github · web-flow · commit 0e57c27dd3c5 · 2022-12-07T09:12:46.000+01:00
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
@@ -521,7 +521,7 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
             return 0;
 
         // inner template
-        if (tok->str() == "<") {
+        if (tok->str() == "<" && tok->previous()->isName()) {
             ++level;
             tok = tok->next();
         }
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
@@ -5300,6 +5300,7 @@ class TestSimplifyTemplate : public TestFixture {
         ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args&...>> constexpr void f() {}")); // #11351
         ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args&&...>> void f() {}"));
         ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args*...>> void f() {}"));
+        ASSERT_EQUALS(1U, templateParameters("S<4 < sizeof(uintptr_t)> x;"));
     }
 
     // Helper function to unit test TemplateSimplifier::getTemplateNamePosition

Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)`
`521`	`521`	`return 0;`
`522`	`522`
`523`	`523`	`// inner template`
`524`		`- if (tok->str() == "<") {`
	`524`	`+ if (tok->str() == "<" && tok->previous()->isName()) {`
`525`	`525`	`++level;`
`526`	`526`	`tok = tok->next();`
`527`	`527`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5300,6 +5300,7 @@ class TestSimplifyTemplate : public TestFixture {`
`5300`	`5300`	`ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args&...>> constexpr void f() {}")); // #11351`
`5301`	`5301`	`ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args&&...>> void f() {}"));`
`5302`	`5302`	`ASSERT_EQUALS(3U, templateParameters("template <class T, class... Args, class Tup = std::tuple<Args*...>> void f() {}"));`
	`5303`	`+ ASSERT_EQUALS(1U, templateParameters("S<4 < sizeof(uintptr_t)> x;"));`
`5303`	`5304`	`}`
`5304`	`5305`
`5305`	`5306`	`// Helper function to unit test TemplateSimplifier::getTemplateNamePosition`