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

Merge pull request #483 from simartin/ticket_6172 

Ticket #6172: Properly grok %type%... template parameters.
This commit is contained in:
PKEuS 2014-12-14 17:01:25 +01:00
parent fef8083ff7 859c6381cc
commit 010eb1c8cb
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/templatesimplifier.cpp
View File

@ -240,8 +240,8 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
if (Token::Match(tok, "& ::| %var%")) if (Token::Match(tok, "& ::| %var%"))
tok = tok->next(); tok = tok->next();
// Skip 'typename...' and 'class...' (Ticket #5774, #6059) // Skip variadic types (Ticket #5774, #6059, #6172)
if (Token::Match(tok, "typename|class . . .")) { if (Token::Match(tok, "%type% . . .")) {
tok = tok->tokAt(4); tok = tok->tokAt(4);
continue; continue;
} }

12
test/testsimplifytemplate.cpp
View File

@ -85,6 +85,7 @@ private:
TEST_CASE(template48); // #6134 - 100% CPU upon invalid code TEST_CASE(template48); // #6134 - 100% CPU upon invalid code
TEST_CASE(template49); // #6237 - template instantiation TEST_CASE(template49); // #6237 - template instantiation
TEST_CASE(template50); // #4272 - simple partial specialization TEST_CASE(template50); // #4272 - simple partial specialization
TEST_CASE(template51); // #6172 - crash upon valid code
TEST_CASE(template_unhandled); TEST_CASE(template_unhandled);
TEST_CASE(template_default_parameter); TEST_CASE(template_default_parameter);
TEST_CASE(template_default_type); TEST_CASE(template_default_type);
@ -917,7 +918,16 @@ private:
ASSERT_EQUALS(expected, tok(code)); ASSERT_EQUALS(expected, tok(code));
} }
void template51() { // #6172
tok("template<int N, int ... M> struct A { "
" static void foo() { "
" int i = N; "
" } "
"}; "
"void bar() { "
" A<0>::foo(); "
"}");
}
void template_default_parameter() { void template_default_parameter() {
{ {