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

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

@@ -16,12 +16,12 @@ namespace tao
    {
       [[nodiscard]] inline bool binary_equal( const binary_view lhs, const binary_view rhs ) noexcept
       {
-         return std::equal( lhs.cbegin(), lhs.cend(), rhs.cbegin(), rhs.cend() );
+         return std::equal( lhs.begin(), lhs.end(), rhs.begin(), rhs.end() );
       }
 
       [[nodiscard]] inline bool binary_less( const binary_view lhs, const binary_view rhs ) noexcept
       {
-         return std::lexicographical_compare( lhs.cbegin(), lhs.cend(), rhs.cbegin(), rhs.cend() );
+         return std::lexicographical_compare( lhs.begin(), lhs.end(), rhs.begin(), rhs.end() );
       }
 
    }  // namespace internal

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

@@ -24,7 +24,7 @@ namespace tao::json::binding
       template< typename... As >
       struct make_array
       {
-         using list = json::internal::merge_type_lists< internal::inherit_elements< As >... >;
+         using list = json::internal::type_list_concat_t< internal::inherit_elements< As >... >;
          using type = internal::array< list >;
       };
 
@@ -34,7 +34,7 @@ namespace tao::json::binding
    using array = typename internal::make_array< As... >::type;
 
    template< for_unknown_key E, for_nothing_value N, typename... As >
-   using basic_object = internal::basic_object< E, N, json::internal::merge_type_lists< internal::inherit_members< As >... > >;
+   using basic_object = internal::basic_object< E, N, json::internal::type_list_concat_t< internal::inherit_members< As >... > >;
 
    template< typename... As >
    using object = basic_object< for_unknown_key::fail, for_nothing_value::encode, As... >;

data/ext/third_party/json/include/tao/json/binding/factory.hpp

@@ -13,6 +13,7 @@
 #include "../forward.hpp"
 
 #include "../basic_value.hpp"
+#include "../external/pegtl/demangle.hpp"
 #include "../external/pegtl/internal/pegtl_string.hpp"
 #include "../internal/escape.hpp"
 #include "../internal/format.hpp"
@@ -134,7 +135,7 @@ namespace tao::json::binding
 
          const auto& a = v.get_object();
          if( a.size() != 1 ) {
-            throw std::runtime_error( json::internal::format( "polymorphic factory requires object of size one for base class ", pegtl::internal::demangle< Base >(), json::message_extension( v ) ) );
+            throw std::runtime_error( json::internal::format( "polymorphic factory requires object of size one for base class ", demangle< Base >(), json::message_extension( v ) ) );
          }
          const auto b = a.begin();
          const auto i = m.find( b->first );
@@ -142,7 +143,7 @@ namespace tao::json::binding
             std::ostringstream oss;
             json::internal::format_to( oss, "unknown factory type \"", json::internal::escape( b->first ), "\" -- known are" );
             internal::list_all_types( oss, m );
-            json::internal::format_to( oss, " for base class ", pegtl::internal::demangle< Base >(), json::message_extension( v ) );
+            json::internal::format_to( oss, " for base class ", demangle< Base >(), json::message_extension( v ) );
             throw std::runtime_error( oss.str() );
          }
          r = i->second.function( b->second, with... );
@@ -169,9 +170,9 @@ namespace tao::json::binding
          const auto i = m.find( &typeid( *p ) );
          if( i == m.end() ) {
             std::ostringstream oss;
-            json::internal::format_to( oss, "unknown factory type ", pegtl::internal::demangle< decltype( *p ) >(), " -- known are" );
+            json::internal::format_to( oss, "unknown factory type ", demangle< decltype( *p ) >(), " -- known are" );
             internal::list_all_types( oss, m );
-            json::internal::format_to( oss, " for base class ", pegtl::internal::demangle< Base >() );
+            json::internal::format_to( oss, " for base class ", demangle< Base >() );
             throw std::runtime_error( oss.str() );
          }
          i->second.function( v, p );
@@ -204,7 +205,7 @@ namespace tao::json::binding
             std::ostringstream oss;
             json::internal::format_to( oss, "unknown factory type \"", json::internal::escape( k ), "\" -- known are" );
             internal::list_all_types( oss, m );
-            json::internal::format_to( oss, " for base class ", pegtl::internal::demangle< Base >() );
+            json::internal::format_to( oss, " for base class ", demangle< Base >() );
             throw std::runtime_error( oss.str() );
          }
          r = i->second.function( parser );
@@ -232,9 +233,9 @@ namespace tao::json::binding
          const auto i = m.find( &typeid( *p ) );
          if( i == m.end() ) {
             std::ostringstream oss;
-            json::internal::format_to( oss, "unknown factory type ", pegtl::internal::demangle< decltype( *p ) >(), " -- known are" );
+            json::internal::format_to( oss, "unknown factory type ", demangle< decltype( *p ) >(), " -- known are" );
             internal::list_all_types( oss, m );
-            json::internal::format_to( oss, " for base class ", pegtl::internal::demangle< Base >() );
+            json::internal::format_to( oss, " for base class ", demangle< Base >() );
             throw std::runtime_error( oss.str() );
          }
          consumer.begin_object( 1 );

