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

Ticket #7914: Properly recognize template parameters that contains operators. (#870)

This commit is contained in:
Simon Martin 2017-02-11 10:13:41 +01:00 committed by PKEuS
parent 7de055361c
commit 326d152aa2
4 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/templatesimplifier.cpp
View File

@ -269,7 +269,7 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
return 0; return 0;
// num/type .. // num/type ..
if (!tok->isNumber() && tok->tokType() != Token::eChar && !tok->isName()) if (!tok->isNumber() && tok->tokType() != Token::eChar && !tok->isName() && !tok->isOp())
return 0; return 0;
tok = tok->next(); tok = tok->next();
if (!tok) if (!tok)
@ -509,6 +509,12 @@ std::list<Token *> TemplateSimplifier::getTemplateInstantiations(Token *tokens)
tok = tok->next()->findClosingBracket(); tok = tok->next()->findClosingBracket();
if (!tok) if (!tok)
break; break;
// #7914
// Ignore template instantiations within template definitions: they will only be
// handled if the definition is actually instantiated
const Token *tok2 = Token::findmatch(tok, "{|;");
if (tok2 && tok2->str() == "{")
tok = tok2->link();
} else if (Token::Match(tok->previous(), "[({};=] %name% <") || } else if (Token::Match(tok->previous(), "[({};=] %name% <") ||
Token::Match(tok->previous(), "%type% %name% <") || Token::Match(tok->previous(), "%type% %name% <") ||
Token::Match(tok->tokAt(-2), "[,:] private|protected|public %name% <")) { Token::Match(tok->tokAt(-2), "[,:] private|protected|public %name% <")) {

3
test/testgarbage.cpp
View File

@ -915,8 +915,7 @@ private:
} }
void garbageCode125() { void garbageCode125() {
ASSERT_THROW(checkCode("{ T struct B : T valueA_AA ; } T : [ T > ( ) { B } template < T > struct A < > : ] { ( ) { return valueA_AC struct { : } } b A < int > AC ( ) a_aa.M ; ( ) ( ) }"), checkCode("{ T struct B : T valueA_AA ; } T : [ T > ( ) { B } template < T > struct A < > : ] { ( ) { return valueA_AC struct { : } } b A < int > AC ( ) a_aa.M ; ( ) ( ) }");
InternalError);
ASSERT_THROW(checkCode("template < Types > struct S :{ ( S < ) S >} { ( ) { } } ( ) { return S < void > ( ) }"), ASSERT_THROW(checkCode("template < Types > struct S :{ ( S < ) S >} { ( ) { } } ( ) { return S < void > ( ) }"),
InternalError); InternalError);
} }

50
test/testsimplifytemplate.cpp
View File

