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

Revert "Fixed #1132 (Detection of misused scope objects)" 

This reverts commit c6acdccfa0.
This commit is contained in:
Pete Johns 2010-10-01 20:52:16 +10:00
parent c6acdccfa0
commit 50c2fa9ab0
4 changed files with 14 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/checkother.cpp
View File

@ -3841,24 +3841,6 @@ void CheckOther::checkMathFunctions()
}
}
bool CheckOther::isIdentifierObjectType(const Token * const tok) const
{
const Token *decltok = Token::findmatch(_tokenizer->tokens(), "%varid%", tok->tokAt(1)->varId());
const std::string classDef = std::string("class|struct ") + std::string(decltok->previous()->strAt(0));
return Token::findmatch(_tokenizer->tokens(), classDef.c_str());
}
void CheckOther::CheckUnusedScopedObject()
{
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
{
if (Token::Match(tok, "[;{}] %var% (") && isIdentifierObjectType(tok))
{
misusedScopeObjectError(tok, tok->tokAt(1)->str());
}
}
}
void CheckOther::postIncrement()
@ -3880,11 +3862,13 @@ void CheckOther::postIncrement()
// Take a look at the variable declaration
const Token *decltok = Token::findmatch(_tokenizer->tokens(), "%varid%", tok2->tokAt(1)->varId());
const std::string classDef = std::string("class ") + std::string(decltok->previous()->strAt(0));
// Is the variable an iterator?
if (decltok && Token::Match(decltok->previous(), "iterator|const_iterator"))
postIncrementError(tok2, tok2->strAt(1), (std::string("++") == tok2->strAt(2)));
else if (isIdentifierObjectType(tok2))
// Is the variable a class?
else if (Token::findmatch(_tokenizer->tokens(), classDef.c_str()))
postIncrementError(tok2, tok2->strAt(1), (std::string("++") == tok2->strAt(2)));
}
}
@ -4107,8 +4091,3 @@ void CheckOther::selfAssignmentError(const Token *tok, const std::string &varnam
"selfAssignment", "Redundant assignment of \"" + varname + "\" to itself");
}
void CheckOther::misusedScopeObjectError(const Token *tok, const std::string& varname)
{
reportError(tok, Severity::error,
"unusedScopedObject", "instance of \"" + varname + "\" object destroyed immediately");
}

14
lib/checkother.h
View File

@ -87,7 +87,6 @@ public:
// New type of check: Check execution paths
checkOther.executionPaths();
checkOther.CheckUnusedScopedObject();
}
@ -184,9 +183,6 @@ public:
/** @brief %Check for assigning a variable to itself*/
void checkSelfAssignment();
/** @brief %Check for objects that are destroyed immediately */
void CheckUnusedScopedObject();
// Error messages..
void cstyleCastError(const Token *tok);
void dangerousUsageStrtolError(const Token *tok);
@ -213,7 +209,6 @@ public:
void fflushOnInputStreamError(const Token *tok, const std::string &varname);
void redundantAssignmentInSwitchError(const Token *tok, const std::string &varname);
void selfAssignmentError(const Token *tok, const std::string &varname);
void misusedScopeObjectError(const Token *tok, const std::string &varname);
void getErrorMessages()
{
@ -227,7 +222,6 @@ public:
zerodivError(0);
mathfunctionCallError(0);
fflushOnInputStreamError(0, "stdin");
misusedScopeObjectError(NULL, "varname");
// style
cstyleCastError(0);
@ -343,14 +337,6 @@ private:
return varname;
}
/**
* @brief query type of identifier
* @param tok Token of the identifier
* @return true if the identifier is of type 'class' or 'struct',
* false otherwise.
*/
bool isIdentifierObjectType(const Token* const tok) const;
};
/// @}
//---------------------------------------------------------------------------

10
lib/token.cpp
View File

@ -417,6 +417,16 @@ bool Token::Match(const Token *tok, const char pattern[], unsigned int varid)
else if (firstWordEquals(p, "%varid%") == 0)
{
if (varid == 0)
{
std::list<ErrorLogger::ErrorMessage::FileLocation> locationList;
const ErrorLogger::ErrorMessage errmsg(locationList,
Severity::error,
"Internal error. Token::Match called with varid 0.",
"cppcheckError");
Check::reportError(errmsg);
}
if (tok->varId() != varid)
return false;

78
test/testother.cpp
View File

@ -104,10 +104,6 @@ private:
TEST_CASE(selfAssignment);
TEST_CASE(testScanf1);
TEST_CASE(testScanf2);
TEST_CASE(trac1132);
TEST_CASE(testMisusedScopeObjectDoesNotPickFunction);
TEST_CASE(testMisusedScopeObjectPicksClass);
TEST_CASE(testMisusedScopeObjectPicksStruct);
}
void check(const char code[])
@ -138,7 +134,6 @@ private:
checkOther.checkFflushOnInputStream();
checkOther.checkSelfAssignment();
checkOther.invalidScanf();
checkOther.CheckUnusedScopedObject();
}
@ -3002,78 +2997,7 @@ private:
ASSERT_EQUALS("[test.cpp:6]: (style) scanf without field width limits can crash with huge input data\n"
"[test.cpp:7]: (style) scanf without field width limits can crash with huge input data\n", errout.str());
}
void trac1132()
{
errout.str("");
std::istringstream code("#include <iostream>\n"
"class Lock\n"
"{\n"
"public:\n"
" Lock(int i)\n"
" {\n"
" std::cout << \"Lock \" << i << std::endl;\n"
" }\n"
" ~Lock()\n"
" {\n"
" std::cout << \"~Lock\" << std::endl;\n"
" }\n"
"};\n"
"int main()\n"
"{\n"
" Lock(123);\n"
" std::cout << \"hello\" << std::endl;\n"
" return 0;\n"
"}\n"
);
Tokenizer tokenizer;
tokenizer.tokenize(code, "trac1132.cpp");
tokenizer.simplifyTokenList();
Settings settings;
CheckOther checkOther(&tokenizer, &settings, this);
checkOther.CheckUnusedScopedObject();
ASSERT_EQUALS("[trac1132.cpp:15]: (error) instance of \"Lock\" object destroyed immediately\n", errout.str());
}
void testMisusedScopeObjectDoesNotPickFunction()
{
check("int main()\n"
"{\n"
" CouldBeFunction(123);\n"
" return 0;\n"
"}\n"
);
ASSERT_EQUALS("", errout.str());
}
void testMisusedScopeObjectPicksClass()
{
check("class NotAFunction;\n"
"int function()\n"
"{\n"
" NotAFunction(123);\n"
" return 0;\n"
"}\n"
);
ASSERT_EQUALS("[test.cpp:3]: (error) instance of \"NotAFunction\" object destroyed immediately\n", errout.str());
}
void testMisusedScopeObjectPicksStruct()
{
check("struct NotAClass;\n"
"bool func()\n"
"{\n"
" NotAClass(123);\n"
" return true;\n"
"}\n"
);
ASSERT_EQUALS("[test.cpp:3]: (error) instance of \"NotAClass\" object destroyed immediately\n", errout.str());
}
};
REGISTER_TEST(TestOther)