Changing if/for/while commands to add braces.

This commit clarifies the scope of these statements. This change
accounts for Tigris ticket CxxTest#55.

.gitignore

@@ -1,4 +1,5 @@
 __pycache__
+*.pyc
 .*
 guide.epub
 guide.pdf

cxxtest/Descriptions.cpp

@@ -34,32 +34,38 @@ namespace CxxTest
     {
         char *p = numberToString( numTotalTests(), s );
 
-        if ( numTotalTests() <= 1 )
+        if ( numTotalTests() <= 1 ) {
             return s;
+        }
 
         unsigned n = numTotalTests();
         unsigned numFactors = 0;
 
         for ( unsigned factor = 2; (factor * factor) <= n; factor += (factor == 2) ? 1 : 2 ) {
             unsigned power;
 
-            for ( power = 0; (n % factor) == 0; n /= factor )
+            for ( power = 0; (n % factor) == 0; n /= factor ) {
                 ++ power;
+            }
 
-            if ( !power )
+            if ( !power ) {
                 continue;
+            }
 
             p = numberToString( factor, copyString( p, (numFactors == 0) ? " = " : " * " ) );
-            if ( power > 1 )
+            if ( power > 1 ) {
                 p = numberToString( power, copyString( p, "^" ) );
+            }
             ++ numFactors;
         }
 
         if ( n > 1 ) {
-            if ( !numFactors )
+            if ( !numFactors ) {
                 copyString( p, tracker().failedTests() ? " :(" : tracker().warnings() ? " :|" : " :)" );
-            else
+            }
+            else {
                 numberToString( n, copyString( p, " * " ) );
+            }
         }
         return s;
     }

cxxtest/ErrorFormatter.h

@@ -257,18 +257,21 @@ namespace CxxTest
 
         void reportTest( void )
         {
-            if( _reported )
+            if ( _reported ) {
                 return;
+            }
             (*_o) << "In " << tracker().suite().suiteName() << "::" << tracker().test().testName() << ":" << endl;
             _reported = true;
         }
 
         void dump( const void *buffer, unsigned size )
         {
-            if ( !buffer )
+            if ( !buffer ) {
                 dumpNull();
-            else
+            }
+            else {
                 dumpBuffer( buffer, size );
+            }
         }
 
         void dumpNull()
@@ -279,15 +282,18 @@ namespace CxxTest
         void dumpBuffer( const void *buffer, unsigned size )
         {
             unsigned dumpSize = size;
-            if ( maxDumpSize() && dumpSize > maxDumpSize() )
+            if ( maxDumpSize() && dumpSize > maxDumpSize() ) {
                 dumpSize = maxDumpSize();
+            }
 
             const unsigned char *p = (const unsigned char *)buffer;
             (*_o) << "   { ";
-            for ( unsigned i = 0; i < dumpSize; ++ i )
+            for ( unsigned i = 0; i < dumpSize; ++ i ) {
                 (*_o) << byteToHex( *p++ ) << " ";
-            if ( dumpSize < size )
+            }
+            if ( dumpSize < size ) {
                 (*_o) << "... ";
+            }
             (*_o) << "}" << endl;
         }
 

cxxtest/LinkedList.cpp

@@ -27,32 +27,36 @@ namespace CxxTest
     Link *List::head()
     {
         Link *l = _head;
-        while ( l && !l->active() )
+        while ( l && !l->active() ) {
             l = l->next();
+        }
         return l;
     }
 
     const Link *List::head() const
     {
         Link *l = _head;
-        while ( l && !l->active() )
+        while ( l && !l->active() ) {
             l = l->next();
+        }
         return l;
     }
 
     Link *List::tail()
     {
         Link *l = _tail;
-        while ( l && !l->active() )
+        while ( l && !l->active() ) {
             l = l->prev();
+        }
         return l;
     }
 
     const Link *List::tail() const
     {
         Link *l = _tail;
-        while ( l && !l->active() )
+        while ( l && !l->active() ) {
             l = l->prev();
+        }
         return l;
     }
 
@@ -64,30 +68,35 @@ namespace CxxTest
     unsigned List::size() const
     {
         unsigned count = 0;
-        for ( const Link *l = head(); l != 0; l = l->next() )
+        for ( const Link *l = head(); l != 0; l = l->next() ) {
             ++ count;
+        }
         return count;
     }
 
     Link *List::nth( unsigned n )
     {
         Link *l = head();
-        while ( n -- )
+        while ( n -- ) {
             l = l->next();
+        }
         return l;
     }
 
     void List::activateAll()
     {
-        for ( Link *l = _head; l != 0; l = l->justNext() )
+        for ( Link *l = _head; l != 0; l = l->justNext() ) {
             l->setActive( true );
+        }
     }
 
     void List::leaveOnly( const Link &link )
     {
-        for ( Link *l = head(); l != 0; l = l->next() )
-            if ( l != &link )
+        for ( Link *l = head(); l != 0; l = l->next() ) {
+            if ( l != &link ) {
                 l->setActive( false );
+            }
+        }
     }
 
     Link::Link() :
