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

Fixed #8297 (Tokenizer:createLinks: 'X<sizeof(int)==1 || sizeof(int)==4>()')

This commit is contained in:
Daniel Marjamäki 2017-12-17 15:53:05 +01:00
parent a01c6c95eb
commit 1428759479
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/tokenize.cpp
View File

@ -3235,6 +3235,31 @@ void Tokenizer::createLinks2()
} else if (!templateToken && !isStruct && Token::Match(token, "%oror%|&&|;")) {
if (Token::Match(token, "&& [,>]"))
continue;
// If there is some such code: A<B||C>..
// Then this is probably a template instantiation if either "B" or "C" has comparisons
if (token->tokType() == Token::eLogicalOp && !type.empty() && type.top()->str() == "<") {
const Token *prev = token->previous();
while (Token::Match(prev, "%name%|%num%|%str%|%cop%|)|]")) {
if (prev->str() == ")" || prev->str() == "]")
prev = prev->link();
else if (prev->tokType() == Token::eLogicalOp || prev->isComparisonOp())
break;
prev = prev->previous();
}
if (prev && prev != type.top() && prev->isComparisonOp())
continue;
const Token *next = token->next();
while (Token::Match(next, "%name%|%num%|%str%|%cop%|(|[")) {
if (next->str() == "(" || next->str() == "[")
next = next->link();
else if (next->tokType() == Token::eLogicalOp || next->isComparisonOp())
break;
next = next->next();
}
if (next && next != type.top() && next->isComparisonOp() && next->str() != ">")
continue;
}
while (!type.empty() && type.top()->str() == "<")
type.pop();
} else if (token->str() == "<" && token->previous() && token->previous()->isName() && !token->previous()->varId()) {

22
test/testtokenize.cpp
View File

@ -4522,6 +4522,28 @@ private:
ASSERT_EQUALS(true, tok->linkAt(3) == nullptr);
}
{
// template
const char code[] = "a<b==3 || c> d;";
errout.str("");
Tokenizer tokenizer(&settings0, this);
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
const Token *tok = tokenizer.tokens();
ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(7));
}
{
// template
const char code[] = "a<b || c==4> d;";
errout.str("");
Tokenizer tokenizer(&settings0, this);
std::istringstream istr(code);
tokenizer.tokenize(istr, "test.cpp");
const Token *tok = tokenizer.tokens();
ASSERT_EQUALS(true, tok->linkAt(1) == tok->tokAt(7));
}
{
const char code[] = "template < f = b || c > struct S;";
errout.str("");