Rename files, classes

Author: d-frey

include/tao/json/from_string.hh

@@ -9,8 +9,8 @@
 #include "internal/value_builder.hh"
 
 #include "internal/grammar.hh"
-#include "internal/sax_action.hh"
-#include "internal/sax_control.hh"
+#include "internal/action.hh"
+#include "internal/control.hh"
 
 namespace tao
 {
@@ -21,7 +21,7 @@ namespace tao
       {
          internal::value_builder< Traits > handler;
          tao_json_pegtl::input input( line, column, data, data + size, source ? source : __PRETTY_FUNCTION__ );
-         tao_json_pegtl::parse_input< internal::grammar, internal::sax_action, internal::sax_control >( input, handler );
+         tao_json_pegtl::parse_input< internal::grammar, internal::action, internal::control >( input, handler );
          return std::move( handler.value );
       }
 

include/tao/json/internal/sax_action.hh include/tao/json/internal/action.hhinclude/tao/json/internal/sax_action.hh renamed to include/tao/json/internal/action.hh

@@ -1,15 +1,15 @@
 // 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_INTERNAL_SAX_ACTION_HH
-#define TAOCPP_JSON_INCLUDE_INTERNAL_SAX_ACTION_HH
+#ifndef TAOCPP_JSON_INCLUDE_INTERNAL_ACTION_HH
+#define TAOCPP_JSON_INCLUDE_INTERNAL_ACTION_HH
 
 #include "../external/pegtl/contrib/changes.hh"
 
 #include "errors.hh"
 #include "grammar.hh"
 
-#include "sax_number_state.hh"
+#include "number_state.hh"
 
 namespace tao
 {
@@ -18,10 +18,10 @@ namespace tao
       namespace internal
       {
          template < typename Rule >
-         struct sax_action : tao_json_pegtl::nothing< Rule > {};
+         struct action : tao_json_pegtl::nothing< Rule > {};
 
          template<>
-         struct sax_action< rules::null >
+         struct action< rules::null >
          {
             template< typename State >
             static void apply( const tao_json_pegtl::input &, State & handler )
@@ -31,7 +31,7 @@ namespace tao
          };
 
          template<>
-         struct sax_action< rules::true_ >
+         struct action< rules::true_ >
          {
             template< typename State >
             static void apply( const tao_json_pegtl::input &, State & handler )
@@ -41,7 +41,7 @@ namespace tao
          };
 
          template<>
-         struct sax_action< rules::false_ >
+         struct action< rules::false_ >
          {
             template< typename State >
             static void apply( const tao_json_pegtl::input &, State & handler )
@@ -51,7 +51,7 @@ namespace tao
          };
 
          template<>
-         struct sax_action< rules::array::begin >
+         struct action< rules::array::begin >
          {
             template< typename State >
             static void apply( const tao_json_pegtl::input &, State & handler )
@@ -61,7 +61,7 @@ namespace tao
          };
 
          template<>
-         struct sax_action< rules::array::element >
+         struct action< rules::array::element >
          {
             template< typename State >
             static void apply( const tao_json_pegtl::input &, State & handler )
@@ -71,7 +71,7 @@ namespace tao
          };
 
          template<>
-         struct sax_action< rules::array::end >
+         struct action< rules::array::end >
          {
             template< typename State >
             static void apply( const tao_json_pegtl::input &, State & handler )
@@ -81,7 +81,7 @@ namespace tao
          };
 
          template<>
-         struct sax_action< rules::object::begin >
+         struct action< rules::object::begin >
          {
             template< typename State >
             static void apply( const tao_json_pegtl::input &, State & handler )
@@ -91,7 +91,7 @@ namespace tao
          };
 
          template<>
-         struct sax_action< rules::object::element >
+         struct action< rules::object::element >
          {
             template< typename State >
             static void apply( const tao_json_pegtl::input &, State & handler )
@@ -101,7 +101,7 @@ namespace tao
          };
 
          template<>
-         struct sax_action< rules::object::end >
+         struct action< rules::object::end >
          {
             template< typename State >
             static void apply( const tao_json_pegtl::input &, State & handler )
@@ -111,27 +111,27 @@ namespace tao
          };
 
          template<>
-         struct sax_action< rules::msign >
+         struct action< rules::msign >
          {
-            static void apply( const tao_json_pegtl::input &, sax_number_state & result )
+            static void apply( const tao_json_pegtl::input &, number_state & result )
             {
                result.mneg = true;
             }
          };
 
          template<>
-         struct sax_action< rules::esign >
+         struct action< rules::esign >
          {
-            static void apply( const tao_json_pegtl::input & in, sax_number_state & result )
+            static void apply( const tao_json_pegtl::input & in, number_state & result )
             {
                result.eneg = ( in.peek_char() == '-' );
             }
          };
 
          template<>
-         struct sax_action< rules::idigits >
+         struct action< rules::idigits >
          {
-            static void apply( const tao_json_pegtl::input & in, sax_number_state & result )
+            static void apply( const tao_json_pegtl::input & in, number_state & result )
             {
                if ( in.size() > ( 1 << 20 ) ) {
                   throw tao_json_pegtl::parse_error( "JSON number with 1 megabyte digits", in );
@@ -151,9 +151,9 @@ namespace tao
          };
 
          template<>
-         struct sax_action< rules::fdigits >
+         struct action< rules::fdigits >
          {
-            static void apply( const tao_json_pegtl::input & in, sax_number_state & result )
+            static void apply( const tao_json_pegtl::input & in, number_state & result )
             {
                result.isfp = true;
 
@@ -184,9 +184,9 @@ namespace tao
          };
 
          template<>
-         struct sax_action< rules::edigits >
+         struct action< rules::edigits >
          {
-            static void apply( const tao_json_pegtl::input & in, sax_number_state & result )
+            static void apply( const tao_json_pegtl::input & in, number_state & result )
             {
                result.isfp = true;
 

include/tao/json/internal/control.hh

@@ -0,0 +1,41 @@
+// 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_INTERNAL_CONTROL_HH
+#define TAOCPP_JSON_INCLUDE_INTERNAL_CONTROL_HH
+
+#include "../external/pegtl/contrib/changes.hh"
+
+#include "errors.hh"
+
+#include "unescape_action.hh"
+
+#include "number_state.hh"
+#include "string_state.hh"
+#include "key_state.hh"
+
+namespace tao
+{
+   namespace json
+   {
+      namespace internal
+      {
+         template< typename Rule >
+         struct control : errors< Rule > {};
+
+         template<>
+         struct control< rules::number > : tao_json_pegtl::change_state< rules::number, number_state, tao_json_pegtl::normal > {};
+
+         template<>
+         struct control< rules::string::content > : tao_json_pegtl::change_state_and_action< rules::string::content, string_state, unescape_action, tao_json_pegtl::normal > {};
+
+         template<>
+         struct control< rules::key::content > : tao_json_pegtl::change_state_and_action< rules::key::content, key_state, unescape_action, tao_json_pegtl::normal > {};
+
+      } // internal
+
+   } // json
+
+} // tao
+
+#endif

…clude/tao/json/internal/sax_key_state.hh include/tao/json/internal/key_state.hhinclude/tao/json/internal/sax_key_state.hh renamed to include/tao/json/internal/key_state.hh include/tao/json/internal/sax_key_state.hh renamed to include/tao/json/internal/key_state.hh

@@ -1,8 +1,8 @@
 // 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_INTERNAL_SAX_KEY_STATE_HH
-#define TAOCPP_JSON_INCLUDE_INTERNAL_SAX_KEY_STATE_HH
+#ifndef TAOCPP_JSON_INCLUDE_INTERNAL_KEY_STATE_HH
+#define TAOCPP_JSON_INCLUDE_INTERNAL_KEY_STATE_HH
 
 #include <string>
 #include <utility>
@@ -13,11 +13,11 @@ namespace tao
    {
       namespace internal
       {
-         struct sax_key_state
+         struct key_state
          {
-            sax_key_state() = default;
-            sax_key_state( const sax_key_state & ) = delete;
-            void operator= ( const sax_key_state & ) = delete;
+            key_state() = default;
+            key_state( const key_state & ) = delete;
+            void operator= ( const key_state & ) = delete;
 
             template< typename Handler >
             void success( Handler & handler )

…de/tao/json/internal/sax_number_state.hh include/tao/json/internal/number_state.hhinclude/tao/json/internal/sax_number_state.hh renamed to include/tao/json/internal/number_state.hh include/tao/json/internal/sax_number_state.hh renamed to include/tao/json/internal/number_state.hh

@@ -1,8 +1,8 @@
 // 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_INTERNAL_SAX_NUMBER_STATE_HH
-#define TAOCPP_JSON_INCLUDE_INTERNAL_SAX_NUMBER_STATE_HH
+#ifndef TAOCPP_JSON_INCLUDE_INTERNAL_NUMBER_STATE_HH
+#define TAOCPP_JSON_INCLUDE_INTERNAL_NUMBER_STATE_HH
 
 #include <cstdint>
 #include <cstdlib>
@@ -18,15 +18,15 @@ namespace tao
       {
          static const std::size_t max_mantissa_digits = 772;
 
-         struct sax_number_state
+         struct number_state
          {
-            sax_number_state()
+            number_state()
             {
                mantissa[ 0 ] = '-';
             }
 
-            sax_number_state( const sax_number_state & ) = delete;
-            void operator= ( const sax_number_state & ) = delete;
+            number_state( const number_state & ) = delete;
+            void operator= ( const number_state & ) = delete;
 
             int32_t exponent10 = 0;
             uint16_t msize = 0;  // Excluding sign.

include/tao/json/internal/sax_control.hh

@@ -1,8 +1,8 @@
 // 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_INTERNAL_SAX_STRING_STATE_HH
-#define TAOCPP_JSON_INCLUDE_INTERNAL_SAX_STRING_STATE_HH
+#ifndef TAOCPP_JSON_INCLUDE_INTERNAL_STRING_STATE_HH
+#define TAOCPP_JSON_INCLUDE_INTERNAL_STRING_STATE_HH
 
 #include <string>
 #include <utility>
@@ -13,11 +13,11 @@ namespace tao
    {
       namespace internal
       {
-         struct sax_string_state
+         struct string_state
          {
-            sax_string_state() = default;
-            sax_string_state( const sax_string_state & ) = delete;
-            void operator= ( const sax_string_state & ) = delete;
+            string_state() = default;
+            string_state( const string_state & ) = delete;
+            void operator= ( const string_state & ) = delete;
 
             template< typename Handler >
             void success( Handler & handler )

…de/tao/json/internal/sax_string_state.hh include/tao/json/internal/string_state.hhinclude/tao/json/internal/sax_string_state.hh renamed to include/tao/json/internal/string_state.hh include/tao/json/internal/sax_string_state.hh renamed to include/tao/json/internal/string_state.hh

@@ -9,8 +9,8 @@
 #include "internal/value_builder.hh"
 
 #include "internal/grammar.hh"
-#include "internal/sax_action.hh"
-#include "internal/sax_control.hh"
+#include "internal/action.hh"
+#include "internal/control.hh"
 
 namespace tao
 {
@@ -20,7 +20,7 @@ namespace tao
       basic_value< Traits > parse_file( const std::string & filename )
       {
          internal::value_builder< Traits > handler;
-         tao_json_pegtl::file_parser( filename ).parse< internal::grammar, internal::sax_action, internal::sax_control >( handler );
+         tao_json_pegtl::file_parser( filename ).parse< internal::grammar, internal::action, internal::control >( handler );
          return std::move( handler.value );
       }