Fixed typos, generalize

Author: d-frey

contrib/nlohmann/to_value.hh

@@ -9,23 +9,22 @@
 #include <cstdint>
 #include <utility>
 
-#include "json.hpp"
-
 namespace tao
 {
    namespace json
    {
       namespace nlohmann
       {
          // SAX consumer to build an nlohmann/json value
+         template< typename Value >
          class to_value
          {
          private:
-            std::vector< ::nlohmann::json > stack_;
+            std::vector< Value > stack_;
             std::vector< std::string > keys_;
 
          public:
-            ::nlohmann::json value;
+            Value value;
 
             void null()
             {
@@ -65,7 +64,7 @@ namespace tao
             // array
             void begin_array()
             {
-               stack_.push_back( ::nlohmann::json::array() );
+               stack_.push_back( Value::array() );
             }
 
             void element()
@@ -82,7 +81,7 @@ namespace tao
             // object
             void begin_object()
             {
-               stack_.push_back( ::nlohmann::json::object() );
+               stack_.push_back( Value::object() );
             }
 
             void key( const std::string & v )
@@ -97,7 +96,7 @@ namespace tao
 
             void member()
             {
-               stack_.back().push_back( ::nlohmann::json::object_t::value_type( std::move( keys_.back() ), std::move( value ) ) );
+               stack_.back().push_back( Value::object_t::value_type( std::move( keys_.back() ), std::move( value ) ) );
                keys_.pop_back();
             }
 

contrib/nlohmann/traverse_value.hh

@@ -1,63 +1,61 @@
 // Copyright (c) 2016 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
-#ifndef TAOCPP_JSON_INCLUDE_JSON_NLOHMANN_TO_VALUE_HH
-#define TAOCPP_JSON_INCLUDE_JSON_NLOHMANN_TO_VALUE_HH
+#ifndef TAOCPP_JSON_INCLUDE_JSON_NLOHMANN_TRAVERSE_VALUE_HH
+#define TAOCPP_JSON_INCLUDE_JSON_NLOHMANN_TRAVERSE_VALUE_HH
 
 #include <cstdint>
 #include <string>
 #include <stdexcept>
 
-#include "json.hpp"
-
 namespace tao
 {
    namespace json
    {
       namespace nlohmann
       {
          // SAX producer for an nlohmann/json value
-         template< typename Handler >
-         void traverse_nlohmann( const nlohmann::json & v, Handler & handler )
+         template< typename Value, typename Handler >
+         void traverse_value( const Value & v, Handler & handler )
          {
             switch( v.type() ) {
-               case nlohmann::json::value_t::null:
+               case Value::value_t::null:
                   handler.null();
                   break;
-               case nlohmann::json::value_t::boolean:
+               case Value::value_t::boolean:
                   handler.boolean( v.get< bool >() );
                   break;
-               case nlohmann::json::value_t::number_integer:
+               case Value::value_t::number_integer:
                   handler.number( v.get< std::int64_t >() );
                   break;
-               case nlohmann::json::value_t::number_unsigned:
+               case Value::value_t::number_unsigned:
                   handler.number( v.get< std::uint64_t >() );
                   break;
-               case nlohmann::json::value_t::number_float:
+               case Value::value_t::number_float:
                   handler.number( v.get< double >() );
                   break;
-               case nlohmann::json::value_t::string:
+               case Value::value_t::string:
                   handler.string( v.get_ref< const std::string & >() );
                   break;
-               case nlohmann::json::value_t::array:
+               case Value::value_t::array:
                   handler.begin_array();
                   for( const auto & e : v ) {
-                     traverse_nlohmann( e, handler );
+                     tao::json::nlohmann::traverse_value( e, handler );
                      handler.element();
                   }
                   handler.end_array();
                   break;
-               case nlohmann::json::value_t::object:
+               case Value::value_t::object:
                   handler.begin_object();
-                  for( nlohmann::json::const_iterator it = v.begin(); it != v.end(); ++it ) {
+                  for( Value::const_iterator it = v.begin(); it != v.end(); ++it ) {
                      handler.key( it.key() );
-                     traverse_nlohmann( it.value(), handler );
+                     tao::json::nlohmann::traverse_value( it.value(), handler );
                      handler.member();
                   }
                   handler.end_object();
                   break;
                default:
-                  throw std::logic_error( "invalid value for nohmann::json::type()" );  // LCOV_EXCL_LINE
+                  throw std::logic_error( "invalid value for type()" );  // LCOV_EXCL_LINE
             }
          }