Add braces for conditional statements and loops

Author: stinos

classwrapper.h

@@ -220,7 +220,9 @@ namespace upywrap
     static mp_obj_t AsPyObj( T* p, bool own )
     {
       if( own )
+      {
         return AsPyObj( native_obj_t( p ) );
+      }
       return AsPyObj( native_obj_t( p, NoDelete ) );
     }
 #else
@@ -343,7 +345,9 @@ namespace upywrap
     {
       auto ret = map.find( attr );
       if( ret == map.end() )
+      {
         return nullptr;
+      }
       return ret->second;
     }
 
@@ -352,7 +356,9 @@ namespace upywrap
     {
       const auto attrValue = FindAttrMaybe( map, attr );
       if( !attrValue )
+      {
         RaiseAttributeException( type.name, attr );
+      }
       return attrValue;
     }
 
@@ -381,7 +387,9 @@ namespace upywrap
         this_type* self = (this_type*) self_in;
         const auto attrValue = FindAttrMaybe( self->getters, attr );
         if( attrValue )
+        {
           *dest = attrValue->Call( self );
+        }
       }
     }
 
@@ -405,7 +413,9 @@ namespace upywrap
       auto self = (this_type*) self_in;
       auto other = (this_type*) other_in;
       if( op != MP_BINARY_OP_EQUAL )
+      {
         return MP_OBJ_NULL; //not supported
+      }
       return ToPy( self->GetPtr() == other->GetPtr() );
     }
 
@@ -461,7 +471,9 @@ namespace upywrap
     static void CheckTypeIsRegistered()
     {
       if( type.base.type == nullptr )
+      {
         RaiseTypeException( (std::string( "Native type " ) + typeid( T ).name() + " has not been registered").data() );
+      }
     }
 
     void AddFunctionToTable( const qstr name, mp_obj_t fun )
@@ -480,7 +492,9 @@ namespace upywrap
       typedef NativeMemberCall< name, Ret, A... > call_type;
       auto callerObject = call_type::CreateCaller( f );
       if( conv )
+      {
         callerObject->convert_retval = conv;
+      }
       functionPointers[ (void*) name ] = callerObject;
       AddFunctionToTable( name(), call_type::CreateUPyFunction() );
     }
@@ -626,7 +640,9 @@ namespace upywrap
       static mp_obj_t MakeNew( const mp_obj_type_t*, mp_uint_t n_args, mp_uint_t, const mp_obj_t *args )
       {
         if( n_args != sizeof...( A ) )
+        {
           RaiseTypeException( "Wrong number of arguments for constructor" );
+        }
         auto f = (init_call_type*) this_type::functionPointers[ (void*) index ];
         UPYWRAP_TRY
         return AsPyObj( native_obj_t( Apply( f, args, make_index_sequence< sizeof...( A ) >() ) ) );
@@ -644,7 +660,9 @@ namespace upywrap
       static mp_obj_t CallN( mp_uint_t n_args, const mp_obj_t* args )
       {
         if( n_args != sizeof...( A ) + 1 )
+        {
           RaiseTypeException( "Wrong number of arguments" );
+        }
         auto self = (this_type*) args[ 0 ];
         auto firstArg = &args[ 1 ];
         auto f = (call_type*) this_type::functionPointers[ (void*) index ];
@@ -791,7 +809,9 @@ namespace upywrap
       //Return None instead which is either useful (e.g. used as 'optional' return value),
       //or will lead to an actual Python exception when used anyway.
       if( !p )
+      {
         return mp_const_none;
+      }
       return ClassWrapper< T >::AsPyObj( std::move( p ) );
     }
   };

detail/callreturn.h

@@ -29,7 +29,9 @@ namespace upywrap
     {
       UPYWRAP_TRY
       if( f->convert_retval )
+      {
         return f->convert_retval( f->Call( FromPy< A >( args )... ) );
+      }
       return ToPy( f->Call( FromPy< A >( args )... ) );
       UPYWRAP_CATCH
     }
@@ -39,7 +41,9 @@ namespace upywrap
     {
       UPYWRAP_TRY
       if( f->convert_retval )
+      {
         return f->convert_retval( f->Call( self, FromPy< A >( args )... ) );
+      }
       return ToPy( f->Call( self, FromPy< A >( args )... ) );
       UPYWRAP_CATCH
     }

detail/frompyobj.h

@@ -83,7 +83,9 @@ namespace upywrap
     {
       mp_uint_t value;
       if( mpz_as_uint_checked( &self->mpz, &value ) )
+      {
         return value;
+      }
       RaiseOverflowException( "Value too large for integer" );
 #if !defined( _MSC_VER ) || defined( _DEBUG )
       return 0u;
@@ -162,23 +164,29 @@ namespace upywrap
 
       auto i = &arg->mpz;
       if( !is_signed && i->neg )
+      {
         RaiseTypeException( "Source integer must be unsigned" );
+      }
 
       auto d = i->dig + i->len;
       std::uint64_t val = 0;
 
       while( d-- > i->dig )
       {
         if( val > maxCalcThreshold )
+        {
           RaiseOverflowException( "Value too large for 64bit integer" );
+        }
         val = ( val << MPZ_DIG_SIZE ) | *d;
       }
 
 #ifdef _MSC_VER
   #pragma warning( disable : 4146 )
 #endif
       if( i->neg )
+      {
         val = -val;
+      }
 #ifdef _MSC_VER
   #pragma warning( default : 4146 )
 #endif
@@ -310,7 +318,9 @@ namespace upywrap
       mp_obj_t* items;
       mp_obj_get_array( arg, &len, &items );
       if( len != sizeof...( A ) )
+      {
         RaiseTypeException( "Not enough tuple elements" );
+      }
       return make_it( items, make_index_sequence< sizeof...( A ) >() );
     }
 
