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

Fixed 'Syntax Error' when < link is not set properly

This commit is contained in:
Daniel Marjamäki 2019-05-15 21:34:56 +02:00
parent 21ec78d8a1
commit 0144db2490
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenize.cpp
View File

@ -3863,7 +3863,7 @@ void Tokenizer::createLinks2()
const bool isScoped = Token::simpleMatch(token->tokAt(-2), "::") || const bool isScoped = Token::simpleMatch(token->tokAt(-2), "::") ||
(Token::Match(token->tokAt(-2), "; %name% <") && usingNames.count(token->previous()->str())); (Token::Match(token->tokAt(-2), "; %name% <") && usingNames.count(token->previous()->str()));
const bool isTemplateDecl = isScoped || Token::Match(token->tokAt(-2), "%name% %name% <"); const bool isTemplateDecl = isScoped || Token::Match(token->tokAt(-2), "%name% %name% <");
const bool isTemplateArgPointerType = Token::Match(token, "< %name%| %type% * >"); const bool isTemplateArgPointerType = Token::Match(token, "< %type% * >");
if (!isTemplateDecl && !isTemplateArgPointerType) { if (!isTemplateDecl && !isTemplateArgPointerType) {
std::map<std::string, bool>::const_iterator it = templateNames.find(token->previous()->str()); std::map<std::string, bool>::const_iterator it = templateNames.find(token->previous()->str());
if (it == templateNames.end()) { if (it == templateNames.end()) {

12
test/testtokenize.cpp
View File

@ -4787,6 +4787,18 @@ private:
tokenizer.tokenize(istr, "test.cpp"); tokenizer.tokenize(istr, "test.cpp");
ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "<")->link()); ASSERT(nullptr != Token::findsimplematch(tokenizer.tokens(), "<")->link());
} }
{
const char code[] = "using std::set;\n"
"void foo()\n"
"{\n"
" for (set<ParticleSource*>::iterator i = sources.begin(); i != sources.end(); ++i) {}\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() {