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

Merge pull request #539 from simartin/ticket_6181 

Ticket #6181: Normalize '>>' into '> >' when it's closing a C++11 template parameter list
This commit is contained in:
Daniel Marjamäki 2015-03-07 15:02:21 +01:00
parent 87ebeb3f65 9c6a625f91
commit 0131bda065
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/tokenize.cpp
View File

@ -2315,6 +2315,14 @@ void Tokenizer::simplifyTemplates()
tok3->deleteNext(4); tok3->deleteNext(4);
tok3->insertToken(MathLib::toString(sizeOfResult)); tok3->insertToken(MathLib::toString(sizeOfResult));
} }
// Ticket #6181: normalize C++11 template parameter list closing syntax
if (tok->str() == "<" && TemplateSimplifier::templateParameters(tok)) {
Token *endTok = tok->findClosingBracket();
if (endTok && endTok->str() == ">>") {
endTok->str(">");
endTok->insertToken(">");
}
}
} }
TemplateSimplifier::simplifyTemplates( TemplateSimplifier::simplifyTemplates(

14
test/testsimplifytemplate.cpp
View File

@ -1009,12 +1009,14 @@ private:
TODO_ASSERT_EQUALS(wanted, current, tok(code)); TODO_ASSERT_EQUALS(wanted, current, tok(code));
} }
{ {
const char code[] = "template<class T, class T2 = A<T>> class B {};\n" const char code[] = "class A { }; "
"template<class B = A, typename C = C<B>> class C {};\n" "template<class T> class B { }; "
"template<class B, typename C> class D { };\n"; "template<class T1, class T2 = B<T1>> class C { }; "
ASSERT_EQUALS("template < class T , class T2 > class B { } ; " "template<class T1 = A, typename T2 = B<A>> class D { };";
"template < class B , typename C > class C { } ; " ASSERT_EQUALS("class A { } ; "
"template < class B , typename C > class D { } ;", tok(code)); "template < class T > class B { } ; "
"template < class T1 , class T2 > class C { } ; "
"template < class T1 , typename T2 > class D { } ;", tok(code));
} }
} }

10
test/testtokenize.cpp
View File

@ -828,7 +828,7 @@ private:
"void z() {\n" "void z() {\n"
" vector<int> VI;\n" " vector<int> VI;\n"
"}\n"; "}\n";
ASSERT_THROW(tokenizeAndStringify(code, true), InternalError); tokenizeAndStringify(code, true);
} }
void tokenize34() { // #6121 void tokenize34() { // #6121
@ -5185,10 +5185,10 @@ private:
} }
void cpp0xtemplate4() { // #6181, #6354, #6414 void cpp0xtemplate4() { // #6181, #6354, #6414
ASSERT_THROW(tokenizeAndStringify("class A; " tokenizeAndStringify("class A; "
"template <class T> class Disposer; " "template <class T> class Disposer; "
"template <typename T, class D = Disposer<T>> class Shim {}; " "template <typename T, class D = Disposer<T>> class Shim {}; "
"class B : public Shim<A> {};"), InternalError); "class B : public Shim<A> {};");
tokenizeAndStringify("template <class ELFT> class ELFObjectImage {}; " tokenizeAndStringify("template <class ELFT> class ELFObjectImage {}; "
"ObjectImage *createObjectImage() { " "ObjectImage *createObjectImage() { "
" return new ELFObjectImage<ELFType<little>>(Obj); " " return new ELFObjectImage<ELFType<little>>(Obj); "