fix #12658 Remove constructor initialize also with checkHeaders = false #6375
Conversation
lib/tokenize.cpp
Outdated
| if (isIncluded && !mSettings.checkHeaders && tok->str() == ":") { | ||
| if (tok->previous() && tok->previous()->str() == ")") { | ||
| const Token *next = tok->next(); | ||
| while (next && next->str() != "{") |
There was a problem hiding this comment.
This won't work if a member is initialized using braces.
RobkeBaer
force-pushed
the
fix12658
branch
2 times, most recently
from
0890f88
to
8bc47d8
Compare
danmar
changed the title
lib/tokenize.cpp
Outdated
| @@ -6225,6 +6225,33 @@ void Tokenizer::simplifyHeadersAndUnusedTemplates() | |||
| for (Token *tok = list.front(); tok; tok = tok->next()) { | |||
| const bool isIncluded = (tok->fileIndex() != 0); | |||
|
|
|||
| // Remove constructor initializer | |||
| if (isIncluded && !mSettings.checkHeaders && tok->str() == ":") { | |||
There was a problem hiding this comment.
what if this is a ternary operation?
a ? (b + c) : ...
lib/tokenize.cpp
Outdated
| } | ||
| if (start && start->str() == ":") { | ||
| const Token *next = start; | ||
| while (Token::Match(next, "[,:]")) { |
There was a problem hiding this comment.
we expect that there is a name token after next right?
while (Token::Match(next, "[,:] %name%"))
There was a problem hiding this comment.
in my opinion it wouldn't hurt to add that more explicit check.
lib/tokenize.cpp
Outdated
| const Token *next = start; | ||
| while (Token::Match(next, "[,:]")) { | ||
| // Skip to ( or { | ||
| while (next && !next->link()) |
There was a problem hiding this comment.
I don't want to skip any random tokens. something more like:
next = next->next();
while (Token::Match(next, "%name%|::|<")) {
if (next->str() == "<")
// find end token.. I believe there is a utility function in template simplifier
next = next->next();
}
if (!Token::Match(next, "(|{"))
// not initializer list..
next = next->link()->next(); // <- goto "," or "{"
There was a problem hiding this comment.
Looking better at it, If after the previous change 'Token::Match(next, "[,:] %name%")' The symbol after %name% should always be a link in a constructor initializer list. If not is is something else. %name% should always be a member or delegate constructor.
Only thing now failing is a parameter pack expansion in an initializer list
template<class... Mixins>
class X : public Mixins...
{
public:
X(const Mixins&... mixins) : Mixins(mixins)... {}
};
Fixes https://trac.cppcheck.net/ticket/12658 by also removing the construcot initializer to leave valid code after removing executable code