google-protobuf 3.15.6 → 3.19.3

data/lib/google/protobuf/descriptor_pb.rb

@@ -0,0 +1,268 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: google/protobuf/descriptor.proto
+
+require 'google/protobuf'
+
+descriptor_data = File.binread(__FILE__).split("\n__END__\n", 2)[1]
+Google::Protobuf::DescriptorPool.generated_pool.add_serialized_file(descriptor_data)
+
+module Google
+  module Protobuf
+    FileDescriptorSet = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FileDescriptorSet").msgclass
+    FileDescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FileDescriptorProto").msgclass
+    DescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.DescriptorProto").msgclass
+    DescriptorProto::ExtensionRange = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.DescriptorProto.ExtensionRange").msgclass
+    DescriptorProto::ReservedRange = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.DescriptorProto.ReservedRange").msgclass
+    ExtensionRangeOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.ExtensionRangeOptions").msgclass
+    FieldDescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FieldDescriptorProto").msgclass
+    FieldDescriptorProto::Type = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FieldDescriptorProto.Type").enummodule
+    FieldDescriptorProto::Label = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FieldDescriptorProto.Label").enummodule
+    OneofDescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.OneofDescriptorProto").msgclass
+    EnumDescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.EnumDescriptorProto").msgclass
+    EnumDescriptorProto::EnumReservedRange = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.EnumDescriptorProto.EnumReservedRange").msgclass
+    EnumValueDescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.EnumValueDescriptorProto").msgclass
+    ServiceDescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.ServiceDescriptorProto").msgclass
+    MethodDescriptorProto = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.MethodDescriptorProto").msgclass
+    FileOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FileOptions").msgclass
+    FileOptions::OptimizeMode = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FileOptions.OptimizeMode").enummodule
+    MessageOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.MessageOptions").msgclass
+    FieldOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FieldOptions").msgclass
+    FieldOptions::CType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FieldOptions.CType").enummodule
+    FieldOptions::JSType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FieldOptions.JSType").enummodule
+    OneofOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.OneofOptions").msgclass
+    EnumOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.EnumOptions").msgclass
+    EnumValueOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.EnumValueOptions").msgclass
+    ServiceOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.ServiceOptions").msgclass
+    MethodOptions = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.MethodOptions").msgclass
+    MethodOptions::IdempotencyLevel = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.MethodOptions.IdempotencyLevel").enummodule
+    UninterpretedOption = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.UninterpretedOption").msgclass
+    UninterpretedOption::NamePart = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.UninterpretedOption.NamePart").msgclass
+    SourceCodeInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.SourceCodeInfo").msgclass
+    SourceCodeInfo::Location = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.SourceCodeInfo.Location").msgclass
+    GeneratedCodeInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.GeneratedCodeInfo").msgclass
+    GeneratedCodeInfo::Annotation = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.GeneratedCodeInfo.Annotation").msgclass
+  end
+end
+
+__END__
+
+ google/protobuf/descriptor.protogoogle.protobuf"G
+FileDescriptorSet2
+file
 (2$.google.protobuf.FileDescriptorProto"�
+FileDescriptorProto
+name
 
(	
+package 
(	
+
+dependency (	
+public_dependency
+ (
+weak_dependency (6
+message_type (2 .google.protobuf.DescriptorProto7
+	enum_type (2$.google.protobuf.EnumDescriptorProto8
+service (2'.google.protobuf.ServiceDescriptorProto8
+	extension (2%.google.protobuf.FieldDescriptorProto-
+options 
(2.google.protobuf.FileOptions9
+source_code_info	 
(2.google.protobuf.SourceCodeInfo
+syntax 
(	"�
+DescriptorProto
+name
 
(	4
+field (2%.google.protobuf.FieldDescriptorProto8
+	extension (2%.google.protobuf.FieldDescriptorProto5
+nested_type (2 .google.protobuf.DescriptorProto7
+	enum_type (2$.google.protobuf.EnumDescriptorProtoH
+extension_range (2/.google.protobuf.DescriptorProto.ExtensionRange9
+
+oneof_decl (2%.google.protobuf.OneofDescriptorProto0
+options 
(2.google.protobuf.MessageOptionsF
+reserved_range	 (2..google.protobuf.DescriptorProto.ReservedRange
+
+ (	e
+ExtensionRange
+start
 
(
+end 
(7
+options 
(2&.google.protobuf.ExtensionRangeOptions+
+
+start
 
(
+end 
("g
+ExtensionRangeOptionsC
+uninterpreted_option� (2$.google.protobuf.UninterpretedOption*	�����"�
+FieldDescriptorProto
+name
 
(	
+number 
(:
+label 
(2+.google.protobuf.FieldDescriptorProto.Label8
+type 
(2*.google.protobuf.FieldDescriptorProto.Type
+	type_name 
(	
+extendee 
(	
+
+oneof_index	 
(
+	json_name
+ 
(	.
+options 
(2.google.protobuf.FieldOptions
+proto3_optional 
("�
+Type
+TYPE_DOUBLE

+
+TYPE_FLOAT
+
+TYPE_INT64
+TYPE_UINT64
+
+TYPE_INT32
+TYPE_FIXED64
+TYPE_FIXED32
+	TYPE_BOOL
+TYPE_STRING	
+
+TYPE_GROUP
+
+TYPE_MESSAGE
+
+TYPE_BYTES
+TYPE_UINT32
+	TYPE_ENUM
+
+
+TYPE_SINT32
+TYPE_SINT64"C
+Label
+LABEL_OPTIONAL

+LABEL_REQUIRED
+LABEL_REPEATED"T
+OneofDescriptorProto
+name
 
(	.
+options 
(2.google.protobuf.OneofOptions"�
+EnumDescriptorProto
+name
 
(	8
+value (2).google.protobuf.EnumValueDescriptorProto-
+options 
(2.google.protobuf.EnumOptionsN
+reserved_range (26.google.protobuf.EnumDescriptorProto.EnumReservedRange
+
+EnumReservedRange
+start
 
(
+end 
("l
+EnumValueDescriptorProto
+name
 
(	
+number 
(2
+options 
(2!.google.protobuf.EnumValueOptions"�

+ServiceDescriptorProto
+name
 
(	6
+method (2&.google.protobuf.MethodDescriptorProto0
+options 
(2.google.protobuf.ServiceOptions"�

+MethodDescriptorProto
+name
 
(	
+
+input_type 
(	
+output_type 
(	/
+options 
(2.google.protobuf.MethodOptions
+client_streaming 
(:false
+server_streaming 
(:false"�
+FileOptions
+java_package
 
(	
+java_outer_classname 
(	"
+java_multiple_files
+ 
(:false)
+java_generate_equals_and_hash 
(B
%
+java_string_check_utf8 
(:falseF
+optimize_for	 
(2).google.protobuf.FileOptions.OptimizeMode:SPEED
+
+go_package 
(	"
+cc_generic_services 
(:false$
+java_generic_services 
(:false"
+py_generic_services 
(:false#
+php_generic_services* 
(:false
+
+deprecated 
(:false
+cc_enable_arenas 
(:true
+objc_class_prefix$ 
(	
+csharp_namespace% 
(	
+swift_prefix' 
(	
+php_class_prefix( 
(	
+
+php_metadata_namespace, 
(	
+ruby_package- 
(	C
+uninterpreted_option� (2$.google.protobuf.UninterpretedOption":
+OptimizeMode	
+SPEED

+	CODE_SIZE
+LITE_RUNTIME*	�����J&'"�
+MessageOptions&
+message_set_wire_format
 
(:false.
+no_standard_descriptor_accessor 
(:false
+
+deprecated 
(:false
+	map_entry 
(C
+uninterpreted_option� (2$.google.protobuf.UninterpretedOption*	�����JJJJ	J	
+"�
+FieldOptions:
+ctype
 
(2#.google.protobuf.FieldOptions.CType:STRING
+packed 
(?
+jstype 
(2$.google.protobuf.FieldOptions.JSType:	JS_NORMAL
+lazy 
(:false
+
+deprecated 
(:false
+weak
+ 
(:falseC
+uninterpreted_option� (2$.google.protobuf.UninterpretedOption"/
+CType
+
+STRING
+CORD

+STRING_PIECE"5
+JSType
+	JS_NORMAL
+	JS_STRING

+	JS_NUMBER*	�����J"^
+OneofOptionsC
+uninterpreted_option� (2$.google.protobuf.UninterpretedOption*	�����"�

+EnumOptions
+allow_alias 
(
+
+deprecated 
(:falseC
+uninterpreted_option� (2$.google.protobuf.UninterpretedOption*	�����J"}
+EnumValueOptions
+
+deprecated
 
(:falseC
+uninterpreted_option� (2$.google.protobuf.UninterpretedOption*	�����"{
+ServiceOptions
+
+deprecated! 
(:falseC
+uninterpreted_option� (2$.google.protobuf.UninterpretedOption*	�����"�
+
+
+deprecated! 
(:false_
+idempotency_level" 
(2/.google.protobuf.MethodOptions.IdempotencyLevel:IDEMPOTENCY_UNKNOWNC
+uninterpreted_option� (2$.google.protobuf.UninterpretedOption"P
+IdempotencyLevel
+IDEMPOTENCY_UNKNOWN
+NO_SIDE_EFFECTS

+
+IDEMPOTENT*	�����"�
+UninterpretedOption;
+name (2-.google.protobuf.UninterpretedOption.NamePart
+identifier_value 
(	
+positive_int_value 
(
+negative_int_value 
(
+double_value 
(

+string_value 
(
+aggregate_value 
(	3
+NamePart
+	name_part
 (	
+is_extension ("�

+SourceCodeInfo:
+location
 (2(.google.protobuf.SourceCodeInfo.Location�

+Location
+path
 (B

+span (B

+leading_comments 
(	
+trailing_comments 
(	!
+leading_detached_comments (	"�

+GeneratedCodeInfoA
+
+annotation
 (2-.google.protobuf.GeneratedCodeInfo.AnnotationO
+
+Annotation
+path
 (B

+source_file 
(	
+begin 
(
+end 
(B~
+com.google.protobufBDescriptorProtosH
Z-google.golang.org/protobuf/types/descriptorpb�

�GPB�Google.Protobuf.Reflection

data/lib/google/protobuf/type_pb.rb

@@ -5,6 +5,7 @@ require 'google/protobuf'
 
 require 'google/protobuf/any_pb'
 require 'google/protobuf/source_context_pb'
+
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("google/protobuf/type.proto", :syntax => :proto3) do
     add_message "google.protobuf.Type" do

data/lib/google/protobuf/well_known_types.rb

@@ -85,6 +85,11 @@ module Google
       def from_time(time)
         self.seconds = time.to_i
         self.nanos = time.nsec
+        self
+      end
+
+      def self.from_time(time)
+        new.from_time(time)
       end
 
       def to_i

data/lib/google/protobuf.rb

@@ -51,77 +51,9 @@ else
     require 'google/protobuf_c'
   end
 
-  module Google
-    module Protobuf
-      module Internal
-        def self.infer_package(names)
-          # Package is longest common prefix ending in '.', if any.
-          if not names.empty?
-            min, max = names.minmax
-            last_common_dot = nil
-            min.size.times { |i|
-              if min[i] != max[i] then break end
-              if min[i] == ?. then last_common_dot = i end
-            }
-            if last_common_dot
-              return min.slice(0, last_common_dot)
-            end
-          end
-
-          nil
-        end
-
-        class NestingBuilder
-          def initialize(msg_names, enum_names)
-            @to_pos = {nil=>nil}
-            @msg_children = Hash.new { |hash, key| hash[key] = [] }
-            @enum_children = Hash.new { |hash, key| hash[key] = [] }
-
-            msg_names.each_with_index { |name, idx| @to_pos[name] = idx }
-            enum_names.each_with_index { |name, idx| @to_pos[name] = idx }
-
-            msg_names.each { |name| @msg_children[parent(name)] << name }
-            enum_names.each { |name| @enum_children[parent(name)] << name }
-          end
-
-          def build(package)
-            return build_msg(package)
-          end
-
-          private
-          def build_msg(msg)
-            return {
-              :pos => @to_pos[msg],
-              :msgs => @msg_children[msg].map { |child| build_msg(child) },
-              :enums => @enum_children[msg].map { |child| @to_pos[child] },
-            }
-          end
-
-          private
-          def parent(name)
-            idx = name.rindex(?.)
-            if idx
-              return name.slice(0, idx)
-            else
-              return nil
-            end
-          end
-        end
-
-        def self.fixup_descriptor(package, msg_names, enum_names)
-          if package.nil?
-            package = self.infer_package(msg_names + enum_names)
-          end
-
-          nesting = NestingBuilder.new(msg_names, enum_names).build(package)
-
-          return package, nesting
-        end
-      end
-    end
-  end
 end
 
+require 'google/protobuf/descriptor_dsl'
 require 'google/protobuf/repeated_field'
 
 module Google

data/tests/basic.rb

@@ -63,6 +63,14 @@ module BasicTest
       end
     end
 
+    def test_issue_8559_crash
+      msg = TestMessage.new
+      msg.repeated_int32 = ::Google::Protobuf::RepeatedField.new(:int32, [1, 2, 3])
+      # TODO: Remove the platform check once https://github.com/jruby/jruby/issues/6818 is released in JRuby 9.3.0.0
+      GC.start(full_mark: true, immediate_sweep: true) unless RUBY_PLATFORM == "java"
+      TestMessage.encode(msg)
+    end
+
     def test_has_field
       m = TestSingularFields.new
       assert !m.has_singular_msg?
@@ -161,6 +169,17 @@ module BasicTest
       assert_equal nil, m.singular_msg
     end
 
+    def test_import_proto2
+      m = TestMessage.new
+      assert !m.has_optional_proto2_submessage?
+      m.optional_proto2_submessage = ::FooBar::Proto2::TestImportedMessage.new
+      assert m.has_optional_proto2_submessage?
+      assert TestMessage.descriptor.lookup('optional_proto2_submessage').has?(m)
+
+      m.clear_optional_proto2_submessage
+      assert !m.has_optional_proto2_submessage?
+    end
+
     def test_clear_repeated_fields
       m = TestMessage.new
 
@@ -480,6 +499,7 @@ module BasicTest
         :optional_int64=>0,
         :optional_msg=>nil,
         :optional_msg2=>nil,
+        :optional_proto2_submessage=>nil,
         :optional_string=>"foo",
         :optional_uint32=>0,
         :optional_uint64=>0,
@@ -600,5 +620,21 @@ module BasicTest
       assert_raise(FrozenErrorType) { m.map_string_int32.delete('a') }
       assert_raise(FrozenErrorType) { m.map_string_int32.clear }
     end
+
+    def test_map_length
+      m = proto_module::MapMessage.new
+      assert_equal 0, m.map_string_int32.length
+      assert_equal 0, m.map_string_msg.length
+      assert_equal 0, m.map_string_int32.size
+      assert_equal 0, m.map_string_msg.size
+
+      m.map_string_int32['a'] = 1
+      m.map_string_int32['b'] = 2
+      m.map_string_msg['a'] = proto_module::TestMessage2.new
+      assert_equal 2, m.map_string_int32.length
+      assert_equal 1, m.map_string_msg.length
+      assert_equal 2, m.map_string_int32.size
+      assert_equal 1, m.map_string_msg.size
+    end
   end
 end

data/tests/stress.rb

@@ -30,7 +30,7 @@ module StressTest
       100_000.times do
         mnew = TestMessage.decode(data)
         mnew = mnew.dup
-        assert_equal mnew.inspect, m.inspect
+        assert_equal m.inspect, mnew.inspect
         assert TestMessage.encode(mnew) == data
       end
     end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 3.15.6
+  version: 3.19.3
 platform: ruby
 authors:
 - Protobuf Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -64,20 +58,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.9
-- !ruby/object:Gem::Dependency
-  name: rubygems-tasks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
 description: Protocol Buffers are Google's data interchange format.
 email: protobuf@googlegroups.com
 executables: []
@@ -100,11 +80,12 @@ files:
 - ext/google/protobuf_c/repeated_field.h
 - ext/google/protobuf_c/ruby-upb.c
 - ext/google/protobuf_c/ruby-upb.h
-- ext/google/protobuf_c/third_party/wyhash/wyhash.h
 - ext/google/protobuf_c/wrap_memcpy.c
 - lib/google/protobuf.rb
 - lib/google/protobuf/any_pb.rb
 - lib/google/protobuf/api_pb.rb
+- lib/google/protobuf/descriptor_dsl.rb
+- lib/google/protobuf/descriptor_pb.rb
 - lib/google/protobuf/duration_pb.rb
 - lib/google/protobuf/empty_pb.rb
 - lib/google/protobuf/field_mask_pb.rb
@@ -123,7 +104,7 @@ homepage: https://developers.google.com/protocol-buffers
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.15.6/ruby
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.19.3/ruby
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -139,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.14
+rubygems_version: 3.3.4
 signing_key: 
 specification_version: 4
 summary: Protocol Buffers

data/ext/google/protobuf_c/third_party/wyhash/wyhash.h

@@ -1,145 +0,0 @@
-/* Copyright 2020 王一 Wang Yi <godspeed_china@yeah.net>
-   This is free and unencumbered software released into the public domain. http://unlicense.org/
-   See github.com/wangyi-fudan/wyhash/ LICENSE
- */
-#ifndef wyhash_final_version
-#define wyhash_final_version
-//defines that change behavior
-#ifndef WYHASH_CONDOM
-#define WYHASH_CONDOM 1 //0: read 8 bytes before and after boundaries, dangerous but fastest. 1: normal valid behavior 2: extra protection against entropy loss (probability=2^-63), aka. "blind multiplication"
-#endif
-#define WYHASH_32BIT_MUM 0	//faster on 32 bit system
-//includes
-#include <stdint.h>
-#include <string.h>
-#if defined(_MSC_VER) && defined(_M_X64)
-  #include <intrin.h>
-  #pragma intrinsic(_umul128)
-#endif
-#if defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__clang__)
-  #define _likely_(x)	__builtin_expect(x,1)
-  #define _unlikely_(x)	__builtin_expect(x,0)
-#else
-  #define _likely_(x) (x)
-  #define _unlikely_(x) (x)
-#endif
-//mum function
-static inline uint64_t _wyrot(uint64_t x) { return (x>>32)|(x<<32); }
-static inline void _wymum(uint64_t *A, uint64_t *B){
-#if(WYHASH_32BIT_MUM)
-  uint64_t hh=(*A>>32)*(*B>>32), hl=(*A>>32)*(unsigned)*B, lh=(unsigned)*A*(*B>>32), ll=(uint64_t)(unsigned)*A*(unsigned)*B;
-  #if(WYHASH_CONDOM>1)
-  *A^=_wyrot(hl)^hh; *B^=_wyrot(lh)^ll;
-  #else
-  *A=_wyrot(hl)^hh; *B=_wyrot(lh)^ll;
-  #endif
-#elif defined(__SIZEOF_INT128__)
-  __uint128_t r=*A; r*=*B; 
-  #if(WYHASH_CONDOM>1)
-  *A^=(uint64_t)r; *B^=(uint64_t)(r>>64);
-  #else
-  *A=(uint64_t)r; *B=(uint64_t)(r>>64);
-  #endif
-#elif defined(_MSC_VER) && defined(_M_X64)
-  #if(WYHASH_CONDOM>1)
-  uint64_t  a,  b;
-  a=_umul128(*A,*B,&b);
-  *A^=a;  *B^=b;
-  #else
-  *A=_umul128(*A,*B,B);
-  #endif
-#else
-  uint64_t ha=*A>>32, hb=*B>>32, la=(uint32_t)*A, lb=(uint32_t)*B, hi, lo;
-  uint64_t rh=ha*hb, rm0=ha*lb, rm1=hb*la, rl=la*lb, t=rl+(rm0<<32), c=t<rl;
-  lo=t+(rm1<<32); c+=lo<t; hi=rh+(rm0>>32)+(rm1>>32)+c;
-  #if(WYHASH_CONDOM>1)
-  *A^=lo;  *B^=hi;
-  #else
-  *A=lo;  *B=hi;
-  #endif
-#endif
-}
-static inline uint64_t _wymix(uint64_t A, uint64_t B){ _wymum(&A,&B); return A^B; }
-//read functions
-#ifndef WYHASH_LITTLE_ENDIAN
-  #if defined(_WIN32) || defined(__LITTLE_ENDIAN__) || (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-    #define WYHASH_LITTLE_ENDIAN 1
-  #elif defined(__BIG_ENDIAN__) || (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
-    #define WYHASH_LITTLE_ENDIAN 0
-  #endif
-#endif
-#if (WYHASH_LITTLE_ENDIAN)
-static inline uint64_t _wyr8(const uint8_t *p) { uint64_t v; memcpy(&v, p, 8); return v;}
-static inline uint64_t _wyr4(const uint8_t *p) { unsigned v; memcpy(&v, p, 4); return v;}
-#elif defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__clang__)
-static inline uint64_t _wyr8(const uint8_t *p) { uint64_t v; memcpy(&v, p, 8); return __builtin_bswap64(v);}
-static inline uint64_t _wyr4(const uint8_t *p) { unsigned v; memcpy(&v, p, 4); return __builtin_bswap32(v);}
-#elif defined(_MSC_VER)
-static inline uint64_t _wyr8(const uint8_t *p) { uint64_t v; memcpy(&v, p, 8); return _byteswap_uint64(v);}
-static inline uint64_t _wyr4(const uint8_t *p) { unsigned v; memcpy(&v, p, 4); return _byteswap_ulong(v);}
-#endif
-static inline uint64_t _wyr3(const uint8_t *p, unsigned k) { return (((uint64_t)p[0])<<16)|(((uint64_t)p[k>>1])<<8)|p[k-1];}
-//wyhash function
-static inline uint64_t _wyfinish16(const uint8_t *p, uint64_t len, uint64_t seed, const uint64_t *secret, uint64_t i){
-#if(WYHASH_CONDOM>0)
-  uint64_t a, b;
-  if(_likely_(i<=8)){
-    if(_likely_(i>=4)){ a=_wyr4(p); b=_wyr4(p+i-4); }
-    else if (_likely_(i)){ a=_wyr3(p,i); b=0; }
-    else a=b=0;
-  } 
-  else{ a=_wyr8(p); b=_wyr8(p+i-8); }
-  return _wymix(secret[1]^len,_wymix(a^secret[1], b^seed));
-#else
-  #define oneshot_shift ((i<8)*((8-i)<<3))
-  return _wymix(secret[1]^len,_wymix((_wyr8(p)<<oneshot_shift)^secret[1],(_wyr8(p+i-8)>>oneshot_shift)^seed));
-#endif
-}
-
-static inline uint64_t _wyfinish(const uint8_t *p, uint64_t len, uint64_t seed, const uint64_t *secret, uint64_t i){
-  if(_likely_(i<=16)) return _wyfinish16(p,len,seed,secret,i);
-  return _wyfinish(p+16,len,_wymix(_wyr8(p)^secret[1],_wyr8(p+8)^seed),secret,i-16);
-}
-
-static inline uint64_t wyhash(const void *key, uint64_t len, uint64_t seed, const uint64_t *secret){
-  const uint8_t *p=(const uint8_t *)key;
-  uint64_t i=len; seed^=*secret;
-  if(_unlikely_(i>64)){
-    uint64_t see1=seed;
-    do{
-      seed=_wymix(_wyr8(p)^secret[1],_wyr8(p+8)^seed)^_wymix(_wyr8(p+16)^secret[2],_wyr8(p+24)^seed);
-      see1=_wymix(_wyr8(p+32)^secret[3],_wyr8(p+40)^see1)^_wymix(_wyr8(p+48)^secret[4],_wyr8(p+56)^see1);
-      p+=64; i-=64;
-    }while(i>64);
-    seed^=see1;
-  }
-  return _wyfinish(p,len,seed,secret,i);
-}
-//utility functions
-static const uint64_t _wyp[5] = {0xa0761d6478bd642full, 0xe7037ed1a0b428dbull, 0x8ebc6af09c88c6e3ull, 0x589965cc75374cc3ull, 0x1d8e4e27c47d124full};
-static inline uint64_t wyhash64(uint64_t A, uint64_t B){  A^=_wyp[0]; B^=_wyp[1];  _wymum(&A,&B);  return _wymix(A^_wyp[0],B^_wyp[1]);}
-static inline uint64_t wyrand(uint64_t *seed){  *seed+=_wyp[0]; return _wymix(*seed,*seed^_wyp[1]);}
-static inline double wy2u01(uint64_t r){ const double _wynorm=1.0/(1ull<<52); return (r>>12)*_wynorm;}
-static inline double wy2gau(uint64_t r){ const double _wynorm=1.0/(1ull<<20); return ((r&0x1fffff)+((r>>21)&0x1fffff)+((r>>42)&0x1fffff))*_wynorm-3.0;}
-static inline uint64_t wy2u0k(uint64_t r, uint64_t k){ _wymum(&r,&k); return k; }
-
-static inline void make_secret(uint64_t seed, uint64_t *secret){
-  uint8_t c[] = {15, 23, 27, 29, 30, 39, 43, 45, 46, 51, 53, 54, 57, 58, 60, 71, 75, 77, 78, 83, 85, 86, 89, 90, 92, 99, 101, 102, 105, 106, 108, 113, 114, 116, 120, 135, 139, 141, 142, 147, 149, 150, 153, 154, 156, 163, 165, 166, 169, 170, 172, 177, 178, 180, 184, 195, 197, 198, 201, 202, 204, 209, 210, 212, 216, 225, 226, 228, 232, 240 };
-  for(size_t i=0;i<5;i++){
-    uint8_t ok;
-    do{
-      ok=1; secret[i]=0;
-      for(size_t j=0;j<64;j+=8) secret[i]|=((uint64_t)c[wyrand(&seed)%sizeof(c)])<<j;
-      if(secret[i]%2==0){ ok=0; continue; }
-      for(size_t j=0;j<i;j++)
-#if defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__clang__)
-        if(__builtin_popcountll(secret[j]^secret[i])!=32){ ok=0; break; }
-#elif defined(_MSC_VER) && defined(_M_X64)
-        if(_mm_popcnt_u64(secret[j]^secret[i])!=32){ ok=0; break; }
-#endif
-       if(!ok)continue;
-       for(uint64_t j=3;j<0x100000000ull;j+=2) if(secret[i]%j==0){ ok=0; break; }
-    }while(!ok);
-  }
-}
-#endif