Update PEGTL to final 2.0.0

Author: d-frey

include/tao/json/external/pegtl.hpp

@@ -5,6 +5,7 @@
 #define TAOCPP_JSON_PEGTL_INCLUDE_PEGTL_HPP
 
 #include "pegtl/config.hpp"
+#include "pegtl/version.hpp"
 
 #include "pegtl/ascii.hpp"
 #include "pegtl/parse.hpp"
@@ -13,21 +14,18 @@
 #include "pegtl/utf32.hpp"
 #include "pegtl/utf8.hpp"
 
-#include "pegtl/parse.hpp"
-
+#include "pegtl/argv_input.hpp"
 #include "pegtl/buffer_input.hpp"
+#include "pegtl/cstream_input.hpp"
 #include "pegtl/file_input.hpp"
+#include "pegtl/istream_input.hpp"
 #include "pegtl/memory_input.hpp"
 #include "pegtl/read_input.hpp"
-#include "pegtl/stream_input.hpp"
 #include "pegtl/string_input.hpp"
 
-// The following files can be included whenever needed; they
-// are not included by default because they include a stream header
-// like <iostream> or <sstream>.
+// The following are not included by
+// default because they include <iostream>.
 
-// #include "pegtl/argv_input.hpp"
 // #include "pegtl/analyze.hpp"
-// #include "pegtl/tracer.hpp"
 
 #endif

include/tao/json/external/pegtl/analyze.hpp

@@ -4,9 +4,10 @@
 #ifndef TAOCPP_JSON_PEGTL_INCLUDE_ANALYZE_HPP
 #define TAOCPP_JSON_PEGTL_INCLUDE_ANALYZE_HPP
 
-#include "analysis/analyze_cycles.hpp"
 #include "config.hpp"
 
+#include "analysis/analyze_cycles.hpp"
+
 namespace tao
 {
    namespace TAOCPP_JSON_PEGTL_NAMESPACE

include/tao/json/external/pegtl/argv_input.hpp

@@ -29,7 +29,7 @@ namespace tao
 
       }  // namespace internal
 
-      template< tracking_mode P = tracking_mode::IMMEDIATE, typename Eol = lf_crlf_eol >
+      template< tracking_mode P = tracking_mode::IMMEDIATE, typename Eol = eol::lf_crlf >
       struct argv_input
          : public memory_input< P, Eol >
       {

include/tao/json/external/pegtl/ascii.hpp

@@ -5,6 +5,8 @@
 #define TAOCPP_JSON_PEGTL_INCLUDE_ASCII_HPP
 
 #include "config.hpp"
+#include "eol.hpp"
+
 #include "internal/result_on_found.hpp"
 #include "internal/rules.hpp"
 
@@ -20,7 +22,6 @@ namespace tao
          struct any : internal::any< internal::peek_char > {};
          struct blank : internal::one< internal::result_on_found::SUCCESS, internal::peek_char, ' ', '\t' > {};
          struct digit : internal::range< internal::result_on_found::SUCCESS, internal::peek_char, '0', '9' > {};
-         struct eol : internal::eol {};
          struct eolf : internal::eolf {};
          struct identifier_first : internal::identifier_first {};
          struct identifier_other : internal::identifier_other {};

include/tao/json/external/pegtl/buffer_input.hpp

@@ -24,7 +24,7 @@ namespace tao
 {
    namespace TAOCPP_JSON_PEGTL_NAMESPACE
    {
-      template< typename Reader, typename Eol = lf_crlf_eol, typename Source = std::string >
+      template< typename Reader, typename Eol = eol::lf_crlf, typename Source = std::string >
       class buffer_input
       {
       public:
@@ -36,17 +36,16 @@ namespace tao
 
          using iterator_t = internal::iterator;
 
-         using memory_t = memory_input< tracking_mode::IMMEDIATE, Eol, Source >;
-         using action_t = internal::action_input< buffer_input, tracking_mode::IMMEDIATE >;
+         using action_t = internal::action_input< buffer_input >;
 
-         template< typename... As >
-         buffer_input( Source in_source, const std::size_t maximum, As&&... as )
+         template< typename T, typename... As >
+         buffer_input( T&& in_source, const std::size_t maximum, As&&... as )
             : m_reader( std::forward< As >( as )... ),
               m_maximum( maximum ),
               m_buffer( new char[ maximum ] ),
-              m_current( { 0, 1, 0, m_buffer.get() } ),
+              m_current( m_buffer.get() ),
               m_end( m_buffer.get() ),
-              m_source( std::move( in_source ) )
+              m_source( std::forward< T >( in_source ) )
          {
          }
 
@@ -149,12 +148,12 @@ namespace tao
             return internal::marker< iterator_t, M >( m_current );
          }
 
-         TAOCPP_JSON_PEGTL_NAMESPACE::position position( const iterator_t& it ) const noexcept
+         TAOCPP_JSON_PEGTL_NAMESPACE::position position( const iterator_t& it ) const
          {
             return TAOCPP_JSON_PEGTL_NAMESPACE::position( it, m_source );
          }
 
-         TAOCPP_JSON_PEGTL_NAMESPACE::position position() const noexcept
+         TAOCPP_JSON_PEGTL_NAMESPACE::position position() const
          {
             return position( m_current );
          }

include/tao/json/external/pegtl/config.hpp

@@ -4,10 +4,12 @@
 #ifndef TAOCPP_JSON_PEGTL_INCLUDE_CONFIG_HPP
 #define TAOCPP_JSON_PEGTL_INCLUDE_CONFIG_HPP
 
-#include "version.hpp"
-
 #ifndef TAOCPP_JSON_PEGTL_NAMESPACE
 #define TAOCPP_JSON_PEGTL_NAMESPACE json_pegtl
 #endif
 
+// Enable some improvements to the readability of
+// demangled type names under some circumstances.
+// #define TAOCPP_JSON_PEGTL_PRETTY_DEMANGLE
+
 #endif

include/tao/json/external/pegtl/contrib/http.hpp

@@ -21,7 +21,7 @@ namespace tao
 
          // This grammar is a direct PEG translation of the original HTTP grammar.
          // It should be considered experimental -- in case of any issues, in particular
-         // missing anchor rules for actions, please contact the developers.
+         // missing rules for attached actions, please contact the developers.
 
          using namespace abnf;
 

include/tao/json/external/pegtl/contrib/uri.hpp

@@ -21,7 +21,7 @@ namespace tao
 
          // This grammar is a direct PEG translation of the original URI grammar.
          // It should be considered experimental -- in case of any issues, in particular
-         // missing anchor rules for actions, please contact the developers.
+         // missing rules for attached actions, please contact the developers.
 
          // Note that this grammar has multiple top-level rules.