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

Fix issue 9141: Syntax error (#1853)

This commit is contained in:
Paul Fultz II 2019-05-26 23:50:43 -05:00 committed by Daniel Marjamäki
parent d594b195d4
commit 61935802d1
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tokenize.cpp
View File

@ -3847,7 +3847,7 @@ void Tokenizer::createLinks2()
while (!type.empty() && type.top()->str() == "<") { while (!type.empty() && type.top()->str() == "<") {
const Token* end = type.top()->findClosingBracket(); const Token* end = type.top()->findClosingBracket();
if (Token::Match(end, "> ;|>")) if (Token::Match(end, "> ;|%comp%"))
break; break;
// Variable declaration // Variable declaration
if (Token::Match(end, "> %var% ;") && (type.top()->tokAt(-2) == nullptr || Token::Match(type.top()->tokAt(-2), ";|}|{"))) if (Token::Match(end, "> %var% ;") && (type.top()->tokAt(-2) == nullptr || Token::Match(type.top()->tokAt(-2), ";|}|{")))
@ -3871,7 +3871,7 @@ void Tokenizer::createLinks2()
if (token->str() == ">>") if (token->str() == ">>")
continue; continue;
if (token->next() && if (token->next() &&
!Token::Match(token->next(), "%name%|>|&|&&|*|::|,|(|)|{|}|;|[|:") && !Token::Match(token->next(), "%name%|%comp%|&|&&|*|::|,|(|)|{|}|;|[|:") &&
!Token::simpleMatch(token->next(), ". . .") && !Token::simpleMatch(token->next(), ". . .") &&
!Token::Match(token->next(), "&& %name% =")) !Token::Match(token->next(), "&& %name% ="))
continue; continue;

15
test/testtokenize.cpp
View File

@ -4858,6 +4858,21 @@ private:
ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> > ;")->link()); ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> > ;")->link());
ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> ;")->link()); ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> ;")->link());
} }
{
// #9141
const char code[] = "struct a {\n"
" typedef int b;\n"
" operator b();\n"
"};\n"
"template <int> using c = a;\n"
"template <int d> c<d> e;\n"
"auto f = -e<1> == 0;\n";
Tokenizer tokenizer(&settings0, this);
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "> ==")->link());
}
} }
void simplifyString() { void simplifyString() {