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

Preprocessor: Tweak parseCommentToken

This commit is contained in:
Daniel Marjamäki 2020-02-23 18:29:36 +01:00
parent 5ed5bf935f
commit bba340da3d
1 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lib/preprocessor.cpp
View File

@ -78,35 +78,47 @@ namespace {
static void parseCommentToken(const simplecpp::Token *tok, std::list<Suppressions::Suppression> &inlineSuppressions, std::list<BadInlineSuppression> *bad) static void parseCommentToken(const simplecpp::Token *tok, std::list<Suppressions::Suppression> &inlineSuppressions, std::list<BadInlineSuppression> *bad)
{ {
const std::size_t position=tok->str().find("cppcheck-suppress"); if (tok->str().size() < 19)
if (position != std::string::npos) { return;
if ((tok->str().length() > position+17) && (tok->str()[position+17] == '[')) { //multi suppress format const std::string::size_type pos1 = tok->str().find_first_not_of("/* \t");
std::string errmsg; if (pos1 == std::string::npos)
std::vector<Suppressions::Suppression> ss; return;
ss = Suppressions::parseMultiSuppressComment(tok->str(), &errmsg); if (pos1 + 17 >= tok->str().size())
return;
if (tok->str().compare(pos1, 17, "cppcheck-suppress") != 0)
return;
if (!errmsg.empty()) // skip spaces after "cppcheck-suppress"
bad->push_back(BadInlineSuppression(tok->location, errmsg)); const std::string::size_type pos2 = tok->str().find_first_not_of(" ", pos1+17);
if (pos2 == std::string::npos)
return;
for (std::vector<Suppressions::Suppression>::iterator iter = ss.begin(); iter!=ss.end(); ++iter) { if (tok->str()[pos2] == '[') {
if (!(*iter).errorId.empty()) // multi suppress format
inlineSuppressions.push_back(*iter); std::string errmsg;
} std::vector<Suppressions::Suppression> ss;
} else { //single suppress format ss = Suppressions::parseMultiSuppressComment(tok->str(), &errmsg);
std::string errmsg;
Suppressions::Suppression s;
if (!s.parseComment(tok->str(), &errmsg))
return;
if (!s.errorId.empty()) if (!errmsg.empty())
inlineSuppressions.push_back(s); bad->push_back(BadInlineSuppression(tok->location, errmsg));
if (!errmsg.empty()) for (std::vector<Suppressions::Suppression>::iterator iter = ss.begin(); iter!=ss.end(); ++iter) {
bad->push_back(BadInlineSuppression(tok->location, errmsg)); if (!(*iter).errorId.empty())
inlineSuppressions.push_back(*iter);
} }
} } else {
//single suppress format
std::string errmsg;
Suppressions::Suppression s;
if (!s.parseComment(tok->str(), &errmsg))
return;
return; if (!s.errorId.empty())
inlineSuppressions.push_back(s);
if (!errmsg.empty())
bad->push_back(BadInlineSuppression(tok->location, errmsg));
}
} }
static void inlineSuppressions(const simplecpp::TokenList &tokens, Settings &mSettings, std::list<BadInlineSuppression> *bad) static void inlineSuppressions(const simplecpp::TokenList &tokens, Settings &mSettings, std::list<BadInlineSuppression> *bad)