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

Fixed , added support for function prototypes to TemplateSimplifier::templateParameters()

This commit is contained in:
PKEuS 2012-08-12 05:19:56 -07:00
parent a15e307df0
commit 2ac2674f67
2 changed files with 9 additions and 3 deletions

6
lib/templatesimplifier.cpp
View File

@ -209,9 +209,9 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
while (Token::Match(tok, "*|&|const")) while (Token::Match(tok, "*|&|const"))
tok = tok->next(); tok = tok->next();
// Function pointer.. // Function pointer or prototype..
if (Token::simpleMatch(tok, "( * ) (")) while (tok->str() == "(")
tok = tok->linkAt(3)->next(); tok = tok->link()->next();
// inner template // inner template
if (tok->str() == "<") { if (tok->str() == "<") {

6
test/testtokenize.cpp
View File

@ -246,6 +246,7 @@ private:
TEST_CASE(varid_unknown_macro); // #2638 - unknown macro is not type TEST_CASE(varid_unknown_macro); // #2638 - unknown macro is not type
TEST_CASE(varid_using); // ticket #3648 TEST_CASE(varid_using); // ticket #3648
TEST_CASE(varid_catch); TEST_CASE(varid_catch);
TEST_CASE(varid_functionPrototypeTemplate);
TEST_CASE(varidclass1); TEST_CASE(varidclass1);
TEST_CASE(varidclass2); TEST_CASE(varidclass2);
@ -3798,6 +3799,11 @@ private:
ASSERT_EQUALS(expected, tokenizeDebugListing(code)); ASSERT_EQUALS(expected, tokenizeDebugListing(code));
} }
void varid_functionPrototypeTemplate() {
ASSERT_EQUALS("\n\n##file 0\n"
"1: function < void ( ) > fptr@1 ;\n", tokenizeDebugListing("function<void(void)> fptr;"));
}
void varidclass1() { void varidclass1() {
const std::string actual = tokenizeDebugListing( const std::string actual = tokenizeDebugListing(
"class Fred\n" "class Fred\n"