Accept nested templates in tokenizer-simplify (cppcheck-opensource#1070)

jokva · danmar · commit a61f21d1b69a · 2018-02-04T09:48:37.000+01:00
The following snippet triggerd the error:

template&lt;typename DerivedT&gt;
template&lt;typename T&gt;
auto ComposableParserImpl&lt;DerivedT&gt;::operator|( T const &amp;other ) const -&gt; Parser {
    return Parser() | static_cast&lt;DerivedT const &amp;&gt;( *this ) | other;
}

Whenever simplifyFunctionParameters was called on a templated class'
templated member function (and probably any nested template), the
tokenizer would recognise it as a syntax error, assuming that return
type *must* come after a template&lt;&gt; token.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -8420,7 +8420,7 @@ const Token * Tokenizer::findGarbageCode() const
         for (const Token *tok = tokens(); tok; tok = tok->next()) {
             if (!Token::simpleMatch(tok, "template <"))
                 continue;
-            if (tok->previous() && !Token::Match(tok->previous(), "[:;{})]"))
+            if (tok->previous() && !Token::Match(tok->previous(), "[:;{})>]"))
                 return tok;
             const Token * const tok1 = tok;
             tok = tok->next()->findClosingBracket();
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -220,6 +220,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(simplifyFunctionParameters1); // #3721
         TEST_CASE(simplifyFunctionParameters2); // #4430
         TEST_CASE(simplifyFunctionParameters3); // #4436
+        TEST_CASE(simplifyFunctionParametersMultiTemplate);
         TEST_CASE(simplifyFunctionParametersErrors);
 
         TEST_CASE(removeParentheses1);       // Ticket #61
@@ -3116,6 +3117,12 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS(code, tokenizeAndStringify(code));
     }
 
+    void simplifyFunctionParametersMultiTemplate() {
+        const char code[] = "template < typename T1 > template < typename T2 > "
+                            "void A < T1 > :: foo ( T2 ) { }";
+        ASSERT_EQUALS(code, tokenizeAndStringify(code));
+    }
+
     void simplifyFunctionParametersErrors() {
         //same parameters...
         ASSERT_THROW(tokenizeAndStringify("void foo(x, x)\n"
