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

fixed false positives for the 'bitwise operator / comparison operator' check

This commit is contained in:
Daniel Marjamäki 2011-08-19 18:06:28 +02:00
parent eda9ff6fc5
commit 2dd1e290eb
3 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/checkother.cpp
View File

@ -153,6 +153,10 @@ void CheckOther::clarifyCondition()
tok2 = tok2->link();
else if (Token::Match(tok2, "<|<=|==|!=|>|>="))
{
// This might be a template
if (!code_is_c() && Token::Match(tok2->previous(), "%var% <"))
break;
clarifyConditionError(tok, tok->strAt(2) == "=", false);
break;
}
@ -174,8 +178,13 @@ void CheckOther::clarifyCondition()
tok2 = tok2->link();
tok2 = tok2->next();
}
if (Token::Match(tok2, "[&|^]"))
{
// don't write false positives when templates are used
if (Token::Match(tok, "<|>") && !code_is_c() && tok2->str() == "&")
continue;
clarifyConditionError(tok,false,true);
}
}
@ -3413,19 +3422,27 @@ static bool isFunction(const std::string &name, const Token *startToken)
return false;
}
bool CheckOther::code_is_c() const
{
const std::string fname = _tokenizer->getFiles()->at(0);
const size_t position = fname.rfind(".");
if (position != std::string::npos)
{
const std::string ext = fname.substr(position);
if (ext == ".c" || ext == ".C")
return true;
}
return false;
}
void CheckOther::checkMisusedScopedObject()
{
// Skip this check for .c files
if (code_is_c())
{
const std::string fname = _tokenizer->getFiles()->at(0);
size_t position = fname.rfind(".");
if (position != std::string::npos)
{
const std::string ext = fname.substr(position);
if (ext == ".c" || ext == ".C")
return;
}
return;
}
const SymbolDatabase * const symbolDatabase = _tokenizer->getSymbolDatabase();

2
lib/checkother.h
View File

@ -403,6 +403,8 @@ private:
return varname;
}
bool code_is_c() const;
};
/// @}
//---------------------------------------------------------------------------

9
test/testother.cpp
View File

@ -2642,6 +2642,12 @@ private:
" for (i = 0; i < 10; i++) {}\n"
"}");
ASSERT_EQUALS("", errout.str());
check("void f() {\n"
" if (x = a<int>()) {}\n"
"}");
ASSERT_EQUALS("", errout.str());
}
// clarify conditions with bitwise operator and comparison
@ -2673,6 +2679,9 @@ private:
check("void f(std::list<int> &ints) { }");
ASSERT_EQUALS("", errout.str());
check("void f() { A<x &> a; }");
ASSERT_EQUALS("", errout.str());
}
void incorrectStringCompare()