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

Make code less strict that looks for garbage template code. Before a template there might be unknown macros.

This commit is contained in:
Daniel Marjamäki 2017-12-31 16:25:41 +01:00
parent 7d2450e445
commit fa42a08a71
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/tokenize.cpp
View File

@ -8369,28 +8369,12 @@ const Token * Tokenizer::findGarbageCode() const
for (const Token *tok = tokens(); tok; tok = tok->next()) { for (const Token *tok = tokens(); tok; tok = tok->next()) {
if (!Token::simpleMatch(tok, "template <")) if (!Token::simpleMatch(tok, "template <"))
continue; continue;
if (tok->previous() && !Token::Match(tok->previous(), "[:;{}]")) if (tok->previous() && !Token::Match(tok->previous(), "[:;{})]"))
return tok; return tok;
const Token *tok1 = tok; const Token * const tok1 = tok;
tok = tok->tokAt(2); tok = tok->next()->findClosingBracket();
while (Token::Match(tok,"%name%|*|,|.|(")) {
if (tok->str() == "(")
tok = tok->link();
tok = tok->next();
}
if (tok && tok->str() == "=") {
while (tok && !Token::Match(tok, "[;{}]") && !Token::Match(tok, ">|>> %name%")) {
if (tok->str() == "(")
tok = tok->link();
tok = tok->next();
}
}
if (!tok) if (!tok)
return tok1; return tok1;
if (Token::simpleMatch(tok->previous(), "template <"))
continue;
if (!Token::Match(tok, ">|>>"))
return tok1;
if (!Token::Match(tok, ">|>> %name%")) if (!Token::Match(tok, ">|>> %name%"))
return tok->next() ? tok->next() : tok1; return tok->next() ? tok->next() : tok1;
} }

8
test/testgarbage.cpp
View File

@ -1008,13 +1008,13 @@ private:
void garbageCode134() { void garbageCode134() {
// Ticket #5605, #5759, #5762, #5774, #5823, #6059 // Ticket #5605, #5759, #5762, #5774, #5823, #6059
ASSERT_THROW(checkCode("foo() template<typename T1 = T2 = typename = unused, T5 = = unused> struct tuple Args> tuple<Args...> { } main() { foo<int,int,int,int,int,int>(); }"), InternalError); ASSERT_THROW(checkCode("foo() template<typename T1 = T2 = typename = unused, T5 = = unused> struct tuple Args> tuple<Args...> { } main() { foo<int,int,int,int,int,int>(); }"), InternalError);
ASSERT_THROW(checkCode("( ) template < T1 = typename = unused> struct Args { } main ( ) { foo < int > ( ) ; }"), InternalError); checkCode("( ) template < T1 = typename = unused> struct Args { } main ( ) { foo < int > ( ) ; }");
ASSERT_THROW(checkCode("() template < T = typename = x > struct a {} { f <int> () }"), InternalError); checkCode("() template < T = typename = x > struct a {} { f <int> () }");
checkCode("template < T = typename = > struct a { f <int> }"); checkCode("template < T = typename = > struct a { f <int> }");
ASSERT_THROW(checkCode("struct S { int i, j; }; " checkCode("struct S { int i, j; }; "
"template<int S::*p, typename U> struct X {}; " "template<int S::*p, typename U> struct X {}; "
"X<&S::i, int> x = X<&S::i, int>(); " "X<&S::i, int> x = X<&S::i, int>(); "
"X<&S::j, int> y = X<&S::j, int>(); "), InternalError); "X<&S::j, int> y = X<&S::j, int>(); ");
checkCode("template <typename T> struct A {}; " checkCode("template <typename T> struct A {}; "
"template <> struct A<void> {}; " "template <> struct A<void> {}; "
"void foo(const void* f = 0) {}"); "void foo(const void* f = 0) {}");