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

Tokenizer: Better handling of array of function pointers

This commit is contained in:
Daniel Marjamäki 2011-12-27 11:56:40 +01:00
parent 326d6df9f5
commit 987392f254
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/tokenize.cpp
View File

@ -5734,9 +5734,9 @@ void Tokenizer:: simplifyFunctionPointers()
else if (tok->previous() && !Token::Match(tok->previous(), "{|}|;|(|public:|protected:|private:")) else if (tok->previous() && !Token::Match(tok->previous(), "{|}|;|(|public:|protected:|private:"))
continue; continue;
if (Token::Match(tok, "%type% *| *| ( * %var% ) (")) if (Token::Match(tok, "%type% *| *| ( * %var% [| ]| ) ("))
; ;
else if (Token::Match(tok, "%type% %type% *| *| ( * %var% ) (")) else if (Token::Match(tok, "%type% %type% *| *| ( * %var% [| ]| ) ("))
tok = tok->next(); tok = tok->next();
else else
continue; continue;
@ -5745,13 +5745,14 @@ void Tokenizer:: simplifyFunctionPointers()
tok = tok->next(); tok = tok->next();
// check that the declaration ends // check that the declaration ends
if (!Token::Match(tok->linkAt(5), ") ;|,|)|=|[")) const Token *endTok = tok->next()->link()->next()->link();
if (!Token::Match(endTok, ") ;|,|)|=|["))
continue; continue;
// ok simplify this function pointer to an ordinary pointer // ok simplify this function pointer to an ordinary pointer
Token::eraseTokens(tok->next()->link(), endTok->next());
tok->next()->link()->deleteThis();
tok->deleteNext(); tok->deleteNext();
tok->tokAt(2)->deleteNext();
Token::eraseTokens(tok->tokAt(2), tok->linkAt(3)->next());
} }
} }

8
test/testtokenize.cpp
View File

@ -315,6 +315,7 @@ private:
TEST_CASE(functionpointer2); TEST_CASE(functionpointer2);
TEST_CASE(functionpointer3); TEST_CASE(functionpointer3);
TEST_CASE(functionpointer4); TEST_CASE(functionpointer4);
TEST_CASE(functionpointer5);
TEST_CASE(removeRedundantAssignment); TEST_CASE(removeRedundantAssignment);
@ -5078,6 +5079,13 @@ private:
ASSERT_EQUALS(expected, tokenizeDebugListing(code, false)); ASSERT_EQUALS(expected, tokenizeDebugListing(code, false));
} }
void functionpointer5() {
const char code[] = ";void (*fp[])(int a) = {0,0,0};";
const char expected[] = "\n\n##file 0\n"
"1: ; void * fp@1 [ ] = { 0 , 0 , 0 } ;\n";
ASSERT_EQUALS(expected, tokenizeDebugListing(code, false));
}
void removeRedundantAssignment() { void removeRedundantAssignment() {
ASSERT_EQUALS("void f ( ) { int * q ; }", tokenizeAndStringify("void f() { int *p, *q; p = q; }", true)); ASSERT_EQUALS("void f ( ) { int * q ; }", tokenizeAndStringify("void f() { int *p, *q; p = q; }", true));
ASSERT_EQUALS("void f ( ) { int * q ; }", tokenizeAndStringify("void f() { int *p = 0, *q; p = q; }", true)); ASSERT_EQUALS("void f ( ) { int * q ; }", tokenizeAndStringify("void f() { int *p = 0, *q; p = q; }", true));