couchbase 3.0.0-universal-darwin-19 → 3.0.1-universal-darwin-19

data/ext/third_party/json/include/tao/json/external/pegtl/internal/has_apply.hpp

@@ -4,21 +4,17 @@
 #ifndef TAO_JSON_PEGTL_INTERNAL_HAS_APPLY_HPP
 #define TAO_JSON_PEGTL_INTERNAL_HAS_APPLY_HPP
 
-#include <type_traits>
+#include <utility>
 
 #include "../config.hpp"
 
 namespace TAO_JSON_PEGTL_NAMESPACE::internal
 {
    template< typename, typename, template< typename... > class, typename... >
-   struct has_apply
-      : std::false_type
-   {};
+   inline constexpr bool has_apply = false;
 
    template< typename C, template< typename... > class Action, typename... S >
-   struct has_apply< C, decltype( C::template apply< Action >( std::declval< S >()... ) ), Action, S... >
-      : std::true_type
-   {};
+   inline constexpr bool has_apply< C, decltype( C::template apply< Action >( std::declval< S >()... ) ), Action, S... > = true;
 
 }  // namespace TAO_JSON_PEGTL_NAMESPACE::internal
 

data/ext/third_party/json/include/tao/json/external/pegtl/internal/has_apply0.hpp

@@ -4,21 +4,17 @@
 #ifndef TAO_JSON_PEGTL_INTERNAL_HAS_APPLY0_HPP
 #define TAO_JSON_PEGTL_INTERNAL_HAS_APPLY0_HPP
 
-#include <type_traits>
+#include <utility>
 
 #include "../config.hpp"
 
 namespace TAO_JSON_PEGTL_NAMESPACE::internal
 {
    template< typename, typename, template< typename... > class, typename... >
-   struct has_apply0
-      : std::false_type
-   {};
+   inline constexpr bool has_apply0 = false;
 
    template< typename C, template< typename... > class Action, typename... S >
-   struct has_apply0< C, decltype( C::template apply0< Action >( std::declval< S >()... ) ), Action, S... >
-      : std::true_type
-   {};
+   inline constexpr bool has_apply0< C, decltype( C::template apply0< Action >( std::declval< S >()... ) ), Action, S... > = true;
 
 }  // namespace TAO_JSON_PEGTL_NAMESPACE::internal
 

data/ext/third_party/json/include/tao/json/external/pegtl/internal/has_match.hpp

@@ -4,7 +4,6 @@
 #ifndef TAO_JSON_PEGTL_INTERNAL_HAS_MATCH_HPP
 #define TAO_JSON_PEGTL_INTERNAL_HAS_MATCH_HPP
 
-#include <type_traits>
 #include <utility>
 
 #include "../apply_mode.hpp"
@@ -21,11 +20,9 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
              class Action,
              template< typename... >
              class Control,
-             typename Input,
+             typename ParseInput,
              typename... States >
-   struct has_match
-      : std::false_type
-   {};
+   inline constexpr bool has_match = false;
 
    template< typename Rule,
              apply_mode A,
@@ -34,22 +31,9 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
              class Action,
              template< typename... >
              class Control,
-             typename Input,
+             typename ParseInput,
              typename... States >
-   struct has_match< decltype( (void)Action< Rule >::template match< Rule, A, M, Action, Control >( std::declval< Input& >(), std::declval< States&& >()... ), void() ), Rule, A, M, Action, Control, Input, States... >
-      : std::true_type
-   {};
-
-   template< typename Rule,
-             apply_mode A,
-             rewind_mode M,
-             template< typename... >
-             class Action,
-             template< typename... >
-             class Control,
-             typename Input,
-             typename... States >
-   inline constexpr bool has_match_v = has_match< void, Rule, A, M, Action, Control, Input, States... >::value;
+   inline constexpr bool has_match< decltype( (void)Action< Rule >::template match< Rule, A, M, Action, Control >( std::declval< ParseInput& >(), std::declval< States&& >()... ), bool() ), Rule, A, M, Action, Control, ParseInput, States... > = true;
 
 }  // namespace TAO_JSON_PEGTL_NAMESPACE::internal
 

data/ext/third_party/json/include/tao/json/external/pegtl/internal/has_unwind.hpp