@ -310,7 +310,7 @@ private:
// The expected result.. // The expected result..
const char expected[] = "void f ( ) { A < int > a ; } " const char expected[] = "void f ( ) { A < int > a ; } "
"template < typename T > class B { void g ( ) { A < T > b ; b = A < T > :: h ( ) ; } } ; " "template < typename T > class B { void g ( ) { A < T > b ; b = A < T > :: h ( ) ; } } ; "
"class A < int > { } ; class A < T > { } ;"; "class A < int > { } ;";
ASSERT_EQUALS(expected, tok(code)); ASSERT_EQUALS(expected, tok(code));
} }
@ -473,7 +473,6 @@ private:
const char expected[] = "int main ( ) { b < 2 > ( ) ; return 0 ; } " const char expected[] = "int main ( ) { b < 2 > ( ) ; return 0 ; } "
"void b < 2 > ( ) { a < 2 > ( ) ; } " "void b < 2 > ( ) { a < 2 > ( ) ; } "
"void a < i > ( ) { } "
"void a < 2 > ( ) { }"; "void a < 2 > ( ) { }";
ASSERT_EQUALS(expected, tok(code)); ASSERT_EQUALS(expected, tok(code));
@ -722,7 +721,6 @@ private:
ASSERT_EQUALS("C < int > c ; " ASSERT_EQUALS("C < int > c ; "
"struct C < int > { A < B < X < int > > > ab ; } ; " "struct C < int > { A < B < X < int > > > ab ; } ; "
"struct B < X < int > > { } ; " // <- redundant.. but nevermind "struct B < X < int > > { } ; " // <- redundant.. but nevermind
"struct A < B < X < T > > > { } ; " // <- redundant.. but nevermind
"struct A < B < X < int > > > { } ;", tok(code)); "struct A < B < X < int > > > { } ;", tok(code));
} }
@ -912,11 +910,12 @@ private:
"template < class T > void Fred < T > :: g ( ) { } " "template < class T > void Fred < T > :: g ( ) { } "
"template void Fred < float > :: f ( ) ; " "template void Fred < float > :: f ( ) ; "
"template void Fred < int > :: g ( ) ; " "template void Fred < int > :: g ( ) ; "
"class Fred < T > { void f ( ) ; void g ( ) ; } ; "
"Fred < T > :: f ( ) { } "
"Fred < T > :: g ( ) { } "
"class Fred < float > { void f ( ) ; void g ( ) ; } ; " "class Fred < float > { void f ( ) ; void g ( ) ; } ; "
"class Fred < int > { void f ( ) ; void g ( ) ; } ;"; "Fred < float > :: f ( ) { } "
"Fred < float > :: g ( ) { } "
"class Fred < int > { void f ( ) ; void g ( ) ; } ; "
"Fred < int > :: f ( ) { } "
"Fred < int > :: g ( ) { }";
ASSERT_EQUALS(expected, tok(code)); ASSERT_EQUALS(expected, tok(code));
} }
@ -927,13 +926,10 @@ private:
"template<> void Fred<float>::f() { }\n" "template<> void Fred<float>::f() { }\n"
"template<> void Fred<int>::g() { }\n"; "template<> void Fred<int>::g() { }\n";
const char expected[] = "template < class T > void Fred < T > :: f ( ) { } " const char expected[] = "template < class T > class Fred { void f ( ) ; } ; "
"template < class T > void Fred < T > :: f ( ) { } "
"template < > void Fred < float > :: f ( ) { } " "template < > void Fred < float > :: f ( ) { } "
"template < > void Fred < int > :: g ( ) { } " "template < > void Fred < int > :: g ( ) { }";
"class Fred < T > { void f ( ) ; } ; "
"Fred < T > :: f ( ) { } "
"class Fred < float > { void f ( ) ; } ; "
"class Fred < int > { void f ( ) ; } ;";
ASSERT_EQUALS(expected, tok(code)); ASSERT_EQUALS(expected, tok(code));
} }
@ -982,13 +978,10 @@ private:
void template55() { // #6604 void template55() { // #6604
// Avoid constconstconst in macro instantiations // Avoid constconstconst in macro instantiations
ASSERT_EQUALS( ASSERT_EQUALS(
"class AtSmartPtr < T > : public ConstCastHelper < AtSmartPtr < const T > , T > { " "template < class T > class AtSmartPtr : public ConstCastHelper < AtSmartPtr < const T > , T > { "
"friend struct ConstCastHelper < AtSmartPtr < const T > , T > ; " "friend struct ConstCastHelper < AtSmartPtr < const T > , T > ; "
"AtSmartPtr < T > ( const AtSmartPtr < T > & r ) ; " "AtSmartPtr ( const AtSmartPtr < T > & r ) ; "
"} ; " "} ;",
"class AtSmartPtr < const T > : public ConstCastHelper < AtSmartPtr < const const T > , const T > { "
"friend struct ConstCastHelper < AtSmartPtr < const const T > , const T > ; "
"AtSmartPtr < const T > ( const AtSmartPtr < T > & r ) ; } ;",
tok("template<class T> class AtSmartPtr : public ConstCastHelper<AtSmartPtr<const T>, T>\n" tok("template<class T> class AtSmartPtr : public ConstCastHelper<AtSmartPtr<const T>, T>\n"
"{\n" "{\n"
" friend struct ConstCastHelper<AtSmartPtr<const T>, T>;\n" " friend struct ConstCastHelper<AtSmartPtr<const T>, T>;\n"
@ -1062,17 +1055,12 @@ private:
" enum {value = !type_equal<T, typename Unconst<T>::type>::value };\n" " enum {value = !type_equal<T, typename Unconst<T>::type>::value };\n"
"};"; "};";
const char exp1[] = "template < class T > struct Unconst { } ; " const char exp1[] = "template < class T > struct Unconst { } ; "
"template < class T > struct Unconst < const T > { } ; "
"template < class T > struct Unconst < const T & > { } ; "
"template < class T > struct Unconst < T * const > { } ; "
"template < class T1 , class T2 > struct type_equal { enum Anonymous0 { value = 0 } ; } ; "
"template < class T > struct type_equal < T , T > { enum Anonymous1 { value = 1 } ; } ; " "template < class T > struct type_equal < T , T > { enum Anonymous1 { value = 1 } ; } ; "
"template < class T > struct template_is_const { enum Anonymous2 { value = ! type_equal < T , Unconst < T > :: type > :: value } ; } ; " "template < class T > struct template_is_const { enum Anonymous2 { value = ! type_equal < T , Unconst < T > :: type > :: value } ; } ;";
"struct type_equal < T , T > { enum Anonymous0 { value = 0 } ; } ; "
"struct Unconst < const T * const > { } ; "
"struct Unconst < const T & * const > { } ; "
"struct Unconst < T * const * const > { } ; "
"struct Unconst < T * const > { } ; "
"struct Unconst < T * const > { } ; "
"struct Unconst < T * const > { } ; "
"struct Unconst < const T & > { } ; "
"struct Unconst < const T > { } ;";
ASSERT_EQUALS(exp1, tok(code1)); ASSERT_EQUALS(exp1, tok(code1));
} }
@ -1346,6 +1334,10 @@ private:
ASSERT_EQUALS(3U, templateParameters("X<char, int(*)(), bool> x;")); ASSERT_EQUALS(3U, templateParameters("X<char, int(*)(), bool> x;"));
TODO_ASSERT_EQUALS(1U, 0U, templateParameters("X<int...> x;")); // Mishandled valid syntax TODO_ASSERT_EQUALS(1U, 0U, templateParameters("X<int...> x;")); // Mishandled valid syntax
TODO_ASSERT_EQUALS(2U, 0U, templateParameters("X<class, typename...> x;")); // Mishandled valid syntax TODO_ASSERT_EQUALS(2U, 0U, templateParameters("X<class, typename...> x;")); // Mishandled valid syntax
ASSERT_EQUALS(2U, templateParameters("X<1, T> x;"));
ASSERT_EQUALS(1U, templateParameters("X<i == 0> x;"));
ASSERT_EQUALS(2U, templateParameters("X<int, i>=0> x;"));
ASSERT_EQUALS(3U, templateParameters("X<int, i>=0, i - 2> x;"));
} }
// Helper function to unit test TemplateSimplifier::getTemplateNamePosition // Helper function to unit test TemplateSimplifier::getTemplateNamePosition

15
test/testsimplifytokens.cpp
View File

@ -2500,16 +2500,13 @@ private:
void simplifyOperator2() { void simplifyOperator2() {
// #6576 // #6576
ASSERT_EQUALS("class TClass { " ASSERT_EQUALS("template < class T > class SharedPtr { "
"public: " "SharedPtr & operator= ( SharedPtr < Y > const & r ) ; "
"TClass & operator= ( const TClass & rhs ) ; "
"} ; " "} ; "
"TClass :: TClass ( const TClass & other ) " "class TClass { "
"{ " "public: TClass & operator= ( const TClass & rhs ) ; "
"operator= ( other ) ; " "} ; "
"} class SharedPtr < Y > { " "TClass :: TClass ( const TClass & other ) { operator= ( other ) ; }",
"SharedPtr < Y > & operator= ( SharedPtr < Y > const & r ) ; "
"} ;",
tok("template<class T>\n" tok("template<class T>\n"
" class SharedPtr {\n" " class SharedPtr {\n"
" SharedPtr& operator=(SharedPtr<Y> const & r);\n" " SharedPtr& operator=(SharedPtr<Y> const & r);\n"