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

Fix simplifyRedundantParanthesis() to work after '}'

This commit is contained in:
Reijo Tomperi 2009-10-05 14:30:05 +03:00
parent 5a0a5422c3
commit 036f3894f1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tokenize.cpp
View File

@ -3408,7 +3408,7 @@ bool Tokenizer::simplifyRedundantParanthesis()
ret = true; ret = true;
} }
if (Token::Match(tok->previous(), "[(!*;] ( %var% )") && tok->next()->varId() != 0) if (Token::Match(tok->previous(), "[(!*;}] ( %var% )") && tok->next()->varId() != 0)
{ {
// We have "( var )", remove the paranthesis // We have "( var )", remove the paranthesis
tok = tok->previous(); tok = tok->previous();

1
test/testsimplifytokens.cpp
View File

@ -421,6 +421,7 @@ private:
ASSERT_EQUALS("void f ( ) { int p [ 10 ] ; p [ 0 ] = 1 ; }", tok("void f(){int p[10]; (p)[0] = 1;}")); ASSERT_EQUALS("void f ( ) { int p [ 10 ] ; p [ 0 ] = 1 ; }", tok("void f(){int p[10]; (p)[0] = 1;}"));
ASSERT_EQUALS("void f ( ) { int p ; if ( ! p ) { } }", tok("void f(){int p; if ((p) == 0) {}}")); ASSERT_EQUALS("void f ( ) { int p ; if ( ! p ) { } }", tok("void f(){int p; if ((p) == 0) {}}"));
ASSERT_EQUALS("void f ( ) { int * p ; * p = 1 ; }", tok("void f(){int *p; *(p) = 1;}")); ASSERT_EQUALS("void f ( ) { int * p ; * p = 1 ; }", tok("void f(){int *p; *(p) = 1;}"));
ASSERT_EQUALS("void f ( ) { int p ; if ( p ) { } p = 1 ; }", tok("void f(){int p; if ( p ) { } (p) = 1;}"));
// keep parantheses.. // keep parantheses..
ASSERT_EQUALS("= a ;", tok("= (char)a;")); ASSERT_EQUALS("= a ;", tok("= (char)a;"));