clang-tidy

d-frey · d-frey · commit 0f19e06a51a0 · 2023-04-28T18:08:30.000+02:00
diff --git a/include/tao/json/binding/versions.hpp b/include/tao/json/binding/versions.hpp
@@ -54,7 +54,7 @@ namespace tao::json::binding
             else {
                static_assert( std::is_void_v< V >, "neither V::to() nor V::as() found" );
             }
-            return std::exception_ptr();
+            return {};
          }
          catch( ... ) {
             return std::current_exception();
@@ -96,7 +96,7 @@ namespace tao::json::binding
             auto m = parser.mark();
             V::template consume< Traits >( parser, x );
             (void)m( true );
-            return std::exception_ptr();
+            return {};
          }
          catch( ... ) {
             return std::current_exception();
diff --git a/include/tao/json/cbor/events/to_stream.hpp b/include/tao/json/cbor/events/to_stream.hpp
@@ -95,13 +95,13 @@ namespace tao::json::cbor::events
       void string( const std::string_view v )
       {
          number( internal::major::STRING, v.size() );
-         os.write( v.data(), v.size() );
+         os.write( v.data(), static_cast< std::streamsize >( v.size() ) );
       }
 
       void binary( const tao::binary_view v )
       {
          number( internal::major::BINARY, v.size() );
-         os.write( reinterpret_cast< const char* >( v.data() ), v.size() );
+         os.write( reinterpret_cast< const char* >( v.data() ), static_cast< std::streamsize >( v.size() ) );
       }
 
       void begin_array()
diff --git a/include/tao/json/contrib/schema.hpp b/include/tao/json/contrib/schema.hpp
@@ -1015,7 +1015,7 @@ namespace tao::json
                   }
                   break;
                case HAS_MULTIPLE_OF_DOUBLE:
-                  if( !is_multiple_of( double( v ), m_node->m_multiple_of.d ) ) {
+                  if( !is_multiple_of( static_cast< double >( v ), m_node->m_multiple_of.d ) ) {
                      m_match = false;
                   }
                   break;
@@ -1031,7 +1031,7 @@ namespace tao::json
                   }
                   break;
                case HAS_MULTIPLE_OF_DOUBLE:
-                  if( !is_multiple_of( double( v ), m_node->m_multiple_of.d ) ) {
+                  if( !is_multiple_of( static_cast< double >( v ), m_node->m_multiple_of.d ) ) {
                      m_match = false;
                   }
                   break;
diff --git a/include/tao/json/contrib/vector_bool_traits.hpp b/include/tao/json/contrib/vector_bool_traits.hpp
@@ -22,7 +22,7 @@ namespace tao::json
          v.emplace_array();
          v.get_array().reserve( o.size() );
          for( const auto e : o ) {
-            v.emplace_back( bool( e ) );
+            v.emplace_back( static_cast< bool >( e ) );
          }
       }
 
