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

Use ValueType in CheckOther::checkSignOfUnsignedVariable() 

Fixed travis: replaced std::string::pop_back by std::string::substr
This commit is contained in:
PKEuS 2016-02-05 20:43:06 +01:00
parent 0847d3d19a
commit c66db46f66
1 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/checkother.cpp
View File

@ -324,11 +324,9 @@ void CheckOther::invalidPointerCast()
if (toType->isIntegral() && fromType->isIntegral()) if (toType->isIntegral() && fromType->isIntegral())
continue; continue;
std::string toStr = toType->isIntegral() ? "integer *" : toType->str(); std::string toStr = toType->isIntegral() ? "integer *" : toType->str();
toStr.pop_back(); toStr = toStr.substr(0, toStr.size()-2);
toStr.pop_back();
std::string fromStr = fromType->isIntegral() ? "integer *" : fromType->str(); std::string fromStr = fromType->isIntegral() ? "integer *" : fromType->str();
fromStr.pop_back(); fromStr = fromStr.substr(0, fromStr.size() - 2);
fromStr.pop_back();
invalidPointerCastError(tok, fromStr, toStr, toType->type == ValueType::Type::CHAR); invalidPointerCastError(tok, fromStr, toStr, toType->type == ValueType::Type::CHAR);
} }
@ -2012,39 +2010,33 @@ void CheckOther::checkSignOfUnsignedVariable()
const Scope * scope = symbolDatabase->functionScopes[i]; const Scope * scope = symbolDatabase->functionScopes[i];
// check all the code in the function // check all the code in the function
for (const Token *tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) { for (const Token *tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) {
// Quick check to see if any of the matches below have any chances if (!tok->isComparisonOp() || !tok->astOperand1() || !tok->astOperand2())
if (!tok->varId() && tok->str() != "0")
continue; continue;
if (Token::Match(tok, "%name% <|<= 0") && tok->varId() && !Token::Match(tok->tokAt(3), "+|-")) {
// TODO: handle a[10].b , a::b , (unsigned int)x , etc if (Token::Match(tok, "<|<= 0") && tok->next() == tok->astOperand2()) {
const Token *prev = tok->previous(); const ValueType* vt = tok->astOperand1()->valueType();
while (prev && (prev->isName() || prev->str() == ".")) if (vt && vt->pointer)
prev = prev->previous();
if (!Token::Match(prev, "(|&&|%oror%"))
continue;
const Variable *var = tok->variable();
if (var && var->typeEndToken()->isUnsigned())
unsignedLessThanZeroError(tok, var->name(), inconclusive);
else if (var && (var->isPointer() || var->isArray()))
pointerLessThanZeroError(tok, inconclusive); pointerLessThanZeroError(tok, inconclusive);
} else if (Token::Match(tok, "0 >|>= %name%") && tok->tokAt(2)->varId() && !Token::Match(tok->tokAt(3), "+|-|*|/") && !Token::Match(tok->previous(), "+|-|<<|>>|~")) { if (vt && vt->sign == ValueType::UNSIGNED)
const Variable *var = tok->tokAt(2)->variable(); unsignedLessThanZeroError(tok, tok->astOperand1()->str(), inconclusive);
if (var && var->typeEndToken()->isUnsigned()) } else if (Token::Match(tok->previous(), "0 >|>=") && tok->previous() == tok->astOperand1()) {
unsignedLessThanZeroError(tok, var->name(), inconclusive); const ValueType* vt = tok->astOperand2()->valueType();
else if (var && var->isPointer() && !Token::Match(tok->tokAt(3), "[.[(]")) if (vt && vt->pointer)
pointerLessThanZeroError(tok, inconclusive); pointerLessThanZeroError(tok, inconclusive);
} else if (Token::Match(tok, "0 <= %name%") && tok->tokAt(2)->varId() && !Token::Match(tok->tokAt(3), "+|-|*|/") && !Token::Match(tok->previous(), "+|-|<<|>>|~")) { if (vt && vt->sign == ValueType::UNSIGNED)
const Variable *var = tok->tokAt(2)->variable(); unsignedLessThanZeroError(tok, tok->astOperand2()->str(), inconclusive);
if (var && var->typeEndToken()->isUnsigned()) } else if (Token::simpleMatch(tok, ">= 0") && tok->next() == tok->astOperand2()) {
unsignedPositiveError(tok, var->name(), inconclusive); const ValueType* vt = tok->astOperand1()->valueType();
else if (var && var->isPointer() && !Token::Match(tok->tokAt(3), "[.[]")) if (vt && vt->pointer)
pointerPositiveError(tok, inconclusive); pointerPositiveError(tok, inconclusive);
} else if (Token::Match(tok, "%name% >= 0") && tok->varId() && !Token::Match(tok->previous(), "++|--|)|+|-|*|/|~|<<|>>") && !Token::Match(tok->tokAt(3), "+|-")) { if (vt && vt->sign == ValueType::UNSIGNED)
const Variable *var = tok->variable(); unsignedPositiveError(tok, tok->astOperand1()->str(), inconclusive);
if (var && var->typeEndToken()->isUnsigned()) } else if (Token::simpleMatch(tok->previous(), "0 <=") && tok->previous() == tok->astOperand1()) {
unsignedPositiveError(tok, var->name(), inconclusive); const ValueType* vt = tok->astOperand2()->valueType();
else if (var && var->isPointer() && tok->strAt(-1) != "*") if (vt && vt->pointer)
pointerPositiveError(tok, inconclusive); pointerPositiveError(tok, inconclusive);
if (vt && vt->sign == ValueType::UNSIGNED)
unsignedPositiveError(tok, tok->astOperand2()->str(), inconclusive);
} }
} }
} }
@ -2173,10 +2165,10 @@ static bool isNegative(const Token *tok, const Settings *settings)
void CheckOther::checkNegativeBitwiseShift() void CheckOther::checkNegativeBitwiseShift()
{ {
for (const Token* tok = _tokenizer->tokens(); tok; tok = tok->next()) { for (const Token* tok = _tokenizer->tokens(); tok; tok = tok->next()) {
if (!Token::Match(tok, "<<|>>|<<=|>>=")) if (!tok->astOperand1() || !tok->astOperand2())
continue; continue;
if (!tok->astOperand1() || !tok->astOperand2()) if (!Token::Match(tok, "<<|>>|<<=|>>="))
continue; continue;
// don't warn if lhs is a class. this is an overloaded operator then // don't warn if lhs is a class. this is an overloaded operator then