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

Fixed #5706 (operators with noexcept broken)

This commit is contained in:
Robert Reif 2014-04-29 04:37:13 +02:00 committed by Daniel Marjamäki
parent 1233d8e47f
commit 4de9e29adc
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/tokenize.cpp
View File

@ -10109,14 +10109,29 @@ void Tokenizer::deleteSymbolDatabase()
static bool operatorEnd(const Token * tok)
{
if (Token::Match(tok, ") const|volatile| noexcept| [=;{),]"))
return true;
if (tok && tok->str() == ")") {
tok = tok->next();
while (tok && !Token::Match(tok, "[=;{),]")) {
if (tok->str() == "const" || tok->str() == "volatile") {
tok = tok->next();
} else if (tok->str() == "noexcept") {
tok = tok->next();
if (tok && tok->str() == "(") {
tok = tok->link()->next();
}
} else if (tok->str() == "throw" && tok->next() && tok->next()->str() == "(") {
tok = tok->next()->link()->next();
}
// unknown macros ") MACRO {" and ") MACRO(...) {"
else if (tok->isUpperCaseName()) {
tok = tok->next();
if (tok && tok->str() == "(") {
tok = tok->link()->next();
}
} else
return false;
}
if (Token::Match(tok, ") const|volatile| noexcept|throw (")) {
int offset = 2;
if (tok->strAt(1) == "const" || tok->strAt(1) == "volatile")
++offset;
if (Token::Match(tok->linkAt(offset), ") [=;{),]"))
return true;
}
@ -10140,7 +10155,8 @@ void Tokenizer::simplifyOperatorName()
op += par->str();
par = par->next();
// merge namespaces eg. 'operator std :: string () const {'
if (par && par->str() == "::" && par->next() && par->next()->isName()) {
if (par && par->str() == "::" && par->next() &&
(par->next()->isName() || Token::Match(par->next(), ".|%op%"))) {
op += par->str();
par = par->next();
}
@ -10177,6 +10193,16 @@ void Tokenizer::simplifyOperatorName()
}
}
}
if (_settings->debugwarnings) {
const Token *tok = list.front();
while ((tok = Token::findsimplematch(tok, "operator")) != nullptr) {
reportError(tok, Severity::debug, "debug",
"simplifyOperatorName: found unsimplified operator name");
tok = tok->next();
}
}
}
// remove unnecessary member qualification..