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

data/ext/third_party/json/include/tao/json/jaxn/internal/integer.hpp

@@ -118,7 +118,7 @@ namespace tao::json::jaxn::internal::integer
       return convert_hex_positive< Signed >( result, std::string_view( input.data() + offset, input.size() - offset ) );
    }
 
-   using unsigned_dec_action = pegtl::integer::unsigned_action;
+   using unsigned_dec_action = pegtl::unsigned_action;
 
    struct unsigned_hex_action
    {
@@ -138,14 +138,12 @@ namespace tao::json::jaxn::internal::integer
    template< typename Rule >
    struct unsigned_action_action
       : pegtl::nothing< Rule >
-   {
-   };
+   {};
 
    template<>
    struct unsigned_action_action< pegtl::plus< pegtl::digit > >
       : unsigned_dec_action
-   {
-   };
+   {};
 
    template<>
    struct unsigned_action_action< pegtl::plus< pegtl::xdigit > >
@@ -161,7 +159,8 @@ namespace tao::json::jaxn::internal::integer
 
    struct unsigned_rule_with_action
    {
-      using analyze_t = unsigned_rule::analyze_t;
+      using rule_t = unsigned_rule_with_action;
+      using subs_t = pegtl::empty_list;
 
       template< pegtl::apply_mode,
                 pegtl::rewind_mode,
@@ -176,7 +175,7 @@ namespace tao::json::jaxn::internal::integer
       }
    };
 
