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

More robust Token::findClosingBracket

This commit is contained in:
Daniel Marjamäki 2020-11-30 19:26:15 +01:00
parent c846c0fbdc
commit 9aa69661b5
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/token.cpp
View File

@ -861,6 +861,14 @@ const Token * Token::findClosingBracket() const
if (mStr != "<") if (mStr != "<")
return nullptr; return nullptr;
if (!mPrevious)
return nullptr;
if (!(mPrevious->isName() ||
Token::Match(mPrevious->previous(), "operator %op% <") ||
Token::Match(mPrevious->tokAt(-2), "operator [([] [)]] <")))
return nullptr;
const Token *closing = nullptr; const Token *closing = nullptr;
const bool templateParameter(strAt(-1) == "template"); const bool templateParameter(strAt(-1) == "template");
std::set<std::string> templateParameters; std::set<std::string> templateParameters;

3
lib/tokenize.cpp
View File

@ -5165,7 +5165,8 @@ void Tokenizer::removeExtraTemplateKeywords()
} }
} }
static std::string getExpression(const Token *tok) { static std::string getExpression(const Token *tok)
{
std::string line; std::string line;
for (const Token *prev = tok->previous(); prev && !Token::Match(prev, "[;{}]"); prev = prev->previous()) for (const Token *prev = tok->previous(); prev && !Token::Match(prev, "[;{}]"); prev = prev->previous())
line = prev->str() + " " + line; line = prev->str() + " " + line;

2
test/testsimplifytemplate.cpp
View File

@ -4798,7 +4798,7 @@ private:
std::istringstream istr(code); std::istringstream istr(code);
tokenizer.createTokens(istr, "test.cpp"); tokenizer.createTokens(istr, "test.cpp");
tokenizer.createLinks(); tokenizer.createLinks();
tokenizer.splitTemplateRightAngleBrackets(false); tokenizer.splitTemplateRightAngleBrackets(false);
const Token *_tok = tokenizer.tokens(); const Token *_tok = tokenizer.tokens();
for (unsigned i = 0 ; i < offset ; ++i) for (unsigned i = 0 ; i < offset ; ++i)