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

data/ext/third_party/json/include/tao/json/contrib/position.hpp

@@ -4,6 +4,7 @@
 #ifndef TAO_JSON_CONTRIB_POSITION_HPP
 #define TAO_JSON_CONTRIB_POSITION_HPP
 
+#include <filesystem>
 #include <ostream>
 #include <string>
 #include <type_traits>
@@ -21,16 +22,15 @@ namespace tao::json
    {
    private:
       std::size_t m_line = 0;
-      std::size_t m_byte_in_line = 0;
+      std::size_t m_column = 0;
       std::string m_source;
 
    public:
-      position() noexcept
-      {}
+      position() = default;
 
-      position( std::string in_source, const std::size_t in_line, const std::size_t in_byte_in_line )
+      position( std::string in_source, const std::size_t in_line, const std::size_t in_column )
          : m_line( in_line ),
-           m_byte_in_line( in_byte_in_line ),
+           m_column( in_column ),
            m_source( std::move( in_source ) )
       {}
 
@@ -39,7 +39,7 @@ namespace tao::json
       position( position&& p ) noexcept
       {
          m_line = p.m_line;
-         m_byte_in_line = p.m_byte_in_line;
+         m_column = p.m_column;
          m_source = std::move( p.m_source );
       }
 
@@ -50,7 +50,7 @@ namespace tao::json
       position& operator=( position&& p ) noexcept
       {
          m_line = p.m_line;
-         m_byte_in_line = p.m_byte_in_line;
+         m_column = p.m_column;
          m_source = std::move( p.m_source );
          return *this;
       }
@@ -65,9 +65,9 @@ namespace tao::json
          return m_line;
       }
 
-      [[nodiscard]] std::size_t byte_in_line() const noexcept
+      [[nodiscard]] std::size_t column() const noexcept
       {
-         return m_byte_in_line;
+         return m_column;
       }
 
       void set_source( const std::string& s )
@@ -79,13 +79,13 @@ namespace tao::json
       void set_position( const T& p )
       {
          m_line = p.line;
-         m_byte_in_line = p.byte_in_line;
+         m_column = p.column;
          m_source = p.source;
       }
 
       void append_message_extension( std::ostream& os ) const
       {
-         os << '[' << m_source << ':' << m_line << ':' << m_byte_in_line << ']';
+         os << '[' << m_source << ':' << m_line << ':' << m_column << ']';
       }
    };
 
@@ -147,18 +147,18 @@ namespace tao::json
    };
 
    template< template< typename... > class Traits, template< typename... > class... Transformers >
-   [[nodiscard]] auto basic_from_file_with_position( const std::string& filename )
+   [[nodiscard]] auto basic_from_file_with_position( const std::filesystem::path& path )
    {
       events::transformer< events::to_basic_value< Traits >, Transformers... > consumer;
-      pegtl::file_input< pegtl::tracking_mode::eager > in( filename );
+      pegtl::file_input< pegtl::tracking_mode::eager > in( path );
       pegtl::parse< internal::grammar, internal::position_action, internal::errors >( in, consumer );
       return std::move( consumer.value );
    }
 
    template< template< typename... > class... Transformers >
-   [[nodiscard]] auto from_file_with_position( const std::string& filename )
+   [[nodiscard]] auto from_file_with_position( const std::filesystem::path& path )
    {
-      return basic_from_file_with_position< make_position_traits< traits >::template type, Transformers... >( filename );
+      return basic_from_file_with_position< make_position_traits< traits >::template type, Transformers... >( path );
    }
 
 }  // namespace tao::json

data/ext/third_party/json/include/tao/json/contrib/reference.hpp

@@ -33,7 +33,6 @@ namespace tao::json
       {
          switch( v.type() ) {
             case type::UNINITIALIZED:
-               return;
             case type::NULL_:
             case type::BOOLEAN:
             case type::SIGNED:
@@ -43,12 +42,17 @@ namespace tao::json
             case type::STRING_VIEW:
             case type::BINARY:
             case type::BINARY_VIEW:
+            case type::VALUE_PTR:
+            case type::OPAQUE_PTR:
+            case type::VALUELESS_BY_EXCEPTION:
                return;
+
             case type::ARRAY:
                for( auto& e : v.get_array() ) {
                   resolve_references( r, e );
                }
                return;
+
             case type::OBJECT:
                for( auto& e : v.get_object() ) {
                   resolve_references( r, e.second );
@@ -92,12 +96,6 @@ namespace tao::json
                   }
                }
                return;
-            case type::VALUE_PTR:
-               return;
-            case type::OPAQUE_PTR:
-               return;
-            case type::VALUELESS_BY_EXCEPTION:
-               return;
          }
          throw std::logic_error( "invalid value for tao::json::type" );  // LCOV_EXCL_LINE
       }

