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

Merge pull request #308 from simartin/ticket_5786 

Ticket #5786: Properly handle cv-qualified member pointers as template parameter
This commit is contained in:
PKEuS 2014-05-15 19:45:25 +02:00
parent b79b5f3dc6 e61e1cb13d
commit 1385f6f7c2
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/templatesimplifier.cpp
View File

@ -228,8 +228,8 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
unsigned int level = 0; unsigned int level = 0;
while (tok) { while (tok) {
// skip const // skip const/volatile
if (tok->str() == "const") if (Token::Match(tok, "const|volatile"))
tok = tok->next(); tok = tok->next();
// skip struct/union // skip struct/union
@ -278,8 +278,11 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
return 0; return 0;
// Function pointer or prototype.. // Function pointer or prototype..
while (tok && (tok->str() == "(" || tok->str() == "[")) while (tok && (tok->str() == "(" || tok->str() == "[")) {
tok = tok->link()->next(); tok = tok->link()->next();
while (tok && Token::Match(tok, "const|volatile")) // Ticket #5786: Skip function cv-qualifiers
tok = tok->next();
}
if (!tok) if (!tok)
return 0; return 0;

28
test/testtokenize.cpp
View File

@ -420,6 +420,7 @@ private:
TEST_CASE(syntax_error_templates_1); TEST_CASE(syntax_error_templates_1);
TEST_CASE(syntax_error_templates_2); TEST_CASE(syntax_error_templates_2);
TEST_CASE(syntax_error_templates_3); // Ticket #5605, #5759, #5762, #5774 TEST_CASE(syntax_error_templates_3); // Ticket #5605, #5759, #5762, #5774
TEST_CASE(template_member_ptr); // Ticket #5786 - crash upon valid code
TEST_CASE(removeKeywords); TEST_CASE(removeKeywords);
@ -6540,6 +6541,33 @@ private:
"A<int> a;"); "A<int> a;");
} }
void template_member_ptr() { // Ticket #5786
tokenizeAndStringify("struct A {}; "
"struct B { "
"template <void (A::*)() const> struct BB {}; "
"template <bool BT> static bool foo(int) { return true; } "
"void bar() { bool b = foo<true>(0); }"
"};");
tokenizeAndStringify("struct A {}; "
"struct B { "
"template <void (A::*)() volatile> struct BB {}; "
"template <bool BT> static bool foo(int) { return true; } "
"void bar() { bool b = foo<true>(0); }"
"};");
tokenizeAndStringify("struct A {}; "
"struct B { "
"template <void (A::*)() const volatile> struct BB {}; "
"template <bool BT> static bool foo(int) { return true; } "
"void bar() { bool b = foo<true>(0); }"
"};");
tokenizeAndStringify("struct A {}; "
"struct B { "
"template <void (A::*)() volatile const> struct BB {}; "
"template <bool BT> static bool foo(int) { return true; } "
"void bar() { bool b = foo<true>(0); }"
"};");
}
void removeKeywords() { void removeKeywords() {
const char code[] = "if (__builtin_expect(!!(x), 1));"; const char code[] = "if (__builtin_expect(!!(x), 1));";