@@ -398,7 +408,9 @@ namespace upywrap
     static std_fun_type Convert( mp_obj_t arg )
     {
       if( arg == mp_const_none )
+      {
         return std_fun_type();
+      }
       const auto obj = reinterpret_cast< mp_obj_base_t* >( MP_OBJ_TO_PTR( arg ) );
       const auto type = obj->type;
       if( type == &mp_type_fun_builtin_0 ||

detail/micropython.h

@@ -131,7 +131,9 @@ namespace upywrap
   {
     mp_obj_exception_t* o = m_new_obj_var( mp_obj_exception_t, mp_obj_t, 0 );
     if( !o )
+    {
       throw std::bad_alloc();
+    }
     o->base.type = exc_type;
     o->traceback_data = nullptr;
     o->args = reinterpret_cast< mp_obj_tuple_t* >( MP_OBJ_TO_PTR( mp_obj_new_tuple( 1, nullptr ) ) );
@@ -223,14 +225,18 @@ namespace upywrap
   static void IntegerBoundCheck( S src )
   {
     if( abs_all< S, std::is_unsigned< S >::value >::abs( src ) > static_cast< S >( std::numeric_limits< T >::max() ) )
+    {
       RaiseOverflowException( "Integer overflow" );
+    }
   }
 
   template< class T >
   static void PositiveIntegerCheck( T src )
   {
     if( src < 0 )
+    {
       RaiseTypeException( "Source integer must be unsigned" );
+    }
   }
 
   template<>
@@ -342,21 +348,27 @@ namespace upywrap
 
       static const size_t maxLen = 50;
       if( (*List())->len > maxLen )
+      {
         RaiseRuntimeException( "StaticPyObjectStore: list is full" );
+      }
     }
 
     static void Remove( mp_obj_t obj )
     {
       if( !Contains( obj ) )
+      {
         RaiseRuntimeException( "StaticPyObjectStore: item not added" );
+      }
       mp_obj_list_remove( *List(), obj );
     }
 
     static mp_obj_list_t* InitBackEnd()
     {
       auto list = List();
       if( *list )
+      {
         RaiseRuntimeException( "StaticPyObjectStore: already initialized" );
+      }
       *list = m_new_obj( mp_obj_list_t );
       mp_obj_list_init( *list, 0 );
       return *list;
@@ -372,13 +384,19 @@ namespace upywrap
     {
       const auto list = *List();
       if( !list )
+      {
         RaiseRuntimeException( "StaticPyObjectStore: not initialized" );
+      }
       size_t len;
       mp_obj_t* items;
       mp_obj_list_get( list, &len, &items );
       for( size_t i = 0 ; i < len ; ++i )
+      {
         if( items[ i ] == obj )
+        {
           return true;
+        }
+      }
       return false;
     }
 
@@ -426,12 +444,16 @@ namespace upywrap
     const qstr qname = qstr_from_str( name );
     mp_obj_module_t* mod = (mp_obj_module_t*) mp_obj_new_module( qname );
     if( doRegister )
+    {
       mp_module_register( qname, mod );
+    }
     //Create StaticPyObjectStore instance and store it in the module's globals dict,
     //which ensures anything in the list will also not be sweeped by the GC.
     //Do this only once though, so all translation units in the binary use the same list.
     if( !StaticPyObjectStore::Initialized() )
+    {
       mp_obj_dict_store( mod->globals, new_qstr( "_StaticPyObjectStore" ), StaticPyObjectStore::InitBackEnd() );
+    }
     return mod;
   }
 

functionwrapper.h

@@ -53,7 +53,9 @@ namespace upywrap
 
       auto callerObject = call_type::CreateCaller( f );
       if( conv )
+      {
         callerObject->convert_retval = conv;
+      }
       functionPointers[ (void*) name ] = callerObject;
       mp_obj_dict_store( globals, new_qstr( name() ), call_type::CreateUPyFunction() );
     }
@@ -85,7 +87,9 @@ namespace upywrap
       static mp_obj_t CallN( mp_uint_t nargs, const mp_obj_t* args )
       {
         if( nargs != sizeof...( A ) )
+        {
           RaiseTypeException( "Wrong number of arguments" );
+        }
         auto f = (call_type*) FunctionWrapper::functionPointers[ (void*) index ];
         return CallVar( f, args, make_index_sequence< sizeof...( A ) >() );
       }

variable.h

@@ -35,10 +35,14 @@ namespace upywrap
     {
       const auto numNames = names.size();
       if( !numNames )
+      {
         throw std::runtime_error( "cannot get variable without a name" );
+      }
       auto var = GetVariable( names[ 0 ].data() );
       for( size_t i = 1 ; i < numNames ; ++i )
+      {
         var = GetVariable( var, names[ i ].data() );
+      }
       return var;
     }
 
@@ -70,7 +74,9 @@ namespace upywrap
     {
       const auto numNames = names.size();
       if( !numNames )
+      {
         throw std::runtime_error( "cannot get variable without a name" );
+      }
       if( numNames == 1 )
       {
         SetVariable( value, names[ 0 ].data() );
@@ -79,7 +85,9 @@ namespace upywrap
       {
         auto var = GetVariable( names[ 0 ].data() );
         for( size_t i = 1 ; i < numNames - 1 ; ++i )
+        {
           var = GetVariable( var, names[ i ].data() );
+        }
         SetVariable( var, value, names[ numNames - 1 ].data() );
       }
     }