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

More simplifyRedundantParenthesis changes: 

simplify also '( var . var . ... . var )' parenthesis.
This commit is contained in:
Edoardo Prezioso 2012-11-04 22:38:18 +01:00
parent b6b359d1c6
commit 24bf6f99e1
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/tokenize.cpp
View File

@ -6544,11 +6544,17 @@ bool Tokenizer::simplifyRedundantParenthesis()
ret = true; ret = true;
} }
if (Token::Match(tok->previous(), "[(,!] ( %var% . %var% )")) { while (Token::Match(tok->previous(), ";|{|}|[|]|(|)|.|,|! ( %var% .")) {
// We have "( var . var )", remove the parenthesis Token *tok2 = tok->tokAt(2);
tok->deleteThis(); while (Token::Match(tok2, ". %var%")) {
tok = tok->tokAt(2); tok2 = tok2->tokAt(2);
}
if (tok2 != tok->link())
break;
// We have "( var . var . ... . var )", remove the parenthesis
tok = tok->previous();
tok->deleteNext(); tok->deleteNext();
tok2->deleteThis();
ret = true; ret = true;
continue; continue;
} }

11
test/testtokenize.cpp
View File

@ -4710,8 +4710,15 @@ private:
// "!(abc.a)" => "!abc.a" // "!(abc.a)" => "!abc.a"
void removeParentheses6() { void removeParentheses6() {
const char code[] = "(!(abc.a))"; {
ASSERT_EQUALS("( ! abc . a )", tokenizeAndStringify(code)); const char code[] = "(!(abc.a))";
ASSERT_EQUALS("( ! abc . a )", tokenizeAndStringify(code));
}
//handle more complex member selections
{
const char code[] = "(!(a.b.c.d));";
ASSERT_EQUALS("( ! a . b . c . d ) ;", tokenizeAndStringify(code));
}
} }
void removeParentheses7() { void removeParentheses7() {