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

Merge pull request #314 from simartin/ticket_5816_2 

Ticket #5816: Properly handle template'd template parameters in enum initializers
This commit is contained in:
PKEuS 2014-05-23 23:08:33 +02:00
parent d299cae5ef fcff8d39d9
commit e1ad71dba5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tokenize.cpp
View File

@ -7572,7 +7572,9 @@ void Tokenizer::simplifyEnum()
endtoken = endtoken->next(); endtoken = endtoken->next();
if (Token::Match(endtoken, "*|,|::|typename")) if (Token::Match(endtoken, "*|,|::|typename"))
endtoken = endtoken->next(); endtoken = endtoken->next();
} while (Token::Match(endtoken, "%var%|%num% *| [,>]") || Token::Match(endtoken, "%var%|%num% :: %any%")); if (endtoken->str() == "<" && TemplateSimplifier::templateParameters(endtoken))
endtoken = endtoken->findClosingBracket();
} while (Token::Match(endtoken, "%var%|%num% *| [,>]") || Token::Match(endtoken, "%var%|%num% ::|< %any%"));
if (endtoken->str() == ">") { if (endtoken->str() == ">") {
enumValueEnd = endtoken; enumValueEnd = endtoken;
if (Token::simpleMatch(endtoken, "> ( )")) if (Token::simpleMatch(endtoken, "> ( )"))

6
test/testsimplifytokens.cpp
View File

@ -2414,6 +2414,12 @@ private:
"enum { e = sizeof(A<int, int>) }; " "enum { e = sizeof(A<int, int>) }; "
"template <class T, class U> struct B {};"); "template <class T, class U> struct B {};");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
tok("template<class T, class U> struct A { static const int value = 0; }; "
"template<class T> struct B { typedef int type; }; "
"template <class T> struct C { "
" enum { value = A<typename B<T>::type, int>::value }; "
"};");
ASSERT_EQUALS("", errout.str());
} }
void template_default_parameter() { void template_default_parameter() {