Style

Author: d-frey

include/tao/json/json_pointer.hh

@@ -38,7 +38,6 @@ namespace tao
          inline std::string json_pointer_next_token( const char * & p, const char * e )
          {
             std::string result;
-            // TODO: Find next '/' first, call result.reserve( x )?
             while ( p != e ) {
                switch ( *p ) {
                   case '/':

include/tao/json/patch.hh

@@ -4,6 +4,9 @@
 #ifndef TAOCPP_JSON_INCLUDE_PATCH_HH
 #define TAOCPP_JSON_INCLUDE_PATCH_HH
 
+#include <stdexcept>
+#include <utility>
+
 #include "value.hh"
 #include "json_pointer.hh"
 
@@ -14,73 +17,73 @@ namespace tao
       template< template< typename ... > class Traits >
       void patch_inplace( basic_value< Traits > & value, const basic_value< Traits > & patch )
       {
-        for( const auto & entry : patch.get_array() ) {
-          const auto & op = entry.at( "op" ).get_string();
-          const json_pointer path( entry.at( "path" ).get_string() );
-          if( op == "test" ) {
-            if( value.at( path ) != entry.at( "value" ) ) {
-              throw std::runtime_error( "test failed for: " + path.value() );
+         for( const auto & entry : patch.get_array() ) {
+            const auto & op = entry.at( "op" ).get_string();
+            const json_pointer path( entry.at( "path" ).get_string() );
+            if ( op == "test" ) {
+               if ( value.at( path ) != entry.at( "value" ) ) {
+                  throw std::runtime_error( "test failed for: " + path.value() );
+               }
+            }
+            else if ( op == "remove" ) {
+               value.erase( path );
+            }
+            else if ( op == "add" ) {
+               value.insert( path, entry.at( "value" ) );
+            }
+            else if ( op == "replace" ) {
+               value.at( path ) = entry.at( "value" );
+            }
+            else if ( op == "move" ) {
+               const json_pointer from( entry.at( "from" ).get_string() );
+               auto v = std::move( value.at( from ) );
+               value.erase( from );
+               value.insert( path, std::move( v ) );
+            }
+            else if ( op == "copy" ) {
+               const json_pointer from( entry.at( "from" ).get_string() );
+               value.insert( path, value.at( from ) );
+            }
+            else {
+               throw std::runtime_error( "unknown patch operation: '" + op + '\'' );
             }
-          }
-          else if( op == "remove" ) {
-            value.erase( path );
-          }
-          else if( op == "add" ) {
-            value.insert( path, entry.at( "value" ) );
-          }
-          else if( op == "replace" ) {
-            value.at( path ) = entry.at( "value" );
-          }
-          else if( op == "move" ) {
-            const json_pointer from( entry.at( "from" ).get_string() );
-            auto v = std::move( value.at( from ) );
-            value.erase( from );
-            value.insert( path, std::move( v ) );
-          }
-          else if( op == "copy" ) {
-            const json_pointer from( entry.at( "from" ).get_string() );
-            value.insert( path, value.at( from ) );
-          }
-          else {
-            throw std::runtime_error( "unknown patch operation: '" + op + '\'' );
-          }
-        }
+         }
       }
 
       template< template< typename ... > class Traits >
       void patch_inplace( basic_value< Traits > & value, basic_value< Traits > && patch )
       {
-        for( const auto & entry : patch.get_array() ) {
-          const auto & op = entry.at( "op" ).get_string();
-          const json_pointer path( entry.at( "path" ).get_string() );
-          if( op == "test" ) {
-            if( value.at( path ) != entry.at( "value" ) ) {
-              throw std::runtime_error( "test failed for: " + path.value() );
+         for( const auto & entry : patch.get_array() ) {
+            const auto & op = entry.at( "op" ).get_string();
+            const json_pointer path( entry.at( "path" ).get_string() );
+            if ( op == "test" ) {
+               if ( value.at( path ) != entry.at( "value" ) ) {
+                  throw std::runtime_error( "test failed for: " + path.value() );
+               }
+            }
+            else if ( op == "remove" ) {
+               value.erase( path );
+            }
+            else if ( op == "add" ) {
+               value.insert( path, std::move( entry.at( "value" ) ) );
+            }
+            else if ( op == "replace" ) {
+               value.at( path ) = std::move( entry.at( "value" ) );
+            }
+            else if ( op == "move" ) {
+               const json_pointer from( entry.at( "from" ).get_string() );
+               auto v = std::move( value.at( from ) );
+               value.erase( from );
+               value.insert( path, std::move( v ) );
+            }
+            else if ( op == "copy" ) {
+               const json_pointer from( entry.at( "from" ).get_string() );
+               value.insert( path, value.at( from ) );
+            }
+            else {
+               throw std::runtime_error( "unknown patch operation: '" + op + '\'' );
             }
-          }
-          else if( op == "remove" ) {
-            value.erase( path );
-          }
-          else if( op == "add" ) {
-            value.insert( path, std::move( entry.at( "value" ) ) );
-          }
-          else if( op == "replace" ) {
-            value.at( path ) = std::move( entry.at( "value" ) );
-          }
-          else if( op == "move" ) {
-            const json_pointer from( entry.at( "from" ).get_string() );
-            auto v = std::move( value.at( from ) );
-            value.erase( from );
-            value.insert( path, std::move( v ) );
-          }
-          else if( op == "copy" ) {
-            const json_pointer from( entry.at( "from" ).get_string() );
-            value.insert( path, value.at( from ) );
-          }
-          else {
-            throw std::runtime_error( "unknown patch operation: '" + op + '\'' );
-          }
-        }
+         }
       }
 
       template< template< typename ... > class Traits >