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

Fix #9877 FP unreadVariable (incomplete code; missing macro definition) (#4278)

This commit is contained in:
chrchr-github 2022-07-17 19:40:39 +02:00 committed by GitHub
parent 87c0b063cb
commit b08aabefee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/tokenize.cpp
View File

@ -4742,9 +4742,6 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
// Is there C++ code in C file?
validateC();
// remove MACRO in variable declaration: MACRO int x;
removeMacroInVarDecl();
// Combine strings and character literals, e.g. L"string", L'c', "string1" "string2"
combineStringAndCharLiterals();
@ -5649,35 +5646,6 @@ void Tokenizer::removeMacroInClassDef()
//---------------------------------------------------------------------------
void Tokenizer::removeMacroInVarDecl()
{
for (Token *tok = list.front(); tok; tok = tok->next()) {
if (Token::Match(tok, "[;{}] %name% (") && tok->next()->isUpperCaseName()) {
// goto ')' parentheses
const Token *tok2 = tok;
int parlevel = 0;
while (tok2) {
if (tok2->str() == "(")
++parlevel;
else if (tok2->str() == ")") {
if (--parlevel <= 0)
break;
}
tok2 = tok2->next();
}
tok2 = tok2 ? tok2->next() : nullptr;
// check if this is a variable declaration..
const Token *tok3 = tok2;
while (tok3 && tok3->isUpperCaseName())
tok3 = tok3->next();
if (tok3 && (tok3->isStandardType() || Token::Match(tok3,"const|static|struct|union|class")))
Token::eraseTokens(tok,tok2);
}
}
}
//---------------------------------------------------------------------------
void Tokenizer::addSemicolonAfterUnknownMacro()
{
if (!isCPP())

3
lib/tokenize.h
View File

@ -204,9 +204,6 @@ public:
*/
void removeMacroInClassDef();
/** Remove unknown macro in variable declarations: PROGMEM char x; */
void removeMacroInVarDecl();
/** Add parentheses for sizeof: sizeof x => sizeof(x) */
void sizeofAddParentheses();

14
test/testtokenize.cpp
View File

@ -358,7 +358,6 @@ private:
// Some simple cleanups of unhandled macros in the global scope
TEST_CASE(removeMacrosInGlobalScope);
TEST_CASE(removeMacroInVarDecl);
TEST_CASE(addSemicolonAfterUnknownMacro);
@ -5318,19 +5317,6 @@ private:
InternalError);
}
void removeMacroInVarDecl() { // #4304
// only remove macros with parentheses (those hurt most)
ASSERT_EQUALS("void f ( ) { PROGMEM int x ; }", tokenizeAndStringify("void f() { PROGMEM int x ; }"));
ASSERT_EQUALS("void f ( ) { int x ; }", tokenizeAndStringify("void f() { SECTION(\".data.ro\") int x ; }"));
// various variable declarations
ASSERT_EQUALS("void f ( ) { CONST int x ; }", tokenizeAndStringify("void f() { SECTION(\".data.ro\") CONST int x ; }"));
ASSERT_EQUALS("void f ( ) { char a [ 4 ] ; }", tokenizeAndStringify("void f() { SECTION(\".data.ro\") char a[4]; }"));
ASSERT_EQUALS("void f ( ) { const char a [ 4 ] ; }", tokenizeAndStringify("void f() { SECTION(\".data.ro\") const char a[4]; }"));
ASSERT_EQUALS("void f ( ) { struct ABC abc ; }", tokenizeAndStringify("void f() { SECTION(\".data.ro\") struct ABC abc; }"));
ASSERT_EQUALS("void f ( ) { CONST struct ABC abc ; }", tokenizeAndStringify("void f() { SECTION(\".data.ro\") CONST struct ABC abc; }"));
}
void addSemicolonAfterUnknownMacro() {
// #6975
ASSERT_EQUALS("void f ( ) { MACRO ( ) ; try { } }", tokenizeAndStringify("void f() { MACRO() try {} }"));

8
test/testunusedvar.cpp
View File

@ -3217,6 +3217,14 @@ private:
" delete [] piArray;\n"
"}");
ASSERT_EQUALS("", errout.str());
functionVariableUsage("int f() {\n" // #9877
" const std::vector<int> x = get();\n"
" MACRO(2U, x.size())\n"
" int i = 0;\n"
" return i;\n"
"}");
ASSERT_EQUALS("", errout.str());
}
void localvar44() { // #4020 - FP