data/ext/third_party/json/include/tao/json/contrib/schema.hpp

@@ -108,6 +108,15 @@ namespace tao::json
          return true;
       }
 
+      [[nodiscard]] inline std::size_t unicode_size( const std::string_view v ) noexcept
+      {
+         std::size_t r = 0;
+         for( char c : v ) {
+            r += static_cast< std::size_t >( ( c & 0xC0 ) != 0x80 );
+         }
+         return r;
+      }
+
       enum schema_flags
       {
          NONE = 0,
@@ -229,7 +238,7 @@ namespace tao::json
             m_flags = m_flags | v;
          }
 
-         void add_type( const std::string& v )
+         void add_type( const std::string_view v )
          {
             if( !v.empty() ) {
                switch( v[ 0 ] ) {
@@ -268,7 +277,7 @@ namespace tao::json
                      break;
                }
             }
-            throw std::runtime_error( "invalid JSON Schema: invalid primitive type '" + v + '\'' );
+            throw std::runtime_error( "invalid JSON Schema: invalid primitive type '" + std::string( v ) + '\'' );
          }
 
          [[nodiscard]] const basic_value< Traits >* find( const char* s ) const
@@ -307,14 +316,14 @@ namespace tao::json
             if( const auto* p = find( "type" ) ) {
                switch( p->type() ) {
                   case type::STRING:
-                     add_type( p->get_string() );
+                     add_type( p->get_string_type() );
                      break;
                   case type::ARRAY:
                      for( const auto& e : p->get_array() ) {
                         if( !e.is_string() ) {
                            throw std::runtime_error( "invalid JSON Schema: elements in array \"type\" must be of type 'string'" );
                         }
-                        add_type( e.get_string() );
+                        add_type( e.get_string_type() );
                      }
                      break;
                   default:
@@ -331,6 +340,9 @@ namespace tao::json
                m_flags = m_flags | HAS_ENUM;
             }
 
+            // const
+            // TODO: Implement me!
+
             // allOf
             if( const auto* p = find( "allOf" ) ) {
                if( !p->is_array() ) {
@@ -379,6 +391,9 @@ namespace tao::json
                m_not = p;
             }
 
+            // dependentSchemas
+            // TODO: Implement me!
+
             // definitions
             if( const auto* p = find( "definitions" ) ) {
                if( !p->is_object() ) {
@@ -600,6 +615,12 @@ namespace tao::json
                m_additional_items = p;
             }
 
+            // unevaluatedItems
+            // TODO: Implement me!
+
+            // contains
+            // TODO: Implement me!
+
             // maxItems
             if( const auto* p = find( "maxItems" ) ) {
                switch( p->type() ) {
@@ -647,6 +668,12 @@ namespace tao::json
                }
             }
 
+            // maxContains
+            // TODO: Implement me!
+
+            // minContains
+            // TODO: Implement me!
+
             // maxProperties
             if( const auto* p = find( "maxProperties" ) ) {
                switch( p->type() ) {
@@ -702,6 +729,9 @@ namespace tao::json
                }
             }
 
+            // dependentRequired
+            // TODO: Implement me!
+
             // properties
             if( const auto* p = find( "properties" ) ) {
                if( !p->is_object() ) {
@@ -741,6 +771,9 @@ namespace tao::json
                m_additional_properties = p;
             }
 
+            // unevaluatedProperties
+            // TODO: Implement me!
+
             // dependencies
             if( const auto* p = find( "dependencies" ) ) {
                if( !p->is_object() ) {
@@ -836,7 +869,7 @@ namespace tao::json
          {
             assert( m_match );
             if( m_node->m_flags & HAS_ENUM ) {
-               m_enum.erase( std::remove_if( m_enum.begin(), m_enum.end(), [&]( const std::unique_ptr< events_compare< Traits > >& p ) { return f( *p ); } ), m_enum.end() );
+               m_enum.erase( std::remove_if( m_enum.begin(), m_enum.end(), [ & ]( const std::unique_ptr< events_compare< Traits > >& p ) { return f( *p ); } ), m_enum.end() );
                if( m_enum.empty() ) {
                   m_match = false;
                }
@@ -926,7 +959,7 @@ namespace tao::json
          void validate_collections( F&& f )
          {
             assert( m_match );
-            const auto f2 = [&]( const std::unique_ptr< schema_consumer >& p ) { return f( *p ); };
+            const auto f2 = [ & ]( const std::unique_ptr< schema_consumer >& p ) { return f( *p ); };
             if( m_match ) {
                validate_item( f2 );
             }
@@ -1226,10 +1259,10 @@ namespace tao::json
 
          void validate_string( const std::string_view v )
          {
-            if( m_node->m_flags & HAS_MAX_LENGTH && v.size() > m_node->m_max_length ) {
+            if( ( m_node->m_flags & HAS_MAX_LENGTH ) && ( unicode_size( v ) > m_node->m_max_length ) ) {
                m_match = false;
             }
-            if( m_node->m_flags & HAS_MIN_LENGTH && v.size() < m_node->m_min_length ) {
+            if( ( m_node->m_flags & HAS_MIN_LENGTH ) && ( unicode_size( v ) < m_node->m_min_length ) ) {
                m_match = false;
             }
             if( m_match && m_node->m_pattern ) {
@@ -1409,10 +1442,10 @@ namespace tao::json
                validate_type( BOOLEAN );
             }
             if( m_match ) {
-               validate_enum( [=]( events_compare< Traits >& c ) { c.boolean( v ); return ! c.match(); } );
+               validate_enum( [ = ]( events_compare< Traits >& c ) { c.boolean( v ); return ! c.match(); } );
             }
             if( m_match ) {
-               validate_collections( [=]( schema_consumer& c ) { c.boolean( v ); return ! c.match(); } );
+               validate_collections( [ = ]( schema_consumer& c ) { c.boolean( v ); return ! c.match(); } );
             }
             if( m_match && m_hash ) {
                m_hash->boolean( v );
@@ -1425,10 +1458,10 @@ namespace tao::json
                validate_type( INTEGER | NUMBER );
             }
             if( m_match ) {
-               validate_enum( [=]( events_compare< Traits >& c ) { c.number( v ); return ! c.match(); } );
+               validate_enum( [ = ]( events_compare< Traits >& c ) { c.number( v ); return ! c.match(); } );
             }
             if( m_match ) {
-               validate_collections( [=]( schema_consumer& c ) { c.number( v ); return ! c.match(); } );
+               validate_collections( [ = ]( schema_consumer& c ) { c.number( v ); return ! c.match(); } );
             }
             if( m_match && m_count.empty() ) {
                validate_number( v );
@@ -1444,10 +1477,10 @@ namespace tao::json
                validate_type( INTEGER | NUMBER );
             }
             if( m_match ) {
-               validate_enum( [=]( events_compare< Traits >& c ) { c.number( v ); return ! c.match(); } );
+               validate_enum( [ = ]( events_compare< Traits >& c ) { c.number( v ); return ! c.match(); } );
             }
             if( m_match ) {
-               validate_collections( [=]( schema_consumer& c ) { c.number( v ); return ! c.match(); } );
+               validate_collections( [ = ]( schema_consumer& c ) { c.number( v ); return ! c.match(); } );
             }
             if( m_match && m_count.empty() ) {
                validate_number( v );
@@ -1463,10 +1496,10 @@ namespace tao::json
                validate_type( NUMBER );
             }
             if( m_match ) {
-               validate_enum( [=]( events_compare< Traits >& c ) { c.number( v ); return ! c.match(); } );
+               validate_enum( [ = ]( events_compare< Traits >& c ) { c.number( v ); return ! c.match(); } );
             }
             if( m_match ) {
-               validate_collections( [=]( schema_consumer& c ) { c.number( v ); return ! c.match(); } );
+               validate_collections( [ = ]( schema_consumer& c ) { c.number( v ); return ! c.match(); } );
             }
             if( m_match && m_count.empty() ) {
                validate_number( v );
@@ -1482,10 +1515,10 @@ namespace tao::json
                validate_type( STRING );
             }
             if( m_match ) {
-               validate_enum( [&]( events_compare< Traits >& c ) { c.string( v ); return ! c.match(); } );
+               validate_enum( [ & ]( events_compare< Traits >& c ) { c.string( v ); return ! c.match(); } );
             }
             if( m_match ) {
-               validate_collections( [&]( schema_consumer& c ) { c.string( v ); return ! c.match(); } );
+               validate_collections( [ & ]( schema_consumer& c ) { c.string( v ); return ! c.match(); } );
             }
             if( m_match && m_count.empty() ) {
                validate_string( v );
@@ -1643,19 +1676,19 @@ namespace tao::json
             m_count.push_back( 0 );
          }
 
-         void key( const std::string& v )
+         void key( const std::string_view sv )
          {
             if( m_match ) {
-               validate_enum( [&]( events_compare< Traits >& c ) { c.key( v ); return ! c.match(); } );
+               validate_enum( [ & ]( events_compare< Traits >& c ) { c.key( sv ); return ! c.match(); } );
             }
             if( m_match ) {
-               validate_collections( [&]( schema_consumer& c ) { c.key( v ); return ! c.match(); } );
+               validate_collections( [ & ]( schema_consumer& c ) { c.key( sv ); return ! c.match(); } );
             }
             if( m_match && m_hash ) {
-               m_hash->key( v );
+               m_hash->key( sv );
             }
             if( m_match && ( m_count.size() == 1 ) && ( m_node->m_flags & HAS_DEPENDENCIES || !m_node->m_required.empty() ) ) {
-               if( !m_keys.insert( v ).second ) {
+               if( !m_keys.insert( std::string( sv ) ).second ) {
                   // duplicate keys immediately invalidate!
                   // TODO: throw?
                   m_match = false;
@@ -1664,13 +1697,13 @@ namespace tao::json
             if( m_match && m_properties.empty() && ( m_count.size() == 1 ) ) {
                if( const auto* p = m_node->m_properties ) {
                   const auto& o = p->get_object();
-                  const auto it = o.find( v );
+                  const auto it = o.find( sv );
                   if( it != o.end() ) {
                      m_properties.push_back( m_container->consumer( &it->second.skip_value_ptr() ) );
                   }
                }
                for( const auto& e : m_node->m_pattern_properties ) {
-                  if( std::regex_search( v, e.first ) ) {
+                  if( std::regex_search( sv.begin(), sv.end(), e.first ) ) {
                      m_properties.push_back( m_container->consumer( e.second ) );
                   }
                }
@@ -1689,16 +1722,6 @@ namespace tao::json
             }
          }
 
-         void key( const std::string_view sv )
-         {
-            key( std::string( sv ) );
-         }
-
-         void key( const char* v )
-         {
-            key( std::string( v ) );
-         }
-
          void member()
          {
             if( m_match ) {

data/ext/third_party/json/include/tao/json/contrib/shared_ptr_traits.hpp

@@ -64,15 +64,23 @@ namespace tao::json
       template< template< typename... > class Traits >
       static void assign( basic_value< Traits >& v, const std::shared_ptr< U >& o )
       {
-         assert( o );
-         v = static_cast< const T& >( *o );
+         if( o ) {
+            v = static_cast< const T& >( *o );
+         }
+         else {
+            v = null;
+         }
       }
 
       template< template< typename... > class Traits, typename Consumer >
       static void produce( Consumer& c, const std::shared_ptr< U >& o )
       {
-         assert( o );
-         json::events::produce< Traits >( c, static_cast< const T& >( *o ) );
+         if( o ) {
+            json::events::produce< Traits >( c, static_cast< const T& >( *o ) );
+         }
+         else {
+            c.null();
+         }
       }
    };
 

data/ext/third_party/json/include/tao/json/contrib/unique_ptr_traits.hpp

@@ -63,15 +63,23 @@ namespace tao::json
       template< template< typename... > class Traits >
       static void assign( basic_value< Traits >& v, const std::unique_ptr< U >& o )
       {
-         assert( o );
-         v = static_cast< const T& >( *o );
+         if( o ) {
+            v = static_cast< const T& >( *o );
+         }
+         else {
+            v = null;
+         }
       }
 
       template< template< typename... > class Traits, typename Consumer >
       static void produce( Consumer& c, const std::unique_ptr< U >& o )
       {
-         assert( o );
-         json::events::produce< Traits >( c, static_cast< const T& >( *o ) );
+         if( o ) {
+            json::events::produce< Traits >( c, static_cast< const T& >( *o ) );
+         }
+         else {
+            c.null();
+         }
       }
    };