Fixed ...... in template instantiations (similar to constconst from cppcheck-opensource#6604)

PKEuS · PKEuS · commit b6709294a8e0 · 2015-04-13T17:03:06.000+02:00
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
@@ -775,6 +775,10 @@ void TemplateSimplifier::expandTemplate(
                     for (const Token *typetok = typesUsedInTemplateInstantiation[itype];
                          typetok && (typeindentlevel>0 || !Token::Match(typetok, ",|>"));
                          typetok = typetok->next()) {
+                        if (Token::simpleMatch(typetok, ". . .")) {
+                            typetok = typetok->tokAt(2);
+                            continue;
+                        }
                         if (Token::Match(typetok, "%name% <") && templateParameters(typetok->next()) > 0)
                             ++typeindentlevel;
                         else if (typeindentlevel > 0 && typetok->str() == ">")
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
@@ -963,6 +963,7 @@ class TestSimplifyTemplate : public TestFixture {
     }
 
     void template55() { // #6604
+        // Avoid constconstconst in macro instantiations
         ASSERT_EQUALS(
             "class AtSmartPtr<T> : public ConstCastHelper < AtSmartPtr<constT> , T > { "
             "friend struct ConstCastHelper < AtSmartPtr<constT> , T > ; "
@@ -976,6 +977,23 @@ class TestSimplifyTemplate : public TestFixture {
                 "    friend struct ConstCastHelper<AtSmartPtr<const T>, T>;\n"
                 "    AtSmartPtr(const AtSmartPtr<T>& r);\n"
                 "};"));
+
+        // Similar problem can also happen with ...
+        ASSERT_EQUALS(
+            "A<int> a ( 0 ) ; struct A<int> { "
+            "A<int> ( int * p ) { p ; } "
+            "} ; "
+            "struct A<int...> { "
+            "A<int...> ( int * p ) { "
+            "p ; "
+            "} } ;",
+            tok("template <typename... T> struct A\n"
+                "{\n"
+                "    A(T* p) {\n"
+                "        (A<T...>*)(p);\n"
+                "    }\n"
+                "};\n"
+                "A<int> a(0);"));
     }
 
     void template_default_parameter() {
