Run astyle

Author: thomasjfox

lib/tokenize.cpp

@@ -2501,7 +2501,7 @@ bool Tokenizer::tokenize(std::istream &code,
     }
 
     // Remove redundant consecutive braces, i.e. '.. { { .. } } ..' -> '.. { .. } ..'.
-    for (Token *tok = _tokens; tok; ) {
+    for (Token *tok = _tokens; tok;) {
         if (Token::simpleMatch(tok, "{ {") && Token::simpleMatch(tok->next()->link(), "} }")) {
             //remove internal parentheses
             tok->next()->link()->deleteThis();
@@ -4339,7 +4339,7 @@ bool Tokenizer::simplifyTokenList()
     simplifyFlowControl();
 
     // Remove redundant consecutive braces, i.e. '.. { { .. } } ..' -> '.. { .. } ..'.
-    for (Token *tok = _tokens; tok; ) {
+    for (Token *tok = _tokens; tok;) {
         if (Token::simpleMatch(tok, "{ {") && Token::simpleMatch(tok->next()->link(), "} }")) {
             //remove internal parentheses
             tok->next()->link()->deleteThis();

test/testsimplifytokens.cpp

@@ -7500,9 +7500,9 @@ class TestSimplifyTokens : public TestFixture {
     }
 
     void consecutiveBraces() {
-            ASSERT_EQUALS("void f ( ) { }", tok("void f(){{}}", true));
-            ASSERT_EQUALS("void f ( ) { }", tok("void f(){{{}}}", true));
-            ASSERT_EQUALS("void f ( ) { for ( ; ; ) { } }", tok("void f(){for(;;){}}", true));
+        ASSERT_EQUALS("void f ( ) { }", tok("void f(){{}}", true));
+        ASSERT_EQUALS("void f ( ) { }", tok("void f(){{{}}}", true));
+        ASSERT_EQUALS("void f ( ) { for ( ; ; ) { } }", tok("void f(){for(;;){}}", true));
     }
 };