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

Update TemplateSimplifier::getTemplateNamePosition to handle out-of-line template methods. 

Add an optional extended description…
This commit is contained in:
Simon Martin 2017-03-19 20:44:20 +01:00 committed by PKEuS
parent 6111b38ebb
commit fb2b29dc7d
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/templatesimplifier.cpp
View File

@ -720,6 +720,14 @@ int TemplateSimplifier::getTemplateNamePosition(const Token *tok)
namepos = 2; namepos = 2;
else if (Token::Match(tok, "> %type% %type% *|&| %type% (")) else if (Token::Match(tok, "> %type% %type% *|&| %type% ("))
namepos = 3; namepos = 3;
else if ((Token::Match(tok, "> %type% <") && Token::Match(tok->linkAt(2), "> :: %type% (")) ||
(Token::Match(tok, "> %type% %type% <") && Token::Match(tok->linkAt(3), "> :: %type% ("))) {
namepos = 2 + (Token::Match(tok, "> %type% %type%"));
const Token *end = tok->linkAt(namepos);
for(const Token *tok2 = tok->tokAt(namepos) ; tok2 != end ; tok2 = tok2->next())
++namepos;
namepos += 2;
}
else if (Token::Match(tok, "> %type% *|&| %type% :: %type% (")) { else if (Token::Match(tok, "> %type% *|&| %type% :: %type% (")) {
namepos = 4; namepos = 4;
starAmpPossiblePosition = 2; starAmpPossiblePosition = 2;

8
test/testsimplifytemplate.cpp
View File

@ -1372,8 +1372,14 @@ private:
TODO_ASSERT_EQUALS(7, -1, templateNamePositionHelper("class A { class B { template<class T> const unsigned foo(); }; } ; " TODO_ASSERT_EQUALS(7, -1, templateNamePositionHelper("class A { class B { template<class T> const unsigned foo(); }; } ; "
"template<class T> const unsigned A::B::foo() { return 0; }", 25)); "template<class T> const unsigned A::B::foo() { return 0; }", 25));
// Template class member // Template class member
TODO_ASSERT_EQUALS(7, -1, templateNamePositionHelper("template<class T> class A { unsigned foo(); }; " ASSERT_EQUALS(6, templateNamePositionHelper("template<class T> class A { A(); }; "
"template<class T> A<T>::A() {}", 18));
ASSERT_EQUALS(8, templateNamePositionHelper("template<class T, class U> class A { A(); }; "
"template<class T, class U> A<T, U>::A() {}", 24));
ASSERT_EQUALS(7, templateNamePositionHelper("template<class T> class A { unsigned foo(); }; "
"template<class T> unsigned A<T>::foo() { return 0; }", 19)); "template<class T> unsigned A<T>::foo() { return 0; }", 19));
ASSERT_EQUALS(9, templateNamePositionHelper("template<class T, class U> class A { unsigned foo(); }; "
"template<class T, class U> unsigned A<T, U>::foo() { return 0; }", 25));
} }
void expandSpecialized() { void expandSpecialized() {