data/ext/third_party/json/include/tao/json/binding/internal/array.hpp

@@ -10,6 +10,7 @@
 #include "../../basic_value.hpp"
 #include "../../forward.hpp"
 
+#include "../../external/pegtl/demangle.hpp"
 #include "../../internal/format.hpp"
 #include "../../internal/type_traits.hpp"
 
@@ -28,7 +29,7 @@ namespace tao::json::binding::internal
       {
          const auto& a = v.get_array();
          if( a.size() != sizeof...( As ) ) {
-            throw std::runtime_error( json::internal::format( "array size mismatch for type ", pegtl::internal::demangle< C >(), " -- expected ", sizeof...( As ), " received ", a.size(), json::message_extension( v ) ) );
+            throw std::runtime_error( json::internal::format( "array size mismatch for type ", demangle< C >(), " -- expected ", sizeof...( As ), " received ", a.size(), json::message_extension( v ) ) );
          }
          return a;
       }

data/ext/third_party/json/include/tao/json/binding/internal/object.hpp

@@ -18,6 +18,7 @@
 #include "../../forward.hpp"
 
 #include "../../basic_value.hpp"
+#include "../../external/pegtl/demangle.hpp"
 #include "../../internal/escape.hpp"
 #include "../../internal/format.hpp"
 #include "../../internal/type_traits.hpp"
@@ -118,7 +119,7 @@ namespace tao::json::binding::internal
                std::ostringstream oss;
                json::internal::format_to( oss, "unknown object key \"", json::internal::escape( k ), "\" -- known are" );
                list_all_keys( oss, m );
-               json::internal::format_to( oss, " for type ", pegtl::internal::demangle< C >(), json::message_extension( v ) );
+               json::internal::format_to( oss, " for type ", demangle< C >(), json::message_extension( v ) );
                throw std::runtime_error( oss.str() );
             }
             i->second.function( p.second, x );
@@ -129,7 +130,7 @@ namespace tao::json::binding::internal
             std::ostringstream oss;
             json::internal::format_to( oss, "missing required key(s)" );
             list_missing_keys( oss, b, m );
-            json::internal::format_to( oss, " for type ", pegtl::internal::demangle< C >(), json::message_extension( v ) );
+            json::internal::format_to( oss, " for type ", demangle< C >(), json::message_extension( v ) );
             throw std::runtime_error( oss.str() );
          }
       }
@@ -175,11 +176,11 @@ namespace tao::json::binding::internal
                std::ostringstream oss;
                json::internal::format_to( oss, "unknown object key \"", json::internal::escape( k ), "\" -- known are" );
                list_all_keys( oss, m );
-               json::internal::format_to( oss, " for type ", pegtl::internal::demangle< C >() );
+               json::internal::format_to( oss, " for type ", demangle< C >() );
                parser.throw_parse_error( oss.str() );
             }
             if( b.test( i->second.index ) ) {
-               parser.throw_parse_error( json::internal::format( "duplicate object key \"", json::internal::escape( k ), "\" for type ", pegtl::internal::demangle< C >() ) );
+               parser.throw_parse_error( json::internal::format( "duplicate object key \"", json::internal::escape( k ), "\" for type ", demangle< C >() ) );
             }
             i->second.function( parser, x );
             b.set( i->second.index );
@@ -189,7 +190,7 @@ namespace tao::json::binding::internal
             std::ostringstream oss;
             json::internal::format_to( oss, "missing required key(s)" );
             list_missing_keys( oss, b, m );
-            json::internal::format_to( oss, " for type ", pegtl::internal::demangle< C >() );
+            json::internal::format_to( oss, " for type ", demangle< C >() );
             parser.throw_parse_error( oss.str() );
          }
       }

data/ext/third_party/json/include/tao/json/binding/versions.hpp

@@ -8,6 +8,8 @@
 #include <stdexcept>
 
 #include "../forward.hpp"
+
+#include "../external/pegtl/demangle.hpp"
 #include "../internal/format.hpp"
 #include "../internal/type_traits.hpp"
 
@@ -33,7 +35,7 @@ namespace tao::json::binding
                std::rethrow_exception( e );  // TODO: Did I miss a way to avoid the throw?
             }
             catch( ... ) {
-               std::throw_with_nested( std::runtime_error( json::internal::format( "all versions failed for type ", pegtl::internal::demangle< C >(), " -- see nested for first error" ) ) );
+               std::throw_with_nested( std::runtime_error( json::internal::format( "all versions failed for type ", demangle< C >(), " -- see nested for first error" ) ) );
             }
          }
       }

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

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

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

@@ -4,7 +4,7 @@
 #ifndef TAO_JSON_CBOR_CONSUME_FILE_HPP
 #define TAO_JSON_CBOR_CONSUME_FILE_HPP
 