@@ -124,59 +133,69 @@ namespace CxxTest
     Link * Link::next()
     {
         Link *l = _next;
-        while ( l && !l->_active )
+        while ( l && !l->_active ) {
             l = l->_next;
+        }
         return l;
     }
 
     Link * Link::prev()
     {
         Link *l = _prev;
-        while ( l && !l->_active )
+        while ( l && !l->_active ) {
             l = l->_prev;
+        }
         return l;
     }
 
     const Link * Link::next() const
     {
         Link *l = _next;
-        while ( l && !l->_active )
+        while ( l && !l->_active ) {
             l = l->_next;
+        }
         return l;
     }
 
     const Link * Link::prev() const
     {
         Link *l = _prev;
-        while ( l && !l->_active )
+        while ( l && !l->_active ) {
             l = l->_prev;
+        }
         return l;
     }
 
     void Link::attach( List &l )
     {
-        if ( l._tail )
+        if ( l._tail ) {
             l._tail->_next = this;
+        }
 
         _prev = l._tail;
         _next = 0;
 
-        if ( l._head == 0 )
+        if ( l._head == 0 ) {
             l._head = this;
+        }
         l._tail = this;
     }
 
     void Link::detach( List &l )
     {
-        if ( _prev )
+        if ( _prev ) {
             _prev->_next = _next;
-        else
+        }
+        else {
             l._head = _next;
+        }
 
-        if ( _next )
+        if ( _next ) {
             _next->_prev = _prev;
-        else
+        }
+        else {
             l._tail = _prev;
+        }
     }
 }
 

cxxtest/Mock.h

@@ -139,8 +139,9 @@ namespace dummy_mock_ns {}
          \
         Base_##MOCK &Base_##MOCK::current() \
         { \
-            if ( _list.empty() ) \
+            if ( _list.empty() ) { \
                 static _Unimplemented_##MOCK unimplemented; \
+            } \
             return *(Base_##MOCK *)_list.tail(); \
         } \
     }
@@ -155,8 +156,9 @@ namespace dummy_mock_ns {}
          \
         TYPE _Unimplemented_##MOCK::NAME ARGS \
         { \
-            while ( false ) \
+            while ( false ) {\
                 return NAME CALL; \
+            } \
             __CXXTEST_MOCK_UNIMPLEMENTED( NAME, ARGS ); \
             return MockTraits<TYPE>::defaultValue(); \
         } \
@@ -177,8 +179,9 @@ namespace dummy_mock_ns {}
          \
         void _Unimplemented_##MOCK::NAME ARGS \
         { \
-            while ( false ) \
+            while ( false ) { \
                 NAME CALL; \
+            } \
             __CXXTEST_MOCK_UNIMPLEMENTED( NAME, ARGS ); \
         } \
          \
@@ -193,8 +196,9 @@ namespace dummy_mock_ns {}
     namespace CXXTEST_MOCK_NAMESPACE { \
         TYPE _Unimplemented_##MOCK::NAME ARGS \
         { \
-            while ( false ) \
+            while ( false ) { \
                 return NAME CALL; \
+            } \
             __CXXTEST_MOCK_UNIMPLEMENTED( NAME, ARGS ); \
             return MockTraits<TYPE>::defaultValue(); \
         } \
@@ -210,8 +214,9 @@ namespace dummy_mock_ns {}
     namespace CXXTEST_MOCK_NAMESPACE { \
         void _Unimplemented_##MOCK::NAME ARGS \
         { \
-            while ( false ) \
+            while ( false ) { \
                 NAME CALL; \
+            } \
             __CXXTEST_MOCK_UNIMPLEMENTED( NAME, ARGS ); \
         } \
     } \

cxxtest/QtGui.h

@@ -77,8 +77,9 @@ namespace CxxTest
 
         void redBar()
         {
-            if ( _startMinimized && _mainWindow->isMinimized() )
+            if ( _startMinimized && _mainWindow->isMinimized() ) {
                 showNormal();
+            }
             setColor( 255, 0, 0 );
             setIcon( QMessageBox::Critical );
             getTotalTests();
@@ -114,12 +115,15 @@ namespace CxxTest
 
             for ( int i = 1; i < argc; ++ i ) {
                 QString arg( argv[i] );
-                if ( arg == "-minimized" )
+                if ( arg == "-minimized" ) {
                     _startMinimized = true;
-                else if ( arg == "-keep" )
+                }
+                else if ( arg == "-keep" ) {
                     _keep = true;
-                else if ( arg == "-title" && (i + 1 < argc) )
+                }
+                else if ( arg == "-title" && (i + 1 < argc) ) {
                     _title = argv[++i];
+                }
             }
         }
 
@@ -135,10 +139,12 @@ namespace CxxTest
             createProgressBar();
             createStatusBar();
             setMainWidget();
-            if ( _startMinimized )
+            if ( _startMinimized ) {
                 showMinimized();
-            else
+            }
+            else {
                 showNormal();
+            }
         }
 
         void getTotalTests()
@@ -255,20 +261,24 @@ namespace CxxTest
 
         bool keep()
         {
-            if ( !_keep )
+            if ( !_keep ) {
                 return false;
-            if ( !_startMinimized )
+            }
+            if ( !_startMinimized ) {
                 return true;
+            }
             return (_mainWindow == _application->activeWindow());
         }
 
         void showSummary()
         {
             QString summary = _strTotalTests + (_numTotalTests == 1 ? " test" : " tests");
-            if ( tracker().failedTests() )
+            if ( tracker().failedTests() ) {
                 summary = "Failed " + asString( tracker().failedTests() ) + " of " + summary;
-            else
+            }
+            else {
                 summary = summary + " passed";
+            }
 
             _mainWindow->setCaption( _title + " - " + summary );