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

cleanup checkother

This commit is contained in:
Daniel Marjamäki 2015-07-22 18:48:43 +02:00
parent f37c6b9e76
commit 75f922e799
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/checkother.cpp
View File

@ -1033,16 +1033,6 @@ void CheckOther::checkSuspiciousEqualityComparison()
if (Token::Match(closeParen->tokAt(-2), "== %any%")) if (Token::Match(closeParen->tokAt(-2), "== %any%"))
suspiciousEqualityComparisonError(closeParen->tokAt(-2)); suspiciousEqualityComparisonError(closeParen->tokAt(-2));
// Equality comparisons with 0 are simplified to negation. For instance,
// (x == 0) is simplified to (!x), so also check for suspicious negation
// in the initialization or increment-decrement parts of the for() loop.
// For example:
// for (!i; i < 10; i++)
if (Token::Match(openParen->next(), "! %name%"))
suspiciousEqualityComparisonError(openParen->next());
if (Token::Match(closeParen->tokAt(-2), "! %name%"))
suspiciousEqualityComparisonError(closeParen->tokAt(-2));
// Skip over for() loop conditions because "for (;running==1;)" // Skip over for() loop conditions because "for (;running==1;)"
// is a bit strange, but not necessarily incorrect. // is a bit strange, but not necessarily incorrect.
tok = closeParen; tok = closeParen;
@ -1826,25 +1816,11 @@ void CheckOther::zerodivError(const Token *tok, bool inconclusive)
void CheckOther::zerodivcondError(const Token *tokcond, const Token *tokdiv, bool inconclusive) void CheckOther::zerodivcondError(const Token *tokcond, const Token *tokdiv, bool inconclusive)
{ {
std::list<const Token *> callstack; std::list<const Token *> callstack;
while (Token::Match(tokcond, "(|%oror%|&&"))
tokcond = tokcond->next();
if (tokcond && tokdiv) { if (tokcond && tokdiv) {
callstack.push_back(tokcond); callstack.push_back(tokcond);
callstack.push_back(tokdiv); callstack.push_back(tokdiv);
} }
std::string condition; const std::string condition(tokcond ? tokcond->expressionString() : "");
if (!tokcond) {
// getErrorMessages
} else if (Token::Match(tokcond, "%num% <|<=")) {
condition = tokcond->strAt(2) + ((tokcond->strAt(1) == "<") ? ">" : ">=") + tokcond->str();
} else if (tokcond->isComparisonOp()) {
condition = tokcond->expressionString();
} else {
if (tokcond->str() == "!")
condition = tokcond->next()->str() + "==0";
else
condition = tokcond->str() + "!=0";
}
const std::string linenr(MathLib::toString(tokdiv ? tokdiv->linenr() : 0)); const std::string linenr(MathLib::toString(tokdiv ? tokdiv->linenr() : 0));
reportError(callstack, Severity::warning, "zerodivcond", "Either the condition '"+condition+"' is useless or there is division by zero at line " + linenr + ".", 0U, inconclusive); reportError(callstack, Severity::warning, "zerodivcond", "Either the condition '"+condition+"' is useless or there is division by zero at line " + linenr + ".", 0U, inconclusive);
} }