Add empty_binary

Author: d-frey

include/tao/json/internal/totally_ordered.hpp

@@ -314,6 +314,26 @@ namespace tao
             }
          };
 
+         template< typename T >
+         struct totally_ordered< T, empty_binary_t, type::BINARY >
+            : operators::totally_ordered< T, empty_binary_t >
+         {
+            friend bool operator==( const T& lhs, empty_binary_t rhs ) noexcept
+            {
+               return lhs == T( rhs );
+            }
+
+            friend bool operator<( const T& lhs, empty_binary_t rhs ) noexcept
+            {
+               return lhs < T( rhs );
+            }
+
+            friend bool operator>( const T& lhs, empty_binary_t rhs ) noexcept
+            {
+               return lhs > T( rhs );
+            }
+         };
+
          template< typename T >
          struct totally_ordered< T, empty_array_t, type::ARRAY >
             : operators::totally_ordered< T, empty_array_t >

include/tao/json/traits.hpp

@@ -267,6 +267,16 @@ namespace tao
          }
       };
 
+      template<>
+      struct traits< empty_binary_t >
+      {
+         template< template< typename... > class Traits >
+         static void assign( basic_value< Traits >& v, empty_binary_t )
+         {
+            v.unsafe_emplace_binary();
+         }
+      };
+
       template<>
       struct traits< empty_array_t >
       {

include/tao/json/type.hpp

@@ -79,6 +79,13 @@ namespace tao
          }
       };
 
+      struct empty_binary_t
+      {
+         constexpr explicit empty_binary_t( int )
+         {
+         }
+      };
+
       struct empty_array_t
       {
          constexpr explicit empty_array_t( int )
@@ -94,6 +101,7 @@ namespace tao
       };
 
       constexpr null_t null{ 0 };
+      constexpr empty_binary_t empty_binary{ 0 };
       constexpr empty_array_t empty_array{ 0 };
       constexpr empty_object_t empty_object{ 0 };
 

include/tao/json/value.hpp

@@ -68,6 +68,7 @@ namespace tao
            internal::totally_ordered< basic_value< Traits >, std::string, type::STRING >,
            internal::totally_ordered< basic_value< Traits >, const char*, type::STRING >,
            internal::totally_ordered< basic_value< Traits >, std::vector< byte >, type::BINARY >,
+           internal::totally_ordered< basic_value< Traits >, empty_binary_t, type::BINARY >,
            internal::totally_ordered< basic_value< Traits >, std::vector< basic_value< Traits > >, type::ARRAY >,
            internal::totally_ordered< basic_value< Traits >, empty_array_t, type::ARRAY >,
            internal::totally_ordered< basic_value< Traits >, std::map< std::string, basic_value< Traits > >, type::OBJECT >,

src/test/json/parse_jaxn.cpp

@@ -174,10 +174,10 @@ namespace tao
          TEST_THROWS( jaxn::from_string( "'f\0o'" ) );
          TEST_THROWS( jaxn::from_string( "\n\n'123456789\0'" ) );
 
-         TEST_ASSERT( jaxn::from_string( "$" ) == std::vector< json::byte >{} );
-         TEST_ASSERT( jaxn::from_string( "$''" ) == std::vector< json::byte >{} );
-         TEST_ASSERT( jaxn::from_string( "$+$''" ) == std::vector< json::byte >{} );
-         TEST_ASSERT( jaxn::from_string( "$''+$" ) == std::vector< json::byte >{} );
+         TEST_ASSERT( jaxn::from_string( "$" ) == empty_binary );
+         TEST_ASSERT( jaxn::from_string( "$''" ) == empty_binary );
+         TEST_ASSERT( jaxn::from_string( "$+$''" ) == empty_binary );
+         TEST_ASSERT( jaxn::from_string( "$''+$" ) == empty_binary );
 
          TEST_ASSERT( jaxn::from_string( "$'a'" ) == 0x61_binary );
          TEST_ASSERT( jaxn::from_string( "$+$'a'" ) == 0x61_binary );