simplifyCalculations: Fix simplification of '( %num% )' when parentheses must be kept

danmar · danmar · commit d0d2a0faf827 · 2014-10-10T13:19:25.000+02:00
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
@@ -1087,7 +1087,7 @@ bool TemplateSimplifier::simplifyCalculations(Token *_tokens)
             }
 
             // Remove parentheses around number..
-            if (Token::Match(tok->tokAt(-2), "%any% ( %num% )") && !tok->tokAt(-2)->isName() && tok->strAt(-2) != ">") {
+            if (Token::Match(tok->tokAt(-2), "%op%|< ( %num% )") && !tok->tokAt(-2)->isName() && tok->strAt(-2) != ">") {
                 tok = tok->previous();
                 tok->deleteThis();
                 tok->deleteNext();
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -2059,6 +2059,9 @@ class TestSimplifyTokens : public TestFixture {
         ASSERT_EQUALS("( y % 2 - 2 )", tok("(y % 2 - 2)"));
 
         ASSERT_EQUALS("( 4 )", tok("(1 * 2 / 1 * 2)")); // #3722
+
+        // don't remove these spaces..
+        ASSERT_EQUALS("new ( auto ) ( 4 ) ;", tok("new (auto)(4);"));
     }
 
     void comparisons() {

Original file line number	Diff line number	Diff line change
`@@ -1087,7 +1087,7 @@ bool TemplateSimplifier::simplifyCalculations(Token *_tokens)`
`1087`	`1087`	`}`
`1088`	`1088`
`1089`	`1089`	`// Remove parentheses around number..`
`1090`		`- if (Token::Match(tok->tokAt(-2), "%any% ( %num% )") && !tok->tokAt(-2)->isName() && tok->strAt(-2) != ">") {`
	`1090`	`+ if (Token::Match(tok->tokAt(-2), "%op%\|< ( %num% )") && !tok->tokAt(-2)->isName() && tok->strAt(-2) != ">") {`
`1091`	`1091`	`tok = tok->previous();`
`1092`	`1092`	`tok->deleteThis();`
`1093`	`1093`	`tok->deleteNext();`
Original file line number	Diff line number	Diff line change
`@@ -2059,6 +2059,9 @@ class TestSimplifyTokens : public TestFixture {`
`2059`	`2059`	`ASSERT_EQUALS("( y % 2 - 2 )", tok("(y % 2 - 2)"));`
`2060`	`2060`
`2061`	`2061`	`ASSERT_EQUALS("( 4 )", tok("(1 * 2 / 1 * 2)")); // #3722`
	`2062`	`+`
	`2063`	`+ // don't remove these spaces..`
	`2064`	`+ ASSERT_EQUALS("new ( auto ) ( 4 ) ;", tok("new (auto)(4);"));`
`2062`	`2065`	`}`
`2063`	`2066`
`2064`	`2067`	`void comparisons() {`