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

Tokenizer: Remove redundant parantheses in rhs. Ticket: #2320

This commit is contained in:
Daniel Marjamäki 2010-12-18 09:44:58 +01:00
parent 18933ea0e6
commit 7eb9855104
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/tokenize.cpp
View File

@ -6426,6 +6426,17 @@ bool Tokenizer::simplifyRedundantParanthesis()
if (tok->str() != "(") if (tok->str() != "(")
continue; continue;
// !!operator = ( x ) ;
if (tok->strAt(-2) != "operator" &&
tok->strAt(-1) == "=" &&
tok->strAt(1) != "{" &&
Token::simpleMatch(tok->link(), ") ;"))
{
tok->link()->deleteThis();
tok->deleteThis();
continue;
}
while (Token::simpleMatch(tok, "( (") && while (Token::simpleMatch(tok, "( (") &&
tok->link()->previous() == tok->next()->link()) tok->link()->previous() == tok->next()->link())
{ {

18
test/testtokenize.cpp
View File

@ -196,6 +196,7 @@ private:
TEST_CASE(removeParantheses7); TEST_CASE(removeParantheses7);
TEST_CASE(removeParantheses8); // Ticket #1865 TEST_CASE(removeParantheses8); // Ticket #1865
TEST_CASE(removeParantheses9); // Ticket #1962 TEST_CASE(removeParantheses9); // Ticket #1962
TEST_CASE(removeParantheses10); // Ticket #2320
TEST_CASE(tokenize_double); TEST_CASE(tokenize_double);
TEST_CASE(tokenize_strings); TEST_CASE(tokenize_strings);
@ -552,7 +553,7 @@ private:
std::ostringstream ostr; std::ostringstream ostr;
for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next()) for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next())
ostr << " " << tok->str(); ostr << " " << tok->str();
ASSERT_EQUALS(" t = ( & p ) ;", ostr.str()); ASSERT_EQUALS(" t = & p ;", ostr.str());
} }
void removeCast3() void removeCast3()
@ -1259,7 +1260,7 @@ private:
"}\n"; "}\n";
ASSERT_EQUALS( ASSERT_EQUALS(
"void foo ( ) { int n ; n = 10 ; i = ( 10 >> 1 ) ; }", "void foo ( ) { int n ; n = 10 ; i = 10 >> 1 ; }",
simplifyKnownVariables(code)); simplifyKnownVariables(code));
} }
{ {
@ -1270,7 +1271,7 @@ private:
"}\n"; "}\n";
ASSERT_EQUALS( ASSERT_EQUALS(
"void foo ( ) { int n ; n = 10 ; i = ( 10 << 1 ) ; }", "void foo ( ) { int n ; n = 10 ; i = 10 << 1 ; }",
simplifyKnownVariables(code)); simplifyKnownVariables(code));
} }
{ {
@ -1281,7 +1282,7 @@ private:
"}\n"; "}\n";
ASSERT_EQUALS( ASSERT_EQUALS(
"void foo ( ) { int n ; n = 10 ; i = ( 1 << 10 ) ; }", "void foo ( ) { int n ; n = 10 ; i = 1 << 10 ; }",
simplifyKnownVariables(code)); simplifyKnownVariables(code));
} }
{ {
@ -1292,7 +1293,7 @@ private:
"}\n"; "}\n";
ASSERT_EQUALS( ASSERT_EQUALS(
"void foo ( ) { int n ; n = 10 ; i = ( 1 >> 10 ) ; }", "void foo ( ) { int n ; n = 10 ; i = 1 >> 10 ; }",
simplifyKnownVariables(code)); simplifyKnownVariables(code));
} }
} }
@ -2343,7 +2344,7 @@ private:
"1: void foo ( )\n" "1: void foo ( )\n"
"2: {\n" "2: {\n"
"3: int x@1 ; x@1 = 1 ;\n" "3: int x@1 ; x@1 = 1 ;\n"
"4: y = ( z * x@1 ) ;\n" "4: y = z * x@1 ;\n"
"5: }\n"); "5: }\n");
ASSERT_EQUALS(expected, tokenizeDebugListing(code)); ASSERT_EQUALS(expected, tokenizeDebugListing(code));
@ -3478,6 +3479,11 @@ private:
ASSERT_EQUALS("void delete ( double num ) ;", tokenizeAndStringify("void delete(double num);", false)); ASSERT_EQUALS("void delete ( double num ) ;", tokenizeAndStringify("void delete(double num);", false));
} }
void removeParantheses10()
{
ASSERT_EQUALS("p = buf + 8 ;", tokenizeAndStringify("p = (buf + 8);", false));
}
void tokenize_double() void tokenize_double()
{ {
const char code[] = "void f()\n" const char code[] = "void f()\n"