@@ -0,0 +1,21 @@
+// Copyright (c) 2020 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/PEGTL/
+
+#ifndef TAO_JSON_PEGTL_INTERNAL_HAS_UNWIND_HPP
+#define TAO_JSON_PEGTL_INTERNAL_HAS_UNWIND_HPP
+
+#include <utility>
+
+#include "../config.hpp"
+
+namespace TAO_JSON_PEGTL_NAMESPACE::internal
+{
+   template< typename, typename... >
+   inline constexpr bool has_unwind = false;
+
+   template< typename C, typename... S >
+   inline constexpr bool has_unwind< C, decltype( C::unwind( std::declval< S >()... ) ), S... > = true;
+
+}  // namespace TAO_JSON_PEGTL_NAMESPACE::internal
+
+#endif

data/ext/third_party/json/include/tao/json/external/pegtl/internal/if_apply.hpp

@@ -7,18 +7,19 @@
 #include "../config.hpp"
 
 #include "apply_single.hpp"
-#include "skip_control.hpp"
+#include "enable_control.hpp"
 
-#include "../analysis/counted.hpp"
 #include "../apply_mode.hpp"
 #include "../rewind_mode.hpp"
+#include "../type_list.hpp"
 
 namespace TAO_JSON_PEGTL_NAMESPACE::internal
 {
    template< typename Rule, typename... Actions >
    struct if_apply
    {
-      using analyze_t = typename Rule::analyze_t;
+      using rule_t = if_apply;
+      using subs_t = type_list< Rule >;
 
       template< apply_mode A,
                 rewind_mode M,
@@ -26,12 +27,12 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
                 class Action,
                 template< typename... >
                 class Control,
-                typename Input,
+                typename ParseInput,
                 typename... States >
-      [[nodiscard]] static bool match( Input& in, States&&... st )
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
       {
          if constexpr( ( A == apply_mode::action ) && ( sizeof...( Actions ) != 0 ) ) {
-            using action_t = typename Input::action_t;
+            using action_t = typename ParseInput::action_t;
             auto m = in.template mark< rewind_mode::required >();
             if( Control< Rule >::template match< apply_mode::action, rewind_mode::active, Action, Control >( in, st... ) ) {
                const action_t i2( m.iterator(), in );
@@ -46,7 +47,7 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
    };
 
    template< typename Rule, typename... Actions >
-   inline constexpr bool skip_control< if_apply< Rule, Actions... > > = true;
+   inline constexpr bool enable_control< if_apply< Rule, Actions... > > = false;
 
 }  // namespace TAO_JSON_PEGTL_NAMESPACE::internal
 

data/ext/third_party/json/include/tao/json/external/pegtl/internal/if_must.hpp

@@ -6,21 +6,20 @@
 
 #include "../config.hpp"
 
+#include "enable_control.hpp"
 #include "must.hpp"
-#include "skip_control.hpp"
-#include "trivial.hpp"
 
 #include "../apply_mode.hpp"
 #include "../rewind_mode.hpp"
-
-#include "../analysis/counted.hpp"
+#include "../type_list.hpp"
 
 namespace TAO_JSON_PEGTL_NAMESPACE::internal
 {
    template< bool Default, typename Cond, typename... Rules >
    struct if_must
    {
-      using analyze_t = analysis::counted< analysis::rule_type::seq, Default ? 0 : 1, Cond, must< Rules... > >;
+      using rule_t = if_must;
+      using subs_t = type_list< Cond, must< Rules... > >;
 
       template< apply_mode A,
                 rewind_mode M,
@@ -28,12 +27,12 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
                 class Action,
                 template< typename... >
                 class Control,
-                typename Input,
+                typename ParseInput,
                 typename... States >
-      [[nodiscard]] static bool match( Input& in, States&&... st )
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
       {
          if( Control< Cond >::template match< A, M, Action, Control >( in, st... ) ) {
-            (void)( Control< must< Rules > >::template match< A, M, Action, Control >( in, st... ) && ... );
+            (void)Control< must< Rules... > >::template match< A, M, Action, Control >( in, st... );
             return true;
          }
          return Default;
@@ -41,7 +40,7 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
    };
 
    template< bool Default, typename Cond, typename... Rules >
-   inline constexpr bool skip_control< if_must< Default, Cond, Rules... > > = true;
+   inline constexpr bool enable_control< if_must< Default, Cond, Rules... > > = false;
 
 }  // namespace TAO_JSON_PEGTL_NAMESPACE::internal
 

data/ext/third_party/json/include/tao/json/external/pegtl/internal/if_must_else.hpp

@@ -9,6 +9,8 @@
 #include "if_then_else.hpp"
 #include "must.hpp"
 
+#include "../type_list.hpp"
+
 namespace TAO_JSON_PEGTL_NAMESPACE::internal
 {
    template< typename Cond, typename Then, typename Else >

data/ext/third_party/json/include/tao/json/external/pegtl/internal/if_then_else.hpp

@@ -6,22 +6,22 @@
 
 #include "../config.hpp"
 
+#include "enable_control.hpp"
 #include "not_at.hpp"
 #include "seq.hpp"
-#include "skip_control.hpp"
 #include "sor.hpp"
 
 #include "../apply_mode.hpp"
 #include "../rewind_mode.hpp"
-
-#include "../analysis/generic.hpp"
+#include "../type_list.hpp"
 
 namespace TAO_JSON_PEGTL_NAMESPACE::internal
 {
    template< typename Cond, typename Then, typename Else >
    struct if_then_else
    {
-      using analyze_t = analysis::generic< analysis::rule_type::sor, seq< Cond, Then >, seq< not_at< Cond >, Else > >;
+      using rule_t = if_then_else;
+      using subs_t = type_list< Cond, Then, Else >;
 
       template< apply_mode A,
                 rewind_mode M,
@@ -29,9 +29,9 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
                 class Action,
                 template< typename... >
                 class Control,
-                typename Input,
+                typename ParseInput,
                 typename... States >
-      [[nodiscard]] static bool match( Input& in, States&&... st )
+      [[nodiscard]] static bool match( ParseInput& in, States&&... st )
       {
          auto m = in.template mark< M >();
          using m_t = decltype( m );
@@ -44,7 +44,7 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
    };
 
    template< typename Cond, typename Then, typename Else >
-   inline constexpr bool skip_control< if_then_else< Cond, Then, Else > > = true;
+   inline constexpr bool enable_control< if_then_else< Cond, Then, Else > > = false;
 
 }  // namespace TAO_JSON_PEGTL_NAMESPACE::internal
 

data/ext/third_party/json/include/tao/json/external/pegtl/internal/istream_reader.hpp

@@ -15,8 +15,7 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
    {
       explicit istream_reader( std::istream& s ) noexcept
          : m_istream( s )
-      {
-      }
+      {}
 
       [[nodiscard]] std::size_t operator()( char* buffer, const std::size_t length )
       {

data/ext/third_party/json/include/tao/json/external/pegtl/internal/istring.hpp

@@ -9,11 +9,11 @@
 #include "../config.hpp"
 
 #include "bump_help.hpp"
+#include "enable_control.hpp"
 #include "result_on_found.hpp"
-#include "skip_control.hpp"
-#include "trivial.hpp"
+#include "success.hpp"
 
-#include "../analysis/counted.hpp"
+#include "../type_list.hpp"
 
 namespace TAO_JSON_PEGTL_NAMESPACE::internal
 {
@@ -42,21 +42,21 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
 
    template<>
    struct istring<>
-      : trivial< true >
-   {
-   };
+      : success
+   {};
 
    template< char... Cs >
    struct istring
    {
-      using analyze_t = analysis::counted< analysis::rule_type::any, sizeof...( Cs ) >;
+      using rule_t = istring;
+      using subs_t = empty_list;
 
-      template< typename Input >
-      [[nodiscard]] static bool match( Input& in ) noexcept( noexcept( in.size( 0 ) ) )
+      template< typename ParseInput >
+      [[nodiscard]] static bool match( ParseInput& in ) noexcept( noexcept( in.size( 0 ) ) )
       {
          if( in.size( sizeof...( Cs ) ) >= sizeof...( Cs ) ) {
             if( istring_equal< Cs... >( in.current() ) ) {
-               bump_help< result_on_found::success, Input, char, Cs... >( in, sizeof...( Cs ) );
+               bump_help< result_on_found::success, ParseInput, char, Cs... >( in, sizeof...( Cs ) );
                return true;
             }
          }
@@ -65,7 +65,7 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
    };
 
    template< char... Cs >
-   inline constexpr bool skip_control< istring< Cs... > > = true;
+   inline constexpr bool enable_control< istring< Cs... > > = false;
 
 }  // namespace TAO_JSON_PEGTL_NAMESPACE::internal
 

data/ext/third_party/json/include/tao/json/external/pegtl/internal/iterator.hpp

@@ -4,6 +4,7 @@
 #ifndef TAO_JSON_PEGTL_INTERNAL_ITERATOR_HPP
 #define TAO_JSON_PEGTL_INTERNAL_ITERATOR_HPP
 
+#include <cassert>
 #include <cstdlib>
 
 #include "../config.hpp"
@@ -16,15 +17,16 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
 
       explicit iterator( const char* in_data ) noexcept
          : data( in_data )
-      {
-      }
+      {}
 
-      iterator( const char* in_data, const std::size_t in_byte, const std::size_t in_line, const std::size_t in_byte_in_line ) noexcept
+      iterator( const char* in_data, const std::size_t in_byte, const std::size_t in_line, const std::size_t in_column ) noexcept
          : data( in_data ),
            byte( in_byte ),
            line( in_line ),
-           byte_in_line( in_byte_in_line )
+           column( in_column )
       {
+         assert( in_line != 0 );
+         assert( in_column != 0 );
       }
 
       iterator( const iterator& ) = default;
@@ -35,16 +37,11 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
       iterator& operator=( const iterator& ) = default;
       iterator& operator=( iterator&& ) = default;
 
-      void reset() noexcept
-      {
-         *this = iterator();
-      }
-
       const char* data = nullptr;
 
       std::size_t byte = 0;
       std::size_t line = 1;
-      std::size_t byte_in_line = 0;
+      std::size_t column = 1;
    };
 
 }  // namespace TAO_JSON_PEGTL_NAMESPACE::internal

data/ext/third_party/json/include/tao/json/external/pegtl/internal/lf_crlf_eol.hpp

@@ -13,8 +13,8 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
    {
       static constexpr int ch = '\n';
 
-      template< typename Input >
-      [[nodiscard]] static eol_pair match( Input& in ) noexcept( noexcept( in.size( 2 ) ) )
+      template< typename ParseInput >
+      [[nodiscard]] static eol_pair match( ParseInput& in ) noexcept( noexcept( in.size( 2 ) ) )
       {
          eol_pair p = { false, in.size( 2 ) };
          if( p.second ) {

data/ext/third_party/json/include/tao/json/external/pegtl/internal/lf_eol.hpp

@@ -13,8 +13,8 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
    {
       static constexpr int ch = '\n';
 
-      template< typename Input >
-      [[nodiscard]] static eol_pair match( Input& in ) noexcept( noexcept( in.size( 1 ) ) )
+      template< typename ParseInput >
+      [[nodiscard]] static eol_pair match( ParseInput& in ) noexcept( noexcept( in.size( 1 ) ) )
       {
          eol_pair p = { false, in.size( 1 ) };
          if( p.second ) {

data/ext/third_party/json/include/tao/json/external/pegtl/internal/list_tail.hpp

@@ -6,14 +6,16 @@
 
 #include "../config.hpp"
 
-#include "list.hpp"
 #include "opt.hpp"
 #include "seq.hpp"
+#include "star.hpp"
+
+#include "../type_list.hpp"
 
 namespace TAO_JSON_PEGTL_NAMESPACE::internal
 {
    template< typename Rule, typename Sep >
-   using list_tail = seq< list< Rule, Sep >, opt< Sep > >;
+   using list_tail = seq< Rule, star< Sep, Rule >, opt< Sep > >;
 
 }  // namespace TAO_JSON_PEGTL_NAMESPACE::internal
 

data/ext/third_party/json/include/tao/json/external/pegtl/internal/list_tail_pad.hpp

@@ -15,7 +15,7 @@
 namespace TAO_JSON_PEGTL_NAMESPACE::internal
 {
    template< typename Rule, typename Sep, typename Pad >
-   using list_tail_pad = seq< list< Rule, pad< Sep, Pad > >, opt< star< Pad >, Sep > >;
+   using list_tail_pad = seq< Rule, star< pad< Sep, Pad >, Rule >, opt< star< Pad >, Sep > >;
 
 }  // namespace TAO_JSON_PEGTL_NAMESPACE::internal
 

data/ext/third_party/json/include/tao/json/external/pegtl/internal/marker.hpp

@@ -16,8 +16,7 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
       static constexpr rewind_mode next_rewind_mode = M;
 
       explicit marker( const Iterator& /*unused*/ ) noexcept
-      {
-      }
+      {}
 
       marker( const marker& ) = delete;
       marker( marker&& ) = delete;
@@ -42,13 +41,12 @@ namespace TAO_JSON_PEGTL_NAMESPACE::internal
       explicit marker( Iterator& i ) noexcept
          : m_saved( i ),
            m_input( &i )
-      {
-      }
+      {}
 
       marker( const marker& ) = delete;
       marker( marker&& ) = delete;
 
-      ~marker() noexcept
+      ~marker()
       {
          if( m_input != nullptr ) {
             ( *m_input ) = m_saved;