walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix #9197 (Template name cache: Assertion `tok && tok->str() == ">"' failed.) (#1964)

This commit is contained in:
IOBYTE 2019-07-07 04:20:43 -04:00 committed by Daniel Marjamäki
parent b0d10273ed
commit c902c5f688
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/templatesimplifier.cpp
View File

@ -426,7 +426,7 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
// Skip variadic types (Ticket #5774, #6059, #6172) // Skip variadic types (Ticket #5774, #6059, #6172)
if (Token::simpleMatch(tok, ". . .")) { if (Token::simpleMatch(tok, ". . .")) {
if ((tok->previous()->isName() && !Token::Match(tok->tokAt(-2), "<|,")) || if ((tok->previous()->isName() && !Token::Match(tok->tokAt(-2), "<|,|::")) ||
(!tok->previous()->isName() && tok->strAt(-1) != ">")) (!tok->previous()->isName() && tok->strAt(-1) != ">"))
return 0; // syntax error return 0; // syntax error
tok = tok->tokAt(3); tok = tok->tokAt(3);
@ -439,6 +439,7 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
} else if (tok->str() == ">>") { } else if (tok->str() == ">>") {
if (level == 1) if (level == 1)
return numberOfParameters; return numberOfParameters;
level -= 2;
} else if (tok->str() == "," && level == 0) { } else if (tok->str() == "," && level == 0) {
++numberOfParameters; ++numberOfParameters;
tok = tok->next(); tok = tok->next();

17
test/testsimplifytemplate.cpp
View File

@ -161,6 +161,7 @@ private:
TEST_CASE(template121); // #9193 TEST_CASE(template121); // #9193
TEST_CASE(template122); // #9147 TEST_CASE(template122); // #9147
TEST_CASE(template123); // #9183 TEST_CASE(template123); // #9183
TEST_CASE(template124); // #9197
TEST_CASE(template_specialization_1); // #7868 - template specialization template <typename T> struct S<C<T>> {..}; 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_2); // #7868 - template specialization template <typename T> struct S<C<T>> {..};
TEST_CASE(template_enum); // #6299 Syntax error in complex enum declaration (including template) TEST_CASE(template_enum); // #6299 Syntax error in complex enum declaration (including template)
@ -2904,6 +2905,22 @@ private:
ASSERT_EQUALS(exp, tok(code)); ASSERT_EQUALS(exp, tok(code));
} }
void template124() { // #9197
const char code[] = "template <bool> struct a;\n"
"template <bool b> using c = typename a<b>::d;\n"
"template <typename> struct e;\n"
"template <typename> struct h {\n"
" template <typename... f, c<h<e<typename f::d...>>::g>> void i();\n"
"};";
const char exp[] = "template < bool > struct a ; "
"template < bool b > using c = typename a < b > :: d ; "
"template < typename > struct e ; "
"template < typename > struct h { "
"template < typename . . . f , c < h < e < typename f :: d . . . > > :: g > > void i ( ) ; "
"} ;";
ASSERT_EQUALS(exp, tok(code));
}
void template_specialization_1() { // #7868 - template specialization template <typename T> struct S<C<T>> {..}; void template_specialization_1() { // #7868 - template specialization template <typename T> struct S<C<T>> {..};
const char code[] = "template <typename T> struct C {};\n" const char code[] = "template <typename T> struct C {};\n"
"template <typename T> struct S {a};\n" "template <typename T> struct S {a};\n"