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

cleanup redundant info in comment. ticket numbers can be looked up with git blame. if the code says there is a syntax error then a comment that says 'invalid code' isn't much clarification.

This commit is contained in:
Daniel Marjamäki 2016-11-06 16:49:25 +01:00
parent ee11f0974a
commit 483fd8682a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/tokenize.cpp
View File

@ -220,7 +220,7 @@ bool Tokenizer::duplicateTypedef(Token **tokPtr, const Token *name, const Token
if (end->str() == "[") { if (end->str() == "[") {
if (!end->link()) if (!end->link())
syntaxError(end); // #6680 invalid code syntaxError(end); // invalid code
end = end->link()->next(); end = end->link()->next();
} else if (end->str() == ",") { } else if (end->str() == ",") {
// check for derived class // check for derived class
@ -1046,7 +1046,7 @@ void Tokenizer::simplifyTypedef()
if (func->previous()->str() == "operator") if (func->previous()->str() == "operator")
func = func->previous(); func = func->previous();
if (!func->previous()) // #7020 if (!func->previous())
syntaxError(func); syntaxError(func);
// check for qualifier // check for qualifier
@ -1485,7 +1485,7 @@ void Tokenizer::simplifyTypedef()
} else if (tok2->strAt(2) == "[") { } else if (tok2->strAt(2) == "[") {
do { do {
if (!tok2->linkAt(2)) if (!tok2->linkAt(2))
syntaxError(tok2); // #6807 syntaxError(tok2);
tok2 = tok2->linkAt(2)->previous(); tok2 = tok2->linkAt(2)->previous();
} while (tok2->strAt(2) == "["); } while (tok2->strAt(2) == "[");
@ -2189,7 +2189,7 @@ void Tokenizer::simplifyLabelsCaseDefault()
if (tok->str() != "case" && tok->next() && tok->next()->str() == ":") { if (tok->str() != "case" && tok->next() && tok->next()->str() == ":") {
tok = tok->next(); tok = tok->next();
if (!tok->next()) if (!tok->next())
syntaxError(tok); // #7270 invalid code syntaxError(tok);
if (tok->next()->str() != ";" && tok->next()->str() != "case") if (tok->next()->str() != ";" && tok->next()->str() != "case")
tok->insertToken(";"); tok->insertToken(";");
else else
@ -2249,7 +2249,7 @@ void Tokenizer::simplifyTemplates()
return; return;
for (Token *tok = list.front(); tok; tok = tok->next()) { for (Token *tok = list.front(); tok; tok = tok->next()) {
// #2648 - simple fix for sizeof used as template parameter // simple fix for sizeof used as template parameter
// TODO: this is a bit hardcoded. make a bit more generic // TODO: this is a bit hardcoded. make a bit more generic
if (Token::Match(tok, "%name% < sizeof ( %type% ) >") && tok->tokAt(4)->isStandardType()) { if (Token::Match(tok, "%name% < sizeof ( %type% ) >") && tok->tokAt(4)->isStandardType()) {
Token * const tok3 = tok->next(); Token * const tok3 = tok->next();
@ -2440,7 +2440,7 @@ void Tokenizer::setVarIdClassDeclaration(const Token * const startToken,
const Token *initListArgLastToken = nullptr; const Token *initListArgLastToken = nullptr;
for (Token *tok = startToken->next(); tok != endToken; tok = tok->next()) { for (Token *tok = startToken->next(); tok != endToken; tok = tok->next()) {
if (!tok) if (!tok)
syntaxError(nullptr); // #7089 invalid code syntaxError(nullptr);
if (initList) { if (initList) {
if (tok == initListArgLastToken) if (tok == initListArgLastToken)
initListArgLastToken = nullptr; initListArgLastToken = nullptr;
@ -2465,7 +2465,7 @@ void Tokenizer::setVarIdClassDeclaration(const Token * const startToken,
if (Token::Match(tok->previous(), "::|.") && tok->strAt(-2) != "this" && !Token::simpleMatch(tok->tokAt(-5), "( * this ) .")) if (Token::Match(tok->previous(), "::|.") && tok->strAt(-2) != "this" && !Token::simpleMatch(tok->tokAt(-5), "( * this ) ."))
continue; continue;
if (!tok->next()) if (!tok->next())
syntaxError(nullptr); // #7237 invalid code syntaxError(nullptr);
if (tok->next()->str() == "::") { if (tok->next()->str() == "::") {
if (tok->str() == className) if (tok->str() == className)
tok = tok->tokAt(2); tok = tok->tokAt(2);
@ -3123,7 +3123,7 @@ bool Tokenizer::simplifySizeof()
do { do {
const MathLib::bigint num = MathLib::toLongNumber(tok2->strAt(1)); const MathLib::bigint num = MathLib::toLongNumber(tok2->strAt(1));
if (num<0) if (num<0)
break; // #6940 negative number break;
size *= (unsigned)num; size *= (unsigned)num;
tok2 = tok2->tokAt(3); tok2 = tok2->tokAt(3);
} while (Token::Match(tok2, "[ %num% ]")); } while (Token::Match(tok2, "[ %num% ]"));
@ -3162,7 +3162,7 @@ bool Tokenizer::simplifySizeof()
tok->deleteThis(); tok->deleteThis();
tok->deleteNext(); tok->deleteNext();
std::ostringstream sz; std::ostringstream sz;
sz << ((isC()) ? _settings->sizeof_int : 1) ; // #7490 sizeof('a') should be sizeof(int) in C mode sz << ((isC()) ? _settings->sizeof_int : 1);
tok->str(sz.str()); tok->str(sz.str());
ret = true; ret = true;
continue; continue;
@ -3460,7 +3460,7 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
// remove Borland stuff.. // remove Borland stuff..
simplifyBorland(); simplifyBorland();
// #2449: syntax error: enum with typedef in it // syntax error: enum with typedef in it
checkForEnumsWithTypedef(); checkForEnumsWithTypedef();
// Remove __asm.. // Remove __asm..
@ -3818,7 +3818,7 @@ void Tokenizer::printDebugOutput(unsigned int simplification) const
if (simplification == 2U && _settings->debugwarnings) { if (simplification == 2U && _settings->debugwarnings) {
printUnknownTypes(); printUnknownTypes();
// #5054 - the typeStartToken() should come before typeEndToken() // the typeStartToken() should come before typeEndToken()
for (unsigned int varid = 1; varid < _symbolDatabase->getVariableListSize(); varid++) { for (unsigned int varid = 1; varid < _symbolDatabase->getVariableListSize(); varid++) {
const Variable *var = _symbolDatabase->getVariableFromVarId(varid); const Variable *var = _symbolDatabase->getVariableFromVarId(varid);
if (!var) if (!var)
@ -4897,9 +4897,9 @@ void Tokenizer::simplifyUndefinedSizeArray()
void Tokenizer::simplifyCasts() void Tokenizer::simplifyCasts()
{ {
for (Token *tok = list.front(); tok; tok = tok->next()) { for (Token *tok = list.front(); tok; tok = tok->next()) {
// #2897 : don't remove cast in such cases: // Don't remove cast in such cases:
// *((char *)a + 1) = 0; // *((char *)a + 1) = 0;
// #3596 : remove cast when casting a function pointer: // Remove cast when casting a function pointer:
// (*(void (*)(char *))fp)(x); // (*(void (*)(char *))fp)(x);
if (!tok->isName() && if (!tok->isName() &&
Token::simpleMatch(tok->next(), "* (") && Token::simpleMatch(tok->next(), "* (") &&