-#include <utility>
+#include <filesystem>
 
 #include "../external/pegtl/file_input.hpp"
 
@@ -15,17 +15,17 @@
 
 namespace tao::json::cbor
 {
-   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 )
    {
-      cbor::basic_parts_parser< utf8_mode::check, pegtl::file_input< pegtl::tracking_mode::lazy > > pp( std::forward< F >( filename ) );
+      cbor::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 )
    {
-      cbor::basic_parts_parser< utf8_mode::check, pegtl::file_input< pegtl::tracking_mode::lazy > > pp( std::forward< F >( filename ) );
+      cbor::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/cbor/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_CBOR_EVENTS_FROM_BINARY_HPP
+#define TAO_JSON_CBOR_EVENTS_FROM_BINARY_HPP
+
+#include "../../binary.hpp"
+#include "../../binary_view.hpp"
+#include "../../external/pegtl/memory_input.hpp"
+
+#include "from_input.hpp"
+
+namespace tao::json::cbor::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::cbor::events::from_binary", byte, line, column );
+      cbor::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 )
+   {
+      cbor::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 )
+   {
+      cbor::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 )
+   {
+      cbor::events::from_binary( consumer, data.data(), data.size(), std::forward< Ts >( ts )... );
+   }
+
+}  // namespace tao::json::cbor::events
+
+#endif

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

@@ -4,7 +4,7 @@
 #ifndef TAO_JSON_CBOR_EVENTS_FROM_FILE_HPP
 #define TAO_JSON_CBOR_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::cbor::events
 {
    // Events producer to parse a file containing a CBOR 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/cbor/events/from_string.hpp

@@ -14,14 +14,14 @@
 namespace tao::json::cbor::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::cbor::events::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::cbor::events::from_string", byte, line, column );
       cbor::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 column = 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 )
    {
       cbor::events::from_string( consumer, data, size, source.c_str(), byte, line, column );
    }

data/ext/third_party/json/include/tao/json/cbor/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_CBOR_FROM_BINARY_HPP
+#define TAO_JSON_CBOR_FROM_BINARY_HPP
+
+#include <utility>
+
+#include "../events/to_value.hpp"
+#include "../events/transformer.hpp"
+
+#include "events/from_binary.hpp"
+
+namespace tao::json::cbor
+{
+   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::cbor
+
+#endif

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

@@ -4,7 +4,7 @@
 #ifndef TAO_JSON_CBOR_FROM_FILE_HPP
 #define TAO_JSON_CBOR_FROM_FILE_HPP
 
-#include <string>
+#include <filesystem>
 #include <utility>
 
 #include "../events/to_value.hpp"
@@ -15,17 +15,17 @@
 namespace tao::json::cbor
 {
    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::cbor

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

@@ -165,7 +165,8 @@ namespace tao::json::cbor::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/consume_file.hpp

@@ -4,7 +4,7 @@
 #ifndef TAO_JSON_CONSUME_FILE_HPP
 #define TAO_JSON_CONSUME_FILE_HPP
 
-#include <utility>
+#include <filesystem>
 
 #include "external/pegtl/file_input.hpp"
 
@@ -14,17 +14,17 @@
 
 namespace tao::json
 {
-   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 )
    {
-      basic_parts_parser< pegtl::file_input< pegtl::tracking_mode::lazy > > pp( std::forward< F >( filename ) );
+      basic_parts_parser< pegtl::file_input< pegtl::tracking_mode::lazy > > pp( path );
       return 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 )
    {
-      basic_parts_parser< pegtl::file_input< pegtl::tracking_mode::lazy > > pp( std::forward< F >( filename ) );
+      basic_parts_parser< pegtl::file_input< pegtl::tracking_mode::lazy > > pp( path );
       consume< Traits >( pp, t );
    }
 

data/ext/third_party/json/include/tao/json/contrib/internal/indirect_traits.hpp

@@ -27,22 +27,29 @@ namespace tao::json::internal
       template< template< typename... > class Traits >
       [[nodiscard]] static bool is_nothing( const T& o )
       {
-         assert( o );
-         return internal::is_nothing< Traits >( add_const( *o ) );
+         return bool( o ) && internal::is_nothing< Traits >( add_const( *o ) );
       }
 
       template< template< typename... > class Traits >
       static void assign( basic_value< Traits >& v, const T& o )
       {
-         assert( o );
-         v = add_const( *o );
+         if( o ) {
+            v = add_const( *o );
+         }
+         else {
+            v = null;
+         }
       }
 
       template< template< typename... > class Traits, typename Consumer >
       static void produce( Consumer& c, const T& o )
       {
-         assert( o );
-         json::events::produce< Traits >( c, add_const( *o ) );
+         if( o ) {
+            json::events::produce< Traits >( c, add_const( *o ) );
+         }
+         else {
+            c.null();
+         }
       }
 
       template< template< typename... > class Traits >