-   using signed_dec_action = pegtl::integer::signed_action;
+   using signed_dec_action = pegtl::signed_action;
 
    struct signed_hex_action
    {
@@ -196,8 +195,7 @@ namespace tao::json::jaxn::internal::integer
    template< typename Rule >
    struct signed_action_action
       : pegtl::nothing< Rule >
-   {
-   };
+   {};
 
    template<>
    struct signed_action_action< pegtl::one< '-', '+' > >
@@ -215,7 +213,7 @@ namespace tao::json::jaxn::internal::integer
       template< typename Input, typename Signed >
       static void apply( const Input& in, const bool negative, Signed& st )
       {
-         if( !( negative ? pegtl::integer::internal::convert_negative< Signed >( st, in.string_view() ) : pegtl::integer::internal::convert_positive< Signed >( st, in.string_view() ) ) ) {
+         if( !( negative ? pegtl::internal::convert_negative< Signed >( st, in.string_view() ) : pegtl::internal::convert_positive< Signed >( st, in.string_view() ) ) ) {
             throw pegtl::parse_error( "signed dec integer overflow", in );
          }
       }
@@ -235,7 +233,8 @@ namespace tao::json::jaxn::internal::integer
 
    struct signed_rule_with_action
    {
-      using analyze_t = signed_rule::analyze_t;
+      using rule_t = signed_rule_with_action;
+      using subs_t = pegtl::empty_list;
 
       template< pegtl::apply_mode,
                 pegtl::rewind_mode,

data/ext/third_party/json/include/tao/json/jaxn/is_identifier.hpp

@@ -11,11 +11,11 @@ namespace tao::json::jaxn
 {
    [[nodiscard]] inline bool is_identifier( const std::string_view v ) noexcept
    {
-      if( v.empty() || std::isdigit( v[ 0 ] ) ) {
+      if( v.empty() || ( std::isdigit( v[ 0 ] ) != 0 ) ) {
          return false;
       }
       for( const auto c : v ) {
-         if( !std::isalnum( c ) && c != '_' ) {
+         if( ( std::isalnum( c ) == 0 ) && ( c != '_' ) ) {
             return false;
          }
       }

data/ext/third_party/json/include/tao/json/jaxn/parts_parser.hpp

@@ -20,8 +20,6 @@ namespace tao::json::jaxn
       {
          struct double_rule
          {
-            using analyze_t = pegtl::analysis::generic< pegtl::analysis::rule_type::any >;
-
             template< apply_mode A,
                       rewind_mode M,
                       template< typename... >
@@ -106,7 +104,7 @@ namespace tao::json::jaxn
 
       [[nodiscard]] bool null()
       {
-         return pegtl::parse< pegtl::seq< json::internal::rules::null, json::internal::rules::wss > >( m_input );
+         return pegtl::parse< pegtl::seq< json::internal::rules::kw_null, json::internal::rules::wss > >( m_input );
       }
 
       [[nodiscard]] bool boolean()

data/ext/third_party/json/include/tao/json/message_extension.hpp

@@ -25,7 +25,7 @@ namespace tao::json
    };
 
    template< typename T >
-   struct message_extension< T, decltype( std::declval< const T& >().public_base().append_message_extension( std::declval< std::ostream& >() ), void() ) >
+   struct message_extension< T, decltype( (void)std::declval< const T& >().public_base().append_message_extension( std::declval< std::ostream& >() ) ) >
    {
       const T& m_v;
 
@@ -42,7 +42,7 @@ namespace tao::json
    };
 
    template< typename T >
-   message_extension( const T& )->message_extension< T >;
+   message_extension( const T& ) -> message_extension< T >;
 
 }  // namespace tao::json
 

data/ext/third_party/json/include/tao/json/msgpack.hpp

@@ -8,6 +8,7 @@
 
 #include "msgpack/consume_file.hpp"
 #include "msgpack/consume_string.hpp"
+#include "msgpack/from_binary.hpp"
 #include "msgpack/from_file.hpp"
 #include "msgpack/from_input.hpp"
 #include "msgpack/from_string.hpp"

data/ext/third_party/json/include/tao/json/msgpack/consume_file.hpp

@@ -4,7 +4,7 @@
 #ifndef TAO_JSON_MSGPACK_CONSUME_FILE_HPP
 #define TAO_JSON_MSGPACK_CONSUME_FILE_HPP
 
-#include <utility>
+#include <filesystem>
 
 #include "../external/pegtl/file_input.hpp"
 
@@ -15,17 +15,17 @@
 
 namespace tao::json::msgpack
 {
-   template< typename T, template< typename... > class Traits = traits, typename F >
-   [[nodiscard]] T consume_file( F&& filename )
+   template< typename T, template< typename... > class Traits = traits >
+   [[nodiscard]] T consume_file( const std::filesystem::path& path )
    {
-      msgpack::basic_parts_parser< utf8_mode::check, pegtl::file_input< pegtl::tracking_mode::lazy > > pp( std::forward< F >( filename ) );
+      msgpack::basic_parts_parser< utf8_mode::check, pegtl::file_input< pegtl::tracking_mode::lazy > > pp( path );
       return json::consume< T, Traits >( pp );
    }
 
-   template< template< typename... > class Traits = traits, typename F, typename T >
-   void consume_file( F&& filename, T& t )
+   template< template< typename... > class Traits = traits, typename T >
+   void consume_file( const std::filesystem::path& path, T& t )
    {
-      msgpack::basic_parts_parser< utf8_mode::check, pegtl::file_input< pegtl::tracking_mode::lazy > > pp( std::forward< F >( filename ) );
+      msgpack::basic_parts_parser< utf8_mode::check, pegtl::file_input< pegtl::tracking_mode::lazy > > pp( path );
       json::consume< Traits >( pp, t );
    }
 

data/ext/third_party/json/include/tao/json/msgpack/events/from_binary.hpp

@@ -0,0 +1,43 @@
+// Copyright (c) 2020 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/json/
+
+#ifndef TAO_JSON_MSGPACK_EVENTS_FROM_BINARY_HPP
+#define TAO_JSON_MSGPACK_EVENTS_FROM_BINARY_HPP
+
+#include "../../binary.hpp"
+#include "../../binary_view.hpp"
+#include "../../external/pegtl/memory_input.hpp"
+
+#include "from_input.hpp"
+
+namespace tao::json::msgpack::events
+{
+   template< typename Consumer >
+   void from_binary( Consumer& consumer, const void* data, const std::size_t size, const char* source = nullptr, const std::size_t byte = 0, const std::size_t line = 1, const std::size_t column = 1 )
+   {
+      const char* cast = static_cast< const char* >( data );
+      pegtl::memory_input< pegtl::tracking_mode::lazy, pegtl::eol::lf_crlf, const char* > in( cast, cast + size, source ? source : "tao::json::msgpack::events::from_binary", byte, line, column );
+      msgpack::events::from_input( consumer, std::move( in ) );
+   }
+
+   template< typename Consumer >
+   void from_binary( Consumer& consumer, const void* data, const std::size_t size, const std::string& source, const std::size_t byte = 0, const std::size_t line = 1, const std::size_t column = 1 )
+   {
+      msgpack::events::from_binary( consumer, data, size, source.c_str(), byte, line, column );
+   }
+
+   template< typename Consumer, typename... Ts >
+   void from_binary( Consumer& consumer, const tao::binary& data, Ts&&... ts )
+   {
+      msgpack::events::from_binary( consumer, data.data(), data.size(), std::forward< Ts >( ts )... );
+   }
+
+   template< typename Consumer, typename... Ts >
+   void from_binary( Consumer& consumer, const tao::binary_view data, Ts&&... ts )
+   {
+      msgpack::events::from_binary( consumer, data.data(), data.size(), std::forward< Ts >( ts )... );
+   }
+
+}  // namespace tao::json::msgpack::events
+
+#endif

data/ext/third_party/json/include/tao/json/msgpack/events/from_file.hpp

@@ -4,7 +4,7 @@
 #ifndef TAO_JSON_MSGPACK_EVENTS_FROM_FILE_HPP
 #define TAO_JSON_MSGPACK_EVENTS_FROM_FILE_HPP
 
-#include <utility>
+#include <filesystem>
 
 #include "../../external/pegtl/file_input.hpp"
 #include "../../external/pegtl/parse.hpp"
@@ -15,10 +15,10 @@ namespace tao::json::msgpack::events
 {
    // Events producer to parse a file containing a MSGPACK string representation.
 
-   template< typename T, typename Consumer >
-   void from_file( Consumer& consumer, T&& filename )
+   template< typename Consumer >
+   void from_file( Consumer& consumer, const std::filesystem::path& path )
    {
-      pegtl::file_input< pegtl::tracking_mode::lazy > in( std::forward< T >( filename ) );
+      pegtl::file_input< pegtl::tracking_mode::lazy > in( path );
       pegtl::parse< internal::grammar >( in, consumer );
    }
 

data/ext/third_party/json/include/tao/json/msgpack/events/from_string.hpp

@@ -14,16 +14,16 @@
 namespace tao::json::msgpack::events
 {
    template< typename Consumer >
-   void from_string( Consumer& consumer, const char* data, const std::size_t size, const char* source = nullptr, const std::size_t byte = 0, const std::size_t line = 1, const std::size_t byte_in_line = 0 )
+   void from_string( Consumer& consumer, const char* data, const std::size_t size, const char* source = nullptr, const std::size_t byte = 0, const std::size_t line = 1, const std::size_t column = 1 )
    {
-      pegtl::memory_input< pegtl::tracking_mode::lazy, pegtl::eol::lf_crlf, const char* > in( data, data + size, source ? source : "tao::json::msgpack::from_string", byte, line, byte_in_line );
+      pegtl::memory_input< pegtl::tracking_mode::lazy, pegtl::eol::lf_crlf, const char* > in( data, data + size, source ? source : "tao::json::msgpack::from_string", byte, line, column );
       msgpack::events::from_input( consumer, std::move( in ) );
    }
 
    template< typename Consumer >
-   void from_string( Consumer& consumer, const char* data, const std::size_t size, const std::string& source, const std::size_t byte = 0, const std::size_t line = 1, const std::size_t byte_in_line = 0 )
+   void from_string( Consumer& consumer, const char* data, const std::size_t size, const std::string& source, const std::size_t byte = 0, const std::size_t line = 1, const std::size_t column = 1 )
    {
-      msgpack::events::from_string( consumer, data, size, source.c_str(), byte, line, byte_in_line );
+      msgpack::events::from_string( consumer, data, size, source.c_str(), byte, line, column );
    }
 
    template< typename Consumer, typename... Ts >

data/ext/third_party/json/include/tao/json/msgpack/events/to_stream.hpp

@@ -135,7 +135,7 @@ namespace tao::json::msgpack::events
          os.write( reinterpret_cast< const char* >( v.data() ), v.size() );
       }
 
-      void begin_array()
+      void begin_array()  // NOLINT(readability-convert-member-functions-to-static)
       {
          throw std::runtime_error( "msgpack requires array size" );
       }
@@ -159,7 +159,7 @@ namespace tao::json::msgpack::events
       void element() noexcept
       {}
 
-      void end_array()
+      void end_array()  // NOLINT(readability-convert-member-functions-to-static)
       {
          assert( false );  // LCOV_EXCL_LINE
       }
@@ -167,7 +167,7 @@ namespace tao::json::msgpack::events
       void end_array( const std::size_t /*unused*/ ) noexcept
       {}
 
-      void begin_object()
+      void begin_object()  // NOLINT(readability-convert-member-functions-to-static)
       {
          throw std::runtime_error( "msgpack requires object size" );
       }
@@ -196,7 +196,7 @@ namespace tao::json::msgpack::events
       void member() noexcept
       {}
 
-      void end_object()
+      void end_object()  // NOLINT(readability-convert-member-functions-to-static)
       {
          assert( false );  // LCOV_EXCL_LINE
       }

data/ext/third_party/json/include/tao/json/msgpack/from_binary.hpp

@@ -0,0 +1,32 @@
+// Copyright (c) 2020 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/json/
+
+#ifndef TAO_JSON_MSGPACK_FROM_BINARY_HPP
+#define TAO_JSON_MSGPACK_FROM_BINARY_HPP
+
+#include <utility>
+
+#include "../events/to_value.hpp"
+#include "../events/transformer.hpp"
+
+#include "events/from_binary.hpp"
+
+namespace tao::json::msgpack
+{
+   template< template< typename... > class Traits, template< typename... > class... Transformers, typename... Ts >
+   [[nodiscard]] basic_value< Traits > basic_from_binary( Ts&&... ts )
+   {
+      json::events::transformer< json::events::to_basic_value< Traits >, Transformers... > consumer;
+      events::from_binary( consumer, std::forward< Ts >( ts )... );
+      return std::move( consumer.value );
+   }
+
+   template< template< typename... > class... Transformers, typename... Ts >
+   [[nodiscard]] value from_binary( Ts&&... ts )
+   {
+      return basic_from_binary< traits, Transformers... >( std::forward< Ts >( ts )... );
+   }
+
+}  // namespace tao::json::msgpack
+
+#endif

data/ext/third_party/json/include/tao/json/msgpack/from_file.hpp

@@ -4,7 +4,7 @@
 #ifndef TAO_JSON_MSGPACK_FROM_FILE_HPP
 #define TAO_JSON_MSGPACK_FROM_FILE_HPP
 
-#include <string>
+#include <filesystem>
 #include <utility>
 
 #include "../events/to_value.hpp"
@@ -15,17 +15,17 @@
 namespace tao::json::msgpack
 {
    template< template< typename... > class Traits, template< typename... > class... Transformers >
-   [[nodiscard]] basic_value< Traits > basic_from_file( const std::string& filename )
+   [[nodiscard]] basic_value< Traits > basic_from_file( const std::filesystem::path& path )
    {
       json::events::transformer< json::events::to_basic_value< Traits >, Transformers... > consumer;
-      events::from_file( consumer, filename );
+      events::from_file( consumer, path );
       return std::move( consumer.value );
    }
 
    template< template< typename... > class... Transformers >
-   [[nodiscard]] value from_file( const std::string& filename )
+   [[nodiscard]] value from_file( const std::filesystem::path& path )
    {
-      return basic_from_file< traits, Transformers... >( filename );
+      return basic_from_file< traits, Transformers... >( path );
    }
 
 }  // namespace tao::json::msgpack

data/ext/third_party/json/include/tao/json/msgpack/internal/grammar.hpp

@@ -41,7 +41,8 @@ namespace tao::json::msgpack::internal
    template< utf8_mode V >
    struct data
    {
-      using analyze_t = pegtl::analysis::generic< pegtl::analysis::rule_type::any >;
+      using rule_t = data;
+      using subs_t = pegtl::empty_list;  // TODO?
 
       template< pegtl::apply_mode A,
                 pegtl::rewind_mode M,

data/ext/third_party/json/include/tao/json/operators.hpp

@@ -87,8 +87,6 @@ namespace tao::json
 
       switch( lhs.type() ) {
          case type::UNINITIALIZED:
-            return true;
-
          case type::NULL_:
             return true;
 
@@ -286,8 +284,6 @@ namespace tao::json
 
       switch( lhs.type() ) {
          case type::UNINITIALIZED:
-            return false;
-
          case type::NULL_:
             return false;
 

data/ext/third_party/json/include/tao/json/parts_parser.hpp

@@ -26,8 +26,6 @@ namespace tao::json
 
          struct boolean
          {
-            using analyze_t = pegtl::analysis::generic< pegtl::analysis::rule_type::any >;
-
             template< pegtl::apply_mode,
                       pegtl::rewind_mode,
                       template< typename... >
@@ -58,8 +56,6 @@ namespace tao::json
 
          struct double_rule
          {
-            using analyze_t = pegtl::analysis::generic< pegtl::analysis::rule_type::any >;
-
             template< apply_mode A,
                       rewind_mode M,
                       template< typename... >
@@ -157,7 +153,7 @@ namespace tao::json
 
       [[nodiscard]] bool null()
       {
-         return pegtl::parse< pegtl::seq< internal::rules::null, internal::rules::wss > >( m_input );
+         return pegtl::parse< pegtl::seq< internal::rules::kw_null, internal::rules::wss > >( m_input );
       }
 
       [[nodiscard]] bool boolean()
@@ -177,14 +173,14 @@ namespace tao::json
       [[nodiscard]] std::int64_t number_signed()
       {
          std::int64_t st = 0;  // TODO: Remove superfluous initialisation when we manage to shup up the warnings on all compilers.
-         pegtl::parse< pegtl::must< pegtl::integer::signed_rule_with_action, internal::rules::wss > >( m_input, st );
+         pegtl::parse< pegtl::must< pegtl::signed_rule_with_action, internal::rules::wss > >( m_input, st );
          return st;
       }
 
       [[nodiscard]] std::uint64_t number_unsigned()
       {
          std::uint64_t st = 0;  // TODO: Remove superfluous initialisation when we manage to shup up the warnings on all compilers.
-         pegtl::parse< pegtl::must< pegtl::integer::unsigned_rule_with_action, internal::rules::wss > >( m_input, st );
+         pegtl::parse< pegtl::must< pegtl::unsigned_rule_with_action, internal::rules::wss > >( m_input, st );
          return st;
       }
 

data/ext/third_party/json/include/tao/json/self_contained.hpp

@@ -20,8 +20,6 @@ namespace tao::json
    {
       switch( v.type() ) {
          case type::UNINITIALIZED:
-            return true;
-
          case type::NULL_:
          case type::BOOLEAN:
          case type::SIGNED:
@@ -29,14 +27,17 @@ namespace tao::json
          case type::DOUBLE:
          case type::STRING:
          case type::BINARY:
+         case type::VALUELESS_BY_EXCEPTION:
             return true;
 
          case type::STRING_VIEW:
          case type::BINARY_VIEW:
+         case type::VALUE_PTR:
+         case type::OPAQUE_PTR:
             return false;
 
          case type::ARRAY:
-            for( auto& e : v.get_array() ) {
+            for( const auto& e : v.get_array() ) {
                if( !is_self_contained( e ) ) {
                   return false;
                }
@@ -44,21 +45,12 @@ namespace tao::json
             return true;
 
          case type::OBJECT:
-            for( auto& e : v.get_object() ) {
+            for( const auto& e : v.get_object() ) {
                if( !is_self_contained( e.second ) ) {
                   return false;
                }
             }
             return true;
-
-         case type::VALUE_PTR:
-            return false;
-
-         case type::OPAQUE_PTR:
-            return false;
-
-         case type::VALUELESS_BY_EXCEPTION:
-            return true;
       }
       // LCOV_EXCL_START
       assert( false );
@@ -76,8 +68,6 @@ namespace tao::json
    {
       switch( v.type() ) {
          case type::UNINITIALIZED:
-            return;
-
          case type::NULL_:
          case type::BOOLEAN:
          case type::SIGNED:
@@ -85,6 +75,7 @@ namespace tao::json
          case type::DOUBLE:
          case type::STRING:
          case type::BINARY:
+         case type::VALUELESS_BY_EXCEPTION:
             return;
 
          case type::STRING_VIEW:
@@ -123,9 +114,6 @@ namespace tao::json
             v = std::move( consumer.value );
             return;
          }
-
-         case type::VALUELESS_BY_EXCEPTION:
-            return;
       }
       throw std::logic_error( "invalid value for tao::json::type" );  // LCOV_EXCL_LINE
    }