Fix #13680 syntax error: template parameter static_cast<uint16_t>(0U) (danmar#7362)

Author: chrchr-github

lib/templatesimplifier.cpp

@@ -983,7 +983,7 @@ void TemplateSimplifier::getTemplateInstantiations()
             // parse backwards and add template instantiations
             // TODO
             for (; tok2 && tok2 != tok; tok2 = tok2->previous()) {
-                if (Token::Match(tok2, ",|< %name% <") &&
+                if (Token::Match(tok2, ",|< %name% <") && !tok2->next()->isKeyword() &&
                     (tok2->strAt(3) == ">" || templateParameters(tok2->tokAt(2)))) {
                     addInstantiation(tok2->next(), tok->scopeInfo()->name);
                 } else if (Token::Match(tok2->next(), "class|struct"))
@@ -2622,6 +2622,13 @@ void TemplateSimplifier::simplifyTemplateArgs(Token *start, const Token *end, st
         }
 
         for (Token *tok = first->next(); tok && tok != end; tok = tok->next()) {
+            if (tok->isKeyword() && endsWith(tok->str(), "_cast")) {
+                Token* tok2 = tok->next()->findClosingBracket();
+                if (!Token::simpleMatch(tok2, "> ("))
+                    syntaxError(tok);
+                tok = tok2->linkAt(1);
+                continue;
+            }
             if (Token::Match(tok, "( %num%|%bool% )") &&
                 (tok->previous() && !tok->previous()->isName())) {
                 tok->deleteThis();

test/testsimplifytemplate.cpp

@@ -216,6 +216,7 @@ class TestSimplifyTemplate : public TestFixture {
         TEST_CASE(template177);
         TEST_CASE(template178);
         TEST_CASE(template179);
+        TEST_CASE(template180);
         TEST_CASE(template_specialization_1);  // #7868 - template specialization template <typename T> struct S<C<T>> {..};
         TEST_CASE(template_specialization_2);  // #7868 - template specialization template <typename T> struct S<C<T>> {..};
         TEST_CASE(template_specialization_3);
@@ -4574,6 +4575,24 @@ class TestSimplifyTemplate : public TestFixture {
         ASSERT_EQUALS(exp, tok(code));
     }
 
+    void template180() {
+        const char code[] = "template<int C>\n" // #13680
+                            "int f() {\n"
+                            "    return dostuff(C);\n"
+                            "}\n"
+                            "void g() {\n"
+                            "    f<static_cast<int>(0U)>();\n"
+                            "}\n";
+        const char exp[] = "int f<static_cast<int>(0U)> ( ) ; "
+                           "void g ( ) { "
+                           "f<static_cast<int>(0U)> ( ) ; "
+                           "} "
+                           "int f<static_cast<int>(0U)> ( ) { "
+                           "return dostuff ( static_cast < int > ( 0U ) ) ; "
+                           "}";
+        ASSERT_EQUALS(exp, tok(code));
+    }
+
     void template_specialization_1() {  // #7868 - template specialization template <typename T> struct S<C<T>> {..};
         const char code[] = "template <typename T> struct C {};\n"
                             "template <typename T> struct S {a};\n"
@@ -6433,11 +6452,11 @@ class TestSimplifyTemplate : public TestFixture {
                             "typedef Derived<C<static_cast<int>(-1)> > C_;\n"
                             "class C3 { C_ c; };";
         const char expected[] = "template < int N > class C { } ; "
-                                "class Base<C<static_cast<int>-1>> ; "
-                                "class Derived<C<static_cast<int>-1>> ; "
-                                "class C3 { Derived<C<static_cast<int>-1>> c ; } ; "
-                                "class Derived<C<static_cast<int>-1>> : private Base<C<static_cast<int>-1>> { } ; "
-                                "class Base<C<static_cast<int>-1>> { } ;";
+                                "class Base<C<static_cast<int>(-1)>> ; "
+                                "class Derived<C<static_cast<int>(-1)>> ; "
+                                "class C3 { Derived<C<static_cast<int>(-1)>> c ; } ; "
+                                "class Derived<C<static_cast<int>(-1)>> : private Base<C<static_cast<int>(-1)>> { } ; "
+                                "class Base<C<static_cast<int>(-1)>> { } ;";
         ASSERT_EQUALS(expected, tok(code));
     }