@@ -31,7 +31,7 @@ namespace tao::json
       {
          c.begin_array( o.size() );
          for( const auto i : o ) {
-            json::events::produce< Traits >( c, bool( i ) );
+            json::events::produce< Traits >( c, static_cast< bool >( i ) );
             c.element();
          }
          c.end_array( o.size() );
diff --git a/include/tao/json/events/hash.hpp b/include/tao/json/events/hash.hpp
@@ -88,14 +88,14 @@ namespace tao::json::events
       {
          if( v >= 0 ) {
             const auto u = static_cast< std::uint64_t >( v );
-            if( u == v ) {
+            if( static_cast< double >( u ) == v ) {
                number( u );
                return;
             }
          }
          else {
             const auto i = static_cast< std::int64_t >( v );
-            if( i == v ) {
+            if( static_cast< double >( i ) == v ) {
                number( i );
                return;
             }
diff --git a/include/tao/json/events/prefer_signed.hpp b/include/tao/json/events/prefer_signed.hpp
@@ -19,7 +19,7 @@ namespace tao::json::events
       void number( const std::uint64_t v )
       {
          if( v <= 9223372036854775807ULL ) {
-            Consumer::number( std::int64_t( v ) );
+            Consumer::number( static_cast< std::int64_t >( v ) );
          }
          else {
             Consumer::number( v );
diff --git a/include/tao/json/events/prefer_unsigned.hpp b/include/tao/json/events/prefer_unsigned.hpp
@@ -19,7 +19,7 @@ namespace tao::json::events
       void number( const std::int64_t v )
       {
          if( v >= 0 ) {
-            Consumer::number( std::uint64_t( v ) );
+            Consumer::number( static_cast< std::uint64_t >( v ) );
          }
          else {
             Consumer::number( v );
diff --git a/include/tao/json/events/to_stream.hpp b/include/tao/json/events/to_stream.hpp
@@ -27,7 +27,7 @@ namespace tao::json::events
    {
    protected:
       std::ostream& os;
-      bool first;
+      bool first = true;
 
       void next()
       {
@@ -38,8 +38,7 @@ namespace tao::json::events
 
    public:
       explicit to_stream( std::ostream& in_os ) noexcept
-         : os( in_os ),
-           first( true )
+         : os( in_os )
       {}
 
       void null()
diff --git a/include/tao/json/events/transformer.hpp b/include/tao/json/events/transformer.hpp
@@ -33,7 +33,7 @@ namespace tao::json
                                 T,
                                 decltype( std::declval< T< B > >().null(),
                                           std::declval< T< B > >().boolean( true ),
-                                          std::declval< T< B > >().number( double( 0.0 ) ),
+                                          std::declval< T< B > >().number( static_cast< double >( 0.0 ) ),
                                           std::declval< T< B > >().string( "" ),
                                           std::declval< T< B > >().element(),
                                           std::declval< T< B > >().member(),
diff --git a/include/tao/json/internal/action.hpp b/include/tao/json/internal/action.hpp
@@ -119,7 +119,7 @@ namespace tao::json::internal
       template< typename Consumer >
       static void apply0( Consumer& consumer )
       {
-         consumer.number( std::uint64_t( 0 ) );
+         consumer.number( static_cast< std::uint64_t >( 0 ) );
       }
    };
 
@@ -129,7 +129,7 @@ namespace tao::json::internal
       template< typename Consumer >
       static void apply0( Consumer& consumer )
       {
-         consumer.number( std::int64_t( 0 ) );
+         consumer.number( static_cast< std::int64_t >( 0 ) );
       }
    };
 
diff --git a/include/tao/json/internal/endian_gcc.hpp b/include/tao/json/internal/endian_gcc.hpp
@@ -45,7 +45,7 @@ namespace tao::json::internal
    {
       [[nodiscard]] static std::int16_t convert( const std::int16_t n ) noexcept
       {
-         return __builtin_bswap16( n );
+         return static_cast< std::int16_t >( __builtin_bswap16( n ) );
       }
 
       [[nodiscard]] static std::uint16_t convert( const std::uint16_t n ) noexcept
@@ -68,7 +68,7 @@ namespace tao::json::internal
 
       [[nodiscard]] static std::int32_t convert( const std::int32_t n ) noexcept
       {
-         return __builtin_bswap32( n );
+         return static_cast< std::int32_t >( __builtin_bswap32( n ) );
       }
 
       [[nodiscard]] static std::uint32_t convert( const std::uint32_t n ) noexcept
@@ -91,7 +91,7 @@ namespace tao::json::internal
 
       [[nodiscard]] static std::int64_t convert( const std::int64_t n ) noexcept
       {
-         return __builtin_bswap64( n );
+         return static_cast< std::int64_t >( __builtin_bswap64( n ) );
       }
 
       [[nodiscard]] static std::uint64_t convert( const std::uint64_t n ) noexcept
@@ -134,7 +134,7 @@ namespace tao::json::internal
    {
       [[nodiscard]] static std::int16_t convert( const std::int16_t n ) noexcept
       {
-         return __builtin_bswap16( n );
+         return static_cast< std::int16_t >( __builtin_bswap16( n ) );
       }
 
       [[nodiscard]] static std::uint16_t convert( const std::uint16_t n ) noexcept
@@ -157,7 +157,7 @@ namespace tao::json::internal
 
       [[nodiscard]] static std::int32_t convert( const std::int32_t n ) noexcept
       {
-         return __builtin_bswap32( n );
+         return static_cast< std::int32_t >( __builtin_bswap32( n ) );
       }
 
       [[nodiscard]] static std::uint32_t convert( const std::uint32_t n ) noexcept
@@ -180,7 +180,7 @@ namespace tao::json::internal
 
       [[nodiscard]] static std::uint64_t convert( const std::uint64_t n ) noexcept
       {
-         return __builtin_bswap64( n );
+         return static_cast< std::int64_t >( __builtin_bswap64( n ) );
       }
 
       [[nodiscard]] static std::int64_t convert( const std::int64_t n ) noexcept
diff --git a/include/tao/json/internal/escape.hpp b/include/tao/json/internal/escape.hpp
@@ -25,7 +25,7 @@ namespace tao::json::internal
             os.write( l, p - l );
             l = ++p;
             os.put( '\\' );
-            os.put( c );
+            os.put( static_cast< char >( c ) );
          }
          else if( c < 32 || c == 127 ) {
             os.write( l, p - l );
diff --git a/include/tao/json/internal/uri_fragment.hpp b/include/tao/json/internal/uri_fragment.hpp
@@ -158,7 +158,7 @@ namespace tao::json::internal
                   break;
                default:
                   if( allowed_uri_fragment_characters[ c ] ) {
-                     result += c;
+                     result += static_cast< char >( c );
                   }
                   else {
                      result += '%';
diff --git a/include/tao/json/jaxn/events/to_pretty_stream.hpp b/include/tao/json/jaxn/events/to_pretty_stream.hpp
@@ -53,7 +53,7 @@ namespace tao::json::jaxn::events
       {
          if( jaxn::is_identifier( v ) ) {
             next();
-            os.write( v.data(), v.size() );
+            os.write( v.data(), static_cast< std::streamsize >( v.size() ) );
          }
          else {
             string( v );
diff --git a/include/tao/json/jaxn/events/to_stream.hpp b/include/tao/json/jaxn/events/to_stream.hpp
@@ -45,7 +45,7 @@ namespace tao::json::jaxn::events
       {
          if( jaxn::is_identifier( v ) ) {
             next();
-            os.write( v.data(), v.size() );
+            os.write( v.data(), static_cast< std::streamsize >( v.size() ) );
          }
          else {
             string( v );
diff --git a/include/tao/json/jaxn/internal/action.hpp b/include/tao/json/jaxn/internal/action.hpp
@@ -165,7 +165,7 @@ namespace tao::json::jaxn::internal
       template< typename Consumer >
       static void apply0( Consumer& consumer )
       {
-         consumer.number( std::uint64_t( 0 ) );
+         consumer.number( static_cast< std::uint64_t >( 0 ) );
       }
    };
 
@@ -175,7 +175,7 @@ namespace tao::json::jaxn::internal
       template< typename Consumer >
       static void apply0( Consumer& consumer )
       {
-         consumer.number( std::int64_t( 0 ) );
+         consumer.number( static_cast< std::int64_t >( 0 ) );
       }
    };
 
diff --git a/include/tao/json/jaxn/internal/bunescape_action.hpp b/include/tao/json/jaxn/internal/bunescape_action.hpp
@@ -28,47 +28,47 @@ namespace tao::json::jaxn::internal
       {
          switch( *in.begin() ) {
             case '"':
-               value.push_back( std::byte( '"' ) );
+               value.push_back( static_cast< std::byte >( '"' ) );
                break;
 
             case '\'':
-               value.push_back( std::byte( '\'' ) );
+               value.push_back( static_cast< std::byte >( '\'' ) );
                break;
 
             case '\\':
-               value.push_back( std::byte( '\\' ) );
+               value.push_back( static_cast< std::byte >( '\\' ) );
                break;
 
             case '/':
-               value.push_back( std::byte( '/' ) );
+               value.push_back( static_cast< std::byte >( '/' ) );
                break;
 
             case 'b':
-               value.push_back( std::byte( '\b' ) );
+               value.push_back( static_cast< std::byte >( '\b' ) );
                break;
 
             case 'f':
-               value.push_back( std::byte( '\f' ) );
+               value.push_back( static_cast< std::byte >( '\f' ) );
                break;
 
             case 'n':
-               value.push_back( std::byte( '\n' ) );
+               value.push_back( static_cast< std::byte >( '\n' ) );
                break;
 
             case 'r':
-               value.push_back( std::byte( '\r' ) );
+               value.push_back( static_cast< std::byte >( '\r' ) );
                break;
 
             case 't':
-               value.push_back( std::byte( '\t' ) );
+               value.push_back( static_cast< std::byte >( '\t' ) );
                break;
 
             case 'v':
-               value.push_back( std::byte( '\v' ) );
+               value.push_back( static_cast< std::byte >( '\v' ) );
                break;
 
             case '0':
-               value.push_back( std::byte( '\0' ) );
+               value.push_back( static_cast< std::byte >( '\0' ) );
                break;
 
             default:
diff --git a/include/tao/json/jaxn/internal/integer.hpp b/include/tao/json/jaxn/internal/integer.hpp
@@ -119,7 +119,7 @@ namespace tao::json::jaxn::internal::integer
       if( input[ 0 ] == '-' ) {
          return convert_hex_negative< Signed >( result, std::string_view( input.data() + 3, input.size() - 3 ) );
       }
-      const auto offset = unsigned( input[ 0 ] == '+' ) + 2;  // The "0x" prefix has length 2.
+      const auto offset = static_cast< unsigned >( input[ 0 ] == '+' ) + 2;  // The "0x" prefix has length 2.
       return convert_hex_positive< Signed >( result, std::string_view( input.data() + offset, input.size() - offset ) );
    }
 
diff --git a/include/tao/json/msgpack/events/to_stream.hpp b/include/tao/json/msgpack/events/to_stream.hpp
diff --git a/include/tao/json/msgpack/internal/grammar.hpp b/include/tao/json/msgpack/internal/grammar.hpp
diff --git a/include/tao/json/msgpack/parts_parser.hpp b/include/tao/json/msgpack/parts_parser.hpp
diff --git a/include/tao/json/parts_parser.hpp b/include/tao/json/parts_parser.hpp
diff --git a/include/tao/json/ubjson/events/to_stream.hpp b/include/tao/json/ubjson/events/to_stream.hpp
diff --git a/include/tao/json/ubjson/internal/grammar.hpp b/include/tao/json/ubjson/internal/grammar.hpp
diff --git a/include/tao/json/ubjson/parts_parser.hpp b/include/tao/json/ubjson/parts_parser.hpp

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ namespace tao::json::binding`
`54`	`54`	`else {`
`55`	`55`	`static_assert( std::is_void_v< V >, "neither V::to() nor V::as() found" );`
`56`	`56`	`}`
`57`		`- return std::exception_ptr();`
	`57`	`+ return {};`
`58`	`58`	`}`
`59`	`59`	`catch( ... ) {`
`60`	`60`	`return std::current_exception();`
`@@ -96,7 +96,7 @@ namespace tao::json::binding`
`96`	`96`	`auto m = parser.mark();`
`97`	`97`	`V::template consume< Traits >( parser, x );`
`98`	`98`	`(void)m( true );`
`99`		`- return std::exception_ptr();`
	`99`	`+ return {};`
`100`	`100`	`}`
`101`	`101`	`catch( ... ) {`
`102`	`102`	`return std::current_exception();`
Original file line number	Diff line number	Diff line change
`@@ -95,13 +95,13 @@ namespace tao::json::cbor::events`
`95`	`95`	`void string( const std::string_view v )`
`96`	`96`	`{`
`97`	`97`	`number( internal::major::STRING, v.size() );`
`98`		`- os.write( v.data(), v.size() );`
	`98`	`+ os.write( v.data(), static_cast< std::streamsize >( v.size() ) );`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`void binary( const tao::binary_view v )`
`102`	`102`	`{`
`103`	`103`	`number( internal::major::BINARY, v.size() );`
`104`		`- os.write( reinterpret_cast< const char* >( v.data() ), v.size() );`
	`104`	`+ os.write( reinterpret_cast< const char* >( v.data() ), static_cast< std::streamsize >( v.size() ) );`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`void begin_array()`
Original file line number	Diff line number	Diff line change
`@@ -1015,7 +1015,7 @@ namespace tao::json`
`1015`	`1015`	`}`
`1016`	`1016`	`break;`
`1017`	`1017`	`case HAS_MULTIPLE_OF_DOUBLE:`
`1018`		`- if( !is_multiple_of( double( v ), m_node->m_multiple_of.d ) ) {`
	`1018`	`+ if( !is_multiple_of( static_cast< double >( v ), m_node->m_multiple_of.d ) ) {`
`1019`	`1019`	`m_match = false;`
`1020`	`1020`	`}`
`1021`	`1021`	`break;`
`@@ -1031,7 +1031,7 @@ namespace tao::json`
`1031`	`1031`	`}`
`1032`	`1032`	`break;`
`1033`	`1033`	`case HAS_MULTIPLE_OF_DOUBLE:`
`1034`		`- if( !is_multiple_of( double( v ), m_node->m_multiple_of.d ) ) {`
	`1034`	`+ if( !is_multiple_of( static_cast< double >( v ), m_node->m_multiple_of.d ) ) {`
`1035`	`1035`	`m_match = false;`
`1036`	`1036`	`}`
`1037`	`1037`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ namespace tao::json`
`22`	`22`	`v.emplace_array();`
`23`	`23`	`v.get_array().reserve( o.size() );`
`24`	`24`	`for( const auto e : o ) {`
`25`		`- v.emplace_back( bool( e ) );`
	`25`	`+ v.emplace_back( static_cast< bool >( e ) );`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`@@ -31,7 +31,7 @@ namespace tao::json`
`31`	`31`	`{`
`32`	`32`	`c.begin_array( o.size() );`
`33`	`33`	`for( const auto i : o ) {`
`34`		`- json::events::produce< Traits >( c, bool( i ) );`
	`34`	`+ json::events::produce< Traits >( c, static_cast< bool >( i ) );`
`35`	`35`	`c.element();`
`36`	`36`	`}`
`37`	`37`	`c.end_array( o.size() );`
Original file line number	Diff line number	Diff line change
`@@ -88,14 +88,14 @@ namespace tao::json::events`
`88`	`88`	`{`
`89`	`89`	`if( v >= 0 ) {`
`90`	`90`	`const auto u = static_cast< std::uint64_t >( v );`
`91`		`- if( u == v ) {`
	`91`	`+ if( static_cast< double >( u ) == v ) {`
`92`	`92`	`number( u );`
`93`	`93`	`return;`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`else {`
`97`	`97`	`const auto i = static_cast< std::int64_t >( v );`
`98`		`- if( i == v ) {`
	`98`	`+ if( static_cast< double >( i ) == v ) {`
`99`	`99`	`number( i );`
`100`	`100`	`return;`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace tao::json::events`
`19`	`19`	`void number( const std::uint64_t v )`
`20`	`20`	`{`
`21`	`21`	`if( v <= 9223372036854775807ULL ) {`
`22`		`- Consumer::number( std::int64_t( v ) );`
	`22`	`+ Consumer::number( static_cast< std::int64_t >( v ) );`
`23`	`23`	`}`
`24`	`24`	`else {`
`25`	`25`	`Consumer::number( v );`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ namespace tao::json::internal`
`119`	`119`	`template< typename Consumer >`
`120`	`120`	`static void apply0( Consumer& consumer )`
`121`	`121`	`{`
`122`		`- consumer.number( std::uint64_t( 0 ) );`
	`122`	`+ consumer.number( static_cast< std::uint64_t >( 0 ) );`
`123`	`123`	`}`
`124`	`124`	`};`
`125`	`125`
`@@ -129,7 +129,7 @@ namespace tao::json::internal`
`129`	`129`	`template< typename Consumer >`
`130`	`130`	`static void apply0( Consumer& consumer )`
`131`	`131`	`{`
`132`		`- consumer.number( std::int64_t( 0 ) );`
	`132`	`+ consumer.number( static_cast< std::int64_t >( 0 ) );`
`133`	`133`	`}`
`134`	`134`	`};`
`135`	`135`