Binary data stringify/prettify

Author: d-frey

include/tao/json/events/jaxn/to_pretty_stream.hpp

@@ -56,7 +56,16 @@ namespace tao
                   after_key = true;
                }
 
-               // TODO: Binary strings!
+               void binary( const std::vector< byte >& v )
+               {
+                  static const char h[] = "0123456789ABCDEF";
+                  next();
+                  os.put( '$' );
+                  for( const auto b : v ) {
+                     os.put( h[ static_cast< unsigned char >( b ) >> 4 ] );
+                     os.put( h[ static_cast< unsigned char >( b ) & 0xF ] );
+                  }
+               }
             };
 
          }  // namespace jaxn

include/tao/json/events/jaxn/to_stream.hpp

@@ -55,7 +55,16 @@ namespace tao
                   first = true;
                }
 
-               // TODO: Binary strings!
+               void binary( const std::vector< byte >& v )
+               {
+                  static const char h[] = "0123456789ABCDEF";
+                  next();
+                  os.put( '$' );
+                  for( const auto b : v ) {
+                     os.put( h[ static_cast< unsigned char >( b ) >> 4 ] );
+                     os.put( h[ static_cast< unsigned char >( b ) & 0xF ] );
+                  }
+               }
             };
 
          }  // namespace jaxn

src/test/json/ostream_jaxn.cpp

@@ -45,6 +45,7 @@ namespace tao
          test_simple( INFINITY, "Infinity" );
          test_simple( -INFINITY, "-Infinity" );
          test_simple( "foo", "\"foo\"" );
+         test_simple( std::vector< byte >( { byte( 1 ), byte( 2 ), byte( 3 ) } ), "$010203" );
          test_simple( empty_array, "[]" );
          test_simple( value::array( {} ), "[]" );
          test_simple( value::array( { 1 } ), "[1]" );
@@ -65,6 +66,7 @@ namespace tao
          test_pretty( 42, "42" );
          test_pretty( 42.1, "42.1" );
          test_pretty( "foo", "\"foo\"" );
+         test_pretty( std::vector< byte >( { byte( 1 ), byte( 2 ), byte( 3 ) } ), "$010203" );
          test_pretty( empty_array, "[]" );
          test_pretty( value::array( {} ), "[]" );
          test_pretty( value::array( { 1 } ), "[\n  1\n]" );